marty 1.0.7 → 1.0.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c0cfa3fa0d78f474f6e7c1bc44ba2070fcc094b0
-  data.tar.gz: c28a5fa19dafea07a63416931c1087b7da37795d
+  metadata.gz: b1ea4f6bcc7d2dc454f65ba38f7cc922e7778354
+  data.tar.gz: efa8f6b874e09398b171995daeb4cc898833bed5
 SHA512:
-  metadata.gz: 89d5443037bee0c5938b27a02426c974a062714355e037c1a91d80d619a1ab1f29c432ab1c5a335592ccd01110d7c9a95643a110dea238b1764b41081fab111a
-  data.tar.gz: 6f4fc68bdd7e32aa4928a04ab2a3024fac47a8eb8fc3c904d64b992a22c50ee6a731533b422306a4618ac7855bead871b1c53df11e61aaab068949bbde4475de
+  metadata.gz: 2df7d3c0f2dd6f1146d65320ba6e6386895d52e7542144e489896193f86f545777d2eecb7ae951f4b70cef9f62ae2f791a8f2ff489f2159f48f97c7646d449b3
+  data.tar.gz: cbf82d6f70c0e1546a17b4c3d8be986c7f95a81f52bbe7c09ffde36aa71b7a1c5a1264525c5864520233925502a058756888d6440ed380a1152a04f653f1adae

data/app/models/marty/data_grid.rb

@@ -182,7 +182,14 @@ class Marty::DataGrid < Marty::Base
             when "boolean"
               v
             else # AR class
-              v.to_s
+              # FIXME: really hacky to hard-code "name".  Used to
+              # perform to_s which could lead ot strange failures when
+              # model had no to_s defined.
+              begin
+                String === v ? v : v.name
+              rescue NoMethodError
+                raise "could not get name for #{v}"
+              end
             end
       end
 
@@ -246,6 +253,7 @@ class Marty::DataGrid < Marty::Base
     raise "non-hash arg #{h}" unless Hash === h
 
     res = dg.lookup_grid_distinct(pt, h, false, distinct)
+
     res["result"]
   end
 

data/app/models/marty/promise.rb

@@ -68,11 +68,8 @@ class Marty::Promise < Marty::Base
   end
 
   def self.children_for_id(id, search_order)
-    if id == 'root'
-      where(parent_id: nil).live_search(search_order).order(id: :desc).includes(:children, :user)
-    else
-      find(id).children.live_search(search_order).order(id: :desc).includes(:children, :user)
-    end
+    q = id == 'root' ? where(parent_id: nil) : find(id).children
+    q.live_search(search_order).order(id: :desc).includes(:children, :user)
   end
 
   def leaf

data/lib/marty/version.rb

@@ -1,3 +1,3 @@
 module Marty
-  VERSION = "1.0.7"
+  VERSION = "1.0.8"
 end

data/spec/models/data_grid_spec.rb

@@ -623,6 +623,17 @@ EOS
         expect(res).to eq [70,"Gb"]
       end
 
+      it "should handle typed (enum) data lookup_grid" do
+        pt = 'infinity'
+        ca = Gemini::State.find_by_name("CA")
+        dg = Marty::DataGrid.lookup(pt, "Gb")
+
+        res = Marty::DataGrid.
+              lookup_grid(pt, dg, {"property_state" => ca}, false)
+
+        expect(res).to eq 70
+      end
+
       it "should return grid data and metadata simple" do
         expected_data = [[1.1, 2.2, 3.3], [4.4, 5.5, 6.6], [1.2, 2.3, 3.4],
                          [4.5, 5.6, 6.7]]

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: marty
 version: !ruby/object:Gem::Version
-  version: 1.0.7
+  version: 1.0.8
 platform: ruby
 authors:
 - Arman Bostani
@@ -14,7 +14,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-08-29 00:00:00.000000000 Z
+date: 2016-09-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: pg