pact-support 0.0.4 → 0.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9c27327d015a0d365e6fb40d46bfaf51988a54bf
-  data.tar.gz: 8f8c448fd177b5aca19761c205cc3c94d8ceecdb
+  metadata.gz: 96c37218ffea4538adf60f7a93d1c494723d14c1
+  data.tar.gz: a54ca9babda872a3aec4412e2d3f2456dc915d72
 SHA512:
-  metadata.gz: 216d7e4778f28365ef8c22a3916a9bfc9d54bcc885e9f0c997938afbaf9a63b5d853f8d1a458caef2973c8874558551fa8fe923edb6ac789fe2bac0202a89e6a
-  data.tar.gz: a5cab6e546286061eabbd519163ed7ced91683ac4d2c9e5192e60cc15c8e3583349a595b32237bcbde4a8076e3fdded6b969e33adbe630261343aca29c85492e
+  metadata.gz: f92a57c9ab90f83c059d23a17434dc4e9cb96424a9ef50953a750ec38bd994adc716b05b7495c76dc1ce1cb9e044ecae5e91517296d400d620b2bcb6eb2598a7
+  data.tar.gz: 0740b78cb0f67a31ef808efcd85e7c00274928247ae1dfa4d7becb401860eeb2c3d8757697de6213258b032770a3771b3f12a59fbfeba90007d50da88eb5ae4e

data/CHANGELOG.md

@@ -2,6 +2,10 @@ Do this to generate your change history
 
   git log --pretty=format:'  * %h - %s (%an, %ad)'
 
+### 0.1.0 (22 October 2014)
+
+* fa7e03f - Removed JSON serialisation code from models. It has been moved to decorators in pact_mock-service. (bethesque, Wed Oct 22 12:53:21 2014 +1100)
+
 ### 0.0.4 (20 October 2014)
 
 * ebe5e32 - Added differ for application/x-www-form-urlencoded bodies. (bethesque, Mon Oct 20 20:26:13 2014 +1100)

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    pact-support (0.0.4)
+    pact-support (0.1.0)
       awesome_print (~> 1.1)
       find_a_port (~> 1.0.1)
       json

data/lib/pact/consumer_contract/consumer_contract.rb

@@ -9,11 +9,7 @@ require 'open-uri'
 require_relative 'service_consumer'
 require_relative 'service_provider'
 require_relative 'interaction'
-require_relative 'request'
 require_relative 'pact_file'
-require_relative 'file_name'
-
-
 
 module Pact
 
@@ -21,8 +17,7 @@ module Pact
 
     include SymbolizeKeys
     include Logging
-    include FileName
-    include ActiveSupportSupport
+    include PactFile
 
     attr_accessor :interactions
     attr_accessor :consumer
@@ -34,32 +29,13 @@ module Pact
       @provider = attributes[:provider]
     end
 
-    def to_hash
-      {
-        provider: @provider.as_json,
-        consumer: @consumer.as_json,
-        interactions: @interactions.collect(&:as_json),
-        metadata: {
-          pactSpecificationVersion: "1.0.0"
-        }
-      }
-    end
-
-    def as_json(options = {})
-      fix_all_the_things to_hash
-    end
-
-    def to_json(options = {})
-      as_json.to_json(options)
-    end
-
     def self.from_hash(hash)
       hash = symbolize_keys(hash)
-      new({
-        :interactions => hash[:interactions].collect { |hash| Interaction.from_hash(hash)},
+      new(
         :consumer => ServiceConsumer.from_hash(hash[:consumer]),
-        :provider => ServiceProvider.from_hash(hash[:provider])
-      })
+        :provider => ServiceProvider.from_hash(hash[:provider]),
+        :interactions => hash[:interactions].collect { |hash| Interaction.from_hash(hash)}
+      )
     end
 
     def self.from_json string
@@ -95,20 +71,5 @@ module Pact
       end
     end
 
-    def pact_file_name
-      file_name consumer.name, provider.name
-    end
-
-    def pactfile_path
-      raise 'You must first specify a consumer and service name' unless (consumer && consumer.name && provider && provider.name)
-      @pactfile_path ||= file_path consumer.name, provider.name
-    end
-
-    def update_pactfile
-      logger.debug "Updating pact file for #{provider.name} at #{pactfile_path}"
-      File.open(pactfile_path, 'w') do |f|
-        f.write fix_json_formatting(JSON.pretty_generate(self))
-      end
-    end
   end
 end

data/lib/pact/consumer_contract/interaction.rb

@@ -24,17 +24,12 @@ module Pact
       end
 
       def to_hash
-        hash = { :description => @description }
-        hash[:provider_state] = @provider_state if @provider_state #Easier to read when provider state at top
-        hash.merge(:request => @request.as_json, :response => @response)
-      end
-
-      def as_json options = {}
-        fix_all_the_things to_hash
-      end
-
-      def to_json(options = {})
-        as_json.to_json(options)
+        {
+          description: description,
+          provider_state: provider_state,
+          request: request.to_hash,
+          response: response.to_hash
+        }
       end
 
       def matches_criteria? criteria
@@ -51,7 +46,7 @@ module Pact
       end
 
       def == other
-        other.is_a?(Interaction) && as_json == other.as_json
+        other.is_a?(Interaction) && to_hash == other.to_hash
       end
 
       def eq? other
@@ -67,7 +62,7 @@ module Pact
       end
 
       def to_s
-        JSON.pretty_generate(self)
+        to_hash.to_s
       end
    end
 end

data/lib/pact/consumer_contract/response.rb

@@ -23,6 +23,10 @@ module Pact
       self[:body]
     end
 
+    def specified? key
+      self.key?(key.to_sym)
+    end
+
     def body_allows_any_value?
       body_not_specified? || body_is_empty_hash?
     end
@@ -43,7 +47,7 @@ module Pact
     end
 
     def body_not_specified?
-      !self.key?(:body)
+      !specified?(:body)
     end
 
   end

data/lib/pact/shared/active_support_support.rb

@@ -36,10 +36,10 @@ module Pact
     # 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
