rspec-webservice_matchers 0.1.0 → 0.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e17330d2e905a3120dc64763b72b809c09ff8d1f
-  data.tar.gz: 92b596e81ef958fdbeedb9a3d055e86652491a22
+  metadata.gz: 7a91cd72d70ca58ac4b471caef6ff810ee90b2b1
+  data.tar.gz: fbda72dad2ca7a23c05be9fc90af9fcb98dfe198
 SHA512:
-  metadata.gz: 0d28212c35e26776331e5890c7147e15e1bebc0eb6f594980e7d9006bb1a56fbb18b577ae473ebee312c200a669fe810701831ff09c510f345fba18fd11de527
-  data.tar.gz: ffc8b713dab93ef563264ca49dbdab0f50ad3dcb3a3a6140c6a1a20d27d8b570d0de0ffe8629df44870d1df342c41c77490dde98e2a0792cc6d22a05691c855b
+  metadata.gz: 8b846008102ec2520cff3be9481d15dc5862dbdcca59025199dbdb6f7c9a887534858cfb9b6dd3bd32b3b31c7bf6a91ba34df8c19065ed32f93e41bfdc46e42c
+  data.tar.gz: f7c089dfbee764e7b96f05cd71e41c03ad97e4ea1ed6dbeb306b57bebc6efb808806a3dcd42111549e7c30725829e5887365f368dacf1a9f17e4114906bf4e1b

data/lib/rspec/webservice_matchers.rb

@@ -20,26 +20,9 @@ module RSpec
       end
     end
 
-    # Would this function be helpful?
-    #
-    # Return true if the domain serves content via SSL
-    # without checking certificate validity.
-    #
-    # def self.supports_ssl?(domain_name)
-    #   begin
-    #     has_valid_ssl_cert?(domain_name)
-    #     # Cert may not be valid, but content IS
-    #     # being served via https.
-    #     return true
-    #   rescue Curl::Err::ConnectionFailedError
-    #     return false
-    #   end
-    # end
-
 
     # RSpec Custom Matchers ###########################################
-    # See https://www.relishapp.com/rspec/rspec-expectations/v/3-0/docs/custom-matchers/define-matcher
-    
+    # See https://www.relishapp.com/rspec/rspec-expectations/v/2-3/docs/custom-matchers/define-matcher
 
     # Test whether https is correctly implemented
     RSpec::Matchers.define :have_a_valid_cert do
@@ -51,16 +34,9 @@ module RSpec
     # Pass successfully if we get a 301 to the place we intend.
     RSpec::Matchers.define :redirect_permanently_to do |expected|
       match do |url|
-        # TODO: Refactor this code. Submit as pull request to Curb.
-        result = Curl::Easy.http_head(url)
-        header_lines = result.head.split("\r\n")
-        header_lines.delete_at(0) # The first reponse header is already parsed.
-        header = {}
-        header_lines.each do |line|
-          key, value = line.split(': ')
-          header[key] = value
-        end         
-        result.response_code == 301 && header['Location'] == expected
+        result  = Curl::Easy.http_head(url)
+        headers = RSpec::WebserviceMatchers.parse_response_headers(result)
+        result.response_code == 301 && headers['Location'] == expected
       end
     end    
 
@@ -70,18 +46,29 @@ module RSpec
     # 3. which is correctly configured
     RSpec::Matchers.define :enforce_https_everywhere do
       match do |domain_name|
-        # TODO: Refactor this code. Submit as pull request to Curb.
-        result = Curl::Easy.http_head("http://#{domain_name}")
-        header_lines = result.head.split("\r\n")
-        header_lines.delete_at(0) # The first reponse header is already parsed.
-        header = {}
-        header_lines.each do |line|
-          key, value = line.split(': ')
-          header[key] = value
-        end
-        (result.response_code == 301) && (/https/ === header['Location']) && (RSpec::WebserviceMatchers.has_valid_ssl_cert?(header['Location']))
+        result  = Curl::Easy.http_head("http://#{domain_name}")
+        headers = RSpec::WebserviceMatchers.parse_response_headers(result)
+        new_url = headers['Location']
+        (result.response_code == 301) && (/https/ === new_url) && (RSpec::WebserviceMatchers.has_valid_ssl_cert?(new_url))
       end
-    end    
+    end   
+
+
+    private
+
+    # Return a hash of response headers from the
+    # given curl result.
+    # TODO: Submit as a pull request to the Curb gem.
+    def self.parse_response_headers(curl_result)
+      header_lines = curl_result.head.split("\r\n")
+      header_lines.delete_at(0) # The first reponse header is in another format and already parsed.
+      response_headers = {}
+      header_lines.each do |line|
+        key, value = line.split(': ')
+        response_headers[key] = value
+      end
+      return response_headers
+    end
 
   end
 end

data/lib/rspec/webservice_matchers/version.rb

@@ -1,5 +1,5 @@
 module RSpec
   module WebserviceMatchers
-    VERSION = "0.1.0"
+    VERSION = "0.1.1"
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rspec-webservice_matchers
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
 platform: ruby
 authors:
 - Robb Shecter