activerecord-databasevalidations 0.2.5 → 0.2.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8c11efae478930073f88dc28f6b2475f8c7007b6
-  data.tar.gz: 2007c8ba0229680b0fcffd2037d9e3de6ea24477
+  metadata.gz: 773b5d266abadfa6217235afa17fd1bd36a94bf2
+  data.tar.gz: 329ce44970fde33714067d8ee71765039850aac3
 SHA512:
-  metadata.gz: 1964dd60bb60504b4d8340915de87fcd6bb03804a542f24b67094fbf59ef3f1c71d3a3beffc99289eafccfec44bc23226ffe03c751a912fec7dbe1a9936228df
-  data.tar.gz: 63af8cccba1e2df89e6734f174eec31702b4f1b73e5c8574daf9896c19496148cc3d6bdf06ecaac3a8c56e6764b217e2f38f66badb91cf83dddc535ff60f1c65
+  metadata.gz: b4733b9f3b656c5baf7a94fb19bf3851f04ae9c69a0264814be7db8b24c37f82e7c8d6bc91f4e0683d9674279875a69e26e8bebbe38854face905b55fdbaa288
+  data.tar.gz: d5089f0a50188e16e6d952c992198795555d7a8a6c0c495fbda0beb442e6610c2dfe749571b23a518338202568f5e1c488b8cd9c42d86272af97fb6fa5e79205

data/.travis.yml

@@ -3,8 +3,6 @@ language: ruby
 cache: bundler
 
 rvm:
-- 1.9.3
-- 2.0.0
 - 2.1.8
 - 2.2.4
 - 2.3.0
@@ -17,15 +15,8 @@ gemfile:
 
 matrix:
   exclude:
-    - rvm: 1.9.3
-      gemfile: Gemfile.activerecord50
-    - rvm: 2.0.0
-      gemfile: Gemfile.activerecord50
     - rvm: 2.1.8
       gemfile: Gemfile.activerecord50
 
-  allow_failures:
-    - gemfile: Gemfile.activerecord50
-
 before_script:
 - mysql -e 'create database database_validations;'

data/CHANGELOG.md

@@ -1 +1,4 @@
 
+# 0.2.6 (March 23, 2016)
+
+* Rails 5 support (#17)

data/lib/active_record/database_validations.rb

@@ -5,5 +5,6 @@ require 'active_record/database_validations/version'
 require 'active_record/database_validations/mysql'
 require 'active_record/validations/database_constraints'
 require 'active_record/validations/string_truncator'
+require 'active_record/validations/typed_column'
 
 I18n.load_path << File.dirname(__FILE__) + '/database_validations/locale/en.yml'

data/lib/active_record/database_validations/mysql.rb

@@ -50,6 +50,7 @@ module ActiveRecord
       end
 
       def self.determine_encoding(column)
+        column = ActiveRecord::Validations::TypedColumn.new(column)
         return nil unless column.text?
         case column.collation
           when /\Autf8/; Encoding::UTF_8

data/lib/active_record/database_validations/version.rb

@@ -1,5 +1,5 @@
 module ActiveRecord
   module DatabaseValidations
-    VERSION = "0.2.5"
+    VERSION = "0.2.6"
   end
 end

data/lib/active_record/validations/database_constraints.rb

@@ -64,6 +64,7 @@ module ActiveRecord
       def attribute_validators(klass, attribute)
         @constraint_validators[attribute] ||= begin
           column = klass.columns_hash[attribute.to_s] or raise ArgumentError.new("Model #{self.class.name} does not have column #{column_name}!")
+          column = ActiveRecord::Validations::TypedColumn.new(column)
 
           [
             not_null_validator(klass, column),

data/lib/active_record/validations/typed_column.rb

@@ -0,0 +1,33 @@
+# Rails 5 doesn't provide `column.number?`-ish methods.
+# This delegator proxies type-related methods to superclass
+# or implements them when they are not available
+
+module ActiveRecord
+  module Validations
+    class TypedColumn < SimpleDelegator
+      def number?
+        if __getobj__.respond_to?(:number?)
+          super
+        else
+          type == :decimal || type == :integer
+        end
+      end
+
+      def text?
+        if __getobj__.respond_to?(:text?)
+          super
+        else
+          type == :text || type == :string
+        end
+      end
+
+      def binary?
+        if __getobj__.respond_to?(:binary?)
+          super
+        else
+          type == :binary
+        end
+      end
+    end
+  end
+end

data/test/database_constraints_validator_test.rb

@@ -159,7 +159,7 @@ class DatabaseConstraintsValidatorTest < Minitest::Test
   def test_integer_range
     subvalidators = Num._validators[:bigint].first.attribute_validators(Num, :bigint)
     assert_equal 1, subvalidators.length
-    assert_kind_of ActiveModel::Validations::NumericalityValidator, range_validator = subvalidators.first
+    assert_kind_of ActiveModel::Validations::NumericalityValidator, subvalidators.first
 
     inside_upper_bound = Num.new(tinyint: 127)
     assert inside_upper_bound.valid?
@@ -181,7 +181,7 @@ class DatabaseConstraintsValidatorTest < Minitest::Test
   def unsigned_integer_range
     subvalidators = Num._validators[:unsigned_int].first.attribute_validators(Num, :unsigned_int)
     assert_equal 1, subvalidators.length
-    assert_kind_of ActiveModel::Validations::NumericalityValidator, range_validator = subvalidators.first
+    assert_kind_of ActiveModel::Validations::NumericalityValidator, subvalidators.first
 
     inside_upper_bound = Num.new(unsigned_int: 4_294_967_295)
     assert inside_upper_bound.valid?

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: activerecord-databasevalidations
 version: !ruby/object:Gem::Version
-  version: 0.2.5
+  version: 0.2.6
 platform: ruby
 authors:
 - Willem van Bergen
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-03-22 00:00:00.000000000 Z
+date: 2016-03-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -131,6 +131,7 @@ files:
 - lib/active_record/database_validations/version.rb
 - lib/active_record/validations/database_constraints.rb
 - lib/active_record/validations/string_truncator.rb
+- lib/active_record/validations/typed_column.rb
 - lib/activerecord-databasevalidations.rb
 - lib/activerecord/databasevalidations.rb
 - test/basic_multilingual_plane_validator_test.rb