validator_attachment 1.1.1 → 2.0.0

checksums.yaml

@@ -0,0 +1,15 @@
+---
+!binary "U0hBMQ==":
+  metadata.gz: !binary |-
+    ODIwYTJhNDE1YmMzZDcyMzRlYzBjOTNlNWYzODdmMjY3YTViYTc4OA==
+  data.tar.gz: !binary |-
+    NTdmNzViMzZjN2JlMGU1MzE1N2Y1NTQwMWI3MjI2OTkzZWY1MjI4YQ==
+SHA512:
+  metadata.gz: !binary |-
+    ZjY2ZjE0ZWE4MzlkYjUxY2I0NDNlZjc2NTU5OGY5MzAzMzc2OTZiZTgyYTZk
+    YzEwYTVjYWE2NTdhMjJjYzdhNTUxYmVlMWVkYWU4ZjMzZjZkODVlYTRlZmRm
+    NGVlYTRlYTkxZmQyYTRmODcwN2UyMzcwN2EwZTQ1YjMwZDQ5ODg=
+  data.tar.gz: !binary |-
+    ZDMxOGZjNjUzMWMxYTFiMDU4NmEyYTI4Mzg2MjAxODRiYmQ5MWNhNTg3MDZk
+    MTlhZWNmMGJiYzQ2YzU3ODEyOGM5YmNmMjBiMzVjOWNlNjQxNDViZDU1Y2Zh
+    ZmYxODhhM2VjMmM2OWI0OTg3NDRjN2RiNThhODE2ZTE2NjQ2OWE=

data/CHANGELOG

@@ -1,3 +1,5 @@
+v2.0.0 Support for Rails 4
+
 v1.1.1 require 'active_support/core_ext/hash/diff'
 
 v1.1.0 attached? together with is_attached?

data/Manifest

@@ -3,8 +3,9 @@ MIT-LICENSE
 README.rdoc
 Rakefile
 lib/validator_attachment.rb
-test/dummy_validator.rb
-test/test_helper.rb
-test/validator_attachment_test.rb
+lib/validator_attachment/version.rb
+spec/dummy_validator.rb
+spec/spec_helper.rb
+spec/validator_attachment_spec.rb
 validator_attachment.gemspec
 Manifest

data/README.rdoc

@@ -1,6 +1,6 @@
 = Validator Attachment
 
-It works with Rails >=3.0. Helps me test my validations on Models with less code. Assuming that Rails validations are
+It works with Rails >=4.0. (For Rails >=3.0 use version 1.x) Helps me test my validations on Models with less code. Assuming that Rails validations are
 already tested, by Rails, then when I have a validation on an attribute of a Model, I just want to test whether the
 validation is there. Nothing more.
 
@@ -14,8 +14,8 @@ Assuming that you have a Model like the following:
 
 In your test:
 
-    test "last name has to be present" do
-      assert ActiveModel::Validations::PresenceValidator.is_attached?(MyAwesomeModel, :last_name)
+    it "last name has to be present" do
+      expect(ActiveModel::Validations::PresenceValidator.is_attached?(MyAwesomeModel, :last_name)).to be true
     end
 
 will test that your +last_name+ attribute on the model +MyAwesomeModel+ has a +:presence+ validation attached. Note
@@ -31,17 +31,17 @@ Optionally, you can also check whether the correct options are attached too. So,
 
 In your test:
 
-    test "last name should not be of correct length" do
+    it "last name should not be of correct length" do
       # you do not have to check for all options
-      assert ActiveModel::Validations::LengthValidator.is_attached?(MyAwesomeModel, :last_name, { :minimum => 3 })
-      assert ActiveModel::Validations::LengthValidator.is_attached?(MyAwesomeModel, :last_name, { :maximum => 60 })
+      it { expect(ActiveModel::Validations::LengthValidator.is_attached?(MyAwesomeModel, :last_name, { :minimum => 3 })).to be true }
+      it { expect(ActiveModel::Validations::LengthValidator.is_attached?(MyAwesomeModel, :last_name, { :maximum => 60 })).to be true }
 
       # or you can check for all
-      assert ActiveModel::Validations::LengthValidator.is_attached?(MyAwesomeModel, :last_name, { :minimum => 3, :maximum => 60 })
+      it { expect(ActiveModel::Validations::LengthValidator.is_attached?(MyAwesomeModel, :last_name, { :minimum => 3, :maximum => 60 })).to be true }
 
       # or you can ask for those and only those, i.e. exact content match
-      assert !ActiveModel::Validations::LengthValidator.is_attached?(MyAwesomeModel, :last_name, { :maximum => 60 }, true)
-      assert ActiveModel::Validations::LengthValidator.is_attached?(MyAwesomeModel, :last_name, { :minimum > 60, :maximum => 60 }, true)
+      it { expect(!ActiveModel::Validations::LengthValidator.is_attached?(MyAwesomeModel, :last_name, { :maximum => 60 }, true)).to be true }
+      it { expect(ActiveModel::Validations::LengthValidator.is_attached?(MyAwesomeModel, :last_name, { :minimum > 60, :maximum => 60 }, true)).to be true }
     end
 
 Another example with +with_options+:
