validation_matcher 1.1.0 → 2.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 13456c24a2ebf2497c63161e49a9aaf5f235c661
-  data.tar.gz: 484ba6b0a3c2553d29f6ed3e47c7a3ea734a62b7
+  metadata.gz: 6317b7828b8591caf64ffeed93606045fd4ce25d
+  data.tar.gz: 6a55e8db45b52cc2635b170e3f759dc561547752
 SHA512:
-  metadata.gz: 40e3aa3d07cd480d49b5b0a0b9093c20695c8a81632795eb85b5aecf580c76944db1bc7317eedf0c4d672109d79a067035ca9bd1f231ef2d4af8f125c8c7fb20
-  data.tar.gz: 69d9c78790bd5f638744dd666f4256dcf45dbd7cfc74cbf708968363430d99027d8b261c46c3c40fcb645e353c584e00c7624fd8975f63a278fa53ce7a2df063
+  metadata.gz: 51a29945a76cdb46fcb7538f4769a81edc737425153c31feef679aad0657e1668243addaf50e1a69f96323581fa4f18243108666575004d8aef0c3c5345b9d9a
+  data.tar.gz: 2873dc12ef33c3f768497dc54db7e11b890e572a39025d287524ded92879bc9bf720ea20daf021b071f80c0135af6019416481089d9f5eb93e133940ace1865e

data/.travis.yml

@@ -7,6 +7,9 @@ language: ruby
 rvm:
   - 1.9.3
   - 2.0.0
-  - 2.1.1
+  - 2.1.4
+  - 2.2.0
 
 script: bundle exec rspec spec
+
+sudo: false

data/README.md

@@ -1,5 +1,5 @@
-Validation Matcher [![build status][ci-image]][ci] [![code climate][cc-image]][cc]
-==================================================================================
+Validation Matcher [![code climate][cc-image]][cc] [![build status][ci-image]][ci] [![gem version][gem-image]][gem]
+===================================================================================================================
 
 About
 -----
@@ -21,6 +21,9 @@ Add to your Gemfile and run the `bundle` command to install it.
   gem 'validation_matcher'
   ```
 
+- specify '~> 1.1.0' for rails 4 & rspec 2
+- specify '~> 1.0.0' for rails 3 & rspec 2
+
 **Requires Ruby 1.9.2 or later.**
 
 Usage
@@ -46,7 +49,9 @@ Usage
 <!-- links -->
 [cc]: https://codeclimate.com/github/BM5k/validation_matcher "code climate"
 [ci]: http://travis-ci.org/BM5k/validation_matcher "build status"
+[gem]: http://badge.fury.io/rb/validation_matcher "gem version"
 
 <!-- images -->
-[cc-image]: https://codeclimate.com/github/BM5k/validation_matcher.png
+[cc-image]: https://codeclimate.com/github/BM5k/validation_matcher.svg
 [ci-image]: https://secure.travis-ci.org/BM5k/validation_matcher.svg?branch=master
+[gem-image]:https://badge.fury.io/rb/validation_matcher.svg

data/lib/validation_matcher/version.rb

@@ -1,3 +1,3 @@
 module ValidationMatcher
-  VERSION = '1.1.0'
+  VERSION = '2.0.0'
 end

data/lib/validation_matcher.rb

@@ -1,5 +1,5 @@
 require 'validation_matcher/version'
-require 'rspec'
+require 'rspec/expectations'
 
 unless Hash.instance_methods.include?(:diff)
   class Hash
@@ -33,11 +33,11 @@ module ValidationMatcher
       msg
     end
 
-    failure_message_for_should do
+    failure_message do
       "Expected #{ described_class } to validate the #{ kind } of #{ @field.inspect } #{ diff }"
     end
 
-    failure_message_for_should_not do
+    failure_message_when_negated do
       "Expected #{ described_class } not to validate the #{ kind } of #{ @field.inspect } #{ diff }"
     end
 
@@ -46,7 +46,7 @@ module ValidationMatcher
     end
 
     def validator
-      @validator ||= actual.class.validators_on(@field).detect { |v| @expected.include? v.kind }
+      @validator ||= actual.class.validators_on(@field).detect { |v| expected == v.kind }
     end
 
     def validator_options

data/validation_matcher.gemspec

@@ -18,10 +18,11 @@ Gem::Specification.new do |s|
   s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
   s.require_paths = ['lib']
 
-  s.add_dependency 'rspec',         '~> 2'
+  s.add_dependency 'rspec-expectations', '~> 3.1'
 
   s.add_development_dependency 'activemodel', '>= 3'
-  s.add_development_dependency 'rake'
   s.add_development_dependency 'pry'
   s.add_development_dependency 'pry-doc'
+  s.add_development_dependency 'rake'
+  s.add_development_dependency 'rspec'
 end

metadata

@@ -1,29 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: validation_matcher
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 2.0.0
 platform: ruby
 authors:
 - BM5k
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-05-06 00:00:00.000000000 Z
+date: 2014-11-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: rspec
+  name: rspec-expectations
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2'
+        version: '3.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2'
+        version: '3.1'
 - !ruby/object:Gem::Dependency
   name: activemodel
   requirement: !ruby/object:Gem::Requirement
@@ -39,7 +39,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '3'
 - !ruby/object:Gem::Dependency
-  name: rake
+  name: pry
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -53,7 +53,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: pry
+  name: pry-doc
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -67,7 +67,21 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: pry-doc
+  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: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -117,7 +131,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: validation_matcher
-rubygems_version: 2.2.2
+rubygems_version: 2.4.2
 signing_key: 
 specification_version: 4
 summary: RSpec matcher for ActiveModel validations