schema_validations 1.2.0 → 1.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6ea33d2335e1af126b8d168661412173f65bd12c
-  data.tar.gz: 91b7ba79752b866df0c1184356f5aa9f43ec311f
+  metadata.gz: 6e6588d0c8d748fe24ce334bf2c57678ce35d345
+  data.tar.gz: 2e49d0ee57215bc100a652834d35196a5a47e33d
 SHA512:
-  metadata.gz: f5d11da519e0fab53b9d494e0e51b203b7a593c22c35e1d68f92a2c442185dd703ea96461566bbb7723b285fe4194db2863f5de3a5d4f2550dbdf3c5831d480b
-  data.tar.gz: 27d023e4d31824c6f85444cdefc34d15002da1efd1f252960c5cb961a1f04abd5cf870d556e9e087baa0361bc993a947eb35fcd18090a6168161e6c23171142f
+  metadata.gz: 9a7899832e98bdaca1f90fa1bb1619d12dbe55fdcce6ccccfea24285d6b20a9ad1f9c63cb904f65a537cebe5196da38c80e53b843f70b6a265c12f6f91e58ebe
+  data.tar.gz: f64bceebdcf7ee916576abd86be39f7d329c9bd020f6c51b1f33e5faaa32b381902b460a6464717cf4c064815d528eea0a21bd6d577428b96153d18ae23a3cf9

data/README.md

