marty 2.6.0 → 2.6.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5793ffa9b322a289ab5cf900d733f296127f4840586baf8a95afe8793e9752cd
-  data.tar.gz: 6e1e78d9cbb3472ac5ed1f99a5592cc1718ab706eb1d878265a5682408d9b130
+  metadata.gz: eb3ca7ab90c87f02efe558edd6cc4645ab3e9fa519ca047961b959d72c58d2b9
+  data.tar.gz: 13ef9b0ebbe0f2e6de2de7e2b8684cadbef122ecc8fec8f1c5dee8240014191c
 SHA512:
-  metadata.gz: 3e47115835ddf8cff33b27b6582f73cd77f5e802099c776981aa47311bae1f11047bbba797fe5def8c8188c5ae10de6e213dff1fe37dd51c974e1d326a2c22dc
-  data.tar.gz: 731b6b6799978cbd72416461ca55c1243eac694b324b8df497a5193d2416569b901c610d862e84a19d58810031c38d4b22d2206280bf9ceaa2ad917b7365ab65
+  metadata.gz: 175f379edebcf299c9b6b0c9d3432bbabb16029f64d4d918b292f4812198efa47716ba88fd4e405230d52ffae5d44afb93fe614541d431f7ad20c47c82d3d5f6
+  data.tar.gz: d4f24991b4876a9f4e97e9facb97d4c68025b3d89fe29fd2e731f3ebd265ff77b7377f3a494b47879119202515cc26f18f040ab0da97bc9717e15c55fb76d6c5

data/.rubocop.yml

@@ -22,3 +22,14 @@ Metrics/BlockLength:
   Exclude:
     - 'spec/**/*'
 
+Style/CaseEquality:
+  Exclude:
+    - 'app/components/marty/report_form.rb'
+    - 'app/models/marty/data_grid.rb'
+    - 'app/helpers/marty/enum_helper.rb'
+    - 'lib/marty/data_change.rb'
+    - 'lib/marty/data_conversion.rb'
+    - 'lib/marty/mcfly_model.rb'
+    - 'lib/marty/monkey.rb'
+    - 'other/marty/api/base.rb'
+    - 'spec/lib/mcfly_model_spec.rb'

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    marty (2.5.9)
+    marty (2.6.0)
       aws-sigv4 (~> 1.0, >= 1.0.2)
       axlsx (= 3.0.0pre)
       coderay
@@ -62,7 +62,9 @@ GEM
       io-like (~> 0.3.0)
     arel (8.0.0)
     ast (2.4.0)
-    aws-sigv4 (1.0.3)
+    aws-eventstream (1.0.2)
+    aws-sigv4 (1.1.0)
+      aws-eventstream (~> 1.0, >= 1.0.2)
     axlsx (3.0.0.pre)
       htmlentities (~> 4.3, >= 4.3.4)
       mimemagic (~> 0.3)

data/app/helpers/marty/enum_helper.rb

@@ -0,0 +1,11 @@
+module Marty
+  module EnumHelper
+    def self.pg_enum?(klass:)
+      return true if klass.is_a? Marty::PgEnum
+      return true if Marty::PgEnum === klass
+      return klass._pg_enum? if klass.respond_to?(:_pg_enum?)
+
+      false
+    end
+  end
+end

data/app/models/marty/data_grid.rb

@@ -92,11 +92,6 @@ class Marty::DataGrid < Marty::Base
     dga && Hash[fields.zip(dga)]
   end
 
-  # deprecated - remove 2018-Oct
-  cached_mcfly_lookup :lookup_id, sig: 2 do |pt, group_id|
-    find_by_group_id group_id
-  end
-
   cached_delorean_fn :exists, sig: 2 do |pt, name|
     Marty::DataGrid.mcfly_pt(pt).where(name: name).exists?
   end
@@ -221,19 +216,6 @@ class Marty::DataGrid < Marty::Base
     res
   end
 
-  # deprecated - remove 2018-Oct
-  cached_delorean_fn :lookup_grid, sig: 4 do |pt, dg, h, distinct|
-    dg_is_grid = Marty::DataGrid === dg
-    dg_is_os = dg.is_a?(OpenStruct)
-    raise "bad DataGrid #{dg}" unless dg_is_grid || dg_is_os
-    raise "non-hash arg #{h}" unless Hash === h
-
-    dgh = dg_is_os ? dg.to_h.stringify_keys :
-            dg.attributes.slice('id', 'group_id', 'created_dt', 'metadata')
-    res = plv_lookup_grid_distinct(h, dgh, false, distinct)
-    res['result']
-  end
-
   cached_delorean_fn :lookup_grid_h, sig: 4 do |pt, dgn, h, distinct|
     dgh = lookup_h(pt, dgn)
     raise "#{dgn} grid not found" unless dgh
@@ -246,7 +228,7 @@ class Marty::DataGrid < Marty::Base
   # FIXME: using cached_delorean_fn just for the caching -- this is
   # not expected to be called from Delorean.
   cached_delorean_fn :find_class_instance, sig: 3 do |pt, klass, v|
