gazer 0.3.10 → 0.3.11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 378d891160a3f1d4a96dad3083a865fcc642fa18f90af66c03c30ecf60c5d04c
-  data.tar.gz: 762d4625315eafec4780539439230727b7793a22a2badb3493c811170bd8012e
+  metadata.gz: dce76479c6d89605e315f8f83c7e8290ccefbb6a543d8e3343b9a391ac3ed454
+  data.tar.gz: 6d54b5c93354d8b09531cdbe4aefd5d335a52e37f2db7c45682292d06d27592c
 SHA512:
-  metadata.gz: ff29c0527bcf56fce1bc2b3284068e73e52540c00648ad1665bcafeb509448e72e6185d3729e59ff3b22c0c5c141ee763c381adcc99c0fc4d5076dff267ba06e
-  data.tar.gz: 76a2a1a2507f1822decd68f69c6f1430c28c492cb95531c3c37fdd995c337bdf1e4986b8f53cd65b479b6e2b91d024e48e6e17bcc0a4e5a07775cb12684e27d6
+  metadata.gz: c2f41c52c372487a5214d9f9472b0896947c5f33663f7f3e75726d7350c0fc73cea814be179312156542fcc2c08e79f308bab2c0bfa6a0275ff3a0b7313a9067
+  data.tar.gz: c8263710569aa4a6e1bf457e4bb0c21b5cf2d01e39b3c230fe7599b81ace74f5d69fa1799f110f3af387fcbda236d2592fb3bae476af70c52754ca9dbe7a6a47

data/CHANGELOG.md

@@ -1,5 +1,12 @@
 # Changelog
 
+## [0.3.11](https://github.com/looker-open-source/gzr/compare/v0.3.10...v0.3.11) (2023-09-29)
+
+
+### Features
+
+* Tech debt removal for better testing ([#223](https://github.com/looker-open-source/gzr/issues/223)) ([e3a7e88](https://github.com/looker-open-source/gzr/commit/e3a7e889fe020a4a1a5f496b634b11cf96c3028f))
+
 ## [0.3.10](https://github.com/looker-open-source/gzr/compare/v0.3.9...v0.3.10) (2023-06-28)
 
 

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    gazer (0.3.10)
+    gazer (0.3.11)
       faraday (~> 2.7.8)
       faraday-multipart (~> 1.0)
       looker-sdk (~> 0.1.6)

data/lib/gzr/command.rb

@@ -53,15 +53,15 @@ module Gzr
     end
 
     def get_user_by_id(user_id, req=nil)
-      user = nil
       begin
-        user = @sdk.user(user_id, req)
+        @sdk.user(user_id, req).to_attrs
+      rescue LookerSDK::NotFound => e
+        nil
       rescue LookerSDK::Error => e
         say_error "Error querying get_user_by_id(#{user_id})"
         say_error e
         raise
       end
-      user
     end
 
     def get_auth()
@@ -129,13 +129,12 @@ module Gzr
 
     def run_inline_query(query)
       begin
-        data = @sdk.run_inline_query("json",query)
+        @sdk.run_inline_query("json",query).collect { |r| r.to_attrs }
       rescue LookerSDK::Error => e
         say_error "Error running inline_query(#{JSON.pretty_generate(query)})"
         say_error e
         raise
       end
-      data
     end
 
     def all_color_collections()
@@ -410,6 +409,11 @@ module Gzr
       parts.join('&.')
     end
 
+    def field_expression_hash(name)
+      parts = name.split(/\./)
+      parts.collect { |p| "&.fetch(:#{p},nil)" }.join('')
+    end
+
 
     # This version of field names yields an expression that can be evaluated against a hash structure
     # like this one...

data/lib/gzr/commands/alert/cat.rb

@@ -41,8 +41,8 @@ module Gzr
           say_warning(@options) if @options[:debug]
           with_session do
             alert = get_alert(@alert_id)
-            write_file(@options[:dir] ? "Alert_#{alert.id}_#{alert.field.name}.json" : nil, @options[:dir],nil, output) do |f|
-              f.puts JSON.pretty_generate(alert.to_attrs)
+            write_file(@options[:dir] ? "Alert_#{alert[:id]}_#{alert[:field][:name]}.json" : nil, @options[:dir],nil, output) do |f|
+              f.puts JSON.pretty_generate(alert)
             end
           end
         end

data/lib/gzr/commands/alert/ls.rb

@@ -51,10 +51,10 @@ module Gzr
             table_hash = Hash.new
             fields = field_names(@options[:fields])
             table_hash[:header] = fields unless @options[:plain]
-            expressions = fields.collect { |fn| field_expression(fn) }
+            expressions = fields.collect { |fn| field_expression_hash(fn) }
             table_hash[:rows] = data.map do |row|
               expressions.collect do |e|
-                eval "row.#{e}"
+                eval "row#{e}"
               end
             end
             table = TTY::Table.new(table_hash)

data/lib/gzr/commands/alert/notifications.rb

@@ -49,10 +49,10 @@ module Gzr
             table_hash = Hash.new
             fields = field_names(@fields)
             table_hash[:header] = fields unless @options[:plain]
-            expressions = fields.collect { |fn| field_expression(fn) }
+            expressions = fields.collect { |fn| field_expression_hash(fn) }
             table_hash[:rows] = data.map do |row|
               expressions.collect do |e|
-                eval "row.#{e}"
+                eval "row#{e}"
               end
             end
             table = TTY::Table.new(table_hash)

data/lib/gzr/commands/attribute/cat.rb

@@ -1,6 +1,6 @@
 # The MIT License (MIT)
 
-# Copyright (c) 2018 Mike DeAngelo Looker Data Sciences, Inc.
+# Copyright (c) 2023 Mike DeAngelo Google, Inc.
 
 # Permission is hereby granted, free of charge, to any person obtaining a copy of
 # this software and associated documentation files (the "Software"), to deal in
@@ -49,8 +49,8 @@ module Gzr
               attr = get_attribute_by_name(@attr,f)
             end
             raise(Gzr::CLI::Error, "Attribute #{@attr} does not exist") unless attr
-            write_file(@options[:dir] ? "Attribute_#{attr.id}_#{attr.name}.json" : nil, @options[:dir],nil, output) do |f|
-              f.puts JSON.pretty_generate(attr.to_attrs)
+            write_file(@options[:dir] ? "Attribute_#{attr[:id]}_#{attr[:name]}.json" : nil, @options[:dir],nil, output) do |f|
+              f.puts JSON.pretty_generate(attr)
             end
           end
         end

data/lib/gzr/commands/attribute/create.rb

@@ -1,6 +1,6 @@
 # The MIT License (MIT)
 
-# Copyright (c) 2018 Mike DeAngelo Looker Data Sciences, Inc.
+# Copyright (c) 2023 Mike DeAngelo Google, Inc.
 
 # Permission is hereby granted, free of charge, to any person obtaining a copy of
 # this software and associated documentation files (the "Software"), to deal in
@@ -47,7 +47,7 @@ module Gzr
             source[:'hidden_value_domain_allowlist'] = @options[:'domain-allowlist'] if @options[:'is-hidden'] && @options[:'domain-allowlist']
 
             attr = upsert_user_attribute(source, @options[:force], output: $stdout)
-            output.puts "Imported attribute #{attr.name} #{attr.id}" unless @options[:plain]
+            output.puts "Imported attribute #{attr[:name]} #{attr[:id]}" unless @options[:plain]
             output.puts attr.id if @options[:plain]
           end
         end

data/lib/gzr/commands/attribute/get_group_value.rb

@@ -1,6 +1,6 @@
 # The MIT License (MIT)
 
-# Copyright (c) 2018 Mike DeAngelo Looker Data Sciences, Inc.
+# Copyright (c) 2023 Mike DeAngelo Google, Inc.
 
 # Permission is hereby granted, free of charge, to any person obtaining a copy of
 # this software and associated documentation files (the "Software"), to deal in
@@ -66,9 +66,9 @@ module Gzr
             end
             raise(Gzr::CLI::Error, "Attribute #{@attr} does not exist") unless attr
 
-            data = query_user_attribute_group_value(group.id,attr.id)
-            say_warning("Attribute #{attr.name} does not have a value set for group #{group.name}", output: output) unless data
-            output.puts data.value if data
+            data = query_user_attribute_group_value(group[:id],attr[:id])
+            say_warning("Attribute #{attr[:name]} does not have a value set for group #{group[:name]}", output: output) unless data
+            output.puts data[:value] if data
           end
         end
       end

data/lib/gzr/commands/attribute/import.rb

@@ -1,6 +1,6 @@
 # The MIT License (MIT)
 
-# Copyright (c) 2018 Mike DeAngelo Looker Data Sciences, Inc.
+# Copyright (c) 2023 Mike DeAngelo Google, Inc.
 
 # Permission is hereby granted, free of charge, to any person obtaining a copy of
 # this software and associated documentation files (the "Software"), to deal in
@@ -42,8 +42,8 @@ module Gzr
           with_session do
             read_file(@file) do |source|
               attr = upsert_user_attribute(source, @options[:force], output: $stdout)
-              output.puts "Imported attribute #{attr.name} #{attr.id}" unless @options[:plain]
-              output.puts attr.id if @options[:plain]
+              output.puts "Imported attribute #{attr[:name]} #{attr[:id]}" unless @options[:plain]
+              output.puts attr[:id] if @options[:plain]
             end
           end
         end

data/lib/gzr/commands/attribute/ls.rb

@@ -1,6 +1,6 @@
 # The MIT License (MIT)
 
-# Copyright (c) 2018 Mike DeAngelo Looker Data Sciences, Inc.
+# Copyright (c) 2023 Mike DeAngelo Google, Inc.
 
 # Permission is hereby granted, free of charge, to any person obtaining a copy of
 # this software and associated documentation files (the "Software"), to deal in
@@ -48,10 +48,10 @@ module Gzr
             table_hash = Hash.new
             fields = field_names(@options[:fields])
             table_hash[:header] = fields unless @options[:plain]
-            expressions = fields.collect { |fn| field_expression(fn) }
+            expressions = fields.collect { |fn| field_expression_hash(fn) }
             table_hash[:rows] = data.map do |row|
               expressions.collect do |e|
-                eval "row.#{e}"
+                eval "row#{e}"
               end
             end
             table = TTY::Table.new(table_hash)

data/lib/gzr/commands/attribute/rm.rb

@@ -1,6 +1,6 @@
 # The MIT License (MIT)
 
-# Copyright (c) 2018 Mike DeAngelo Looker Data Sciences, Inc.
+# Copyright (c) 2023 Mike DeAngelo Google, Inc.
 
 # Permission is hereby granted, free of charge, to any person obtaining a copy of
 # this software and associated documentation files (the "Software"), to deal in
@@ -50,10 +50,10 @@ module Gzr
             raise(Gzr::CLI::Error, "Attribute #{attr[:name]} is a system built-in and cannot be deleted ") if attr[:is_system]
             raise(Gzr::CLI::Error, "Attribute #{attr[:name]} is marked permanent and cannot be deleted ") if attr[:is_permanent]
 
-            delete_user_attribute(attr.id)
+            delete_user_attribute(attr[:id])
 
-            output.puts "Deleted attribute #{attr.name} #{attr.id}" unless @options[:plain]
-            output.puts attr.id if @options[:plain]
+            output.puts "Deleted attribute #{attr[:name]} #{attr[:id]}" unless @options[:plain]
+            output.puts attr[:id] if @options[:plain]
           end
         end
       end

data/lib/gzr/commands/attribute/set_group_value.rb

@@ -1,6 +1,6 @@
 # The MIT License (MIT)
 
-# Copyright (c) 2018 Mike DeAngelo Looker Data Sciences, Inc.
+# Copyright (c) 2023 Mike DeAngelo Google, Inc.
 
 # Permission is hereby granted, free of charge, to any person obtaining a copy of
 # this software and associated documentation files (the "Software"), to deal in
@@ -67,9 +67,9 @@ module Gzr
             end
             raise(Gzr::CLI::Error, "Attribute #{@attr} does not exist") unless attr
 
-            data = update_user_attribute_group_value(group.id,attr.id, @value)
-            say_warning("Attribute #{attr.name} does not have a value set for group #{group.name}", output: output) unless data
-            output.puts "Group attribute #{data.id} set to #{data.value}"
+            data = update_user_attribute_group_value(group[:id],attr[:id], @value)
+            say_warning("Attribute #{attr[:name]} does not have a value set for group #{group[:name]}", output: output) unless data
+            output.puts "Group attribute #{data[:id]} set to #{data[:value]}"
           end
         end
       end

data/lib/gzr/commands/connection/dialects.rb

@@ -1,6 +1,6 @@
 # The MIT License (MIT)
 
-# Copyright (c) 2018 Mike DeAngelo Looker Data Sciences, Inc.
+# Copyright (c) 2023 Mike DeAngelo Google, Inc.
 
 # Permission is hereby granted, free of charge, to any person obtaining a copy of
 # this software and associated documentation files (the "Software"), to deal in
@@ -46,11 +46,11 @@ module Gzr
 
             table_hash = Hash.new
             fields = field_names(@options[:fields])
-            table_hash[:header] = data[0].to_attrs.keys unless @options[:plain]
-            expressions = fields.collect { |fn| field_expression(fn) }
+            table_hash[:header] = data[0].keys unless @options[:plain]
+            expressions = fields.collect { |fn| field_expression_hash(fn) }
             table_hash[:rows] = data.map do |row|
               expressions.collect do |e|
-                eval "row.#{e}"
+                eval "row#{e}"
               end
             end
             table = TTY::Table.new(table_hash)

data/lib/gzr/commands/connection/ls.rb

@@ -47,10 +47,10 @@ module Gzr
             table_hash = Hash.new
             fields = field_names(@options[:fields])
             table_hash[:header] = fields unless @options[:plain]
-            expressions = fields.collect { |fn| field_expression(fn) }
+            expressions = fields.collect { |fn| field_expression_hash(fn) }
             table_hash[:rows] = data.map do |row|
               expressions.collect do |e|
-                eval "row.#{e}"
+                eval "row#{e}"
               end
             end
             table = TTY::Table.new(table_hash)

data/lib/gzr/commands/connection/test.rb

@@ -44,10 +44,10 @@ module Gzr
             table_hash = Hash.new
             fields = field_names(@options[:fields])
             table_hash[:header] = fields unless @options[:plain]
-            expressions = fields.collect { |fn| field_expression(fn) }
+            expressions = fields.collect { |fn| field_expression_hash(fn) }
             table_hash[:rows] = data.map do |row|
               expressions.collect do |e|
-                eval "row.#{e}"
+                eval "row#{e}"
               end
             end
             table = TTY::Table.new(table_hash)

data/lib/gzr/commands/dashboard/import.rb

@@ -72,7 +72,7 @@ module Gzr
                 filter = new_filter.select do |k,v|
                   (keys_to_keep('create_dashboard_filter') + [:row]).include? k
                 end
-                filter[:dashboard_id] = dashboard.id
+                filter[:dashboard_id] = dashboard[:id]
                 say_warning "Creating filter" if @options[:debug]
                 dashboard[:dashboard_filters].push create_dashboard_filter(filter)
               end
@@ -84,7 +84,7 @@ module Gzr
                 end
                 (element[:query_id],element[:look_id],element[:merge_result_id]) = process_dashboard_element(new_element)
                 say_warning "Creating dashboard element #{element.select {|k,v| !v.nil?}.inspect}" if @options[:debug]
-                element[:dashboard_id] = dashboard.id
+                element[:dashboard_id] = dashboard[:id]
                 result_maker = copy_result_maker_filterables(new_element)
                 element[:result_maker] = result_maker if result_maker
                 dashboard_element = create_dashboard_element(element)
@@ -101,42 +101,42 @@ module Gzr
                   end
                 end
                 dashboard[:dashboard_elements].push dashboard_element
-                [new_element[:id], dashboard_element.id]
+                [new_element[:id], dashboard_element[:id]]
               end
 
               source_dashboard_layouts = data[:dashboard_layouts].map do |new_layout|
                 layout_obj = nil
                 if new_layout[:active]
-                  layout_obj = get_dashboard_layout(dashboard[:dashboard_layouts].first.id)
-                  say_warning "Updating layout #{layout_obj.id}" if @options[:debug]
+                  layout_obj = get_dashboard_layout(dashboard[:dashboard_layouts].first[:id])
+                  say_warning "Updating layout #{layout_obj[:id]}" if @options[:debug]
                 else
                   layout = new_layout.select do |k,v|
                     (keys_to_keep('create_dashboard_layout') - [:dashboard_id]).include? k
                   end
-                  layout[:dashboard_id] = dashboard.id
+                  layout[:dashboard_id] = dashboard[:id]
                   say_warning "Creating dashboard layout #{layout}" if @options[:debug]
                   layout_obj = create_dashboard_layout(layout)
                   say_warning "Created dashboard layout #{JSON.pretty_generate layout_obj.map(&:to_a).to_json}" if @options[:debug]
                 end
-                layout_components = new_layout[:dashboard_layout_components].zip(layout_obj.dashboard_layout_components)
+                layout_components = new_layout[:dashboard_layout_components].zip(layout_obj[:dashboard_layout_components])
                 layout_components.each do |source,target|
                   component = keys_to_keep('update_dashboard_layout_component').collect do |e|
                     [e,nil]
                   end.to_h
-                  component[:dashboard_layout_id] = target.dashboard_layout_id
+                  component[:dashboard_layout_id] = target[:dashboard_layout_id]
 
                   component.merge!(source.select do |k,v|
                     (keys_to_keep('update_dashboard_layout_component') - [:id,:dashboard_layout_id]).include? k
                   end)
 
                   component[:dashboard_element_id] = elem_table.assoc(source[:dashboard_element_id])[1]
-                  say_warning "Updating dashboard layout component #{target.id}" if @options[:debug]
-                  update_dashboard_layout_component(target.id,component)
+                  say_warning "Updating dashboard layout component #{target[:id]}" if @options[:debug]
+                  update_dashboard_layout_component(target[:id],component)
                 end
               end
-              upsert_plans_for_dashboard(dashboard.id,@me.id,data[:scheduled_plans]) if data[:scheduled_plans]
-              output.puts "Imported dashboard #{dashboard.id}" unless @options[:plain]
-              output.puts dashboard.id if @options[:plain]
+              upsert_plans_for_dashboard(dashboard[:id],@me[:id],data[:scheduled_plans]) if data[:scheduled_plans]
+              output.puts "Imported dashboard #{dashboard[:id]}" unless @options[:plain]
+              output.puts dashboard[:id] if @options[:plain]
             end
           end
         end
@@ -162,8 +162,8 @@ module Gzr
           same_slug = (slug_used&.fetch(:id,nil) == existing_dashboard&.fetch(:id,nil))
 
           if slug_used && !same_slug then
-            say_warning "slug #{slug_used.slug} already used for dashboard #{slug_used.title} in folder #{slug_used.folder_id}", output: output
-            say_warning("That dashboard is in the 'Trash' but not fully deleted yet", output: output) if slug_used.deleted
+            say_warning "slug #{slug_used[:slug]} already used for dashboard #{slug_used[:title]} in folder #{slug_used[:folder_id]}", output: output
+            say_warning("That dashboard is in the 'Trash' but not fully deleted yet", output: output) if slug_used[:deleted]
             say_warning "dashboard will be imported with new slug", output: output
           end
 
@@ -173,28 +173,28 @@ module Gzr
             end
             raise Gzr::CLI::Error, "Dashboard #{existing_dashboard[:title]} with slug #{existing_dashboard[:slug]} already exists in folder #{target_folder_id}\nUse --force if you want to overwrite it" unless @options[:force]
 
-            say_ok "Modifying existing dashboard #{existing_dashboard.id} #{existing_dashboard[:title]} in folder #{target_folder_id}", output: output
+            say_ok "Modifying existing dashboard #{existing_dashboard[:id]} #{existing_dashboard[:title]} in folder #{target_folder_id}", output: output
             new_dash = source.select do |k,v|
               (keys_to_keep('update_dashboard') - [:space_id,:folder_id,:user_id,:slug]).include? k
             end
             new_dash[:slug] = source[:slug] unless slug_used
             new_dash[:deleted] = false if existing_dashboard[:deleted]
-            d = update_dashboard(existing_dashboard.id,new_dash)
+            d = update_dashboard(existing_dashboard[:id],new_dash)
 
-            d.dashboard_filters.each do |f|
-              delete_dashboard_filter(f.id)
+            d[:dashboard_filters].each do |f|
+              delete_dashboard_filter(f[:id])
             end
-            d.dashboard_filters = []
+            d[:dashboard_filters] = []
 
-            d.dashboard_elements.each do |e|
-              delete_dashboard_element(e.id)
+            d[:dashboard_elements].each do |e|
+              delete_dashboard_element(e[:id])
             end
-            d.dashboard_elements = []
+            d[:dashboard_elements] = []
 
-            d.dashboard_layouts.each do |l|
-              delete_dashboard_layout(l.id) unless l.active
+            d[:dashboard_layouts].each do |l|
+              delete_dashboard_layout(l[:id]) unless l[:active]
             end
-            d.dashboard_layouts.select! { |l| l.active }
+            d[:dashboard_layouts].select! { |l| l[:active] }
 
             return d
           else
@@ -203,7 +203,7 @@ module Gzr
             end
             new_dash[:slug] = source[:slug] unless slug_used
             new_dash[:folder_id] = target_folder_id
-            new_dash[:user_id] = @me.id
+            new_dash[:user_id] = @me[:id]
             new_dash.select!{|k,v| !v.nil?}
             say_warning "new dashboard request #{new_dash.inspect}" if @options[:debug]
             d = create_dashboard(new_dash)
@@ -227,13 +227,13 @@ module Gzr
         end
 
         def process_dashboard_element(dash_elem)
-          return [nil, upsert_look(@me.id, create_fetch_query(dash_elem[:look][:query]).id, @dest_folder_id, dash_elem[:look]).id, nil] if dash_elem[:look]
+          return [nil, upsert_look(@me[:id], create_fetch_query(dash_elem[:look][:query])[:id], @dest_folder_id, dash_elem[:look])[:id], nil] if dash_elem[:look]
 
           query = dash_elem[:result_maker]&.fetch(:query, false) || dash_elem[:query]
-          return [create_fetch_query(query).id, nil, nil] if query
+          return [create_fetch_query(query)[:id], nil, nil] if query
 
           merge_result = dash_elem[:result_maker]&.fetch(:merge_result, false) || dash_elem[:merge_result]
-          return [nil,nil,create_merge_result(merge_result).id] if merge_result
+          return [nil,nil,create_merge_result(merge_result)[:id]] if merge_result
 
           [nil,nil,nil]
         end

data/lib/gzr/commands/dashboard/mv.rb

@@ -1,6 +1,6 @@
 # The MIT License (MIT)
 
-# Copyright (c) 2018 Mike DeAngelo Looker Data Sciences, Inc.
+# Copyright (c) 2023 Mike DeAngelo Google, Inc.
 
 # Permission is hereby granted, free of charge, to any person obtaining a copy of
 # this software and associated documentation files (the "Software"), to deal in

data/lib/gzr/commands/folder/cat.rb

@@ -1,6 +1,6 @@
 # The MIT License (MIT)
 
-# Copyright (c) 2018 Mike DeAngelo Looker Data Sciences, Inc.
+# Copyright (c) 2023 Mike DeAngelo Google, Inc.
 
 # Permission is hereby granted, free of charge, to any person obtaining a copy of
 # this software and associated documentation files (the "Software"), to deal in
@@ -42,8 +42,8 @@ module Gzr
           say_warning("options: #{@options.inspect}") if @options[:debug]
           with_session do
             data = query_folder(@folder_id)
-            write_file(@options[:dir] ? "Folder_#{data.id}_#{data.name}.json" : nil, @options[:dir], nil, output) do |f|
-              f.puts JSON.pretty_generate(data.to_attrs)
+            write_file(@options[:dir] ? "Folder_#{data[:id]}_#{data[:name]}.json" : nil, @options[:dir], nil, output) do |f|
+              f.puts JSON.pretty_generate(data)
             end
           end
         end

data/lib/gzr/commands/folder/create.rb

@@ -1,6 +1,6 @@
 # The MIT License (MIT)
 
-# Copyright (c) 2018 Mike DeAngelo Looker Data Sciences, Inc.
+# Copyright (c) 2023 Mike DeAngelo Google, Inc.
 
 # Permission is hereby granted, free of charge, to any person obtaining a copy of
 # this software and associated documentation files (the "Software"), to deal in
@@ -40,8 +40,8 @@ module Gzr
           folder = nil
           with_session do
             folder = create_folder(@name, @parent_folder)
-            output.puts "Created folder #{folder.id}" unless @options[:plain]
-            output.puts folder.id if @options[:plain]
+            output.puts "Created folder #{folder[:id]}" unless @options[:plain]
+            output.puts folder[:id] if @options[:plain]
           end
         end
       end

data/lib/gzr/commands/folder/export.rb

@@ -1,6 +1,6 @@
 # The MIT License (MIT)
 
-# Copyright (c) 2018 Mike DeAngelo Looker Data Sciences, Inc.
+# Copyright (c) 2023 Mike DeAngelo Google, Inc.
 
 # Permission is hereby granted, free of charge, to any person obtaining a copy of
 # this software and associated documentation files (the "Software"), to deal in
@@ -86,7 +86,7 @@ module Gzr
         end
 
         def process_folder(folder_id, base, rel_path = nil)
-          folder = query_folder(folder_id).to_attrs
+          folder = query_folder(folder_id)
           name = folder[:name]
           name = "nil (#{folder_id})" if name.nil?
           path = Pathname.new(name.gsub('/',"\u{2215}"))

data/lib/gzr/commands/folder/ls.rb

@@ -1,6 +1,6 @@
 # The MIT License (MIT)
 
-# Copyright (c) 2018 Mike DeAngelo Looker Data Sciences, Inc.
+# Copyright (c) 2023 Mike DeAngelo Google, Inc.
 
 # Permission is hereby granted, free of charge, to any person obtaining a copy of
 # this software and associated documentation files (the "Software"), to deal in
@@ -71,15 +71,14 @@ module Gzr
             f = @options[:fields]
 
             data = folder_ids.map do |folder_id|
-              query_folder(folder_id, f).to_attrs
+              query_folder(folder_id, f)
             end.compact
             folder_ids.each do |folder_id|
-              query_folder_children(folder_id, 'id,name,parent_id').map {|child| child.to_attrs}.each do |child|
+              query_folder_children(folder_id, 'id,name,parent_id').each do |child|
                 data.push child
               end
             end
 
-
             begin
               puts "No data returned for folders #{folder_ids.inspect}"
               return nil

data/lib/gzr/commands/folder/rm.rb

@@ -1,6 +1,6 @@
 # The MIT License (MIT)
 
-# Copyright (c) 2018 Mike DeAngelo Looker Data Sciences, Inc.
+# Copyright (c) 2023 Mike DeAngelo Google, Inc.
 
 # Permission is hereby granted, free of charge, to any person obtaining a copy of
 # this software and associated documentation files (the "Software"), to deal in
@@ -44,8 +44,8 @@ module Gzr
               return nil
             end unless folder
             children = query_folder_children(@folder)
-            unless (folder.looks.length == 0 && folder.dashboards.length == 0 && children.length == 0) || @options[:force] then
-              raise Gzr::CLI::Error, "Folder '#{folder.name}' is not empty. Folder cannot be deleted unless --force is specified"
+            unless (folder[:looks].length == 0 && folder[:dashboards].length == 0 && children.length == 0) || @options[:force] then
+              raise Gzr::CLI::Error, "Folder '#{folder[:name]}' is not empty. Folder cannot be deleted unless --force is specified"
             end
             delete_folder(@folder)
           end

data/lib/gzr/commands/folder/top.rb

@@ -1,6 +1,6 @@
 # The MIT License (MIT)
 
-# Copyright (c) 2018 Mike DeAngelo Looker Data Sciences, Inc.
+# Copyright (c) 2023 Mike DeAngelo Google, Inc.
 
 # Permission is hereby granted, free of charge, to any person obtaining a copy of
 # this software and associated documentation files (the "Software"), to deal in
@@ -50,12 +50,12 @@ module Gzr
             table_hash = Hash.new
             fields = field_names(@options[:fields])
             table_hash[:header] = fields unless @options[:plain]
-            expressions = fields.collect { |fn| field_expression(fn) }
+            expressions = fields.collect { |fn| field_expression_hash(fn) }
             rows = []
             folders.each do |h|
-              if ( h.is_shared_root || h.is_users_root || h.is_embed_shared_root || h.is_embed_users_root) then
+              if ( h[:is_shared_root] || h[:is_users_root] || h[:is_embed_shared_root] || h[:is_embed_users_root] ) then
                 rows << expressions.collect do |e|
-                  eval "h.#{e}"
+                  eval "h#{e}"
                 end
               end
             end