fakeweb-matcher 1.2.2 → 1.2.3

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: 43ddc80116ddeeddb5d4b268a0252c99f9bd2411
+  data.tar.gz: 7c1fb3ba541ddd2466645fcd0b553453279e6d8a
+SHA512:
+  metadata.gz: 4ad8c46c69e7809dcfdaac6ba7a8eef114cc33ea2861bedf3c28d1093f6d316c92fbbfdf73c8d2bb9cfcf900fb407898f66c74228e31f63ca64fc0ec9f598dea
+  data.tar.gz: db1e4a89c70313c28e4af53d268aae8233cb657cbbacc3b37430bd16bc57301173e4823e0204dfa59dfa90e3a150ef9be35df4247073038f4dee3b5af56da25a

data/Rakefile

@@ -1,4 +1,9 @@
-require 'tasks/distribution'
-require 'tasks/testing'
+require 'rubygems'
+require 'bundler'
+ 
+Bundler.require :default, :development
+
+require "#{File.dirname(__FILE__)}/tasks/distribution"
+require "#{File.dirname(__FILE__)}/tasks/testing"
 
 task :default => :spec

data/VERSION.yml

@@ -1,4 +1,4 @@
---- 
+---
 :major: 1
 :minor: 2
-:patch: 2
+:patch: 3

data/lib/fake_web_matcher/request_matcher.rb

@@ -1,8 +1,8 @@
 module FakeWebMatcher
   # Matcher class, following RSpec's expectations. Used to confirm whether a
   # request has been made on a given method and URI.
-  # 
-  
+  #
+
   # Monkey patch to add a normalize! method to the URI::HTTP class.
   # It doesn't currently sort the query params which means two URLs
   # that are equivalent except for a different order of query params
@@ -13,115 +13,120 @@ module FakeWebMatcher
     # affect equality.
     def normalize!
       if query
-        query_array = self.query.split('&')
-        set_query(query_array.sort.join('&'))
+        normalised_query = self.query.split('&').sort.join('&')
+        if respond_to? :set_query
+          set_query normalised_query
+        else
+          self.query = normalised_query
+        end
       end
+
       super
     end
   end
 
   class RequestMatcher
     attr_reader :url, :method
-    
+
     # Create a new matcher.
-    # 
+    #
     # @param [Symbol] method The HTTP method. Defaults to :any if not supplied.
     # @param [String, Regexp] uri The URI to check for
-    # 
+    #
     def initialize(*args)
       @method, @url = args_split(*args)
     end
-    
+
     # Indication of whether there's a match on the URI from given requests.
-    # 
+    #
     # @param [Module] FakeWeb Module, necessary for RSpec, although not
     #   required internally.
     # @return [Boolean] true if the URI was requested, otherwise false.
-    # 
+    #
     def matches?(fakeweb)
       !FakeWeb::Registry.instance.requests.detect { |req|
         method, url = args_split(*req)
         match_method(method) && match_url(url)
       }.nil?
     end
-    
+
     # Failure message if the URI should have been requested.
-    # 
+    #
     # @return [String] failure message
-    # 
+    #
     def failure_message
       regex?(@url) ? regex_failure_message : url_failure_message
     end
-    
+
     # Failure message if the URI should not have been requested.
-    # 
+    #
     # @return [String] failure message
     #
     def negative_failure_message
       regex?(@url) ? regex_negative_failure_message : url_negative_failure_message
     end
-    
+
     private
-    
+
     def regex_negative_failure_message
       "A URL that matches #{@url.inspect} was requested#{failure_message_method} and should not have been."
     end
-    
+
     def url_negative_failure_message
       "The URL #{@url} was requested#{failure_message_method} and should not have been."
     end
-    
+
     def regex_failure_message
         "A URL that matches #{@url.inspect} was not requested#{failure_message_method}."
     end
-    
+
     def url_failure_message
         "The URL #{@url} was not requested#{failure_message_method}."
     end
-    
+
     def failure_message_method
       " using #{formatted_method}" unless @method == :any
     end
-    
+
     # Compares methods, or ignores if either side of the comparison is :any.
-    # 
+    #
     # @param [Symbol] method HTTP method
     # @return [Boolean] true if methods match or either is :any.
-    # 
+    #
     def match_method(method)
       @method == :any || method == :any || method == @method
     end
-    
-    # Compares the url either by match it agains a regular expression or 
+
+    # Compares the url either by match it agains a regular expression or
     # by simple comparison
-    # 
+    #
     # @param [String] url the called URI
     # @return [Boolean] true if exprexted URI and called URI match.
-    # 
+    #
     def match_url(url)
       return @url.match(url.to_s) if regex?(@url)
       @url == url
     end
-    
+
     # Expected method formatted to be an uppercase string. Example: :get becomes
     # "GET".
-    # 
+    #
     # @return [String] uppercase method
-    # 
+    #
     def formatted_method
       @method.to_s.upcase
     end
-    
+
     # Interprets given arguments to a method and URI instance. The URI, as a
     # string, is required, but the method is not (will default to :any).
-    # 
+    #
     # @param [Array] args
     # @return [Array] Two items: method and URI instance or regular expression
-    # 
+    #
     def args_split(*args)
       method  = :any
       uri     = nil
-      
+
       case args.length
       when 1 then uri         = args[0]
       when 2 then method, uri = args[0], args[1]
@@ -131,7 +136,7 @@ module FakeWebMatcher
       uri = URI.parse(uri) unless regex?(uri)
       return method, uri
     end
-    
+
     def regex?(object)
       object.is_a?(Regexp)
     end

data/spec/lib/fake_web_matcher/extension_spec.rb

@@ -1,4 +1,4 @@
-require 'spec/spec_helper'
+require 'spec_helper'
 
 describe FakeWebMatcher::Extension do
   it "should be included into the FakeWeb::Registry class" do

data/spec/lib/fake_web_matcher/matchers_spec.rb

@@ -1,4 +1,4 @@
-require 'spec/spec_helper'
+require 'spec_helper'
 
 describe FakeWebMatcher::Matchers do
   describe '#have_requested' do

data/spec/lib/fake_web_matcher/request_matcher_spec.rb

@@ -1,4 +1,4 @@
-require 'spec/spec_helper'
+require 'spec_helper'
 
 describe FakeWebMatcher::RequestMatcher do
   describe '#initialize' do

data/spec/lib/fake_web_matcher_spec.rb

@@ -1,4 +1,4 @@
-require 'spec/spec_helper'
+require 'spec_helper'
 
 describe FakeWebMatcher do
   #

data/spec/spec_helper.rb

@@ -1,11 +1,11 @@
 $:.unshift File.dirname(__FILE__) + '/../lib'
+$:.unshift File.dirname(__FILE__) + '/.'
 
 require 'rubygems'
+require 'bundler'
+ 
+Bundler.require :default, :development
+
 require 'open-uri'
-require 'spec'
 require 'fake_web'
 require 'fake_web_matcher'
-
-Spec::Runner.configure do |config|
-  #
-end

metadata

@@ -1,65 +1,93 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: fakeweb-matcher
-version: !ruby/object:Gem::Version 
-  hash: 27
-  prerelease: false
-  segments: 
-  - 1
-  - 2
-  - 2
-  version: 1.2.2
+version: !ruby/object:Gem::Version
+  version: 1.2.3
 platform: ruby
-authors: 
+authors:
 - Pat Allan
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2010-10-25 00:00:00 +11:00
-default_executable: 
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2014-12-28 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: fakeweb
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
     - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 21
-        segments: 
-        - 1
-        - 2
-        - 5
+      - !ruby/object:Gem::Version
         version: 1.2.5
   type: :runtime
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: rspec
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.2.5
+- !ruby/object:Gem::Dependency
+  name: rspec
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
     - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 31
-        segments: 
-        - 1
-        - 2
-        - 0
+      - !ruby/object:Gem::Version
         version: 1.2.0
   type: :runtime
-  version_requirements: *id002
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.2.0
+- !ruby/object:Gem::Dependency
+  name: jeweler
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 1.7.0
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 1.7.0
+- !ruby/object:Gem::Dependency
+  name: rake
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 0.8.7
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 0.8.7
+- !ruby/object:Gem::Dependency
+  name: yard
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 0.7.2
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 0.7.2
 description: 
 email: pat@freelancing-gods.com
 executables: []
-
 extensions: []
-
-extra_rdoc_files: 
+extra_rdoc_files:
 - LICENSE
 - README.textile
-files: 
+files:
 - LICENSE
 - README.textile
 - Rakefile
@@ -74,43 +102,33 @@ files:
 - spec/lib/fake_web_matcher/request_matcher_spec.rb
 - spec/lib/fake_web_matcher_spec.rb
 - spec/spec_helper.rb
-has_rdoc: true
 homepage: http://github.com/freelancing-god/fakeweb-matcher
 licenses: []
-
+metadata: {}
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
-  none: false
-  requirements: 
+required_ruby_version: !ruby/object:Gem::Requirement
+  requirements:
   - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
-  none: false
-  requirements: 
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
+  requirements:
   - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: 
-rubygems_version: 1.3.7
+rubygems_version: 2.2.2
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: RSpec matcher for the FakeWeb library
-test_files: 
+test_files:
 - spec/lib/fake_web_matcher/extension_spec.rb
 - spec/lib/fake_web_matcher/matchers_spec.rb
 - spec/lib/fake_web_matcher/request_matcher_spec.rb
 - spec/lib/fake_web_matcher_spec.rb
 - spec/spec_helper.rb
+has_rdoc: