rails-schema-validations 0.4 → 0.5

data/lib/rails-schema-validations.rb

@@ -4,17 +4,20 @@ module ActiveRecord::Validations::ClassMethods
     self.content_columns.map do |col|
       case col.type
       when :integer
-        validates_numericality_of col.name, :only_integer => true, :allow_nil => col.null
+        # assuming unsigned!
+        validates_numericality_of col.name, :only_integer => true, :allow_nil => col.null,
+          :less_than => (2 ** (8 * col.limit)) / 2
       when :float
+        # less_than would need to look at col.scale, col.float
         validates_numericality_of col.name, :allow_nil => col.null
-      #when :time, :datetime :string 
+      #when :time, :datetime
+      when :string 
+        if col.limit
+          validates_length_of col.name, :maximum => col.limit, :allow_nil => col.null
+        end
       end
     end.compact + content_columns.map do |col|
       validates_presence_of col.name unless col.null
-    end.compact + content_columns.map do |col|
-      if col.limit
-        validates_length_of col.name, :maximum => col.limit, :allow_nil => col.null
-      end
     end
   end
 end

data/test/validations_from_schema_test.rb

@@ -14,8 +14,8 @@ def load_schema
         t.send(kind, "#{kind}_notnull", :null => false)
       end
       %w(string integer).each do |kind|
-        t.send(kind, "#{kind}_limit", :limit => 10)
-        t.send(kind, "#{kind}_limit_notnull", :limit => 10, :null => false)
+        t.send(kind, "#{kind}_limit", :limit => 4)
+        t.send(kind, "#{kind}_limit_notnull", :limit => 4, :null => false)
       end
       t.timestamps
     end
@@ -61,8 +61,8 @@ context Model do
   asserts_error_on :integer_limit, 1.1
 
   asserts_error_on :string_limit, '12345678910'
-  asserts_error_on :integer_limit, 12345678910
+  asserts_error_on :integer_limit, 2 ** (8 * 4)
 
   asserts_no_error_on :string_limit, '12'
-  asserts_no_error_on :integer_limit, 1
+  asserts_no_error_on :integer_limit, 2 ** (8 * 3)
 end

metadata

@@ -1,12 +1,12 @@
 --- !ruby/object:Gem::Specification 
 name: rails-schema-validations
 version: !ruby/object:Gem::Version 
-  hash: 3
+  hash: 1
   prerelease: false
   segments: 
   - 0
-  - 4
-  version: "0.4"
+  - 5
+  version: "0.5"
 platform: ruby
 authors: 
 - Greg Weber