lib/gzr/modules/model/set.rb in gazer-0.3.10 vs lib/gzr/modules/model/set.rb in gazer-0.3.11

@@ -27,11 +27,11 @@
 
       def all_model_sets(fields=nil)
         req = {}
         req[:fields] = fields if fields
         begin
-          return @sdk.all_model_sets(req)
+          @sdk.all_model_sets(req).collect { |s| s.to_attrs }
         rescue LookerSDK::NotFound => e
           return nil
         rescue LookerSDK::Error => e
           say_error "Error querying all_model_sets(#{JSON.pretty_generate(req)})"
           say_error e
@@ -41,11 +41,11 @@
 
       def cat_model_set(set_id, fields=nil)
         req = {}
         req[:fields] = fields if fields
         begin
-          return @sdk.model_set(set_id,req)&.to_attrs
+          @sdk.model_set(set_id,req)&.to_attrs
         rescue LookerSDK::NotFound => e
           return nil
         rescue LookerSDK::Error => e
           say_error "Error querying model_set(#{set_id},#{JSON.pretty_generate(req)})"
           say_error e
@@ -71,11 +71,11 @@
           req[:all_access] = all_access unless all_access.nil?
           req[:built_in] = built_in unless built_in.nil?
           req[:filter_or] = filter_or unless filter_or.nil?
           req[:limit] = 64
           loop do
-            page = @sdk.search_model_sets(req)
+            page = @sdk.search_model_sets(req).collect { |s| s.to_attrs }
             data+=page
             break unless page.length == req[:limit]
             req[:offset] = (req[:offset] || 0) + req[:limit]
           end
         rescue LookerSDK::NotFound => e
@@ -88,30 +88,30 @@
         data
       end
 
       def update_model_set(model_set_id, data)
         begin
-          return @sdk.update_model_set(model_set_id, data)&.to_attrs
+          @sdk.update_model_set(model_set_id, data)&.to_attrs
         rescue LookerSDK::Error => e
           say_error "Error calling update_model_set(#{model_set_id},#{JSON.pretty_generate(data)})"
           say_error e
           raise
         end
       end
 
       def create_model_set(data)
         begin
-          return @sdk.create_model_set(data)&.to_attrs
+          @sdk.create_model_set(data)&.to_attrs
         rescue LookerSDK::Error => e
           say_error "Error calling create_model_set(#{JSON.pretty_generate(data)})"
           say_error e
           raise
         end
       end
 
       def delete_model_set(model_set_id)
         begin
-          return @sdk.delete_model_set(model_set_id)
+          @sdk.delete_model_set(model_set_id)
         rescue LookerSDK::Error => e
           say_error "Error calling delete_model_set(#{model_set_id}})"
           say_error e
           raise
         end