marty 0.5.40 → 0.5.41

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f166abb0b1bc5f9da59dc6c3879fbda45bfa1c2a
-  data.tar.gz: 78a16a950bbc27e7f34f54e6d123bd1bd3a112e8
+  metadata.gz: 1cc0b3b8b64fe73e733f400846ff9e944b1dc113
+  data.tar.gz: 87db6321d7a7d2117e2b55bea1979bc0a8ac8e2d
 SHA512:
-  metadata.gz: 19fc34d83a632f06a345f927dad2769d89310c3ff330abf34dd99f7bdd054799e29d5067e78dc3b167c669d5a0004ad6d293ba6fb63f24a053610f4bb090e1d6
-  data.tar.gz: d08d671febf9c71fde42c01c37f61a62d861544a3c30f39de44f55eb69b421444b45565b01f1ac94c78d54b56934d2ee52fa7ee3c0fd03ee542bfc1d7b7d7033
+  metadata.gz: ec029611b74c122897ad1497d9ff9ab06b68198354ab942e542759b8bbbfb553c37527615749c3eb14d62e6420fa2bb64df28b41c7a1afb41758ba9ccc6fc07c
+  data.tar.gz: fabfcf96a6a52c4211d0fac59ff573844246ce08f4c752dbe70c339b1c4c041bf84e4354221302b0528a81ea7ff89211ba3840095af0a89fc93f4fb3feecaf94

data/app/models/marty/data_grid.rb

@@ -148,7 +148,7 @@ class Marty::DataGrid < Marty::Base
     data_type.constantize rescue nil
   end
 
-  def lookup_grid_distinct(pt, h, return_grid_data=false)
+  def lookup_grid_distinct(pt, h, return_grid_data=false, distinct=true)
     isets = {}
 
     (dir_infos("v") + dir_infos("h")).each do
@@ -221,7 +221,7 @@ class Marty::DataGrid < Marty::Base
       end
 
       raise "Grid #{name}, (#{isets[dir].count}) #{dir} matches > 1." if
-        isets[dir] && isets[dir].count > 1
+        distinct && isets[dir] && isets[dir].count > 1
     end
 
     vi, hi = isets["v"].first, isets["h"].first if isets["v"] && isets["h"]
@@ -239,6 +239,18 @@ class Marty::DataGrid < Marty::Base
     }
   end
 
+  # FIXME: added for Apollo -- not sure where this belongs given that
+  # DGs were moved to marty.  Should add documentation about callers
+  # keeping the hash small.
+  cached_delorean_fn :lookup_grid, sig: 4 do
+    |pt, dg, h, distinct|
+    raise "bad DataGrid #{dg}" unless Marty::DataGrid === dg
+    raise "non-hash arg #{h}" unless Hash === h
+
+    res = dg.lookup_grid_distinct(pt, h, false, distinct)
+    res["result"]
+  end
+
   # 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
@@ -516,7 +528,7 @@ class Marty::DataGrid < Marty::Base
 
     c_data_type = Marty::DataGrid.convert_data_type(data_type)
 
-    raise "bad data type" unless c_data_type
+    raise "bad data type #{data_type}" unless c_data_type
 
     # based on data type, decide to check using convert or instance
     # lookup.  FIXME: DRY.

data/lib/marty/data_exporter.rb

@@ -40,7 +40,7 @@ class Marty::DataExporter
 
     # if all array items are hashes, we merge them
     obj = hash_array_merge(obj, config["transpose"]) if
-      obj.is_a?(Array) && obj.map {|x| x.is_a? Hash}.all?
+      obj.is_a?(Array) && obj.all? {|x| x.is_a? Hash}
 
     # symbolize config keys as expected by CSV.generate
     conf = config.each_with_object({}) { |(k,v), h|

data/lib/marty/version.rb

@@ -1,3 +1,3 @@
 module Marty
-  VERSION = "0.5.40"
+  VERSION = "0.5.41"
 end

data/spec/models/data_grid_spec.rb

@@ -108,6 +108,13 @@ hb_indicator\tboolean\tv
 
 true\t456
 false\t123
+EOS
+
+Ge =<<EOS
+ltv\tnumrange\th
+
+>110\t>120
+1.1\t1.1
 EOS
 
     before(:each) do
@@ -216,11 +223,24 @@ EOS
     describe "lookup" do
       before(:each) do
         ["G1", "G2", "G3", "G4", "G5", "G6", "G7", "G8", "Ga", "Gb",
-         "Gc", "Gd"].each { |g|
+         "Gc", "Gd", "Ge"].each { |g|
           dg_from_import(g, "Marty::DataGridSpec::#{g}".constantize)
         }
       end
 
+      it "should handle non-distinct lookups" do
+        pt = 'infinity'
+
+        dg = Marty::DataGrid.lookup(pt, "Ge")
+        res = Marty::DataGrid.lookup_grid(pt, dg, {"ltv"=>500}, false)
+
+        expect(res).to eq(1.1)
+
+        expect {
+          Marty::DataGrid.lookup_grid(pt, dg, {"ltv"=>500}, true)
+        }.to raise_error(RuntimeError)
+      end
+
       it "should handle boolean lookups" do
         res = [true, false].map { |hb_indicator|
           lookup_grid_helper('infinity',

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: marty
 version: !ruby/object:Gem::Version
-  version: 0.5.40
+  version: 0.5.41
 platform: ruby
 authors:
 - Arman Bostani
@@ -14,7 +14,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-06-03 00:00:00.000000000 Z
+date: 2016-06-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: pg