wildcard_matchers 0.1.4 → 0.1.5

data/CHANGELOG.md

@@ -1,3 +1,7 @@
+## 0.1.5
+* ENHANCEMENT
+ * add without_query! modifier to with_uri_template matcher
+
 ## 0.1.4
 * ENHANCEMENT
  * with_uri_template matcher

data/README.md

@@ -33,6 +33,8 @@ See specs, for more detail.
 * with_uri_template
  * with_uri_template("http://example.com/users/{id}", "id" => "1") === "http://example.com/users/1" #=> true
  * with_uri_template("http://example.com/users{?id}", "id" => "1") === "http://example.com/users?id=1" #=> true
+* with_uri_template and witout_query!
+ * with_uri_template("http://example.com/users", "id" => "1").without_query! === "http://example.com/users?id=1" #=> true
 * hash_includes
  * hash_includes(:a) === { :a => 1 } #=> true
  * hash_includes(:b) === { :a => 1 } #=> false

data/VERSION

@@ -1 +1 @@
-0.1.4
+0.1.5

data/lib/wildcard_matchers/matchers/is_uri.rb

@@ -1,3 +1,5 @@
+require "addressable/uri"
+
 module WildcardMatchers
   module Matchers
     def is_uri(hash = {})
@@ -8,18 +10,10 @@ module WildcardMatchers
       protected
       def wildcard_match(actual)
         unless actual
-          errors.push "#{position}: expect uri but nil"
-          return
+          return errors.push "#{position}: expect URI but nil"
         end
 
-        uri = nil
-        begin
-          require "addressable/uri"
-          uri = ::Addressable::URI.parse(actual) # if actual is ::URI re-parse
-        rescue LoadError
-          require "uri"
-          uri = actual.is_a?(::URI) ? actual : ::URI.parse(actual)
-        end
+        uri = ::Addressable::URI.parse(actual) # if actual is ::URI re-parse
 
         expectation.each do |key, value|
           errors.push(*self.class.superclass.check_errors(uri.__send__(key), value, position + "[#{key.inspect}]"))

data/lib/wildcard_matchers/matchers/with_uri_template.rb

@@ -14,11 +14,40 @@ module WildcardMatchers
         @position    = position
       end
 
+      def without_query!
+        @without_query = true
+
+        # umhhh
+        uri = ::Addressable::URI.parse(@template.pattern.split("{?").first)
+
+        @template_without_query = ::Addressable::Template.new(uri.omit(:query).to_s)
+
+        self
+      end
+
       protected
       def wildcard_match(actual)
-        extracted = @template.extract(actual)
+        unless actual
+          return errors.push("#{position}: expect URI but nil")
+        end
+
+        if @without_query
+          uri = ::Addressable::URI.parse(actual)
+
+          params = uri.query_values || {}
+
+          unless extracted = @template_without_query.extract(uri.omit!(:query).to_s)
+            return errors.push("#{position}: expect #{uri.to_s} to match #{@template_without_query.pattern}")
+          end
+
+          errors.push(*self.class.superclass.check_errors(extracted.merge(params), expectation, position))
+        else
+          unless extracted = @template.extract(actual)
+            return errors.push("#{position}: expect #{actual} to match #{@template.pattern}")
+          end
 
-        errors.push(*self.class.superclass.check_errors(extracted, expectation, position))
+          errors.push(*self.class.superclass.check_errors(extracted, expectation, position))
+        end
       end
     end
   end

data/spec/spec_helper.rb

@@ -15,4 +15,6 @@ end
 # global debug function
 # usage:
 #   wildcard_match?(actual, expected, &$debug)
-$debug = proc {|errors| puts errors }
+def debugger
+  ENV["DEBUG"] ? proc {|errors| puts errors } : nil
+end

data/spec/support/shared_examples.rb

@@ -1,25 +1,25 @@
 shared_examples_for "wildcard match" do |actual, matcher, *args|
-  expected = matcher.inspect + (args.size > 0 ? "(#{args.map(&:inspect).join(", ")})" : "")
+  expected = matcher.to_s + (args.size > 0 ? "(#{args.map(&:inspect).join(", ")})" : "")
 
   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)).should be_true
+      wildcard_match?(actual, send(matcher, *args), &debugger).should be_true
     else
-      wildcard_match?(actual, matcher).should be_true
+      wildcard_match?(actual, matcher, &debugger).should be_true
     end
   end
 end
 
 shared_examples_for "not wildcard match" do |actual, matcher, *args|