+      if json =~ /\{".*?":"/
         JSON.pretty_generate(JSON.parse(json, create_additions: false))
+      else
+        json
       end
     end
 

data/lib/pact/shared/request.rb

@@ -22,14 +22,6 @@ module Pact
         @query = is_unspecified?(query) ? query : Pact::Query.create(query)
       end
 
-      def to_json(options = {})
-        as_json.to_json(options)
-      end
-
-      def as_json options = {}
-        to_hash
-      end
-
       def to_hash
         hash = {
           method: method,
@@ -59,6 +51,10 @@ module Pact
         http_method_modifies_resource? && body_specified?
       end
 
+      def specified? key
+        !is_unspecified?(self.send(key))
+      end
+
       protected
 
       # Not including DELETE, as we don't care about the resources updated state.
@@ -74,17 +70,13 @@ module Pact
         specified?(:body)
       end
 
-      def specified? key
-        !is_unspecified?(self.send(key))
-      end
-
       def is_unspecified? value
         value.is_a? self.class.key_not_found.class
       end
 
       def to_hash_without_body_or_query
         keep_keys = [:method, :path, :headers]
-        as_json.reject{ |key, value| !keep_keys.include? key }.tap do | hash |
+        to_hash.reject{ |key, value| !keep_keys.include? key }.tap do | hash |
           hash[:method] = method.upcase
         end
       end

data/lib/pact/support/version.rb

@@ -1,5 +1,5 @@
 module Pact
   module Support
-    VERSION = "0.0.4"
+    VERSION = "0.1.0"
   end
 end

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

@@ -3,28 +3,6 @@ require 'pact/consumer_contract'
 
 module Pact
   describe ConsumerContract do
-    describe "as_json" do
-
-      class MockInteraction
-        def as_json(options ={})
-          {:mock => "interaction"}
-        end
-      end
-
-      before do
-        allow(DateTime).to receive(:now).and_return(DateTime.strptime("2013-08-15T13:27:13+10:00"))
-      end
-
-      let(:service_consumer) { double('ServiceConsumer', :as_json => {:a => 'consumer'}) }
-      let(:service_provider) { double('ServiceProvider', :as_json => {:a => 'provider'}) }
-      let(:pact) { ConsumerContract.new({:interactions => [MockInteraction.new], :consumer => service_consumer, :provider => service_provider }) }
-      let(:expected_as_json) { {:provider=>{:a=>"provider"}, :consumer=>{:a=>"consumer"}, :interactions=>[{:mock=>"interaction"}], :metadata=>{:pactSpecificationVersion=> "1.0.0" }} }
-
-      it "should return a hash representation of the Pact" do
-        expect(pact.as_json).to eq expected_as_json
-      end
-
-    end
 
     describe ".from_json" do
       let(:loaded_pact) { ConsumerContract.from_json(string) }

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

@@ -53,56 +53,6 @@ module Pact
         end
       end
 
-      describe "to JSON" do
-        let(:request) do
-          {
-            method: 'post',
-            path: '/foo',
-            body: Term.new(generate: 'waffle', matcher: /ffl/),
-            headers: { 'Content-Type' => 'application/json' },
-            query: '',
-          }
-        end
-
-        let(:response) do
-          { baz: /qux/, wiffle: Term.new(generate: 'wiffle', matcher: /iff/) }
-        end
-
-        let(:parsed_result) do
-          JSON.load(subject.to_json)
-        end
-
-        subject { Interaction.from_hash('response' => response, 'request' => request) }
-
-        it "contains the request" do
-          expect(parsed_result['request']).to eq({
-              'method' => 'post',
-              'path' => '/foo',
-              'headers' => {
-                'Content-Type' => 'application/json'
-              },
-              'body' => Term.new(generate: 'waffle', matcher: /ffl/),
-              'query' => ''
-            })
-        end
-
-        describe "response" do
-
-          it "serialises regexes" do
-            expect(parsed_result['response']['baz']).to eql /qux/
-          end
-
-          it "serialises terms" do
-            term = Term.new(generate:'wiffle', matcher: /iff/)
-            parsed_term = parsed_result['response']['wiffle']
-            expect(term.matcher).to eql parsed_term.matcher
-            expect(term.generate).to eql parsed_term.generate
-          end
-
-        end
-
-      end
-
       describe "request_modifies_resource_without_checking_response_body?" do
 
         let(:interaction) { Interaction.new(request: request, response: response)}

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

@@ -26,15 +26,6 @@ module Pact
       end
     end
 
-    describe "as_json" do
-      subject { Request::Expected.new(:get, '/path', {:header => 'value'}, {:body => 'yeah'}, "query", {some: 'options'}) }
-      context "with options" do
-        it "does not include the options because they are a temporary hack and should leave no trace of themselves in the pact file" do
-          expect(subject.as_json.key?(:options)).to be false
-        end
-      end
-    end
-
     describe "matching to actual requests" do
 
       subject { Request::Expected.new(expected_method, expected_path, expected_headers, expected_body, expected_query, options) }

data/spec/lib/pact/shared/request_spec.rb

@@ -18,12 +18,6 @@ module Pact
 
       subject { TestRequest.new("get", "/", {some: "things"}, {some: "things"} , "some=things") }
 
-      describe "#to_json" do
-        it "renders the keys in a sensible order" do
-          expect(subject.to_json).to match(/method.*path.*query.*headers.*body/)
-        end
-      end
-
       describe "#full_path" do
 
         subject { TestRequest.new("get", "/something", {}, {some: "things"} , query).full_path }

data/tasks/spec.rake

@@ -2,5 +2,14 @@ require 'rspec/core/rake_task'
 
 RSpec::Core::RakeTask.new(:spec)
 
-task :default => [:spec]
+task :set_active_support_on do
+  ENV["LOAD_ACTIVE_SUPPORT"] = 'true'
+end
+
+desc "This is to ensure that the gem still works even when active support JSON is loaded."
+task :spec_with_active_support => [:set_active_support_on] do
+  Rake::Task['spec'].execute
+end
+
+task :default => [:spec, :spec_with_active_support]
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: pact-support
 version: !ruby/object:Gem::Version
-  version: 0.0.4
+  version: 0.1.0
 platform: ruby
 authors:
 - James Fraser
@@ -12,7 +12,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-10-20 00:00:00.000000000 Z
+date: 2014-10-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: randexp