schema_validations 2.1.1 → 2.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a5d849122ca6f0e6f08d91e2cb391407fc7fc227
-  data.tar.gz: f8645f3bc0d1fcb7da740dc1e2f28e86570f0b01
+  metadata.gz: f722b7a85eff3f3def8a6355153476f9801da846
+  data.tar.gz: 1e6eb1107162cd7eb637473d59ebd1d4de2ec33e
 SHA512:
-  metadata.gz: 09ac9381a024e6a9f82ffe2e619217d5eb0c13dce2c83cedb5feb001faccf6ad65c7cd2d51a5291d20e969aad15adcadb4e880ebb6e55054291748b7cb30bdc1
-  data.tar.gz: d6359451dc9673a2cff5fdd768a0c5e42fe6df3acecf20412c769070f052d70da2f748b583363f1c7a0c5cb656b5884cf1848ab75ed41bf0efd19e025cf98084
+  metadata.gz: b5dfa087e36e5a81ac6f3e38fa6912db50e43785bb0d6c46959d1c48dc1a208cf6108d5eabab8c255a159ca65ed5de5994f6519f039dcca155e3548ad7963534
+  data.tar.gz: 102c7dda2cc81cb0c0dbbc0e5518ee6c14368b365ce34c0181c69405b7521964b764a978b2e3ca598446894d3ee54a01bd8cbfaff3e420a6974c2351db12733a

data/.travis.yml

@@ -5,11 +5,14 @@
 ---
 sudo: false
 rvm:
-- 2.1.5
+- 2.3.1
 gemfile:
 - gemfiles/activerecord-4.2/Gemfile.mysql2
 - gemfiles/activerecord-4.2/Gemfile.postgresql
 - gemfiles/activerecord-4.2/Gemfile.sqlite3
+- gemfiles/activerecord-5.0/Gemfile.mysql2
+- gemfiles/activerecord-5.0/Gemfile.postgresql
+- gemfiles/activerecord-5.0/Gemfile.sqlite3
 env: POSTGRESQL_DB_USER=postgres MYSQL_DB_USER=travis
 addons:
   postgresql: '9.4'

data/README.md

@@ -174,7 +174,8 @@ As of version 1.2.0, SchemaValidations supports and is tested on:
 
 <!-- SCHEMA_DEV: MATRIX - begin -->
 <!-- These lines are auto-generated by schema_dev based on schema_dev.yml -->
-* ruby **2.1.5** with activerecord **4.2**, using **mysql2**, **postgresql** or **sqlite3**
+* ruby **2.3.1** with activerecord **4.2**, using **mysql2**, **postgresql** or **sqlite3**
+* ruby **2.3.1** with activerecord **5.0**, using **mysql2**, **postgresql** or **sqlite3**
 
 <!-- SCHEMA_DEV: MATRIX - end -->
 
@@ -186,6 +187,12 @@ Earlier versions of SchemaValidations supported:
 
 ## Release Notes
 
+### 2.2.0
+
+* Works with AR 5.0.  Thanks to [@plicjo](https://github.coms/plicjo).
+* Works with `:money` type
+* Bug fix when logger is nil.  Thanks to [@gamecreature](https://github.com/gamecreature).
+
 ### 2.1.1
 
 * Bug fix for `:decimal` when `precision` is nil (#37)

data/gemfiles/activerecord-5.0/Gemfile.base

@@ -0,0 +1,3 @@
+eval File.read File.expand_path('../../Gemfile.base', __FILE__)
+
+gem "activerecord", "~> 5.0.0"

data/gemfiles/activerecord-5.0/Gemfile.mysql2

@@ -0,0 +1,10 @@
+require "pathname"
+eval(Pathname.new(__FILE__).dirname.join("Gemfile.base").read, binding)
+
+platform :ruby do
+  gem "mysql2"
+end
+
+platform :jruby do
+  gem 'activerecord-jdbcmysql-adapter'
+end

data/gemfiles/activerecord-5.0/Gemfile.postgresql

@@ -0,0 +1,10 @@
+require "pathname"
+eval(Pathname.new(__FILE__).dirname.join("Gemfile.base").read, binding)
+
+platform :ruby do
+  gem "pg"
+end
+
+platform :jruby do
+  gem 'activerecord-jdbcpostgresql-adapter'
+end

data/gemfiles/activerecord-5.0/Gemfile.sqlite3

@@ -0,0 +1,10 @@
+require "pathname"
+eval(Pathname.new(__FILE__).dirname.join("Gemfile.base").read, binding)
+
+platform :ruby do
+  gem "sqlite3"
+end
+
+platform :jruby do
+  gem 'activerecord-jdbcsqlite3-adapter', '>=1.3.0.beta2'
+end

data/lib/schema_validations/active_record/validations.rb

@@ -98,9 +98,9 @@ module SchemaValidations
             datatype = case
                        when respond_to?(:defined_enums) && defined_enums.has_key?(column.name) then :enum
                        when column.type == :integer then :integer
-                       when column.type == :decimal then :decimal
-                       when column.number? then :numeric
-                       when column.text? then :text
+                       when column.type == :decimal || column.type == :money then :decimal
+                       when column.type == :float   then :numeric
+                       when column.type == :text || column.type == :string then :text
                        when column.type == :boolean then :boolean
                        end
 
@@ -133,15 +133,15 @@ module SchemaValidations
         end
 
         def load_integer_column_validations(name, column) # :nodoc:
-          options = { :allow_nil => true, :only_integer => true }
-
-          if range = column.cast_type.try(: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
+          integer_range = ::ActiveRecord::Type::Integer.new.range
+          # The Ruby Range object does not support excluding the beginning of a Range,
+          # so we always include :greater_than_or_equal_to
+          options = { :allow_nil => true, :only_integer => true, greater_than_or_equal_to: integer_range.begin }
+
+          if integer_range.exclude_end?
+            options[:less_than] = integer_range.end
+          else
+            options[:less_than_or_equal_to] = integer_range.end
           end
 
           validate_logged :validates_numericality_of, name, options
@@ -196,7 +196,7 @@ module SchemaValidations
           if _filter_validation(method, arg)
             msg = "[schema_validations] #{self.name}.#{method} #{arg.inspect}"
             msg += ", #{opts.inspect[1...-1]}" if opts.any?
-            logger.debug msg
+            logger.debug msg if logger
             send method, arg, opts
           end
         end

data/lib/schema_validations/version.rb

@@ -1,3 +1,3 @@
 module SchemaValidations
-  VERSION = "2.1.1"
+  VERSION = "2.2.0"
 end

data/schema_dev.yml

@@ -1,7 +1,8 @@
 ruby:
-  - 2.1.5
+  - 2.3.1
 activerecord:
   - 4.2
+  - 5.0
 db:
   - mysql2
   - postgresql

data/schema_validations.gemspec

@@ -21,9 +21,9 @@ Gem::Specification.new do |s|
   s.require_paths = ["lib"]
 
   s.add_dependency("schema_plus_columns")
-  s.add_dependency("activerecord", "~> 4.2", ">= 4.2.1")
+  s.add_dependency("activerecord", ">= 4.2.1", "< 5.1")
   s.add_dependency("valuable")
-      
+
   s.add_development_dependency("schema_dev", "~> 3.6")
   s.add_development_dependency("rake")
   s.add_development_dependency("rdoc")

data/spec/spec_helper.rb

@@ -18,6 +18,15 @@ RSpec.configure do |config|
   config.around(:each) do |example|
     DatabaseCleaner.clean
     remove_all_models
+
+    class ActiveRecord::InternalMetadata
+      def self.create_table
+      end
+
+      def self.[]=(first, second)
+      end
+    end
+
     ActiveRecord::Migration.suppress_messages do
       example.run
     end

data/spec/validations_spec.rb

@@ -97,19 +97,25 @@ describe "Validations" do
       expect(Article.new(votes: -2147483649).error_on(:votes).size).to eq(1)
     end
 
+    it "can include the end range" do
+      allow_any_instance_of(::ActiveRecord::Type::Integer).to receive(:range).and_return(-2147483648..2147483648)
+
+      expect(Article.new(votes: 2147483648).error_on(:votes).size).to eq(0)
+    end
+
     it "should validate the range of decimal precision with scale" do
       expect(Article.new(max10: 10).error_on(:max10).size).to eq(1)
       expect(Article.new(max10: 5).error_on(:max10).size).to eq(0)
       expect(Article.new(max10: -10).error_on(:max10).size).to eq(1)
     end
-    
+
     it "should validate the range of decimal precision without scale" do
       expect(Article.new(max100: 100).error_on(:max100).size).to eq(1)
       expect(Article.new(max100: 50).error_on(:max100).size).to eq(0)
       expect(Article.new(max100: -100).error_on(:max100).size).to eq(1)
     end
 
-    it "should not validate the range of arbitrary decimal" do
+    it "should not validate the range of arbitrary decimal", :mysql => :skip do  # mysql provides a default precision
       expect(Article.new(arbitrary: Float::MAX).error_on(:arbitrary).size).to eq(0)
     end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: schema_validations
 version: !ruby/object:Gem::Version
-  version: 2.1.1
+  version: 2.2.0
 platform: ruby
 authors:
 - Ronen Barzel
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-04-06 00:00:00.000000000 Z
+date: 2016-11-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: schema_plus_columns
@@ -29,22 +29,22 @@ dependencies:
   name: activerecord
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '4.2'
     - - ">="
       - !ruby/object:Gem::Version
         version: 4.2.1
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '5.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '4.2'
     - - ">="
       - !ruby/object:Gem::Version
         version: 4.2.1
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '5.1'
 - !ruby/object:Gem::Dependency
   name: valuable
   requirement: !ruby/object:Gem::Requirement
@@ -179,6 +179,10 @@ files:
 - gemfiles/activerecord-4.2/Gemfile.mysql2
 - gemfiles/activerecord-4.2/Gemfile.postgresql
 - gemfiles/activerecord-4.2/Gemfile.sqlite3
+- gemfiles/activerecord-5.0/Gemfile.base
+- gemfiles/activerecord-5.0/Gemfile.mysql2
+- gemfiles/activerecord-5.0/Gemfile.postgresql
+- gemfiles/activerecord-5.0/Gemfile.sqlite3
 - init.rb
 - lib/schema_validations.rb
 - lib/schema_validations/active_record/type.rb
@@ -211,7 +215,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: schema_validations
-rubygems_version: 2.2.2
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: Automatically creates validations basing on the database schema.