@@ -6,8 +6,7 @@ on the database schema.
 
 [![Gem Version](https://badge.fury.io/rb/schema_validations.svg)](http://badge.fury.io/rb/schema_validations)
 [![Build Status](https://secure.travis-ci.org/SchemaPlus/schema_validations.svg)](http://travis-ci.org/SchemaPlus/schema_validations)
-[![Coverage Status](https://img.shields.io/coveralls/SchemaPlus/schema_validations.svg)](https://coveralls.io/r/SchemaPlus/schema_validations)
-[![Dependency Status](https://gemnasium.com/lomba/schema_validations.svg)](https://gemnasium.com/lomba/schema_validations)
+[![Coverage Status](https://coveralls.io/repos/SchemaPlus/schema_validations/badge.svg?branch=master&service=github)](https://coveralls.io/github/SchemaPlus/schema_validations)
 
 
 ## Overview
@@ -106,11 +105,11 @@ Constraints:
 
 Data types:
 
-|         Type       |                      Validation                           |
-|--------------------|-----------------------------------------------------------|
-| :boolean           | :validates ... :inclusion => { :in => [true, false] }     |
-| :float             | :validates ... :numericality => true                      |
-| :integer           | :validates ... :numericality => { :only_integer => true } |
+|         Type       |                      Validation                                                                                |
+|--------------------|----------------------------------------------------------------------------------------------------------------|
+| :boolean           | :validates ... :inclusion => { :in => [true, false] }                                                          |
+| :float             | :validates ... :numericality => true                                                                           |
+| :integer           | :validates ... :numericality => { :only_integer => true, :greater_than_or_equal_to => ..., :less_than => ... } |
 
 ## How do I know what it did?
 If you're curious (or dubious) about what validations SchemaValidations
@@ -131,6 +130,10 @@ use case.
 
 ## Release Notes
 
+### 1.3.0
+
+* Add range checks to integer validations.  Thanks to [@lowjoel](https://github.com/lowjoel)
+
 ### 1.2.0
 
 * No longer pull in schema_plus's auto-foreign key behavior. Limited to AR >= 4.2.1

data/lib/schema_validations/active_record/validations.rb

@@ -106,7 +106,7 @@ module SchemaValidations
 
           case datatype
           when :integer
-            validate_logged :validates_numericality_of, name, :allow_nil => true, :only_integer => true
+            load_integer_column_validations(name, column)
           when :numeric
             validate_logged :validates_numericality_of, name, :allow_nil => true
           when :text
@@ -127,6 +127,20 @@ module SchemaValidations
         end
       end
 
+      def load_integer_column_validations(name, column) # :nodoc:
+        options = { :allow_nil => true, :only_integer => true }
+
+        range = column.cast_type.send(:range)
+        options[:greater_than_or_equal_to] = range.begin
+        if range.exclude_end?
+          options[:less_than] = range.end
+        else
+          options[:less_than_or_equal_to] = range.end
+        end
+
+        validate_logged :validates_numericality_of, name, options
+      end
+
       def load_association_validations #:nodoc:
         reflect_on_all_associations(:belongs_to).each do |association|
           # :primary_key_name was deprecated (noisily) in rails 3.1
@@ -144,9 +158,14 @@ module SchemaValidations
 
       def add_uniqueness_validation(column) #:nodoc:
         scope = column.unique_scope.map(&:to_sym)
-        condition = :"#{column.name}_changed?"
         name = column.name.to_sym
-        validate_logged :validates_uniqueness_of, name, :scope => scope, :allow_nil => true, :if => condition
+        validate_logged :validates_uniqueness_of, name, :scope => scope, :allow_nil => true, :if => (proc do |record|
+          if scope.all? { |scope_sym| record.public_send(:"#{scope_sym}?") }
+            record.public_send(:"#{column.name}_changed?")
+          else
+            false
+          end
+        end)
       end
 
       def create_schema_validations? #:nodoc:

data/lib/schema_validations/version.rb

@@ -1,3 +1,3 @@
 module SchemaValidations
-  VERSION = "1.2.0"
+  VERSION = "1.3.0"
 end

data/lib/schema_validations.rb

@@ -43,7 +43,7 @@ module SchemaValidations
     has_value :except, :default => [:created_at, :updated_at, :created_on, :updated_on]
 
     ##
-    # :attr_accessor: only_type
+    # :attr_accessor: except_type
     #
     # List of validation types to exclude from automatic validation.
     # Value is a single type, and array of types, or +nil+.  Default is +nil+.

data/spec/validations_spec.rb

@@ -20,6 +20,11 @@ describe "Validations" do
           belongs_to :news_article, :class_name => 'Article', :foreign_key => :article_id
           schema_validations :except => :content
         end
+
+        class ArticleReview < ActiveRecord::Base
+          belongs_to :article
+          belongs_to :review
+        end
       end
     end
 
@@ -61,6 +66,11 @@ describe "Validations" do
       expect(Article.new(:state => 1.23).error_on(:state).size).to eq(1)
     end
 
+    it "should validate the range of votes" do
+      expect(Article.new(votes: 2147483648).error_on(:votes).size).to eq(1)
+      expect(Article.new(votes: -2147483649).error_on(:votes).size).to eq(1)
+    end
+
     it "should validate average_mark numericality" do
       expect(Article.new(:average_mark => "high").error_on(:average_mark).size).to eq(1)
     end
@@ -103,6 +113,19 @@ describe "Validations" do
       expect(Review.new.error_on(:news_article).size).to eq(1)
     end
 
+    it "should not validate uniqueness when scope is absent" do
+      article_review_1 = ArticleReview.create(:article_id => 1, :review_id => nil)
+      expect(article_review_1).to be_valid
+
+      article_review_2 = ArticleReview.create(:article_id => 1, :review_id => nil)
+      expect(article_review_2).to be_valid
+
+      article_review_3 = ArticleReview.create(:article_id => nil, :review_id => 1)
+      expect(article_review_3).to be_valid
+
+      article_review_4 = ArticleReview.create(:article_id => nil, :review_id => 1)
+      expect(article_review_4).to be_valid
+    end
   end
 
   context "auto-created but changed" do
@@ -297,6 +320,7 @@ describe "Validations" do
           t.string :title, :limit => 50
           t.text  :content, :null => false
           t.integer :state
+          t.integer :votes
           t.float   :average_mark, :null => false
           t.boolean :active, :null => false
         end
@@ -311,6 +335,11 @@ describe "Validations" do
         end
         add_index :reviews, :article_id, :unique => true
 
+        create_table :article_reviews, :force => true do |t|
+          t.integer :article_id
+          t.integer :review_id
+        end
+        add_index :article_reviews, [:article_id, :review_id], :unique => true
       end
     end
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: schema_validations
 version: !ruby/object:Gem::Version
-  version: 1.2.0
+  version: 1.3.0
 platform: ruby
 authors:
 - Ronen Barzel
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-05-12 00:00:00.000000000 Z
+date: 2015-07-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: schema_plus_columns