@@ -56,8 +56,8 @@ Another example with +with_options+:
 You can test this as follows:
 
     test "user admin validators" do
-      assert ActiveModel::Validations::LengthValidator.is_attached?(User, :password, { :minimum => 10, :if => :is_admin? })
-      assert ActiveModel::Validations::PresenceValidator.is_attached?(User, :username, { :if => :is_admin? })
+      it { expect(ActiveModel::Validations::LengthValidator.is_attached?(User, :password, { :minimum => 10, :if => :is_admin? })).to be true }
+      it { exepct(ActiveModel::Validations::PresenceValidator.is_attached?(User, :username, { :if => :is_admin? })).to be true }
     end
 
 In the file {validator_attachment_test.rb}[https://github.com/pmatsinopoulos/validator_attachment/blob/master/test/validator_attachment_test.rb]

data/Rakefile

@@ -1,19 +1,6 @@
 #!/usr/bin/env rake
 require 'rubygems'
 require 'rake'
-require 'echoe'
-
-Echoe.new('validator_attachment') do |p|
-  p.summary     = "Is this ActiveModel Validator Used?"
-  p.description = "Checks whether an ActiveModel Validator is attached to an attribute of a Model and with which options"
-  p.url         = "http://github.com/pmatsinopoulos/validator_attachment"
-  p.author      = "Panayotis Matsinopoulos"
-  p.email       = "panayotis@matsinopoulos.gr"
-  p.ignore_pattern = ["tmp/*", "script/*", "rdoc_output/*", "rdoc_output/js/*", "rdoc_output/images/*", "rdoc_output/ActiveModel/*", "rdoc_output/lib/*",
-                      "yard_output/*", "yard_output/js/*", "yard_output/css/*", "Gemfile", "Gemfile.lock", "*.iml"]
-  p.runtime_dependencies = ["rails ~>3.0"]
-  p.development_dependencies = ["rails ~>3.0"]
-end
 
 Dir["#{File.dirname(__FILE__)}/tasks/*.rake"].sort.each{ |ext| load ext }
 

data/lib/validator_attachment.rb

@@ -1,11 +1,11 @@
-require 'active_support/core_ext/hash/diff'
+require "rails/all"
 
 module ValidatorAttachment
 
   # Given a +klass+ checks whether the target Validator is attached to
   # the given +attribute+ of the model with class +klass+. It can also check
   # whether validator is attached together with some +options+ and if these
-  # +options+ are the only ones used (given +exact_math+ +true+)
+  # +options+ are the only ones used (given +exact_match+ +true+)
   #
   # @param [Class] klass the Model class that uses the Validator
   # @param [Symbol] attribute the attribute of the Model class that we want
@@ -18,7 +18,7 @@ module ValidatorAttachment
   #   should not have more or less options.
   # @return [boolean] whether Validator is attached or not
   #
-  # @see http://github.com/pmatsinopoulos/validator_attachment Please project home page for more details and examples of usage.
+  # @see http://github.com/pmatsinopoulos/validator_attachment project home page for more details and examples of usage.
   #
   def is_attached?(klass, attribute, options=nil, exact_match=false)
     validators = klass._validate_callbacks.map{|vc| vc.raw_filter}
@@ -39,7 +39,7 @@ module ValidatorAttachment
         # The logic of comparison:
         #   I find the difference of +val.options+ to +options+ and then I remove from +val.options+ this difference.
         #   The remaining keys of +val.options+ should be hash equal to +options+
-        validators = validators.find_all{|val| val.options.present? && val.options.reject{|k,v| val.options.diff(options).keys.include?(k)} == options}
+        validators = validators.find_all{|val| val.options.present? && val.options.merge(options) == val.options}
       end
     end
 

data/spec/spec_helper.rb

@@ -0,0 +1,6 @@
+current_path = File.expand_path("..", __FILE__)
+$: << "../lib"
+$: << current_path
+
+require "validator_attachment"
+require "dummy_validator"

data/spec/validator_attachment_spec.rb

@@ -0,0 +1,160 @@
+require 'spec_helper'
+
+describe ValidatorAttachment do
+  module ValidatorAttachmentTest
+    class SampleModel
+      include ActiveModel::Validations
+      include ActiveRecord::Validations
+
+      validates :acceptance_attr_1, :acceptance => true
+      validates :acceptance_attr_2, :acceptance => { :allow_nil => true }
+      validates :acceptance_attr_3, :acceptance => { :allow_nil => false }
+      validates :acceptance_attr_4, :acceptance => { :accept => 'sure' }
+      validates :acceptance_attr_5, :acceptance => { :allow_nil => true, :accept => 'sure' }
+
+      validates :email_1, :confirmation => true
+      validates :email_2, :confirmation => true, :presence => true
+
+      validates :exclusion_1, :exclusion => { :in => %w(ab cd ef), :message => 'not allowed' }
+
+      validates :legacy_code, :format => { :with => /\Aa.+\d\z/, :message => 'wrong format' }
+
+      validates :size, :inclusion => { :in => %w(small medium large),
+                                       :message => "%{value} is not a valid size" }
+
+      validates :name,                :length => { :minimum => 2 }
+      validates :bio,                 :length => { :maximum => 500 }
+      validates :password,            :length => { :in => 6..20 }
+      validates :registration_number, :length => { :is => 6 }
+      validates :account_number,      :length => { :minimum => 2, :maximum => 6, :wrong_length => 'wrong length, please try again' }
+      validates :student_id,          :length => { :maximum => 10, :too_long => 'sorry, too long', :too_short => 'sorry, too short' }
+      validates :mama_telephone,      :length => { :is => 8 }
+
+      validates :points, :numericality => true
+      validates :games_played, :numericality => { :only_integer => true }
+      validates :num_1, :numericality => { :greater_than => 1 }
+      validates :num_2, :numericality => { :greater_than_or_equal_to => 2 }
+      validates :num_3, :numericality => { :equal_to => 3 }
+      validates :num_4, :numericality => { :less_than => 4 }
+      validates :num_5, :numericality => { :less_than_or_equal_to => 5 }
+      validates :num_6, :numericality => { :odd => true }
+      validates :num_7, :numericality => { :even => true }
+
+      validates :identity_number, :uniqueness => true
+      validates :identity_number_1, :uniqueness => { :scope => :num_7 }
+      validates :identity_number_2, :uniqueness => { :case_sensitive => true}
+
+      validates :num_8, :presence => true, :if => :paid_with_card?
+
+      with_options :if => :is_admin? do |admin|
+        admin.validates :num_9, :length => { :minimum => 10 }
+        admin.validates :num_10, :presence => true
+      end
+
+      validates :my_facebook_email, :presence => true, :dummy => true
+
+      def persisted?
+        false
+      end
+    end
+  end
+
+  context 'ActiveModel::EachValidator' do
+    it 'responds to is_attached?' do
+      expect(ActiveModel::EachValidator).to respond_to(:is_attached?)
+    end
+
+    it 'responds to attached?' do
+      expect(ActiveModel::EachValidator).to respond_to(:attached?)
+    end
+  end
+
+  context 'acceptance validator' do
+    it { expect(ActiveModel::Validations::AcceptanceValidator.is_attached?(ValidatorAttachmentTest::SampleModel, :acceptance_attr_1)).to be true }
+    it { expect(ActiveModel::Validations::AcceptanceValidator.is_attached?(ValidatorAttachmentTest::SampleModel, :acceptance_attr_2, {:allow_nil => true})).to be true }
+    it { expect(ActiveModel::Validations::AcceptanceValidator.is_attached?(ValidatorAttachmentTest::SampleModel, :acceptance_attr_3, {:allow_nil => false})).to be true }
+    it { expect(ActiveModel::Validations::AcceptanceValidator.is_attached?(ValidatorAttachmentTest::SampleModel, :acceptance_attr_4, {:accept => 'sure'})).to be true }
+    it { expect(ActiveModel::Validations::AcceptanceValidator.is_attached?(ValidatorAttachmentTest::SampleModel, :acceptance_attr_5, {:accept => 'sure'})).to be true }
+    it { expect(!ActiveModel::Validations::AcceptanceValidator.is_attached?(ValidatorAttachmentTest::SampleModel, :acceptance_attr_5, {:accept => 'sure'}, true)).to be true }
+    it { expect(ActiveModel::Validations::AcceptanceValidator.is_attached?(ValidatorAttachmentTest::SampleModel, :acceptance_attr_5, {:accept => 'sure', :allow_nil => true}, true)).to be true }
+  end
+
+  context 'confirmation validator' do
+    it { expect(ActiveModel::Validations::ConfirmationValidator.is_attached?(ValidatorAttachmentTest::SampleModel, :email_1)).to be true }
+    it { expect(!ActiveModel::Validations::ConfirmationValidator.is_attached?(ValidatorAttachmentTest::SampleModel, :acceptance_attr_1)).to be true }
+    it { expect(ActiveModel::Validations::ConfirmationValidator.is_attached?(ValidatorAttachmentTest::SampleModel, :email_2)).to be true }
+  end
+
+  context 'presence validator' do
+    it { expect(ActiveModel::Validations::PresenceValidator.is_attached?(ValidatorAttachmentTest::SampleModel, :email_2)).to be true }
+    it { expect(ActiveModel::Validations::PresenceValidator.attached?(ValidatorAttachmentTest::SampleModel, :email_2)).to be true }
+  end
+
+  context 'exclusion validator' do
+    it { expect(!ActiveModel::Validations::ExclusionValidator.is_attached?(ValidatorAttachmentTest::SampleModel, :email_2)).to be true }
+    it { expect(ActiveModel::Validations::ExclusionValidator.is_attached?(ValidatorAttachmentTest::SampleModel, :exclusion_1, {:in => %w(ab cd ef)})).to be true }
+    it { expect(!ActiveModel::Validations::ExclusionValidator.is_attached?(ValidatorAttachmentTest::SampleModel, :exclusion_1, {:in => %w(ab cd ef gh)})).to be true }
+  end
+
+  context 'format validator' do
+    it { expect(ActiveModel::Validations::FormatValidator.is_attached?(ValidatorAttachmentTest::SampleModel, :legacy_code)).to be true }
+    it { expect(ActiveModel::Validations::FormatValidator.is_attached?(ValidatorAttachmentTest::SampleModel, :legacy_code, {:message => 'wrong format'})).to be true }
+    it { expect(ActiveModel::Validations::FormatValidator.is_attached?(ValidatorAttachmentTest::SampleModel, :legacy_code, {:with => /\Aa.+\d\z/})).to be true }
+    it { expect(ActiveModel::Validations::FormatValidator.is_attached?(ValidatorAttachmentTest::SampleModel, :legacy_code, {:message => 'wrong format', :with => /\Aa.+\d\z/})).to be true }
+    it { expect(!ActiveModel::Validations::FormatValidator.is_attached?(ValidatorAttachmentTest::SampleModel, :legacy_code, {:with => /\Aa.+\z/})).to be true }
+  end
+
+  context 'inclusion validator' do
+    it { expect(ActiveModel::Validations::InclusionValidator.is_attached?(ValidatorAttachmentTest::SampleModel, :size, {:in => %w(small medium large)})).to be true }
+    it { expect(ActiveModel::Validations::InclusionValidator.is_attached?(ValidatorAttachmentTest::SampleModel, :size, {:message => "%{value} is not a valid size"})).to be true }
+  end
+  
+  context 'length validator' do
+    it { expect(ActiveModel::Validations::LengthValidator.is_attached?(ValidatorAttachmentTest::SampleModel, :name)).to be true }
+    it { expect(ActiveModel::Validations::LengthValidator.is_attached?(ValidatorAttachmentTest::SampleModel, :name, {:minimum => 2})).to be true }
+    it { expect(!ActiveModel::Validations::LengthValidator.is_attached?(ValidatorAttachmentTest::SampleModel, :name, {:maximum => 2})).to be true }
+    it { expect(ActiveModel::Validations::LengthValidator.is_attached?(ValidatorAttachmentTest::SampleModel, :bio, {:maximum => 500})).to be true }
+    # watch out how :in has been interpreted to :minimum .. :maximum
+    it { expect(ActiveModel::Validations::LengthValidator.is_attached?(ValidatorAttachmentTest::SampleModel, :password, {:minimum => 6})).to be true }
+    it { expect(ActiveModel::Validations::LengthValidator.is_attached?(ValidatorAttachmentTest::SampleModel, :password, {:maximum => 20})).to be true }
+    it { expect(!ActiveModel::Validations::LengthValidator.is_attached?(ValidatorAttachmentTest::SampleModel, :registration_number, {:is => 2})).to be true }
+    it { expect(ActiveModel::Validations::LengthValidator.is_attached?(ValidatorAttachmentTest::SampleModel, :registration_number, {:is => 6})).to be true }
+    it { expect(ActiveModel::Validations::LengthValidator.is_attached?(ValidatorAttachmentTest::SampleModel, :account_number, {:wrong_length => 'wrong length, please try again', :minimum => 2})).to be true }
+    it { expect(ActiveModel::Validations::LengthValidator.is_attached?(ValidatorAttachmentTest::SampleModel, :student_id, {:too_long => 'sorry, too long', :maximum => 10})).to be true }
+    it { expect(ActiveModel::Validations::LengthValidator.is_attached?(ValidatorAttachmentTest::SampleModel, :mama_telephone, {:is => 8})).to be true }
+  end
+  
+  context 'numericality' do
+    it { expect(ActiveModel::Validations::NumericalityValidator.is_attached?(ValidatorAttachmentTest::SampleModel, :points)).to be true }
+    it { expect(!ActiveModel::Validations::NumericalityValidator.is_attached?(ValidatorAttachmentTest::SampleModel, :points, { :only_integer => true })).to be true }
+    it { expect(ActiveModel::Validations::NumericalityValidator.is_attached?(ValidatorAttachmentTest::SampleModel, :games_played, { :only_integer => true })).to be true }
+
+    it { expect(ActiveModel::Validations::NumericalityValidator.is_attached?(ValidatorAttachmentTest::SampleModel, :num_1, { :greater_than => 1 })).to be true }
+    it { expect(ActiveModel::Validations::NumericalityValidator.is_attached?(ValidatorAttachmentTest::SampleModel, :num_2, { :greater_than_or_equal_to => 2 })).to be true }
+    it { expect(ActiveModel::Validations::NumericalityValidator.is_attached?(ValidatorAttachmentTest::SampleModel, :num_3, { :equal_to => 3 })).to be true }
+    it { expect(ActiveModel::Validations::NumericalityValidator.is_attached?(ValidatorAttachmentTest::SampleModel, :num_4, { :less_than => 4 })).to be true }
+    it { expect(ActiveModel::Validations::NumericalityValidator.is_attached?(ValidatorAttachmentTest::SampleModel, :num_5, { :less_than_or_equal_to => 5 })).to be true }
+    it { expect(ActiveModel::Validations::NumericalityValidator.is_attached?(ValidatorAttachmentTest::SampleModel, :num_6, { :odd => true })).to be true }
+    it { expect(ActiveModel::Validations::NumericalityValidator.is_attached?(ValidatorAttachmentTest::SampleModel, :num_7, { :even => true })).to be true }
+  end
+  
+  context 'uniqueness' do
+    it { expect(ActiveRecord::Validations::UniquenessValidator.is_attached?(ValidatorAttachmentTest::SampleModel, :identity_number)).to be true }
+    it { expect(ActiveRecord::Validations::UniquenessValidator.is_attached?(ValidatorAttachmentTest::SampleModel, :identity_number_1)).to be true }
+    it { expect(!ActiveRecord::Validations::UniquenessValidator.is_attached?(ValidatorAttachmentTest::SampleModel, :identity_number_1, { :scope => :num_1 })).to be true }
+    it { expect(ActiveRecord::Validations::UniquenessValidator.is_attached?(ValidatorAttachmentTest::SampleModel, :identity_number_1, { :scope => :num_7 })).to be true }
+    it { expect(ActiveRecord::Validations::UniquenessValidator.is_attached?(ValidatorAttachmentTest::SampleModel, :identity_number_2)).to be true }
+    it { expect(ActiveRecord::Validations::UniquenessValidator.is_attached?(ValidatorAttachmentTest::SampleModel, :identity_number_2, { :case_sensitive => true})).to be true }
+  end
+  
+  context 'conditional validation' do
+    it { expect(ActiveModel::Validations::PresenceValidator.is_attached?(ValidatorAttachmentTest::SampleModel, :num_8, { :if => :paid_with_card? })).to be true }
+    it { expect(ActiveModel::Validations::LengthValidator.is_attached?(ValidatorAttachmentTest::SampleModel, :num_9, { :minimum => 10, :if => :is_admin? })).to be true }
+    it { expect(ActiveModel::Validations::PresenceValidator.is_attached?(ValidatorAttachmentTest::SampleModel, :num_10, { :if => :is_admin? })).to be true }
+  end
+  
+  context 'custom validator' do
+    it { expect(DummyValidator.is_attached?(ValidatorAttachmentTest::SampleModel, :my_facebook_email)).to be true }
+    it { expect(ActiveModel::Validations::PresenceValidator.is_attached?(ValidatorAttachmentTest::SampleModel, :my_facebook_email)).to be true }
+  end
+end

data/validator_attachment.gemspec

@@ -1,36 +1,29 @@
 # -*- encoding: utf-8 -*-
+lib = File.expand_path('../lib', __FILE__)
+$LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
+require 'validator_attachment/version'
 
 Gem::Specification.new do |s|
   s.name = "validator_attachment"
-  s.version = "1.1.1"
+  s.version = ValidatorAttachment::VERSION
 
   s.required_rubygems_version = Gem::Requirement.new(">= 1.2") if s.respond_to? :required_rubygems_version=
   s.authors = ["Panayotis Matsinopoulos"]
-  s.date = "2012-04-13"
+  s.date = "2015-07-12"
   s.description = "Checks whether an ActiveModel Validator is attached to an attribute of a Model and with which options"
   s.email = "panayotis@matsinopoulos.gr"
   s.extra_rdoc_files = ["CHANGELOG", "README.rdoc", "lib/validator_attachment.rb"]
-  s.files = ["CHANGELOG", "MIT-LICENSE", "README.rdoc", "Rakefile", "lib/validator_attachment.rb", "test/dummy_validator.rb", "test/test_helper.rb", "test/validator_attachment_test.rb", "validator_attachment.gemspec", "Manifest"]
+  s.files = ["CHANGELOG", "MIT-LICENSE", "README.rdoc", "Rakefile", "lib/validator_attachment.rb", "spec/dummy_validator.rb", "spec/spec_helper.rb", "spec/validator_attachment_spec.rb", "validator_attachment.gemspec", "Manifest"]
   s.homepage = "http://github.com/pmatsinopoulos/validator_attachment"
   s.rdoc_options = ["--line-numbers", "--inline-source", "--title", "Validator_attachment", "--main", "README.rdoc"]
   s.require_paths = ["lib"]
   s.rubyforge_project = "validator_attachment"
-  s.rubygems_version = "1.8.17"
+  s.rubygems_version = "2.2.2"
   s.summary = "Is this ActiveModel Validator Used?"
-  s.test_files = ["test/validator_attachment_test.rb", "test/test_helper.rb"]
+  s.test_files = ["spec/validator_attachment_spec.rb", "spec/spec_helper.rb", "spec/dummy_validator.rb"]
 
-  if s.respond_to? :specification_version then
-    s.specification_version = 3
-
-    if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
-      s.add_runtime_dependency(%q<rails>, ["~> 3.0"])
-      s.add_development_dependency(%q<rails>, ["~> 3.0"])
-    else
-      s.add_dependency(%q<rails>, ["~> 3.0"])
-      s.add_dependency(%q<rails>, ["~> 3.0"])
-    end
-  else
-    s.add_dependency(%q<rails>, ["~> 3.0"])
-    s.add_dependency(%q<rails>, ["~> 3.0"])
-  end
+  s.add_runtime_dependency('rails', "~>4.0", "~>4.0")
+  s.add_development_dependency('bundler', '~>1.0')
+  s.add_development_dependency('rake', '~>10.0')
+  s.add_development_dependency('rspec', '~>3.0')
 end

metadata

@@ -1,36 +1,60 @@
 --- !ruby/object:Gem::Specification
 name: validator_attachment
 version: !ruby/object:Gem::Version
-  version: 1.1.1
-  prerelease: 
+  version: 2.0.0
 platform: ruby
 authors:
 - Panayotis Matsinopoulos
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-04-13 00:00:00.000000000 Z
+date: 2015-07-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '4.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '4.0'
 - !ruby/object:Gem::Dependency
-  name: rails
+  name: bundler
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '1.0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '1.0'
+- !ruby/object:Gem::Dependency
+  name: rake
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '10.0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '10.0'
+- !ruby/object:Gem::Dependency
+  name: rspec
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -38,7 +62,6 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -55,16 +78,17 @@ extra_rdoc_files:
 files:
 - CHANGELOG
 - MIT-LICENSE
+- Manifest
 - README.rdoc
 - Rakefile
 - lib/validator_attachment.rb
-- test/dummy_validator.rb
-- test/test_helper.rb
-- test/validator_attachment_test.rb
+- spec/dummy_validator.rb
+- spec/spec_helper.rb
+- spec/validator_attachment_spec.rb
 - validator_attachment.gemspec
-- Manifest
 homepage: http://github.com/pmatsinopoulos/validator_attachment
 licenses: []
+metadata: {}
 post_install_message: 
 rdoc_options:
 - --line-numbers
@@ -76,24 +100,23 @@ rdoc_options:
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '1.2'
 requirements: []
 rubyforge_project: validator_attachment
-rubygems_version: 1.8.21
+rubygems_version: 2.2.2
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Is this ActiveModel Validator Used?
 test_files:
-- test/validator_attachment_test.rb
-- test/test_helper.rb
+- spec/validator_attachment_spec.rb
+- spec/spec_helper.rb
+- spec/dummy_validator.rb
 has_rdoc: 

data/test/test_helper.rb

@@ -1,9 +0,0 @@
-require 'rubygems'
-require 'test/unit'
-require 'active_support'
-require 'active_model'
-require 'active_record'
-require 'active_support/core_ext/hash/diff'
-require 'active_support/core_ext/object/with_options'
-require File.expand_path('../../lib/validator_attachment', __FILE__)
-require 'dummy_validator'

data/test/validator_attachment_test.rb

@@ -1,155 +0,0 @@
-require 'test_helper'
-
-class ValidatorAttachmentTest < ActiveSupport::TestCase
-
-  class SampleModel
-    include ActiveModel::Validations
-    include ActiveRecord::Validations
-
-    validates :acceptance_attr_1, :acceptance => true
-    validates :acceptance_attr_2, :acceptance => { :allow_nil => true }
-    validates :acceptance_attr_3, :acceptance => { :allow_nil => false }
-    validates :acceptance_attr_4, :acceptance => { :accept => 'sure' }
-    validates :acceptance_attr_5, :acceptance => { :allow_nil => true, :accept => 'sure' }
-
-    validates :email_1, :confirmation => true
-    validates :email_2, :confirmation => true, :presence => true
-
-    validates :exclusion_1, :exclusion => { :in => %w(ab cd ef), :message => 'not allowed' }
-
-    validates :legacy_code, :format => { :with => /^a.+\d$/, :message => 'wrong format' }
-
-    validates :size, :inclusion => { :in => %w(small medium large),
-                                     :message => "%{value} is not a valid size" }
-
-    validates :name,                :length => { :minimum => 2 }
-    validates :bio,                 :length => { :maximum => 500 }
-    validates :password,            :length => { :in => 6..20 }
-    validates :registration_number, :length => { :is => 6 }
-    validates :account_number,      :length => { :minimum => 2, :maximum => 6, :wrong_length => 'wrong length, please try again' }
-    validates :student_id,          :length => { :maximum => 10, :too_long => 'sorry, too long', :too_short => 'sorry, too short' }
-    validates :mama_telephone,      :length => { :is => 8 }
-
-    validates :points, :numericality => true
-    validates :games_played, :numericality => { :only_integer => true }
-    validates :num_1, :numericality => { :greater_than => 1 }
-    validates :num_2, :numericality => { :greater_than_or_equal_to => 2 }
-    validates :num_3, :numericality => { :equal_to => 3 }
-    validates :num_4, :numericality => { :less_than => 4 }
-    validates :num_5, :numericality => { :less_than_or_equal_to => 5 }
-    validates :num_6, :numericality => { :odd => true }
-    validates :num_7, :numericality => { :even => true }
-
-    validates :identity_number, :uniqueness => true
-    validates :identity_number_1, :uniqueness => { :scope => :num_7 }
-    validates :identity_number_2, :uniqueness => { :case_sensitive => true}
-
-    validates :num_8, :presence => true, :if => :paid_with_card?
-
-    with_options :if => :is_admin? do |admin|
-      admin.validates :num_9, :length => { :minimum => 10 }
-      admin.validates :num_10, :presence => true
-    end
-
-    validates :my_facebook_email, :presence => true, :dummy => true
-
-    def persisted?
-      false
-    end
-
-  end
-
-  test "validator attachment" do
-    assert ActiveModel::EachValidator.respond_to?(:is_attached?)
-    assert ActiveModel::EachValidator.respond_to?(:attached?)
-  end
-
-  test "acceptance validator" do
-    assert ActiveModel::Validations::AcceptanceValidator.is_attached?(ValidatorAttachmentTest::SampleModel, :acceptance_attr_1)
-    assert ActiveModel::Validations::AcceptanceValidator.is_attached?(ValidatorAttachmentTest::SampleModel, :acceptance_attr_2, {:allow_nil => true})
-    assert ActiveModel::Validations::AcceptanceValidator.is_attached?(ValidatorAttachmentTest::SampleModel, :acceptance_attr_3, {:allow_nil => false})
-    assert ActiveModel::Validations::AcceptanceValidator.is_attached?(ValidatorAttachmentTest::SampleModel, :acceptance_attr_4, {:accept => 'sure'})
-    assert ActiveModel::Validations::AcceptanceValidator.is_attached?(ValidatorAttachmentTest::SampleModel, :acceptance_attr_5, {:accept => 'sure'})
-    assert !ActiveModel::Validations::AcceptanceValidator.is_attached?(ValidatorAttachmentTest::SampleModel, :acceptance_attr_5, {:accept => 'sure'}, true)
-    assert ActiveModel::Validations::AcceptanceValidator.is_attached?(ValidatorAttachmentTest::SampleModel, :acceptance_attr_5, {:accept => 'sure', :allow_nil => true}, true)
-  end
-
-  test "confirmation validator" do
-    assert ActiveModel::Validations::ConfirmationValidator.is_attached?(ValidatorAttachmentTest::SampleModel, :email_1)
-    assert !ActiveModel::Validations::ConfirmationValidator.is_attached?(ValidatorAttachmentTest::SampleModel, :acceptance_attr_1)
-    assert ActiveModel::Validations::ConfirmationValidator.is_attached?(ValidatorAttachmentTest::SampleModel, :email_2)
-  end
-
-  test "presence validator" do
-    assert ActiveModel::Validations::PresenceValidator.is_attached?(ValidatorAttachmentTest::SampleModel, :email_2)
-    assert ActiveModel::Validations::PresenceValidator.attached?(ValidatorAttachmentTest::SampleModel, :email_2)
-  end
-
-  test "exclusion validator" do
-    assert !ActiveModel::Validations::ExclusionValidator.is_attached?(ValidatorAttachmentTest::SampleModel, :email_2)
-    assert ActiveModel::Validations::ExclusionValidator.is_attached?(ValidatorAttachmentTest::SampleModel, :exclusion_1, {:in => %w(ab cd ef)})
-    assert !ActiveModel::Validations::ExclusionValidator.is_attached?(ValidatorAttachmentTest::SampleModel, :exclusion_1, {:in => %w(ab cd ef gh)})
-  end
-
-  test "format validator" do
-    assert ActiveModel::Validations::FormatValidator.is_attached?(ValidatorAttachmentTest::SampleModel, :legacy_code)
-    assert ActiveModel::Validations::FormatValidator.is_attached?(ValidatorAttachmentTest::SampleModel, :legacy_code, {:message => 'wrong format'})
-    assert ActiveModel::Validations::FormatValidator.is_attached?(ValidatorAttachmentTest::SampleModel, :legacy_code, {:with => /^a.+\d$/})
-    assert ActiveModel::Validations::FormatValidator.is_attached?(ValidatorAttachmentTest::SampleModel, :legacy_code, {:message => 'wrong format', :with => /^a.+\d$/})
-    assert !ActiveModel::Validations::FormatValidator.is_attached?(ValidatorAttachmentTest::SampleModel, :legacy_code, {:with => /^a.+$/})
-  end
-
-  test "inclusion validator" do
-    assert ActiveModel::Validations::InclusionValidator.is_attached?(ValidatorAttachmentTest::SampleModel, :size, {:in => %w(small medium large)})
-    assert ActiveModel::Validations::InclusionValidator.is_attached?(ValidatorAttachmentTest::SampleModel, :size, {:message => "%{value} is not a valid size"})
-  end
-
-  test "length validator" do
-    assert ActiveModel::Validations::LengthValidator.is_attached?(ValidatorAttachmentTest::SampleModel, :name)
-    assert ActiveModel::Validations::LengthValidator.is_attached?(ValidatorAttachmentTest::SampleModel, :name, {:minimum => 2})
-    assert !ActiveModel::Validations::LengthValidator.is_attached?(ValidatorAttachmentTest::SampleModel, :name, {:maximum => 2})
-    assert ActiveModel::Validations::LengthValidator.is_attached?(ValidatorAttachmentTest::SampleModel, :bio, {:maximum => 500})
-    # watch out how :in has been interpreted to :minimum .. :maximum
-    assert ActiveModel::Validations::LengthValidator.is_attached?(ValidatorAttachmentTest::SampleModel, :password, {:minimum => 6})
-    assert ActiveModel::Validations::LengthValidator.is_attached?(ValidatorAttachmentTest::SampleModel, :password, {:maximum => 20})
-    assert !ActiveModel::Validations::LengthValidator.is_attached?(ValidatorAttachmentTest::SampleModel, :registration_number, {:is => 2})
-    assert ActiveModel::Validations::LengthValidator.is_attached?(ValidatorAttachmentTest::SampleModel, :registration_number, {:is => 6})
-    assert ActiveModel::Validations::LengthValidator.is_attached?(ValidatorAttachmentTest::SampleModel, :account_number, {:wrong_length => 'wrong length, please try again', :minimum => 2})
-    assert ActiveModel::Validations::LengthValidator.is_attached?(ValidatorAttachmentTest::SampleModel, :student_id, {:too_long => 'sorry, too long', :maximum => 10})
-    assert ActiveModel::Validations::LengthValidator.is_attached?(ValidatorAttachmentTest::SampleModel, :mama_telephone, {:is => 8})
-  end
-
-  test "numericality" do
-    assert ActiveModel::Validations::NumericalityValidator.is_attached?(ValidatorAttachmentTest::SampleModel, :points)
-    assert !ActiveModel::Validations::NumericalityValidator.is_attached?(ValidatorAttachmentTest::SampleModel, :points, { :only_integer => true })
-    assert ActiveModel::Validations::NumericalityValidator.is_attached?(ValidatorAttachmentTest::SampleModel, :games_played, { :only_integer => true })
-
-    assert ActiveModel::Validations::NumericalityValidator.is_attached?(ValidatorAttachmentTest::SampleModel, :num_1, { :greater_than => 1 })
-    assert ActiveModel::Validations::NumericalityValidator.is_attached?(ValidatorAttachmentTest::SampleModel, :num_2, { :greater_than_or_equal_to => 2 })
-    assert ActiveModel::Validations::NumericalityValidator.is_attached?(ValidatorAttachmentTest::SampleModel, :num_3, { :equal_to => 3 })
-    assert ActiveModel::Validations::NumericalityValidator.is_attached?(ValidatorAttachmentTest::SampleModel, :num_4, { :less_than => 4 })
-    assert ActiveModel::Validations::NumericalityValidator.is_attached?(ValidatorAttachmentTest::SampleModel, :num_5, { :less_than_or_equal_to => 5 })
-    assert ActiveModel::Validations::NumericalityValidator.is_attached?(ValidatorAttachmentTest::SampleModel, :num_6, { :odd => true })
-    assert ActiveModel::Validations::NumericalityValidator.is_attached?(ValidatorAttachmentTest::SampleModel, :num_7, { :even => true })
-  end
-
-  test "uniqueness" do
-    assert ActiveRecord::Validations::UniquenessValidator.is_attached?(ValidatorAttachmentTest::SampleModel, :identity_number)
-    assert ActiveRecord::Validations::UniquenessValidator.is_attached?(ValidatorAttachmentTest::SampleModel, :identity_number_1)
-    assert !ActiveRecord::Validations::UniquenessValidator.is_attached?(ValidatorAttachmentTest::SampleModel, :identity_number_1, { :scope => :num_1 })
-    assert ActiveRecord::Validations::UniquenessValidator.is_attached?(ValidatorAttachmentTest::SampleModel, :identity_number_1, { :scope => :num_7 })
-    assert ActiveRecord::Validations::UniquenessValidator.is_attached?(ValidatorAttachmentTest::SampleModel, :identity_number_2)
-    assert ActiveRecord::Validations::UniquenessValidator.is_attached?(ValidatorAttachmentTest::SampleModel, :identity_number_2, { :case_sensitive => true})
-  end
-
-  test "conditional validation" do
-    assert ActiveModel::Validations::PresenceValidator.is_attached?(ValidatorAttachmentTest::SampleModel, :num_8, { :if => :paid_with_card? })
-    assert ActiveModel::Validations::LengthValidator.is_attached?(ValidatorAttachmentTest::SampleModel, :num_9, { :minimum => 10, :if => :is_admin? })
-    assert ActiveModel::Validations::PresenceValidator.is_attached?(ValidatorAttachmentTest::SampleModel, :num_10, { :if => :is_admin? })
-  end
-
-  test "custom validator" do
-    assert DummyValidator.is_attached?(ValidatorAttachmentTest::SampleModel, :my_facebook_email)
-    assert ActiveModel::Validations::PresenceValidator.is_attached?(ValidatorAttachmentTest::SampleModel, :my_facebook_email)
-  end
-end