pact-mock_service 2.7.0 → 2.7.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5a983f436b468fd2f527a129750823d49276141e1246817da7124225a12d2b6e
-  data.tar.gz: ebf7bee8331a4f26e127adcbe8d79f36b6fad80c0f22963753d265990f735369
+  metadata.gz: 8f39b2196b6e3bb4b78b25d97581128eadf84f7a00d31ba6cac6a7bd2f3e4e48
+  data.tar.gz: 7f6ebd1c45f8ec2fdc3b4e241eecbc673db7efbe5cd926882c1d739a488388bf
 SHA512:
-  metadata.gz: de5168f4ba6c88f9e7ea3dd7f03b64e105a37f94a33975d4f20c03b58af328ae18f57ee96c6919bf520325bb850c37be48effa99b877de2e6e95ad17ffd666b2
-  data.tar.gz: 5b0fd099ed6d5ac6f905e8e0ba148b1ea37757e02657ea3db56889bd5f03077ab1844c9348ade2af94b0ef3e42cfb58185a402cb7d1c5677056fd93e5567f461
+  metadata.gz: 99c4dc93f7b56c19b53ce4b6387f4da8d2353f3253b212fa172e7f026b00d60fbe210bdb20c59486d729772c150408a9173a568245c2d9c4ce55ccc9e2d6e61f
+  data.tar.gz: f106889170d931af0102e2bd393a51b33fa1bcb9e3dbb4a7a7c8ac9d186ef798af5914a7250b1ac8db2156911909f3f96ff63ef33b8144087d3934f9d7107cbb

data/CHANGELOG.md

@@ -1,3 +1,12 @@
+<a name="v2.7.1"></a>
+### v2.7.1 (2018-05-09)
+
+
+#### Bug Fixes
+
+* ensure underscored headers are maintained	 ([0724701](/../../commit/0724701))
+
+
 <a name="v2.7.0"></a>
 ### v2.7.0 (2018-05-04)
 

data/lib/pact/consumer/mock_service/rack_request_helper.rb

@@ -38,14 +38,25 @@ module Pact
 
       def headers_from env
         headers = env.reject{ |key, value| !(key.start_with?("HTTP") || key == 'CONTENT_TYPE' || key == 'CONTENT_LENGTH')}
-        headers.inject({}) do | hash, header |
+        dasherized_headers = headers.inject({}) do | hash, header |
           hash[standardise_header(header.first)] = header.last
           hash
         end
+        # This header is set in lib/pact/mock_service/server/webrick_request_monkeypatch.rb to allow use to
+        # restore the original header names with underscores.
+        restore_underscored_header_names(dasherized_headers, (env['X_PACT_UNDERSCORED_HEADER_NAMES'] || '').split(","))
       end
 
       def standardise_header header
-        header.gsub(/^HTTP_/, '').split("_").collect{|word| word[0] + word[1..-1].downcase}.join("-")
+        header.gsub(/^HTTP_/, '').split(/[_-]/).collect{|word| word[0].upcase + word[1..-1].downcase}.join("-")
+      end
+
+      def restore_underscored_header_names dasherized_headers, original_header_names
+        original_header_names.each_with_object(dasherized_headers) do | original_header_name, headers |
+          if headers.key?(standardise_header(original_header_name))
+            headers[original_header_name] = headers.delete(standardise_header(original_header_name))
+          end
+        end
       end
     end
   end

data/lib/pact/mock_service/control_server/run.rb

@@ -1,4 +1,5 @@
 require 'pact/mock_service/control_server/app'
+require 'pact/mock_service/server/webrick_request_monkeypatch'
 
 module Pact
   module MockService

data/lib/pact/mock_service/run.rb

@@ -2,6 +2,7 @@ require 'find_a_port'
 require 'pact/mock_service/app'
 require 'pact/consumer/mock_service/set_location'
 require 'pact/mock_service/run'
+require 'pact/mock_service/server/webrick_request_monkeypatch'
 
 module Pact
   module MockService

data/lib/pact/mock_service/server/webrick_request_monkeypatch.rb

@@ -0,0 +1,15 @@
+module WEBrick
+  class HTTPRequest
+    alias_method :pact_original_meta_vars, :meta_vars
+
+    def meta_vars
+      original_underscored_headers = []
+      self.each{|key, val| original_underscored_headers << key if key.include?("_") }
+      # This header allows us to restore the original format (eg. underscored) of the headers
+      # when parsing the incoming Rack env back to a response object.
+      vars = pact_original_meta_vars
+      vars["X_PACT_UNDERSCORED_HEADER_NAMES"] = original_underscored_headers.join(",")
+      vars
+    end
+  end
+end

data/lib/pact/mock_service/version.rb

@@ -1,5 +1,5 @@
 module Pact
   module MockService
-    VERSION = "2.7.0"
+    VERSION = "2.7.1"
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: pact-mock_service
 version: !ruby/object:Gem::Version
-  version: 2.7.0
+  version: 2.7.1
 platform: ruby
 authors:
 - James Fraser
@@ -12,7 +12,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-05-04 00:00:00.000000000 Z
+date: 2018-05-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rack
@@ -374,6 +374,7 @@ files:
 - lib/pact/mock_service/server/respawn.rb
 - lib/pact/mock_service/server/spawn.rb
 - lib/pact/mock_service/server/wait_for_server_up.rb
+- lib/pact/mock_service/server/webrick_request_monkeypatch.rb
 - lib/pact/mock_service/session.rb
 - lib/pact/mock_service/spawn.rb
 - lib/pact/mock_service/version.rb