context_validations 0.2.0 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 73cdca917a7c501806a934a2a078dee76089ce0e
-  data.tar.gz: 28a7ab80f6cadfc68e930a3c605f8d5228c08fef
+  metadata.gz: 4c10225e24879cbd621f483a0b9dd7991a0e766c
+  data.tar.gz: 6a063c5a6db544b10699d27dfeaace99a201508a
 SHA512:
-  metadata.gz: b0178c54af6220b49ce4cd14366827130c6dcad234a2bb2f44af889224b14ae55adcdf29c697d25820ec4808f93a12b232f23de5d81a664bf461484a645c6da2
-  data.tar.gz: e05af07a17649aef1991cfc013851f8a945e0d7ef1093d464c7a898a6ad233488fbd083a15ad118b6759fa27602de97749528a77c480cb8b19e300c16a1e8845
+  metadata.gz: 8f87ef1b8678c4f028dbfc8c1112ad16bdff61aad0762d535920e94be5097e31d1d2d41bbd00a03ec11812f73013a0961c13357165246bf8981ae619e40d0ffa
+  data.tar.gz: 931c8c469b30d6e50bba0ff68d94dec5d3d0c91d16f19f3aae28ae9809e2f41b54674391e6d177244d7386f76c18953cdc0e835ef3190925301eb0f2e3562074

data/context_validations.gemspec

@@ -16,12 +16,12 @@ Gem::Specification.new do |spec|
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ['lib']
 
-  spec.add_dependency 'activesupport'
+  spec.add_dependency 'activesupport', '~> 4.1'
 
   spec.add_development_dependency 'bundler', '~> 1.3'
   spec.add_development_dependency 'rake'
   spec.add_development_dependency 'minitest'
   spec.add_development_dependency 'm'
-  spec.add_development_dependency 'activerecord'
+  spec.add_development_dependency 'activerecord', '~> 4.1'
   spec.add_development_dependency 'sqlite3'
 end

data/lib/context_validations/controller.rb

@@ -53,7 +53,7 @@ module ContextValidations::Controller
         key = "#{key.to_s.camelize}Validator"
         namespace = defined?(ActiveRecord) ? ActiveRecord::Base : ActiveModel::Validations
         klass = key.include?('::') ? key.constantize : namespace.const_get(key)
-        validator = klass.new(defaults.merge(_parse_validates_options(options)))
+        validator = { class: klass, options: defaults.merge(_parse_validates_options(options)) }
         validators << validator
       end
       validators

data/lib/context_validations/model.rb

@@ -22,7 +22,10 @@ module ContextValidations::Model
   #
   # @param [[ActiveMode::Validations::Validator]]
   def validations=(validations)
-    @validations = validations.flatten
+    @validations = validations.flatten.map do |validator|
+      validator[:options][:class] = self.class
+      validator[:class].new(validator[:options])
+    end
   end
 
   protected

data/lib/context_validations/version.rb

@@ -1,3 +1,3 @@
 module ContextValidations
-  VERSION = '0.2.0'
+  VERSION = '0.3.0'
 end

data/test/model_test.rb

@@ -21,7 +21,11 @@ describe 'Model' do
   end
 
   it 'accepts validations set onto the instance' do
-    validations = [ActiveModel::Validations::PresenceValidator.new(:attributes => [:first_name]), ActiveModel::Validations::FormatValidator.new(:attributes => [:email], :with => EmailFormat), ActiveRecord::Validations::UniquenessValidator.new(:attributes => [:email])]
+    validations = [
+      {class: ActiveModel::Validations::PresenceValidator, options: { :attributes => [:first_name] }},
+      {class: ActiveModel::Validations::FormatValidator, options: { :attributes => [:email], :with => EmailFormat }},
+      {class: ActiveRecord::Validations::UniquenessValidator, options: { :attributes => [:email] }}
+    ]
     @user.validations = validations
     @user.valid?.must_equal false
     @user.errors.count.must_equal 2
@@ -29,10 +33,10 @@ describe 'Model' do
 
   it 'respect conditional validations set onto the instance' do
     validations = [
-      ActiveModel::Validations::PresenceValidator.new(:attributes => [:first_name], :if => :can_validate?),
-      ActiveModel::Validations::PresenceValidator.new(:attributes => [:first_name], :if => Proc.new { |model| model.can_validate? }),
-      ActiveModel::Validations::PresenceValidator.new(:attributes => [:first_name], :unless => :cannot_validate?),
-      ActiveModel::Validations::PresenceValidator.new(:attributes => [:first_name], :unless => Proc.new { |model| model.cannot_validate? })
+      {class: ActiveModel::Validations::PresenceValidator, options: { :attributes => [:first_name], :if => :can_validate? }},
+      {class: ActiveModel::Validations::PresenceValidator, options: { :attributes => [:first_name], :if => Proc.new { |model| model.can_validate? }}},
+      {class: ActiveModel::Validations::PresenceValidator, options: { :attributes => [:first_name], :unless => :cannot_validate? }},
+      {class: ActiveModel::Validations::PresenceValidator, options: { :attributes => [:first_name], :unless => Proc.new { |model| model.cannot_validate? }}}
     ]
     def @user.can_validate?
       false

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: context_validations
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.3.0
 platform: ruby
 authors:
 - Brian Cardarella
@@ -14,16 +14,16 @@ dependencies:
   name: activesupport
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '4.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '4.1'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -84,16 +84,16 @@ dependencies:
   name: activerecord
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '4.1'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '4.1'
 - !ruby/object:Gem::Dependency
   name: sqlite3
   requirement: !ruby/object:Gem::Requirement