activerecord-databasevalidations 0.1.0 → 0.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: dc6901e44580bc7760d63ab78aeb0575678dfba8
-  data.tar.gz: 6b056fa79931ef1db0080e718d34d071a212b164
+  metadata.gz: 759df661c99bd799d77eeeb2917d9d892d22de04
+  data.tar.gz: d2880441b78e568c1b7f6649158786dd84ceee1d
 SHA512:
-  metadata.gz: bfc973cd0579d7138c18e3403b214b9a546e61722937160e3342edcbd8a1610a513d9cec77a19b4ff77e0dc9a0a1c493b00ce9b7b7302cb6905f304bc02aab41
-  data.tar.gz: fe39aa4f6917b4a1de65edd48e566a348f1f7ac020a5c05eb2cd882204492f516f8a673ee43e16bf4bfca0b93d1c9a92e3e4a36025783a4c44a4f1cf2f7f99e8
+  metadata.gz: 65b73884f526c3bda96b3ea7e4a56ba9c520ad26d33cbefd70dd59e3244ad6963dac22ff82c86f7449f58f72b0cfcfde0b798ca34f3905be747bce56f74925ac
+  data.tar.gz: 6a54b91564ece55439ce503e46c963a22090e14c170e29528bd1dc5fce0802d66b8ba36e908e7be2b8cc96e54f5da0520a10f680ff5876a5038d6a20a0d4640c

data/.gitignore

@@ -3,7 +3,7 @@
 .bundle
 .config
 .yardoc
-Gemfile.lock
+Gemfile*.lock
 InstalledFiles
 _yardoc
 coverage

data/.travis.yml

@@ -5,5 +5,9 @@ rvm:
 - 2.0.0
 - 2.1.3
 
+gemfile:
+- Gemfile.activerecord40
+- Gemfile.activerecord41
+
 before_script:
 - mysql -e 'create database database_validations;'

data/Gemfile.activerecord40

@@ -0,0 +1,4 @@
+source 'https://rubygems.org'
+gemspec
+
+gem 'activerecord', '~> 4.0.0'

data/Gemfile.activerecord41

@@ -0,0 +1,4 @@
+source 'https://rubygems.org'
+gemspec
+
+gem 'activerecord', '~> 4.1.0'

data/activerecord-databasevalidations.gemspec

@@ -18,10 +18,10 @@ Gem::Specification.new do |spec|
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ["lib"]
 
-  spec.add_runtime_dependency "activerecord", "~> 4"
+  spec.add_runtime_dependency "activerecord", "~> 4.0"
 
   spec.add_development_dependency "bundler", "~> 1.5"
   spec.add_development_dependency "rake"
-  spec.add_development_dependency "minitest", "~> 5"
+  spec.add_development_dependency "minitest"
   spec.add_development_dependency "mysql2"
 end

data/lib/active_record/database_validations/version.rb

@@ -1,5 +1,5 @@
 module ActiveRecord
   module DatabaseValidations
-    VERSION = "0.1.0"
+    VERSION = "0.1.1"
   end
 end

data/lib/active_record/validations/database_constraints.rb

@@ -21,12 +21,11 @@ module ActiveRecord
         longblob:   { validator: ActiveModel::Validations::BytesizeValidator, default_maximum: 2 ** 32 - 1 },
       }
 
-      attr_reader :klass, :constraints
+      attr_reader :constraints
 
       VALID_CONSTRAINTS = Set[:size, :basic_multilingual_plane, :not_null]
 
       def initialize(options = {})
-        @klass = options[:class]
         @constraints = Set.new(Array.wrap(options[:in]) + Array.wrap(options[:with]))
         @constraint_validators = {}
         super
@@ -39,14 +38,14 @@ module ActiveRecord
         raise ArgumentError, "#{invalid_constraints.map(&:inspect).join(',')} is not a valid constraint." unless invalid_constraints.empty?
       end
 
-      def not_null_validator(column)
+      def not_null_validator(klass, column)
         return unless constraints.include?(:not_null)
         return if column.null
 
         ActiveModel::Validations::NotNullValidator.new(attributes: [column.name.to_sym], class: klass)
       end
 
-      def size_validator(column)
+      def size_validator(klass, column)
         return unless constraints.include?(:size)
         return unless column.text? || column.binary?
 
@@ -61,26 +60,26 @@ module ActiveRecord
         end
       end
 
-      def basic_multilingual_plane_validator(column)
+      def basic_multilingual_plane_validator(klass, column)
         return unless constraints.include?(:basic_multilingual_plane)
         return unless column.text? && column.collation =~ /\Autf8(?:mb3)?_/
         ActiveModel::Validations::BasicMultilingualPlaneValidator.new(attributes: [column.name.to_sym], class: klass)
       end
 
