pact-support 1.6.1 → 1.6.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4c584f8dad000c655b33004fe1fc0f2d1a264fe1
-  data.tar.gz: 06ac6740417e58b3d004dd3e837af2921c5d9b21
+  metadata.gz: 7052ae315f37af6ae3f7ea9d1996f8cbb12ea7d0
+  data.tar.gz: 648fff2d0659c82cca19046f1c5440f86e9cf2ab
 SHA512:
-  metadata.gz: 1d01444d16e4310290bada8fd89a93ac87d6d5ac52b882afebaa5a12e6e4f416d76246defcdf9a15e9defdbdd9b3e8d445e2bd1acc0e23df976d2c30658af259
-  data.tar.gz: 3663da705c0bf5faffc385f6ba266b2b299b2b159b826b54358e2f567ca97071ab3c73fba4a189bdf29d256f3fb4ca82a983f42abde59c95c42cbac0ad0147f6
+  metadata.gz: 9c2f5d2b7f6c792582eeaf03a70446aff2c3d67395a4b6448c11fbd6a38e9fbb6538f0b206b1cf297b923cbc7c0d977854160d412f6e0b540f36bae250f8e420
+  data.tar.gz: 516d17b3b6c5b8590b264d934334dcdd6c8360e19a9581390f8e6353f17407ca098d63bedf35f213615e1076214d743eb03196063e7166fe56bb781698af1a77

data/CHANGELOG.md

@@ -1,3 +1,13 @@
+<a name="v1.6.2"></a>
+### v1.6.2 (2018-05-31)
+
+
+#### Bug Fixes
+
+* **windows-path**
+  * prevent locale file paths to be parsed by URI to stop errors in windows paths like spaces in paths	 ([ecf64d6](/../../commit/ecf64d6))
+
+
 <a name="v1.6.1"></a>
 ### v1.6.1 (2018-05-21)
 

data/lib/pact/consumer_contract/pact_file.rb

@@ -36,39 +36,25 @@ module Pact
     end
 
     def render_pact(uri_string, options)
-      uri_obj = URI(windows_safe(uri_string))
-      if uri_obj.userinfo
-        options[:username] = uri_obj.user unless options[:username]
-        options[:password] = uri_obj.password unless options[:password]
-      end
-      get(uri_obj, options)
+      local?(uri_string) ? get_local(uri_string, options) : get_remote_with_retry(uri_string, options)
     end
 
     private
-
-    def get(uri, options)
-      local?(uri) ?  get_local(uri, options) : get_remote_with_retry(uri, options)
-    end
-
+    
     def local? uri
-      !uri.host
+      !uri.start_with?("http://", "https://")
     end
 
-    def get_local(uri, _)
-      File.read uri.to_s
+    def get_local(filepath, _)
+      File.read windows_safe(filepath)
     end
 
-    def get_remote(uri, options)
-      request = Net::HTTP::Get.new(uri)
-      request.basic_auth(options[:username], options[:password]) if options[:username]
-      Net::HTTP.start(uri.host, uri.port, use_ssl: uri.scheme == 'https') do |http|
-        http.open_timeout = options[:open_timeout] || OPEN_TIMEOUT
-        http.read_timeout = options[:read_timeout] || READ_TIMEOUT
-        http.request(request)
-      end
-    end
-
-    def get_remote_with_retry(uri, options)
+    def get_remote_with_retry(uri_string, options)
+      uri = URI(uri_string)
+      if uri.userinfo
+		options[:username] = uri.user unless options[:username]
+		options[:password] = uri.password unless options[:password]
+	  end
       ((options[:retry_limit] || RETRY_LIMIT) + 1).times do |i|
         begin
           response = get_remote(uri, options)
@@ -88,6 +74,16 @@ module Pact
         end
       end
     end
+    
+    def get_remote(uri, options)
+      request = Net::HTTP::Get.new(uri)
+      request.basic_auth(options[:username], options[:password]) if options[:username]
+      Net::HTTP.start(uri.host, uri.port, use_ssl: uri.scheme == 'https') do |http|
+        http.open_timeout = options[:open_timeout] || OPEN_TIMEOUT
+        http.read_timeout = options[:read_timeout] || READ_TIMEOUT
+        http.request(request)
+      end
+    end
 
     def success?(response)
       response.code.to_i == 200

data/lib/pact/support/version.rb

@@ -1,5 +1,5 @@
 module Pact
   module Support
-    VERSION = "1.6.1"
+    VERSION = "1.6.2"
   end
 end

data/spec/lib/pact/matching_rules_spec.rb

@@ -16,7 +16,7 @@ module Pact
       subject { MatchingRules.merge(object, rules, options)}
 
       context "when the pact_specification_version is nil" do
-        let(:pact_specification_version) { nil }
+        let(:options) { { pact_specification_version: nil } }
 
         it "calls Merge" do
           expect(Merge).to receive(:call)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: pact-support
 version: !ruby/object:Gem::Version
-  version: 1.6.1
+  version: 1.6.2
 platform: ruby
 authors:
 - James Fraser
@@ -12,7 +12,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-05-21 00:00:00.000000000 Z
+date: 2018-05-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: randexp