pact 1.0.19 → 1.0.20

data/CHANGELOG.md

@@ -2,6 +2,10 @@ Do this to generate your change history
 
     git log --date=relative --pretty=format:'  * %h - %s (%an, %ad)'
 
+### 1.0.20 (29 October 2013)
+
+  * c03f34f - Fixed the pretty generation of JSON when active support is loaded. It is both a sad and a happy moment. (Beth, 7 minutes ago)
+
 ### 1.0.19 (29 October 2013)
  * e4b990e - Gsub '-' to '_' in request headers. (Sebastian Glazebrook, 4 minutes ago)
  * 52ac8f8 - Added documentation for PACT_DESCRIPTION and PACT_PROVIDER_STATE to README. (Beth, 13 hours ago)

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    pact (1.0.19)
+    pact (1.0.20)
       awesome_print (~> 1.1.0)
       find_a_port (~> 1.0.1)
       json
@@ -38,12 +38,15 @@ GEM
     eventmachine (1.0.3)
     fakefs (0.4.2)
     find_a_port (1.0.1)
+    geminabox-client (0.0.2)
+      multipart-post
     hashie (2.0.5)
     i18n (0.6.5)
     json (1.8.1)
     method_source (0.8.2)
     minitest (4.7.5)
     multi_json (1.8.2)
+    multipart-post (1.2.0)
     pry (0.9.12.2)
       coderay (~> 1.0.5)
       method_source (~> 0.8)
@@ -84,6 +87,7 @@ DEPENDENCIES
   activesupport
   debugger
   fakefs (~> 0.4)
+  geminabox-client
   hashie (~> 2.0)
   pact!
   pry

data/lib/pact/consumer_contract/active_support_support.rb

@@ -18,6 +18,12 @@ module Pact
       thing
     end
 
+    # ActiveSupport JSON overwrites (i.e. TRAMPLES) the json methods of the Regexp class directly
+    # (beneath its destructive hooves of destruction).
+    # This does not seem to be able to be undone without affecting the JSON serialisation in the
+    # calling project, so the best way I've found to fix this issue is to reattach the
+    # original as_json to the Regexp instances in the ConsumerContract before we write them to the
+    # pact file. If anyone can find a better way, please submit a pull request ASAP!
     def fix_regexp regexp
       def regexp.as_json options = {}
         {:json_class => 'Regexp', "o" => self.options, "s" => self.source }
@@ -25,5 +31,17 @@ module Pact
       regexp
     end
 
+    # Having Active Support JSON loaded somehow kills the formatting of pretty_generate for objects.
+    # Don't ask me why, but it still seems to work for hashes, so the hacky work around is to
+    # reparse the generated JSON into a hash and pretty_generate that... sigh...
+    # Oh ActiveSupport, why....
+    def fix_json_formatting json
+      if json.include?("\n")
+        json
+      else
+        JSON.pretty_generate(JSON.parse(json, create_additions: false))
+      end
+    end
+
   end
 end

data/lib/pact/consumer_contract/consumer_contract.rb

@@ -139,7 +139,7 @@ module Pact
     def update_pactfile
       logger.debug "Updating pact file for #{provider.name} at #{pactfile_path}"
       File.open(pactfile_path, 'w') do |f|
-        f.write JSON.pretty_generate(self)
+        f.write fix_json_formatting(JSON.pretty_generate(self))
       end
     end
   end

data/lib/pact/version.rb

@@ -1,3 +1,3 @@
 module Pact
-  VERSION = "1.0.19"
+  VERSION = "1.0.20"
 end

data/pact.gemspec

@@ -35,4 +35,5 @@ Gem::Specification.new do |gem|
   gem.add_development_dependency 'rspec-fire'
   gem.add_development_dependency 'activesupport'
   gem.add_development_dependency 'debugger'
+  gem.add_development_dependency 'geminabox-client'
 end

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

@@ -39,5 +39,20 @@ module Pact
         expect(json).to include("{\"json_class\":\"Regexp\",\"o\":0,\"s\":\"alligator\"}")
       end
     end
+
+    describe "fix_json_formatting" do
+      let(:active_support_affected_pretty_generated_json) { "{\"json_class\":\"Regexp\",\"o\":0,\"s\":\"a*b\"}" }
+      let(:pretty_generated_json) do
+'{
+  "json_class": "Regexp",
+  "o": 0,
+  "s": "a*b"
+}'
+      end
+
+      it "pretty formats the json that has been not pretty formatted because of ActiveSupport" do
+        expect(fix_json_formatting(active_support_affected_pretty_generated_json)).to eq (pretty_generated_json.strip)
+      end
+    end
   end
 end

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

@@ -191,7 +191,7 @@ eos
       end
 
       it "should write the interactions to the file" do
-        File.read(expected_pact_path).gsub(/\s+/, '').should eql expected_pact_string.strip.gsub(/\s+/, '')
+        File.read(expected_pact_path).should eql expected_pact_string.strip
       end
     end
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: pact
 version: !ruby/object:Gem::Version
-  version: 1.0.19
+  version: 1.0.20
   prerelease: 
 platform: ruby
 authors:
@@ -271,6 +271,22 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: geminabox-client
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: Define a pact between service consumers and providers
 email:
 - james.fraser@alumni.swinburne.edu
@@ -430,15 +446,21 @@ required_ruby_version: !ruby/object:Gem::Requirement
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+      segments:
+      - 0
+      hash: -2921179149528665156
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+      segments:
+      - 0
+      hash: -2921179149528665156
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.25
+rubygems_version: 1.8.23
 signing_key: 
 specification_version: 3
 summary: Define a pact between service consumers and providers