marty 1.0.0 → 1.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8f0f6b19ce2c15e5918e27386f89e6bf83bc3738
-  data.tar.gz: 3da45154c7ad5476a9748af3b11ac158bbdf12d6
+  metadata.gz: 77e6182b8e9feb509b401e87c0fd8233bfa6777a
+  data.tar.gz: 78707cf573b3c33d872b0346a4751c38f26f14d3
 SHA512:
-  metadata.gz: 44bd77724a580c2bd0ea7cbf22db382135dfe8bd4f853a9ca9c5299edfd25daa2f1a79421f4b85accd8364711a4183ccaa844a6c99be710d14b28f5a2cc16a60
-  data.tar.gz: 28623145da5a246f826bd5879e2b1c5dab4a39fb73af9e45ce65e48c448dadb8bdb97746b1aacfac38672ef4ef0ef6c98a755238ef3c438730b3dbdb3745afea
+  metadata.gz: 7ca495f675cbe04547f2d885a6661f1da7cc6793bf7c9fc9a55759e24b4877df7878a032347dd3c0d81b5c5122b8cc504d47ed0560cdd2bd73ea8e0a51ece0d4
+  data.tar.gz: 1898fd8cd7daf7d3e7d2d0f8ed8560a45c7874339b2617291f782d005910a0d6ab8c3b68d5630c32521a597bfc27883737c4b28552a08745675742f144e5367e

data/app/components/marty/grid.rb

@@ -50,5 +50,4 @@ class Marty::Grid < ::Netzke::Grid::Base
       r.order("#{json_col} ->> '#{field}' " + dir.to_s)
     end
   end
-
 end

data/app/models/marty/data_grid.rb

@@ -13,7 +13,6 @@ class Marty::DataGrid < Marty::Base
   }
 
   ARRSEP = '|'
-  NULLABLE_TYPES = Set["string", "integer"]
 
   class DataGridValidator < ActiveModel::Validator
     def validate(dg)
@@ -195,9 +194,7 @@ class Marty::DataGrid < Marty::Base
               where(q, v).uniq.pluck(:index)
       end
 
-      if v.nil? || (ixa.empty? && NULLABLE_TYPES.member?(type))
-        # NULLABLE_TYPES fields allow NULL key wildcards.  If no match
-        # for key was found, try NULL.
+      if v.nil? || ixa.empty?
         ixa = ix_class.
           where(data_grid_id: group_id,
                 created_dt:   created_dt,

data/app/models/marty/grid_index_boolean.rb

@@ -1,4 +1,4 @@
 class Marty::GridIndexBoolean < Marty::Base
   validates_presence_of :created_dt, :data_grid_id, :attr, :index
-  validates_inclusion_of :key, in: [true, false]
+  validates_inclusion_of :key, in: [true, false, nil]
 end

data/app/models/marty/grid_index_int4range.rb

@@ -1,3 +1,3 @@
 class Marty::GridIndexInt4range < Marty::Base
-  validates_presence_of :created_dt, :data_grid_id, :attr, :key, :index
+  validates_presence_of :created_dt, :data_grid_id, :attr, :index
 end

data/app/models/marty/grid_index_integer.rb

@@ -1,3 +1,3 @@
 class Marty::GridIndexInteger < Marty::Base
-  validates_presence_of :created_dt, :data_grid_id, :attr, :key, :index
+  validates_presence_of :created_dt, :data_grid_id, :attr, :index
 end

data/app/models/marty/grid_index_numrange.rb

@@ -1,3 +1,3 @@
 class Marty::GridIndexNumrange < Marty::Base
-  validates_presence_of :created_dt, :data_grid_id, :attr, :key, :index
+  validates_presence_of :created_dt, :data_grid_id, :attr, :index
 end

data/db/migrate/106_make_grid_indexes_nullable.rb

@@ -0,0 +1,10 @@
+class MakeGridIndexesNullable < ActiveRecord::Migration
+  include Marty::Migrations
+
+  def change
+    change_column_null(:marty_grid_index_numranges,  :key, true)
+    change_column_null(:marty_grid_index_int4ranges, :key, true)
+    change_column_null(:marty_grid_index_integers,   :key, true)
+    change_column_null(:marty_grid_index_booleans,   :key, true)
+  end
+end

data/lib/marty/version.rb

@@ -1,3 +1,3 @@
 module Marty
-  VERSION = "1.0.0"
+  VERSION = "1.0.1"
 end

data/spec/models/data_grid_spec.rb

@@ -115,6 +115,18 @@ ltv\tnumrange\th
 
 >110\t>120
 1.1\t1.1
+EOS
+
+Gf = <<EOS
+lenient string
+b\tboolean\tv
+i\tinteger\tv
+i4\tint4range\tv
+n\tnumrange\tv
+
+true\t1\t<10\t<10.0\tY
+\t2\t\t\tM
+false\t\t>10\t\tN
 EOS
 
     before(:each) do
@@ -177,20 +189,6 @@ EOS
         }.to raise_error(ActiveRecord::RecordInvalid)
       end
 
-      it "NULL keys are only allowed on string fields" do
-        g_bad = G2.sub(/1\|2/, "")
-
-        expect {
-          dg_from_import("G2", g_bad)
-        }.to raise_error(ActiveRecord::RecordInvalid)
-
-        g_bad = G2.sub(/<=80/, "")
-
-        expect {
-          dg_from_import("G2", g_bad)
-        }.to raise_error(ActiveRecord::RecordInvalid)
-      end
-
       it "Unknown keys for typed grids should raise error" do
         g_bad = G8.sub(/G3/, "XXXXX")
 
@@ -220,17 +218,63 @@ EOS
       end
     end
 
-    describe "lookup" do
+    describe "lookups for infinity" do
+      let(:pt) { 'infinity'}
+
       before(:each) do
         ["G1", "G2", "G3", "G4", "G5", "G6", "G7", "G8", "Ga", "Gb",
-         "Gc", "Gd", "Ge"].each { |g|
+         "Gc", "Gd", "Ge", "Gf"].each { |g|
           dg_from_import(g, "Marty::DataGridSpec::#{g}".constantize)
         }
       end
 
-      it "should handle non-distinct lookups" do
-        pt = 'infinity'
+      context "should handle NULL key values" do
+        let(:dg) { Marty::DataGrid.lookup(pt, "Gf") }
 
+        it 'true returns Y' do
+          res = Marty::DataGrid.
+                lookup_grid(pt, dg, {"b"=>true}, true)
+          expect(res).to eq('Y')
+        end
+
+        it '13 returns N' do
+          res = Marty::DataGrid.
+                lookup_grid(pt, dg, {"i"=>13}, true)
+          expect(res).to eq('N')
+        end
+
+        it '13 & numrange 0 returns nil' do
+          res = Marty::DataGrid.
+                lookup_grid(pt, dg, {"i"=>13, "n"=>0}, true)
+          expect(res).to be_nil
+        end
+
+        it '13 & int4range 15 returns N' do
+          res = Marty::DataGrid.
+                lookup_grid(pt, dg, {"i"=>13, "i4"=>15}, true)
+          expect(res).to eq('N')
+        end
+
+        it '13 & int4range 1 returns nil' do
+          res = Marty::DataGrid.
+                lookup_grid(pt, dg, {"i"=>13, "i4"=>1}, true)
+          expect(res).to be_nil
+        end
+
+        it 'false, 3, numrange 15 returns N' do
+          res = Marty::DataGrid.
+                lookup_grid(pt, dg, {"b"=>false, "i"=>3, "n"=>15}, true)
+          expect(res).to eq('N')
+        end
+
+        it '13, numrange 15 returns N' do
+          res = Marty::DataGrid.
+                lookup_grid(pt, dg, {"i"=>13, "n"=>15}, true)
+          expect(res).to eq('N')
+        end
+      end
+
+      it "should handle non-distinct lookups" do
         dg = Marty::DataGrid.lookup(pt, "Ge")
         res = Marty::DataGrid.lookup_grid(pt, dg, {"ltv"=>500}, false)
 
@@ -475,7 +519,6 @@ EOS
       end
 
       it "should return grid data and metadata simple" do
-        pt = 'infinity'
         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]]
         expected_metadata = [{"dir"=>"v",
@@ -502,7 +545,6 @@ EOS
       end
 
       it "should return grid data and metadata multi (following)" do
-        pt = 'infinity'
         expected_data =  [[1.1, 2.2, 3.3],[4.4, 5.5, 6.6],[1.2, 2.3, 3.4],
                           [4.5, 5.6, nil],[11.0, 22.0, 33.0]]
         expected_metadata = [{"dir"=>"v",
@@ -527,7 +569,6 @@ EOS
       end
 
       it "should return grid data and metadata multi (not following)" do
-        pt = 'infinity'
         expected_data = [["G1"], ["G2"], ["G3"]]
         expected_metadata = [{"dir"=>"v",
                               "attr"=>"ltv",

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: marty
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.0.1
 platform: ruby
 authors:
 - Arman Bostani
@@ -14,7 +14,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-06-16 00:00:00.000000000 Z
+date: 2016-06-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: pg
@@ -430,6 +430,7 @@ files:
 - db/migrate/103_create_marty_grid_index_integers.rb
 - db/migrate/104_create_marty_grid_index_strings.rb
 - db/migrate/105_create_marty_grid_index_booleans.rb
+- db/migrate/106_make_grid_indexes_nullable.rb
 - db/seeds.rb
 - gemini_deprecations.md
 - lib/marty.rb