pact-support 0.3.1 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a641a88b589e629a6991b1d4f03486bbf25457c8
-  data.tar.gz: bfe932a2a9ea158088c848ddeda4eeb02d0d55dd
+  metadata.gz: a9d55f72d24799e4cfe2fd71d535eaf37eb70c74
+  data.tar.gz: e6c16b4858bd228d4a0d32b43bd11ac14b53bc6a
 SHA512:
-  metadata.gz: 5c219a9254a8eb62cc3c3c2216dcc83e734acf4ff04bdd17f96670fa6f1d3ed7cc372d14154acda42719a4c3e142e38acd24b441d762256919009a801e6a4168
-  data.tar.gz: 7ff96f3a742321247936a84fca00c2f33065f2558d8bafa4126981be51d96403e52988fa59576979bef0e12b82f5239a76699169e14717bf253c6b8e17934f23
+  metadata.gz: 70a1d305f8a0655db237cbf488118f47285f5bcd08e493b597620faf6f2cad99a2a9de0f9a71f89d9fca25422564c3b69743685cfc45df9d11206e3e9925e5e0
+  data.tar.gz: 121e1252a85b993bc22c7becb00b79430754e7e329459f4ec7c5141092b2a04e3587ec98b22c0d1bd8f4c2c027a25cb1cbc282fc2600de40033ebe4dfbd43cdc

data/CHANGELOG.md

@@ -2,6 +2,11 @@ Do this to generate your change history
 
   git log --pretty=format:'  * %h - %s (%an, %ad)'
 
+### 0.4.0 (20 March 2015)
+
+* 409bde5 - support url including basic authentication info, e.g.: http://username:password@packtbroker.com (lifei zhou, Wed Mar 18 21:49:29 2015 +1100)
+* d0d42bb - added http basic authentication options when open uri (lifei zhou, Thu Feb 26 22:03:21 2015 +1100)
+
 ### 0.3.1 (24 Februrary 2015)
 
 * e3d6d6d - Fixed bug when Content-Type is a Pact::Term. (Beth Skurrie, Tue Feb 24 17:25:10 2015 +1100)

data/RELEASING.md

@@ -0,0 +1,14 @@
+# Releasing
+
+1. Increment the version in `lib/pact/support/version.rb`
+2. Update the `CHANGELOG.md` using:
+
+      $ git log --pretty=format:'  * %h - %s (%an, %ad)'
+
+3. Add files to git
+
+      $ git add CHANGELOG.md lib/pact/support/version.rb
+
+3. Release:
+
+      $ bundle exec rake release

data/lib/pact/consumer_contract/pact_file.rb

@@ -5,9 +5,10 @@ module Pact
     extend self
 
     def read uri, options = {}
-      pact = open(uri.to_s) { | file | file.read }
+      uri_string = uri.to_s
+      pact = render_pact(uri_string, options)
       if options[:save_pactfile_to_tmp]
-        save_pactfile_to_tmp pact, ::File.basename(uri.to_s)
+        save_pactfile_to_tmp pact, ::File.basename(uri_string)
       end
       pact
     rescue StandardError => e
@@ -20,5 +21,17 @@ module Pact
       ::FileUtils.mkdir_p Pact.configuration.tmp_dir
       ::File.open(Pact.configuration.tmp_dir + "/#{name}", "w") { |file|  file << pact}
     end
+
+    def render_pact uri_string, options
+      uri_obj = URI(uri_string)
+      uri_user_info = uri_obj.userinfo
+      if(uri_user_info)
+        options[:username] = uri_obj.user unless options[:username]
+        options[:password] = uri_obj.password unless options[:password]
+        uri_string = uri_string.sub("#{uri_user_info}@", '')
+      end
+      open_options = options[:username] ? {http_basic_authentication:[options[:username],options[:password]]} : {}
+      open(uri_string, open_options) { | file | file.read }
+    end
   end
 end

data/lib/pact/support/version.rb

@@ -1,5 +1,5 @@
 module Pact
   module Support
-    VERSION = "0.3.1"
+    VERSION = "0.4.0"
   end
 end

data/spec/lib/pact/consumer_contract/pact_file_spec.rb

@@ -0,0 +1,47 @@
+require 'spec_helper'
+require 'pact/consumer_contract/pact_file'
+
+module Pact
+  describe PactFile do
+    describe 'render_pact' do
+      let(:uri_without_userinfo) { 'http://pactbroker.com'}
+      let(:pact_content) { 'api contract'}
+      context 'without basic authentication' do
+        it 'should open uri to get pact file content' do
+          expect(PactFile).to receive(:open).with(uri_without_userinfo, {}).and_return(pact_content)
+          expect(PactFile.render_pact(uri_without_userinfo, {})).to eq(pact_content)
+        end
+      end
+
+      context 'basic authentication' do
+        let(:username) { 'brokeruser'}
+        let(:password) { 'brokerpassword'}
+        let(:options) do
+          { username: username, password: password }
+        end
+        context 'when userinfo is specified in the option' do
+          it 'should open uri to get pact file content with userinfo in the options' do
+            expect(PactFile).to receive(:open).with(uri_without_userinfo, {http_basic_authentication:[username, password]})
+                                .and_return(pact_content)
+            expect(PactFile.render_pact(uri_without_userinfo, options)).to eq(pact_content)
+          end
+          let(:uri_with_userinfo) { 'http://dummyuser:dummyps@pactbroker.com'}
+          it 'should use userinfo in options which overwrites userinfo in url' do
+            expect(PactFile).to receive(:open).with(uri_without_userinfo, {http_basic_authentication:[username, password]})
+                                .and_return(pact_content)
+            expect(PactFile.render_pact(uri_with_userinfo, options)).to eq(pact_content)
+          end
+        end
+
+        context 'when user info is specified in url' do
+          let(:uri_with_userinfo) { "http://#{username}:#{password}@pactbroker.com"}
+          it 'should open uri to get pact file content with userinfo in the uri' do
+            expect(PactFile).to receive(:open).with(uri_without_userinfo, {http_basic_authentication:[username, password]})
+                                .and_return(pact_content)
+            expect(PactFile.render_pact(uri_with_userinfo, {})).to eq(pact_content)
+          end
+        end
+      end
+    end
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: pact-support
 version: !ruby/object:Gem::Version
-  version: 0.3.1
+  version: 0.4.0
 platform: ruby
 authors:
 - James Fraser
@@ -12,7 +12,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-02-24 00:00:00.000000000 Z
+date: 2015-03-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: randexp
@@ -228,6 +228,7 @@ files:
 - Gemfile
 - LICENSE.txt
 - README.md
+- RELEASING.md
 - Rakefile
 - lib/pact/configuration.rb
 - lib/pact/consumer/request.rb
@@ -291,6 +292,7 @@ files:
 - spec/lib/pact/consumer_contract/consumer_contract_spec.rb
 - spec/lib/pact/consumer_contract/headers_spec.rb
 - spec/lib/pact/consumer_contract/interaction_spec.rb
+- spec/lib/pact/consumer_contract/pact_file_spec.rb
 - spec/lib/pact/consumer_contract/query_hash_spec.rb
 - spec/lib/pact/consumer_contract/query_string_spec.rb
 - spec/lib/pact/consumer_contract/request_spec.rb
@@ -374,6 +376,7 @@ test_files:
 - spec/lib/pact/consumer_contract/consumer_contract_spec.rb
 - spec/lib/pact/consumer_contract/headers_spec.rb
 - spec/lib/pact/consumer_contract/interaction_spec.rb
+- spec/lib/pact/consumer_contract/pact_file_spec.rb
 - spec/lib/pact/consumer_contract/query_hash_spec.rb
 - spec/lib/pact/consumer_contract/query_string_spec.rb
 - spec/lib/pact/consumer_contract/request_spec.rb