wildcard_matchers 0.1.8 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 52e48c6e9eaad4ea695992466a5a726dc7a1e4b1
-  data.tar.gz: 8f75b0056fba808d7fbe54e72db0b17a3c7056a8
+  metadata.gz: 853afdf97de17d19cae1c6f7703e48b314b70ae4
+  data.tar.gz: fbc0e3281dc8fbd20219547f33fcc7f6497af99b
 SHA512:
-  metadata.gz: 8e31b57f16b51787ab151d90f4a476b7a9923ac279aa7fd0d8101ac3bc548b5914b35e33caa7c5efe53dcebbfc61d7658cbc2797b3190f608b80c681ec6e7867
-  data.tar.gz: d2d54da9a515823092accf2b0e2c623bf7bfac9dbf2763263087885f19da32c73a7d68991b9940803c4fb242992f977e597b88290763fa5e6a48f7fad0a07c55
+  metadata.gz: f21ad64d86ec34f64620abc02e5d511e43b5440a1b7484665f11bb195fd263275f56a6cfed265a7f1ff425fde80706c699b7c7c2aca4aece5e6c7aa72f67fbc3
+  data.tar.gz: ff2e4ba038cdd9fd96cd46a34a344b4f2ca37df3c8bc02256fb4d6f567d495b6928aeddad05dab9765cbc51bff9aee9a7e83a161fadf64ef917a6e431269e6e8

data/CHANGELOG.md

@@ -1,3 +1,7 @@
+## 0.2.0
+* Update
+ * wildcard_matchers now works on rspec3.x (@yuki-hirako)
+
 ## 0.1.8
 * ENHANCEMENT
  * wildcard_match have capablity to use block

data/Rakefile

@@ -4,7 +4,7 @@ require "bundler/gem_tasks"
 require 'rspec/core'
 require 'rspec/core/rake_task'
 RSpec::Core::RakeTask.new(:spec) do |spec|
-  spec.pattern = FileList['spec/**/*_spec.rb']
+  spec.pattern = 'spec/**/*_spec.rb'
 end
 
 task :default => :spec

data/VERSION

@@ -1 +1 @@
-0.1.8
+0.2.0

data/lib/wildcard_matchers/rspec.rb

@@ -11,8 +11,15 @@ RSpec::Matchers.define :wildcard_match do |expected|
     @matcher === actual
   end
 
-  failure_message_for_should do |actual|
-    @matcher.errors.join("\n")
+  # RSpec now prefers `failure_message` instead of `failure_message_for_should`.
+  if respond_to? :failure_message
+    failure_message do |actual| # RSpec 3.x
+      @matcher.errors.join("\n")
+    end
+  else
+    failure_message_for_should do |actual| # RSpec 1.2, 2.x
+      @matcher.errors.join("\n")
+    end
   end
 end
 

data/spec/support/shared_examples.rb

@@ -4,9 +4,9 @@ shared_examples_for "wildcard match" do |actual, matcher, *args|
   it "#{actual.inspect} with #{expected}" do
     if matcher.is_a?(Symbol) and WildcardMatchers.respond_to?(matcher)
       # Note: some symbol comes here and may fail
-      wildcard_match?(actual, send(matcher, *args), &debugger).should be_true
+      expect(wildcard_match?(actual, send(matcher, *args), &debugger)).to be true
     else
-      wildcard_match?(actual, matcher, &debugger).should be_true
+      expect(wildcard_match?(actual, matcher, &debugger)).to be true
     end
   end
 end
@@ -17,9 +17,9 @@ shared_examples_for "not wildcard match" do |actual, matcher, *args|
   it "#{actual.inspect} with #{expected}" do
     if matcher.is_a?(Symbol) and WildcardMatchers.respond_to?(matcher)
       # Note: some symbol comes here and may fail
-      wildcard_match?(actual, send(matcher, *args), &debugger).should be_false
+      expect(wildcard_match?(actual, send(matcher, *args), &debugger)).to be false
     else
-      wildcard_match?(actual, matcher, &debugger).should be_false
+      expect(wildcard_match?(actual, matcher, &debugger)).to be false
     end
   end
 end
@@ -38,9 +38,9 @@ shared_examples_for "wildcard match with helper" do |actual, helper, matcher, *a
   it "#{actual.inspect} with #{expected}" do
     if matcher.is_a?(Symbol) and WildcardMatchers.respond_to?(matcher)
       # Note: some symbol comes here and may fail
-      wildcard_match?(actual, send(helper, send(matcher, *args)), &debugger).should be_true
+      expect(wildcard_match?(actual, send(helper, send(matcher, *args)), &debugger)).to be true
     else
-      wildcard_match?(actual, send(helper, matcher), &debugger).should be_true
+      expect(wildcard_match?(actual, send(helper, matcher), &debugger)).to be true
     end
   end
 end

data/spec/wildcard_matchers/helpers/for_all_spec.rb

@@ -9,6 +9,6 @@ describe WildcardMatchers::Helpers::ForAll do
   end
 
   it "should match using lambda with helper" do
-    [ 2, 4, 6].should wildcard_match(for_all ->(item) { item % 2 == 0 })
+    expect([ 2, 4, 6]).to wildcard_match(for_all ->(item) { item % 2 == 0 })
   end
 end

data/spec/wildcard_matchers/helpers/for_any_spec.rb

@@ -8,6 +8,6 @@ describe WildcardMatchers::Helpers::ForAny do
   end
 
   it "should match using lambda with helper" do
-    [ 1, 2, 3 ].should wildcard_match(for_any ->(item) { item % 2 == 0 })
+    expect([ 1, 2, 3 ]).to wildcard_match(for_any ->(item) { item % 2 == 0 })
   end
 end

data/spec/wildcard_matchers/matchers/hash_includes_spec.rb

@@ -18,6 +18,6 @@ describe WildcardMatchers::Matchers::HashIncludes do
   # bug
   it "cannot be corrupted" do
     matcher = hash_includes(a: 1)
-    2.times { wildcard_match?({ a: 2 }, matcher, &debugger).should be_false }
+    2.times { expect(wildcard_match?({ a: 2 }, matcher, &debugger)).to be false }
   end
 end

data/spec/wildcard_matchers/matchers/with_uri_template_spec.rb

@@ -28,19 +28,19 @@ describe WildcardMatchers::Matchers::WithUriTemplate do
 
   context "with without_query!" do
     it "works" do
-      wildcard_match?(
+      expect(wildcard_match?(
         "http://example.com/?hoge=fuga&fuga=ugu",
         with_uri_template("http://example.com/{?hoge}", hash_includes("hoge" => "fuga")).without_query!,
         &debugger
-      ).should be_true
+      )).to be true
     end
 
     it "works" do
-      wildcard_match?(
+      expect(wildcard_match?(
         "http://example.com/ugu?hoge=fuga&fuga=ugu",
         with_uri_template("http://example.com/{piyo}{?hoge}", hash_includes("hoge" => "fuga", "piyo" => "ugu")).without_query!,
         &debugger
-      ).should be_true
+      )).to be true
     end
   end
 end

data/spec/wildcard_matchers/rspec_spec.rb

@@ -4,21 +4,21 @@ describe "matcher wildcard_match" do
   [ [ 1, Integer ],
   ].each do |actual, expected|
     it "match #{actual.inspect} with #{expected}" do
-      actual.should wildcard_match(expected)
+      expect(actual).to wildcard_match(expected)
     end
   end
 
   [ [ 1, ->(e) { e == 1 } ],
   ].each do |actual, expected|
     it "match #{actual.inspect} with #{expected} block" do
-      actual.should wildcard_match(&expected)
+      expect(actual).to wildcard_match(&expected)
     end
   end
 
   [ [ "1", :is_a_string ],
   ].each do |actual, expected|
     it "match #{actual.inspect} with #{expected}" do
-      actual.should wildcard_match(send(expected))
+      expect(actual).to wildcard_match(send(expected))
     end
   end
 
@@ -31,10 +31,10 @@ describe "matcher wildcard_match" do
   ].each do |actual, expected, failure_message|
     it "not match #{actual.inspect} with #{expected} and return #{failure_message.inspect} as failure_message" do
       begin
-        actual.should wildcard_match(expected)
+        expect(actual).to wildcard_match(expected)
         fail # if matched come here and must fail
-      rescue => e
-        e.message.should include(failure_message)
+      rescue RSpec::Expectations::ExpectationNotMetError => e
+        expect(e.message).to include(failure_message)
       end
     end
   end

data/spec/wildcard_matchers_spec.rb

@@ -81,7 +81,7 @@ describe target do
 
       failure = nil
       wildcard_match?(actual, expected) {|errors| failure = errors }
-      failure.should wildcard_match([/#{actual.inspect} .+ #{expected.inspect}/])
+      expect(failure).to wildcard_match([/#{actual.inspect} .+ #{expected.inspect}/])
     end
 
     it "can get several failure messages" do
@@ -93,7 +93,7 @@ describe target do
 
       expect_failures = [ /#{actual.first}.+#{expected.first}/,
                           /#{actual.last}.+#{expected.last}/ ]
-      failure.should wildcard_match(expect_failures)
+      expect(failure).to wildcard_match(expect_failures)
     end
 
     # TODO: more failure message

metadata

@@ -1,125 +1,125 @@
 --- !ruby/object:Gem::Specification
 name: wildcard_matchers
 version: !ruby/object:Gem::Version
-  version: 0.1.8
+  version: 0.2.0
 platform: ruby
 authors:
 - okitan
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-07-26 00:00:00.000000000 Z
+date: 2014-09-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: facets
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: addressable
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '2.3'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '2.3'
 - !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: rspec
   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: autowatchr
   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: pry
   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: tapp
   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: coveralls
   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: wildcard matchers
@@ -129,12 +129,12 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .coveralls.yml
-- .gitignore
-- .rspec
-- .ruby-gemset
-- .ruby-version
-- .travis.yml
+- ".coveralls.yml"
+- ".gitignore"
+- ".rspec"
+- ".ruby-gemset"
+- ".ruby-version"
+- ".travis.yml"
 - CHANGELOG.md
 - Gemfile
 - LICENSE
@@ -176,17 +176,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.0.5
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: wildcard matchers which can use in rspec