-  expected = matcher.inspect + (args.size > 0 ? "(#{args.map(&:inspect).join(", ")})" : "")
+  expected = matcher.to_s + (args.size > 0 ? "(#{args.map(&:inspect).join(", ")})" : "")
 
   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)).should be_false
+      wildcard_match?(actual, send(matcher, *args), &debugger).should be_false
     else
-      wildcard_match?(actual, matcher).should be_false
+      wildcard_match?(actual, matcher, &debugger).should 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))).should be_true
+      wildcard_match?(actual, send(helper, send(matcher, *args)), &debugger).should be_true
     else
-      wildcard_match?(actual, send(helper, matcher)).should be_true
+      wildcard_match?(actual, send(helper, matcher), &debugger).should be_true
     end
   end
 end

data/spec/wildcard_matchers/matchers/with_uri_template_spec.rb

@@ -1,14 +1,46 @@
 require "spec_helper"
 
 describe WildcardMatchers::Matchers::WithUriTemplate do
-  [ [ "http://example.com/hoge/fuga", :with_uri_template, "http://example.com/hoge/{fuga}", "fuga" => "fuga" ],
+  extend WildcardMatchers::Matchers
+
+  [ [ "http://example.com/hoge/fuga",           :with_uri_template, "http://example.com/{hoge}/{fuga}",
+                                                                    "hoge" => "hoge", "fuga" => "fuga" ],
+    [ "http://example.com/hoge/fuga",           :with_uri_template, "http://example.com{/hoge,fuga}",
+                                                                    "hoge" => "hoge", "fuga" => "fuga" ],
+    [ "http://example.com/?hoge=fuga&fuga=ugu", :with_uri_template, "http://example.com/{?hoge,fuga}",
+                                                                    "hoge" => "fuga", "fuga" => "ugu" ],
+    [ "http://example.com/?hoge=fuga&fuga=ugu", :with_uri_template, "http://example.com/{?hoge,fuga}",
+                                                                    hash_includes("hoge" => "fuga") ],
   ].each do |actual, matcher, *args|
     it_behaves_like "wildcard match", actual, matcher, *args
   end
 
-  [ [ "http://example.com/hoge/fuga", :with_uri_template, "http://example.com/hoge/{fuga}", "fuga" => "hoge" ],
-    [ "http://example.com/hoge/fuga", :with_uri_template, "http://example.com/hoge/{fuga}", "hoge" => "fuga" ],
+  [ [ "http://example.com/hoge/fuga",  :with_uri_template, "http://example.com/hoge/{fuga}",   "fuga" => "hoge" ],
+    [ "http://example.com/hoge/fuga",  :with_uri_template, "http://example.com/{hoge}/{fuga}", "hoge" => "fuga" ],
+    [ "http://example.com/",           :with_uri_template, "http://example.com/{fuga}",        {} ],
+    [ "http://example.com/?hoge=fuga", :with_uri_template, "http://example.com/{?hoge}",       "hoge" => "ugu" ],
+
+    [ "http://example.com/?hoge=fuga&fuga=ugu", :with_uri_template, "http://example.com/{?hoge}",
+                                                                    hash_includes("hoge" => "fuga") ],
   ].each do |actual, matcher, *args|
     it_behaves_like "not wildcard match", actual, matcher, *args
   end
+
+  context "with without_query!", :focused do
+    it "works" do
+      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
+    end
+
+    it "works" do
+      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
+    end
+  end
 end

data/wildcard_matchers.gemspec

@@ -15,14 +15,12 @@ Gem::Specification.new do |gem|
   gem.version       = File.read(File.join(File.dirname(__FILE__), "VERSION")).chomp
 
   gem.add_dependency "facets"
+  gem.add_dependency "addressable", "~> 2.3"
 
   gem.add_development_dependency "rake"
   gem.add_development_dependency "rspec"
   gem.add_development_dependency "autowatchr"
 
-  # your choice
-  gem.add_development_dependency "addressable"
-
   # for debug
   gem.add_development_dependency "pry"
   gem.add_development_dependency "tapp"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: wildcard_matchers
 version: !ruby/object:Gem::Version
-  version: 0.1.4
+  version: 0.1.5
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-03-07 00:00:00.000000000 Z
+date: 2013-03-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: facets
@@ -28,23 +28,23 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: rake
+  name: addressable
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
+        version: '2.3'
+  type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '2.3'
 - !ruby/object:Gem::Dependency
-  name: rspec
+  name: rake
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
@@ -60,7 +60,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: autowatchr
+  name: rspec
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
@@ -76,7 +76,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: addressable
+  name: autowatchr
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements: