static_models 0.4.5 → 0.4.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8f04db8a1974a679eb14287f3a693315b7f6fd3a
-  data.tar.gz: 360864b05b888ba14c4c1edcca3004843a646e2e
+  metadata.gz: ef16467be2cf5b1af8c2563e1756c231b0488f23
+  data.tar.gz: 40d99eba2608411081c3dca132b83ce6cbeba957
 SHA512:
-  metadata.gz: b915ac1cdb5db7027699ea4af95c928d6848cfb81b0ee3bf303a41b77b362522090285ed5ec50c43091f11f0ef1cb6f2572581c5907d8e96e45e7bcf4253acc4
-  data.tar.gz: dee03953935995525d7a7b1604a6dfc2fbd401fa57b529cef6746def521a0aecabe91c38187ccb65e7d79045fac3979596427639e366bd54d40c99e371c48836
+  metadata.gz: ddd989a5d05a2e12224f737b745b96872f37c5f5d7161409b6a05bd0a83121b532b74af56095fb674b2aa24bd579341a20a0ea94f589db80bf5147b92610af10
+  data.tar.gz: 1a320c81218ceb01903cc2cb8ba57e99a06c0d6e946fd1b47b9c723f05a83e9c0aedd66a0f5307a83f8ca46b8cdc560fe7ef454f03578397cbf58bac0f73a0a6

data/lib/static_models/version.rb

@@ -1,3 +1,3 @@
 module StaticModels
-  VERSION = "0.4.5"
+  VERSION = "0.4.6"
 end

data/lib/static_models.rb

@@ -45,6 +45,12 @@ module StaticModels
     end
 
     class_methods do
+      NumberType = if Gem::Version.new(RUBY_VERSION) >= Gem::Version.new('2.4.0')
+        Integer
+      else  
+        Fixnum
+      end
+
       def static_models_dense(table)
         columns = table.first
         hashes = table[1..-1].collect do |row|
@@ -56,11 +62,7 @@ module StaticModels
 
       def static_models_sparse(table)
         table.each do |row|
-          expected = if Gem::Version.new(RUBY_VERSION) >= Gem::Version.new('2.4.0')
-            row.size == 2 ? [Integer, Symbol] : [Integer, Symbol, Hash]
-          else  
-            row.size == 2 ? [Fixnum, Symbol] : [Fixnum, Symbol, Hash]
-          end
+          expected = row.size == 2 ? [NumberType, Symbol] : [NumberType, Symbol, Hash]
 
           if row.collect(&:class) != expected
             raise ValueError.new("Invalid row #{row}, expected #{expected}")
@@ -79,7 +81,7 @@ module StaticModels
           raise ValueError.new("Table column names must all be Symbols")
         end
 
-        unless hashes.all?{|h| h[:id].is_a?(Fixnum)}
+        unless hashes.all?{|h| h[:id].is_a?(NumberType)}
           raise ValueError.new("Ids must be integers")
         end
 
@@ -105,7 +107,7 @@ module StaticModels
       end
 
       def find_by_code(code)
-        all.select{|x| x.code == code.to_sym}.first 
+        all.select{|x| x.code == code.try(:to_sym)}.first 
       end
 
       def all

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: static_models
 version: !ruby/object:Gem::Version
-  version: 0.4.5
+  version: 0.4.6
 platform: ruby
 authors:
 - nubis
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-08-15 00:00:00.000000000 Z
+date: 2018-09-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport