rspec-webservice_matchers 4.0.2 → 4.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a235a451fd315c776f1f3d3b11755e2d93c88b73
-  data.tar.gz: 3826ce984adaae4a9cb9b49b361bd7f3b9aab6bf
+  metadata.gz: 2b238603ebf7eb99200ebeed083b9d902362abce
+  data.tar.gz: e66536bd2aebb782227b02ad3d8aa2f3f01d2f04
 SHA512:
-  metadata.gz: 831a900c20d355fa637fd9f2b8146737457e379e4b1a22e8dd528a09de48fea8d5695e99e706a84887d593c1ea64c199a07ae4e937259b4645416fabb590aff4
-  data.tar.gz: a9b1d9a7a937a0ec451f40d3198b47d9b1868d1b5849211ca094d626f3b260d35fc8a9ea6fac3d67fd6f0ffe3e5d3565b3b0cce39d1ffa31779714151e66551c
+  metadata.gz: 336f8d6acad41a9a274d8cdd816522a4545bc6a3d7c24d8ed6dd2c98e588036b35dd176890752e1e9e1997bd18f687066688a79b9e1aecfd103924d7bd3f7c15
+  data.tar.gz: 34abd12248f8b59a2f058f203f9bd67d321147760fa3f5543fe440533701d468bf64922d746c208d442c334552c0845844fc415e3ccd47196fe7188f9ecae575

data/lib/rspec/webservice_matchers/redirect_helpers.rb

@@ -0,0 +1,64 @@
+require 'rspec/webservice_matchers/util'
+
+module RSpec
+  module WebserviceMatchers
+    module RedirectHelpers
+      def redirect_failure_message(exception, status, actual_location, kind)
+        return Util.error_message(exception) if exception
+
+        errors = []
+        unless redirect? status, kind: kind
+          errors << "received a #{kind_for(status)} redirect"
+        end
+        unless locations_match? expected, actual_location
+          errors << "received location #{actual_location}"
+        end
+        unless redirect? status
+          errors << "not a redirect: received status #{status}"
+        end
+
+        Util.error_message(errors)
+      end
+
+      def redirects_correctly?(status, actual_loc, expected_loc, kind)
+        redirect?(status, kind: kind) && locations_match?(expected_loc, actual_loc)
+      end
+
+      def redirect_result(url_or_domain_name)
+        status, headers = Util.head(url_or_domain_name)
+        [status, headers['location']]
+      end
+
+      def locations_match?(expected, actual)
+        actual =~ %r{#{expected}/?}
+      end
+
+      def redirect?(status, kind: nil)
+        case kind
+        when :permanent
+          permanent_redirect?(status)
+        when :temporary
+          temp_redirect?(status)
+        else
+          temp_redirect?(status) || permanent_redirect?(status)
+        end
+      end
+
+      def temp_redirect?(status)
+        [302, 307].include?(status)
+      end
+
+      def permanent_redirect?(status)
+        status == 301
+      end
+
+      def kind_for(status)
+        {
+          301 => 'permanent',
+          302 => 'temporary',
+          307 => 'temporary'
+        }[status]
+      end
+    end
+  end
+end

data/lib/rspec/webservice_matchers/redirect_permanently_to.rb

@@ -1,44 +1,26 @@
 require 'rspec/webservice_matchers/util'
+require 'rspec/webservice_matchers/redirect_helpers'
 
 module RSpec
   module WebserviceMatchers
     module RedirectPermanentlyTo
-      # Do we get a 301 to the place we intend?
-      RSpec::Matchers.define :redirect_permanently_to do |expected|
-        include RSpec
-        exception = status = actual_location = nil
+      RSpec::Matchers.define :redirect_permanently_to do |expected_location|
+        include RedirectHelpers
+        kind = :permanent
+        status = actual_location = exception = nil
 
         match do |url_or_domain_name|
           begin
-            status, headers = Util.head(url_or_domain_name)
-            actual_location = headers['location']
-
-            Util.permanent_redirect?(status) &&
-              expected_location?(expected, actual_location)
-          rescue Exception => e
+            status, actual_location = redirect_result(url_or_domain_name)
+            redirects_correctly?(status, actual_location, expected_location, kind)
+          rescue Faraday::ConnectionFailed => e
             exception = e
             false
           end
         end
 
         failure_message do
-          return Util.error_message(exception) if exception
-
-          errors = []
-          if Util.temp_redirect? status
-            errors << "received a temporary redirect, status #{status}"
-          end
-          unless expected_location?(expected, actual_location)
-            errors << "received location #{actual_location}"
-          end
-          unless Util.redirect? status
-            errors << "not a redirect: received status #{status}"
-          end
-          Util.error_message(errors)
-        end
-
-        def expected_location?(expected, actual)
-          actual =~ %r{#{expected}/?}
+          redirect_failure_message(exception, status, actual_location, kind)
         end
       end
     end

data/lib/rspec/webservice_matchers/redirect_temporarily_to.rb

@@ -1,45 +1,26 @@
 require 'rspec/webservice_matchers/util'
+require 'rspec/webservice_matchers/redirect_helpers'
 
 module RSpec
   module WebserviceMatchers
     module RedirectTemporarilyTo
-      # Do we get a 302 or 307 to the place we intend?
-      RSpec::Matchers.define :redirect_temporarily_to do |expected|
-        include RSpec
+      RSpec::Matchers.define :redirect_temporarily_to do |expected_location|
+        include RedirectHelpers
+        kind = :temporary
         status = actual_location = exception = nil
 
         match do |url_or_domain_name|
           begin
-            status, headers = Util.head(url_or_domain_name)
-            actual_location = headers['location']
-
-            Util.temp_redirect?(status) &&
-              expected_location?(expected, actual_location)
-          rescue Exception => e
+            status, actual_location = redirect_result(url_or_domain_name)
+            redirects_correctly?(status, actual_location, expected_location, kind)
+          rescue Faraday::ConnectionFailed => e
             exception = e
             false
           end
         end
 
         failure_message do
-          return Util.error_message(exception) if exception
-
-          errors = []
-          if Util.permanent_redirect? status
-            errors << 'received a permanent redirect'
-          end
-          unless expected_location? expected, actual_location
-            errors << "received location #{actual_location}"
-          end
-          unless Util.redirect? status
-            errors << "not a redirect: received status #{status}"
-          end
-
-          Util.error_message(errors)
-        end
-
-        def expected_location?(expected, actual)
-          actual =~ %r{#{expected}/?}
+          redirect_failure_message(exception, status, actual_location, kind)
         end
       end
     end

data/lib/rspec/webservice_matchers/util.rb

@@ -11,25 +11,13 @@ module RSpec
     module Util
       def self.error_message(errors)
         return errors.message if errors.respond_to?(:message)
-        
+
         errors
           .map(&:to_s)
           .join('; ')
           .capitalize
       end
 
-      def self.redirect?(status)
-        temp_redirect?(status) || permanent_redirect?(status)
-      end
-
-      def self.temp_redirect?(status)
-        [302, 307].include?(status)
-      end
-
-      def self.permanent_redirect?(status)
-        status == 301
-      end
-
       def self.status(url_or_domain_name, follow: false)
         head(url_or_domain_name, follow: follow)[0]
       end

data/lib/rspec/webservice_matchers/version.rb

@@ -1,5 +1,5 @@
 module RSpec
   module WebserviceMatchers
-    VERSION = '4.0.2'
+    VERSION = '4.1.0'
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rspec-webservice_matchers
 version: !ruby/object:Gem::Version
-  version: 4.0.2
+  version: 4.1.0
 platform: ruby
 authors:
 - Robb Shecter
@@ -140,6 +140,7 @@ files:
 - lib/rspec/webservice_matchers/be_up.rb
 - lib/rspec/webservice_matchers/enforce_https_everywhere.rb
 - lib/rspec/webservice_matchers/have_a_valid_cert.rb
+- lib/rspec/webservice_matchers/redirect_helpers.rb
 - lib/rspec/webservice_matchers/redirect_permanently_to.rb
 - lib/rspec/webservice_matchers/redirect_temporarily_to.rb
 - lib/rspec/webservice_matchers/util.rb
@@ -180,3 +181,4 @@ test_files:
 - spec/rspec/webservice_matchers/redirect_spec.rb
 - spec/rspec/webservice_matchers/ssl_spec.rb
 - spec/spec_helper.rb
+has_rdoc: