marty 1.0.3 → 1.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: bebe74227eb431e5b56683fb41cdf571d65ad9ae
-  data.tar.gz: 52e50bf586ade69e69501f408ba8795d5296a108
+  metadata.gz: 9eca20c44c4ac0d2d1aee885ad3f191084430fcb
+  data.tar.gz: bb1d9ade2b3762cd8498d059e3d7dba62eb247a9
 SHA512:
-  metadata.gz: 6f047a2e07c4c2808c7385e7558e9c1243710e62385f317a7ab472175f78e22fb4fd74119d3d30b5cb2117d0ee3e7b834f6077e1ab463b9df887dae4f28c6632
-  data.tar.gz: 68b1e9630134ac55a561a3e9b4df22ac4e7dc0fd6bbc43fcb032ec505c4e98c70c4a521c368d317267a5687569ab851eff8b4861ca53a273afda14f89e1d153d
+  metadata.gz: 1e34d45e691a904e1823b386b8f0b0141c7b03662847706eb951375bc4a210d3d6fb1f9197f21de70601969f4028ee7fe7debdcece2d9c4f91e11f6c2e963200
+  data.tar.gz: d25b19be0b9a86e1fbbfe2fd617d8b64d0202d2ef1c0a21ca9136e5ccc5d0bd007ccda1f2b107bda101a9881d2954ac72595957fdd0aa6c9aeef0a050dae1eba

data/app/models/marty/data_grid.rb

@@ -9,7 +9,6 @@ class Marty::DataGrid < Marty::Base
     "integer"   => Marty::GridIndexInteger,
     "string"    => Marty::GridIndexString,
     "boolean"   => Marty::GridIndexBoolean,
-    "float"     => true
   }
 
   ARRSEP = '|'
@@ -428,7 +427,7 @@ class Marty::DataGrid < Marty::Base
 
   def self.maybe_get_klass(type)
     begin
-      klass = type.constantize unless INDEX_MAP[type]
+      klass = type.constantize unless INDEX_MAP[type] || type == "float"
     rescue NameError
       raise "unknown header type/klass: #{type}"
     end
@@ -478,6 +477,8 @@ class Marty::DataGrid < Marty::Base
       raise "metadata elements must include attr/type/dir" unless
         attr && type && dir
       raise "bad dir #{dir}" unless ["h", "v"].member? dir
+      raise "unknown metadata type #{type}" unless
+        Marty::DataGrid.type_to_index(type)
 
       res = {
         "attr" => attr,

data/lib/marty/version.rb

@@ -1,3 +1,3 @@
 module Marty
-  VERSION = "1.0.3"
+  VERSION = "1.0.4"
 end

data/spec/models/data_grid_spec.rb

@@ -146,6 +146,20 @@ county_name\tstring\tv
 
 NY\t\t10
 \tR\t8
+EOS
+
+Gi =<<EOS
+units\tinteger\tv\t\t
+ltv\tfloat\tv\t\t
+cltv\tfloat\th\t\t
+fico\tnumrange\th\t\t
+
+\t\t80.5\t90.5\t100.5
+\t\t>=600<700\t>=700<750\t>=750
+1|2\t80.5\t1.1\t2.2\t3.3
+1|2\t90.5\t4.4\t5.5\t6.6
+3|4\t100.5\t1.2\t2.3\t3.4
+3|4\t105.5\t4.5\t5.6\t6.7
 EOS
 
     before(:each) do
@@ -186,6 +200,15 @@ EOS
         expect(Marty::DataGrid.lookup('infinity', "G3").name).to eq "G3"
       end
 
+      it "should not allow bad axis types" do
+        expect {
+          dg_from_import("Gi", Gi)
+        }.to raise_error(/unknown metadata type float/)
+        expect {
+          dg_from_import("Gi", Gi.sub(/float/, 'abcdef'))
+        }.to raise_error(/unknown metadata type abcdef/)
+      end
+
       it "should not allow dup attr names" do
         g_bad = G1.sub(/fico/, "ltv")
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: marty
 version: !ruby/object:Gem::Version
-  version: 1.0.3
+  version: 1.0.4
 platform: ruby
 authors:
 - Arman Bostani