-      def attribute_validators(attribute)
+      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}!")
 
           [
-            not_null_validator(column),
-            size_validator(column),
-            basic_multilingual_plane_validator(column),
+            not_null_validator(klass, column),
+            size_validator(klass, column),
+            basic_multilingual_plane_validator(klass, column),
           ].compact
         end
       end
 
       def validate_each(record, attribute, value)
-        attribute_validators(attribute).each do |validator|
+        attribute_validators(record.class, attribute).each do |validator|
           validator.validate_each(record, attribute, value)
         end
       end

data/test/database_constraints_validator_test.rb

@@ -49,14 +49,14 @@ class DatabaseConstraintsValidatorTest < Minitest::Test
 
   def test_not_null_field_defines_not_null_validator_if_requested
     validator = Foo._validators[:checked].first
-    subvalidators = validator.attribute_validators(:checked)
+    subvalidators = validator.attribute_validators(Foo, :checked)
     assert_equal 1, subvalidators.length
     assert_kind_of ActiveModel::Validations::NotNullValidator, subvalidators.first
   end
 
   def test_string_field_defines_length_validator_by_default
     validator = Foo._validators[:string].first
-    subvalidators = validator.attribute_validators(:string)
+    subvalidators = validator.attribute_validators(Foo, :string)
     assert_equal 1, subvalidators.length
     assert_kind_of ActiveModel::Validations::LengthValidator, subvalidators.first
     assert_equal 40, subvalidators.first.options[:maximum]
@@ -64,7 +64,7 @@ class DatabaseConstraintsValidatorTest < Minitest::Test
 
   def test_blob_field_defines_bytesize_validator
     validator = Foo._validators[:blob].first
-    subvalidators = validator.attribute_validators(:blob)
+    subvalidators = validator.attribute_validators(Foo, :blob)
     assert_equal 1, subvalidators.length
     assert_kind_of ActiveModel::Validations::BytesizeValidator, subvalidators.first
     assert_equal 65535, subvalidators.first.options[:maximum]
@@ -73,7 +73,7 @@ class DatabaseConstraintsValidatorTest < Minitest::Test
 
   def test_not_null_text_field_defines_requested_bytesize_validator_and_unicode_validator
     validator = Foo._validators[:not_null_text].first
-    subvalidators = validator.attribute_validators(:not_null_text)
+    subvalidators = validator.attribute_validators(Foo, :not_null_text)
     assert_equal 2, subvalidators.length
 
     assert_kind_of ActiveModel::Validations::BytesizeValidator, subvalidators.first
@@ -90,7 +90,7 @@ class DatabaseConstraintsValidatorTest < Minitest::Test
 
   def test_should_not_create_a_validor_for_a_utf8mb4_field
     assert Bar.new(mb4_string: '💩').valid?
-    Bar._validators[:mb4_string].first.attribute_validators(:mb4_string).empty?
+    Bar._validators[:mb4_string].first.attribute_validators(Bar, :mb4_string).empty?
   end
 
   def test_error_messages

data/test/test_helper.rb

@@ -9,6 +9,8 @@ require "yaml"
 
 require "active_record/database_validations"
 
+Minitest::Test = MiniTest::Unit::TestCase unless defined?(MiniTest::Test)
+
 database_yml = YAML.load_file(File.expand_path('../database.yml', __FILE__))
 ActiveRecord::Base.establish_connection(database_yml['test'])
 I18n.enforce_available_locales = false

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: activerecord-databasevalidations
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
 platform: ruby
 authors:
 - Willem van Bergen
@@ -14,70 +14,70 @@ dependencies:
   name: activerecord
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '4'
+        version: '4.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '4'
+        version: '4.0'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '1.5'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '1.5'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: minitest
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - '>='
       - !ruby/object:Gem::Version
-        version: '5'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - '>='
       - !ruby/object:Gem::Version
-        version: '5'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: mysql2
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 description: Opt-in validations for your ActiveRecord models based on your MySQL database
@@ -88,9 +88,11 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- ".gitignore"
-- ".travis.yml"
+- .gitignore
+- .travis.yml
 - Gemfile
+- Gemfile.activerecord40
+- Gemfile.activerecord41
 - LICENSE.txt
 - README.md
 - Rakefile
@@ -121,17 +123,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.0.14
 signing_key: 
 specification_version: 4
 summary: Add validations to your ActiveRecord models based on MySQL database constraints.