-    if Marty::PgEnum === klass
+    if ::Marty::EnumHelper.pg_enum?(klass: klass)
       klass.find_by_name(v)
     else
       # FIXME: very hacky -- hard-coded name
@@ -254,8 +236,9 @@ class Marty::DataGrid < Marty::Base
     end
   end
 
-  def self.lookup_grid_distinct_entry_h(pt, h, dgh, visited = nil, follow = true,
-                                        return_grid_data = false, distinct = true)
+  def self.lookup_grid_distinct_entry_h(
+        pt, h, dgh, visited = nil, follow = true,
+        return_grid_data = false, distinct = true)
 
     # Perform grid lookup, if result is another data_grid, and follow is true,
     # then perform lookup on the resulting grid.  Allows grids to be nested
@@ -278,18 +261,18 @@ class Marty::DataGrid < Marty::Base
     res = vhash['result']
 
     v = case
-             when Marty::PgEnum === res
-               c_data_type.find_by_name(res)
-             when Marty::DataGrid == c_data_type
-               follow ?
-                 Marty::DataGrid.lookup_h(pt, res) :
-                 Marty::DataGrid.lookup(pt, res)
-             else
-               Marty::DataConversion.find_row(c_data_type, { 'name' => res }, pt)
-         end
-
-    return vhash.merge('result' => v) unless (Marty::DataGrid == c_data_type &&
-                                              follow)
+        when ::Marty::EnumHelper.pg_enum?(klass: res)
+          c_data_type.find_by_name(res)
+        when Marty::DataGrid == c_data_type
+          follow ?
+            Marty::DataGrid.lookup_h(pt, res) :
+            Marty::DataGrid.lookup(pt, res)
+        else
+          Marty::DataConversion.find_row(c_data_type, { 'name' => res }, pt)
+        end
+
+    return vhash.merge('result' => v) unless
+      Marty::DataGrid == c_data_type && follow
 
     visited ||= []
 
@@ -298,8 +281,8 @@ class Marty::DataGrid < Marty::Base
     raise "#{self.class} recursion loop detected -- #{visited}" if
       visited.member?(v['group_id'])
 
-    lookup_grid_distinct_entry_h(pt, h, v, visited, follow, return_grid_data,
-                                 distinct)
+    lookup_grid_distinct_entry_h(
+      pt, h, v, visited, follow, return_grid_data, distinct)
   end
 
   def dir_infos(dir)

data/app/models/marty/pg_enum.rb

@@ -24,6 +24,10 @@ module Marty::PgEnum
   def seed
   end
 
+  def _pg_enum?
+    true
+  end
+
   alias_method :find_by_name, :[]
   alias_method :lookup, :[]
 end

data/lib/marty/data_change.rb

@@ -114,7 +114,9 @@ class Marty::DataChange
 
   delorean_fn :do_pg_enum_export, sig: 1 do |k|
     klass = k.constantize
-    next (klass.is_a? Marty::PgEnum) ? klass.get_all : []
+    next klass.get_all if ::Marty::EnumHelper.pg_enum?(klass: klass)
+
+    []
   end
 
   delorean_fn :export_changes, sig: 3 do |t0, t1, class_name|

data/lib/marty/monkey.rb

@@ -11,7 +11,7 @@ class Delorean::BaseModule::BaseClass
 
     def _get_attr(obj, attr, _e)
       if (Marty::Enum === obj ||
-          Marty::PgEnum === obj) && !obj.respond_to?(attr)
+          ::Marty::EnumHelper.pg_enum?(klass: obj)) && !obj.respond_to?(attr)
         obj[attr]
       else
         old_get_attr(obj, attr, _e)

data/lib/marty/version.rb

@@ -1,3 +1,3 @@
 module Marty
-  VERSION = '2.6.0'
+  VERSION = '2.6.1'
 end

data/make-dummy.mk

@@ -17,7 +17,7 @@ dummy-app-bash:
 	docker-compose --file=docker-compose.dummy.yml run --rm app bash
 
 dummy-app-console:
-	docker-compose --file=docker-compose.dummy.yml run --rm app bin/rails c
+	docker-compose --file=docker-compose.dummy.yml run --rm app /bin/bash -c "cd spec/dummy && bin/rails c"
 
 dummy-app-initialise-docker:
 	touch .bash_history.docker

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: marty
 version: !ruby/object:Gem::Version
-  version: 2.6.0
+  version: 2.6.1
 platform: ruby
 authors:
 - Arman Bostani
@@ -14,7 +14,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-03-25 00:00:00.000000000 Z
+date: 2019-03-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: pg
@@ -300,6 +300,7 @@ files:
 - app/controllers/marty/report_controller.rb
 - app/controllers/marty/rpc_controller.rb
 - app/helpers/marty/application_helper.rb
+- app/helpers/marty/enum_helper.rb
 - app/helpers/marty/script_set.rb
 - app/models/marty/api_auth.rb
 - app/models/marty/api_config.rb