pact-support 1.3.0.alpha.2 → 1.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 252461d85c1d41233fbc3fd74d9a4f6a3628ac42
-  data.tar.gz: c3be8741ec52e41666815d821d7575f39f20f0b2
+  metadata.gz: 6bc207d989ed7eac517729f4664305316b83b64b
+  data.tar.gz: 5e1a83e3f0d51d01ef712ee33091ef070b926ba6
 SHA512:
-  metadata.gz: 7ac6f0ce52bb4956369e47a406fefa75fba3ec9b300ad35ed95e76b02ae46f8a9eaf8952dd6c18092ff8e372a941bd3f3d5994b290eec23f71d7db69c7ad2f1b
-  data.tar.gz: 3f9dea60c0342fbaf4ac68ba38dcee5623510f61220984a3870b035659eddfb7398190a18f8e127f166a29859e78f727425544f416718ecf4e3cf229950e8a77
+  metadata.gz: fc3a3af1fa03f3d920741bd65e0bf83047bc29eddea3109d755cababd978d0de9e26f2c1e3c944f79623b2d41ef06416184357c2247d62b6e072b5059c81d33c
+  data.tar.gz: 286126e9c5cc0e5c617e0c1cb324a5453a82b8b37f34dc367ded266dbb19618d1f7cbf7f73029b6ed83a3850cb2c9ee325caa642acf844347998d0122f407eb8

data/.travis.yml

@@ -4,6 +4,8 @@ rvm:
   - 2.1.8
   - 2.2.4
   - 2.3.1
+  - 2.4.3
+  - 2.5.0
   - jruby-9.1.13.0
 gemfile:
   - gemfiles/default.gemfile
@@ -19,5 +21,9 @@ matrix:
       gemfile: gemfiles/ruby_under_22.gemfile
     - rvm: 2.3.1
       gemfile: gemfiles/ruby_under_22.gemfile
+    - rvm: 2.4.3
+      gemfile: gemfiles/ruby_under_22.gemfile
+    - rvm: 2.5.0
+      gemfile: gemfiles/ruby_under_22.gemfile
     - rvm: jruby-9.1.13.0
       gemfile: gemfiles/ruby_under_22.gemfile

data/CHANGELOG.md

@@ -1,6 +1,17 @@
-Do this to generate your change history
+<a name="v1.3.0"></a>
+### v1.3.0 (2018-03-19)
 
-  git log --pretty=format:'  * %h - %s (%an, %ad)'
+#### Features
+
+* do not automatically create tmp/pacts dir	 ([de9e25e](/../../commit/de9e25e))
+
+
+<a name="v1.2.5"></a>
+### v1.2.5 (2018-02-16)
+
+#### Bug Fixes
+
+* replace backslashes in pact dir path with forward slashes	 ([a1b5013](/../../commit/a1b5013))
 
 ### 1.2.4 (2017-10-30)
 * 80bbdcc - fix: remove unused dependency on rack-test (Beth Skurrie, Mon Oct 30 09:52:22 2017 +1100)

data/RELEASING.md

@@ -1,15 +1,5 @@
 # Releasing
 
-1. Increment the version in `lib/pact/support/version.rb`
-2. Update the `CHANGELOG.md` using:
+Run
 
-      $ git log --pretty=format:'  * %h - %s (%an, %ad)' vX.Y.Z..HEAD
-
-3. Add files to git
-
-      $ git add CHANGELOG.md lib/pact/support/version.rb
-      $ git commit -m "chore(release): version $(ruby -r ./lib/pact/support/version.rb -e "puts Pact::Support::VERSION")"
-
-3. Release:
-
-      $ bundle exec rake release
+    script/release.sh [major|minor|patch] # default is minor

data/lib/pact/configuration.rb

@@ -72,8 +72,8 @@ module Pact
 
     # Should this be deprecated in favour of register_diff_formatter???
     def diff_formatter= diff_formatter
-      register_diff_formatter /.*/, diff_formatter
-      register_diff_formatter nil, diff_formatter
+      register_diff_formatter(/.*/, diff_formatter)
+      register_diff_formatter(nil, diff_formatter)
     end
 
     def register_diff_formatter content_type, diff_formatter
@@ -174,11 +174,9 @@ module Pact
 
   def self.configure
     yield configuration
-    FileUtils::mkdir_p configuration.tmp_dir
   end
 
   def self.clear_configuration
     @configuration = nil
   end
-
 end

data/lib/pact/consumer_contract/consumer_contract.rb

@@ -10,9 +10,9 @@ require 'pact/consumer_contract/service_consumer'
 require 'pact/consumer_contract/service_provider'
 require 'pact/consumer_contract/interaction'
 require 'pact/consumer_contract/pact_file'
-require 'pact/consumer_contract/http_consumer_contract_parser'
 
 module Pact
+
   class ConsumerContract
 
     include SymbolizeKeys
@@ -29,19 +29,13 @@ module Pact
       @provider = attributes[:provider]
     end
 
-    def self.add_parser consumer_contract_parser
-      parsers << consumer_contract_parser
-    end
-
-    def self.parsers
-      @parsers ||= [Pact::HttpConsumerContractParser.new]
-    end
-
     def self.from_hash(hash)
-      parsers.each do | parser |
-        return parser.call(hash) if parser.can_parse?(hash)
-      end
-      raise Pact::Error.new("No consumer contract parser found for hash: #{hash}")
+      hash = symbolize_keys(hash)
+      new(
+        :consumer => ServiceConsumer.from_hash(hash[:consumer]),
+        :provider => ServiceProvider.from_hash(hash[:provider]),
+        :interactions => hash[:interactions].collect { |h| Interaction.from_hash(h)}
+      )
     end
 
     def self.from_json string
@@ -60,9 +54,9 @@ module Pact
     def find_interaction criteria
       interactions = find_interactions criteria
       if interactions.size == 0
-        raise Pact::Error.new("Could not find interaction matching #{criteria} in pact file between #{consumer.name} and #{provider.name}.")
+        raise "Could not find interaction matching #{criteria} in pact file between #{consumer.name} and #{provider.name}."
       elsif interactions.size > 1
-        raise Pact::Error.new("Found more than 1 interaction matching #{criteria} in pact file between #{consumer.name} and #{provider.name}.")
+        raise "Found more than 1 interaction matching #{criteria} in pact file between #{consumer.name} and #{provider.name}."
       end
       interactions.first
     end

data/lib/pact/consumer_contract/file_name.rb

@@ -8,11 +8,15 @@ module Pact
     end
 
     def file_path consumer_name, provider_name, pact_dir = Pact.configuration.pact_dir, options = {}
-      File.join(pact_dir, file_name(consumer_name, provider_name, options))
+      File.join(windows_safe(pact_dir), file_name(consumer_name, provider_name, options))
     end
 
     def filenamify name
       name.downcase.gsub(/\s/, '_')
     end
+
+    def windows_safe(pact_dir)
+      pact_dir.gsub("\\", "/")
+    end
   end
 end

data/lib/pact/consumer_contract/interaction.rb

@@ -6,7 +6,7 @@ require 'pact/matching_rules'
 require 'pact/errors'
 
 module Pact
-  class Interaction
+   class Interaction
     include ActiveSupportSupport
       include SymbolizeKeys
 
@@ -36,10 +36,6 @@ module Pact
         }
       end
 
-      def http?
-        true
-      end
-
       def validate!
         raise Pact::InvalidInteractionError.new(self) unless description && request && response
       end

data/lib/pact/consumer_contract/query_string.rb

@@ -1,5 +1,4 @@
 require 'pact/shared/active_support_support'
-require 'pact/matchers'
 
 module Pact
   class QueryString

data/lib/pact/matchers/matchers.rb

@@ -224,7 +224,7 @@ module Pact
           expected_desc = class_name_with_value_in_brackets(expected)
           expected_desc.gsub!("(", "(like ")
           actual_desc = class_name_with_value_in_brackets(actual)
-          message = "Expected #{expected_desc} but got #{actual_desc} at <path>"
+          "Expected #{expected_desc} but got #{actual_desc} at <path>"
         end
       end
     end

data/lib/pact/matching_rules/jsonpath.rb

@@ -13,7 +13,6 @@ module Pact
       def initialize(path)
         scanner = StringScanner.new(path)
         @path = []
-        bracket_count = 0
         while not scanner.eos?
           if token = scanner.scan(/\$/)
             @path << token
@@ -49,10 +48,10 @@ module Pact
             @path.last << token
           end
         end
+      end
 
-        def to_s
-          path.join
-        end
+      def to_s
+        path.join
       end
     end
   end

data/lib/pact/reification.rb

@@ -15,8 +15,8 @@ module Pact
       when Pact::Term, Regexp, Pact::SomethingLike, Pact::ArrayLike
         from_term(term.generate)
       when Hash
-        term.inject({}) do |mem, (key,term)|
-          mem[key] = from_term(term)
+        term.inject({}) do |mem, (key,t)|
+          mem[key] = from_term(t)
           mem
         end
       when Array

data/lib/pact/shared/form_differ.rb

@@ -1,4 +1,3 @@
-require 'pact/matchers/matchers'
 require 'uri'
 
 module Pact
@@ -19,8 +18,8 @@ module Pact
     end
 
     def self.ensure_values_are_arrays hash
-      hash.each_with_object({}) do | (key, value), hash |
-        hash[key.to_s] = [*value]
+      hash.each_with_object({}) do | (key, value), h |
+        h[key.to_s] = [*value]
       end
     end
 

data/lib/pact/shared/json_differ.rb

@@ -1,11 +1,9 @@
-require 'pact/matchers/matchers'
-
 module Pact
   class JsonDiffer
 
     extend Matchers
     
-    # Delegates to https://github.com/bethesque/pact-support/blob/master/lib/pact/matchers/matchers.rb#L25
+    # Delegates to https://github.com/pact-foundation/pact-support/blob/master/lib/pact/matchers/matchers.rb#L25
     def self.call expected, actual, options = {}
       diff expected, actual, options
     end

data/lib/pact/shared/request.rb

@@ -1,4 +1,3 @@
-require 'pact/matchers'
 require 'pact/symbolize_keys'
 require 'pact/consumer_contract/headers'
 require 'pact/consumer_contract/query'

data/lib/pact/shared/text_differ.rb

@@ -1,4 +1,3 @@
-require 'pact/matchers/matchers'
 require 'pact/matchers/difference'
 
 module Pact

data/lib/pact/support/version.rb

@@ -1,5 +1,5 @@
 module Pact
   module Support
-    VERSION = "1.3.0.alpha.2"
+    VERSION = "1.3.0"
   end
 end

data/pact-support.gemspec

@@ -28,10 +28,12 @@ Gem::Specification.new do |gem|
   gem.add_runtime_dependency 'awesome_print', '~> 1.1'
 
   gem.add_development_dependency 'rake', '~> 10.0.3'
-  gem.add_development_dependency 'webmock', '~> 2.0.0'
+  gem.add_development_dependency 'webmock', '~> 3.3'
   gem.add_development_dependency 'pry'
   gem.add_development_dependency 'fakefs', '~> 0.11.2'
   gem.add_development_dependency 'hashie', '~> 2.0'
   gem.add_development_dependency 'activesupport'
   gem.add_development_dependency 'appraisal'
+  gem.add_development_dependency 'conventional-changelog', '~>1.3'
+  gem.add_development_dependency 'bump', '~> 0.5'
 end

data/script/release.sh

@@ -0,0 +1,9 @@
+#!/bin/sh
+set -e
+
+git checkout -- lib/pact/support/version.rb
+bundle exec bump ${1:-minor} --no-commit
+bundle exec rake generate_changelog
+git add CHANGELOG.md lib/pact/support/version.rb
+git commit -m "Releasing version $(ruby -r ./lib/pact/support/version.rb -e "puts Pact::Support::VERSION")"
+bundle exec rake release

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

@@ -3,53 +3,50 @@ require 'pact/consumer_contract'
 
 module Pact
   describe ConsumerContract do
-    describe ".from_json" do
 
+    describe ".from_json" do
       let(:loaded_pact) { ConsumerContract.from_json(string) }
+      context "when the top level object is a ConsumerContract" do
+        let(:string) { '{"interactions":[{"request": {"path":"/path", "method" : "get"}, "response": {"status" : 200}}], "consumer": {"name" : "Bob"} , "provider": {"name" : "Mary"} }' }
 
-      context "with an HTTP contract" do
-        context "when the top level object is a ConsumerContract" do
-          let(:string) { '{"interactions":[{"request": {"path":"/path", "method" : "get"}, "response": {"status" : 200}}], "consumer": {"name" : "Bob"} , "provider": {"name" : "Mary"} }' }
-
-          it "should create a Pact" do
-            expect(loaded_pact).to be_instance_of ConsumerContract
-          end
+        it "should create a Pact" do
+          expect(loaded_pact).to be_instance_of ConsumerContract
+        end
 
-          it "should have interactions" do
-            expect(loaded_pact.interactions).to be_instance_of Array
-          end
+        it "should have interactions" do
+          expect(loaded_pact.interactions).to be_instance_of Array
+        end
 
-          it "should have a consumer" do
-            expect(loaded_pact.consumer).to be_instance_of Pact::ServiceConsumer
-          end
+        it "should have a consumer" do
+          expect(loaded_pact.consumer).to be_instance_of Pact::ServiceConsumer
+        end
 
-          it "should have a provider" do
-            expect(loaded_pact.provider).to be_instance_of Pact::ServiceProvider
-          end
+        it "should have a provider" do
+          expect(loaded_pact.provider).to be_instance_of Pact::ServiceProvider
         end
+      end
 
-        context "with old 'producer' key" do
-          let(:string) { File.read('./spec/support/a_consumer-a_producer.json')}
-          it "should create a Pact" do
-            expect(loaded_pact).to be_instance_of ConsumerContract
-          end
+      context "with old 'producer' key" do
+        let(:string) { File.read('./spec/support/a_consumer-a_producer.json')}
+        it "should create a Pact" do
+          expect(loaded_pact).to be_instance_of ConsumerContract
+        end
 
-          it "should have interactions" do
-            expect(loaded_pact.interactions).to be_instance_of Array
-          end
+        it "should have interactions" do
+          expect(loaded_pact.interactions).to be_instance_of Array
+        end
 
-          it "should have a consumer" do
-            expect(loaded_pact.consumer).to be_instance_of Pact::ServiceConsumer
-          end
+        it "should have a consumer" do
+          expect(loaded_pact.consumer).to be_instance_of Pact::ServiceConsumer
+        end
 
-          it "should have a provider" do
-            expect(loaded_pact.provider).to be_instance_of Pact::ServiceProvider
-            expect(loaded_pact.provider.name).to eq "an old producer"
-          end
+        it "should have a provider" do
+          expect(loaded_pact.provider).to be_instance_of Pact::ServiceProvider
+          expect(loaded_pact.provider.name).to eq "an old producer"
+        end
 
-          it "should have a provider_state" do
-            expect(loaded_pact.interactions.first.provider_state).to eq 'state one'
-          end
+        it "should have a provider_state" do
+          expect(loaded_pact.interactions.first.provider_state).to eq 'state one'
         end
       end
     end

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

@@ -3,13 +3,22 @@ require 'pact/consumer_contract/file_name'
 module Pact
   describe FileName do
     describe "file_path" do
-      let(:subject) { FileName.file_path 'foo', 'bar', 'tmp/pacts' }
+
+      subject { FileName.file_path 'foo', 'bar', 'tmp/pacts' }
       it { is_expected.to eq 'tmp/pacts/foo-bar.json' }
 
       context "when unique is true" do
-        let(:subject) { FileName.file_path 'foo', 'bar', 'tmp/pacts', unique: true }
+        subject { FileName.file_path 'foo', 'bar', 'tmp/pacts', unique: true }
         it { is_expected.to match %r{tmp/pacts/foo-bar-\d+.json} }
       end
+
+      context "when the path includes backslashes" do
+        subject { FileName.file_path 'foo', 'bar', 'c:\tmp\pacts' }
+
+        it "changes them to forward slashes" do
+          expect(subject).to eq "c:/tmp/pacts/foo-bar.json"
+        end
+      end
     end
   end
 end

data/spec/lib/pact/matchers/list_diff_formatter_spec.rb

@@ -1,6 +1,7 @@
 require 'spec_helper'
 require 'pact/matchers/list_diff_formatter'
 require 'pact/matchers/matchers'
+require 'support/ruby_version_helpers'
 
 # Needed to stop the ai printing in color
 # TODO: fix this!
@@ -23,7 +24,7 @@ module Pact
 \tExpected type:
 \t\tString
 \tActual type:
-\t\tFixnum
+\t\t#{RubyVersionHelpers.numeric_type}
 EOS
           }
 

data/spec/lib/pact/matchers/matchers_messages_mismatched_value_spec.rb

@@ -1,11 +1,13 @@
 require 'spec_helper'
 require 'pact/matchers'
 require 'pact/consumer_contract/headers'
+require 'support/ruby_version_helpers'
 
 module Pact::Matchers
 
   describe Pact::Matchers do
     include Pact::Matchers
+    extend RubyVersionHelpers
 
     describe "diff" do
       STRING = "foo"
@@ -23,7 +25,7 @@ module Pact::Matchers
         [STRING, ARRAY, "Expected \"foo\" but got an Array at <path>"],
         [Pact.like(STRING), "bar", nil],
         [Pact.like(STRING), nil, "Expected a String (like \"foo\") but got nil at <path>"],
-        [Pact.like(STRING), INT, "Expected a String (like \"foo\") but got a Fixnum (1) at <path>"],
+        [Pact.like(STRING), INT, "Expected a String (like \"foo\") but got #{a_numeric} (1) at <path>"],
         [Pact.like(STRING), FLOAT, "Expected a String (like \"foo\") but got a Float (1.0) at <path>"],
         [Pact.like(STRING), HASH, "Expected a String (like \"foo\") but got a Hash at <path>"],
         [Pact.like(STRING), ARRAY, "Expected a String (like \"foo\") but got an Array at <path>"],
@@ -34,22 +36,22 @@ module Pact::Matchers
         [INT, HASH, "Expected 1 but got a Hash at <path>"],
         [INT, ARRAY, "Expected 1 but got an Array at <path>"],
         [Pact.like(INT), 2, nil],
-        [Pact.like(INT), nil, "Expected a Fixnum (like 1) but got nil at <path>"],
-        [Pact.like(INT), STRING, "Expected a Fixnum (like 1) but got a String (\"foo\") at <path>"],
-        [Pact.like(INT), FLOAT, "Expected a Fixnum (like 1) but got a Float (1.0) at <path>"],
-        [Pact.like(INT), HASH, "Expected a Fixnum (like 1) but got a Hash at <path>"],
-        [Pact.like(INT), ARRAY, "Expected a Fixnum (like 1) but got an Array at <path>"],
+        [Pact.like(INT), nil, "Expected #{a_numeric} (like 1) but got nil at <path>"],
+        [Pact.like(INT), STRING, "Expected #{a_numeric} (like 1) but got a String (\"foo\") at <path>"],
+        [Pact.like(INT), FLOAT, "Expected #{a_numeric} (like 1) but got a Float (1.0) at <path>"],
+        [Pact.like(INT), HASH, "Expected #{a_numeric} (like 1) but got a Hash at <path>"],
+        [Pact.like(INT), ARRAY, "Expected #{a_numeric} (like 1) but got an Array at <path>"],
         [HASH, HASH, nil],
         [HASH, nil, "Expected a Hash but got nil at <path>"],
         [HASH, STRING, "Expected a Hash but got a String (\"foo\") at <path>"],
-        [HASH, INT, "Expected a Hash but got a Fixnum (1) at <path>"],
+        [HASH, INT, "Expected a Hash but got #{a_numeric} (1) at <path>"],
         [HASH, FLOAT, "Expected a Hash but got a Float (1.0) at <path>"],
         [HASH, ARRAY, "Expected a Hash but got an Array at <path>"],
         [Pact.like(HASH), STRING, "Expected a Hash but got a String (\"foo\") at <path>"],
         [ARRAY, ARRAY, nil],
         [ARRAY, nil, "Expected an Array but got nil at <path>"],
         [ARRAY, STRING, "Expected an Array but got a String (\"foo\") at <path>"],
-        [ARRAY, INT, "Expected an Array but got a Fixnum (1) at <path>"],
+        [ARRAY, INT, "Expected an Array but got #{a_numeric} (1) at <path>"],
         [ARRAY, FLOAT, "Expected an Array but got a Float (1.0) at <path>"],
         [ARRAY, HASH, "Expected an Array but got a Hash at <path>"]
       ]

data/spec/lib/pact/matchers/matchers_messages_regexp_spec.rb

@@ -1,11 +1,13 @@
 require 'spec_helper'
 require 'pact/matchers'
 require 'pact/consumer_contract/headers'
+require 'support/ruby_version_helpers'
 
 module Pact::Matchers
 
   describe Pact::Matchers do
     include Pact::Matchers
+    include RubyVersionHelpers
 
     describe "diff" do
       STRING = "foo"
@@ -29,10 +31,10 @@ module Pact::Matchers
           end
         end
 
-        context "when the actual is a Fixnum" do
+        context "when the actual is a numeric" do
           let(:actual) { INT }
           it "returns a message" do
-            expect(difference[:thing].message).to eq "Expected a String matching /foo/ (like \"food\") but got a Fixnum (1) at <path>"
+            expect(difference[:thing].message).to eq "Expected a String matching /foo/ (like \"food\") but got #{a_numeric} (1) at <path>"
           end
         end
 
@@ -43,10 +45,10 @@ module Pact::Matchers
           end
         end
 
-        context "when the actual is a Fixnum" do
+        context "when the actual is a numeric" do
           let(:actual) { INT }
           it "returns a message" do
-            expect(difference[:thing].message).to eq "Expected a String matching /foo/ (like \"food\") but got a Fixnum (1) at <path>"
+            expect(difference[:thing].message).to eq "Expected a String matching /foo/ (like \"food\") but got #{a_numeric} (1) at <path>"
           end
         end
 
@@ -68,10 +70,10 @@ module Pact::Matchers
           end
         end
 
-        context "when the actual is a Fixnum" do
+        context "when the actual is a numeric" do
           let(:actual) { INT }
           it "returns a message" do
-            expect(difference[:thing].message).to eq "Expected a String matching /foo/ but got a Fixnum (1) at <path>"
+            expect(difference[:thing].message).to eq "Expected a String matching /foo/ but got #{a_numeric} (1) at <path>"
           end
         end
 
@@ -82,10 +84,10 @@ module Pact::Matchers
           end
         end
 
-        context "when the actual is a Fixnum" do
+        context "when the actual is a numeric" do
           let(:actual) { INT }
           it "returns a message" do
-            expect(difference[:thing].message).to eq "Expected a String matching /foo/ but got a Fixnum (1) at <path>"
+            expect(difference[:thing].message).to eq "Expected a String matching /foo/ but got #{a_numeric} (1) at <path>"
           end
         end
 

data/spec/lib/pact/matchers/type_difference_spec.rb

@@ -1,9 +1,11 @@
 require 'spec_helper'
 require 'pact/matchers/type_difference'
+require 'support/ruby_version_helpers'
 
 module Pact
   module Matchers
     describe TypeDifference do
+      include RubyVersionHelpers
 
       describe "#as_json" do
 
@@ -21,7 +23,7 @@ module Pact
         end
 
         context "when the actual is an ActualType" do
-          let(:expected_hash) { {:EXPECTED_TYPE => "String", :ACTUAL_TYPE => "Fixnum" } }
+          let(:expected_hash) { {:EXPECTED_TYPE => "String", :ACTUAL_TYPE => numeric_type.to_s } }
 
           it "uses the key ACTUAL_TYPE" do
              expect(subject.as_json).to eq(expected_hash)

data/spec/lib/pact/matchers/unix_diff_formatter_spec.rb

@@ -2,10 +2,12 @@ require 'spec_helper'
 require 'pact/matchers/unix_diff_formatter'
 require 'pact/matchers/expected_type'
 require 'pact/matchers/actual_type'
+require 'support/ruby_version_helpers'
 
 module Pact
   module Matchers
     describe UnixDiffFormatter do
+      include RubyVersionHelpers
 
       describe ".call" do
 
@@ -35,7 +37,7 @@ module Pact
           let(:output) { <<-EOF
  {
 -  "thing": String
-+  "thing": Fixnum
++  "thing": #{numeric_type}
  }
 EOF
           }

data/spec/support/ruby_version_helpers.rb

@@ -0,0 +1,23 @@
+module RubyVersionHelpers
+  RUBY_2_4 = Gem::Version.new('2.4.0')
+  CURRENT_RUBY = Gem::Version.new(RUBY_VERSION)
+
+  def numeric_type
+    if CURRENT_RUBY < RUBY_2_4
+      Fixnum
+    else
+      Integer
+    end
+  end
+  module_function :numeric_type
+
+  def a_numeric
+    type = numeric_type
+    if type == Integer
+      "an #{type}"
+    else
+      "a #{type}"
+    end
+  end
+  module_function :a_numeric
+end

data/tasks/release.rake

@@ -0,0 +1,5 @@
+task :generate_changelog do
+  require 'pact/support/version'
+  require 'conventional_changelog'
+  ConventionalChangelog::Generator.new.generate! version: "v#{Pact::Support::VERSION}"
+end

data/tasks/spec.rake

@@ -12,3 +12,4 @@ task :spec_with_active_support => [:set_active_support_on] do
 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: 1.3.0.alpha.2
+  version: 1.3.0
 platform: ruby
 authors:
 - James Fraser
@@ -12,7 +12,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-03-08 00:00:00.000000000 Z
+date: 2018-03-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: randexp
@@ -132,14 +132,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.0.0
+        version: '3.3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.0.0
+        version: '3.3'
 - !ruby/object:Gem::Dependency
   name: pry
   requirement: !ruby/object:Gem::Requirement
@@ -210,6 +210,34 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: conventional-changelog
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.3'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.3'
+- !ruby/object:Gem::Dependency
+  name: bump
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.5'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.5'
 description: 
 email:
 - james.fraser@alumni.swinburne.edu
@@ -240,7 +268,6 @@ files:
 - lib/pact/consumer_contract/consumer_contract.rb
 - lib/pact/consumer_contract/file_name.rb
 - lib/pact/consumer_contract/headers.rb
-- lib/pact/consumer_contract/http_consumer_contract_parser.rb
 - lib/pact/consumer_contract/interaction.rb
 - lib/pact/consumer_contract/pact_file.rb
 - lib/pact/consumer_contract/query.rb
@@ -293,6 +320,7 @@ files:
 - lib/pact/term.rb
 - lib/tasks/pact.rake
 - pact-support.gemspec
+- script/release.sh
 - script/update-pact-specification-v2
 - spec/fixtures/interaction-with-matching-rules.json
 - spec/integration/matching_rules_extract_and_merge_spec.rb
@@ -356,6 +384,7 @@ files:
 - spec/support/markdown_pact.json
 - spec/support/missing_provider_states_output.txt
 - spec/support/options.json
+- spec/support/ruby_version_helpers.rb
 - spec/support/shared_examples_for_request.rb
 - spec/support/spec_support.rb
 - spec/support/stubbing.json
@@ -363,6 +392,7 @@ files:
 - spec/support/test_app_fail.json
 - spec/support/test_app_pass.json
 - spec/support/test_app_with_right_content_type_differ.json
+- tasks/release.rake
 - tasks/spec.rake
 homepage: https://github.com/bethesque/pact-support
 licenses:
@@ -379,9 +409,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '2.0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">"
+  - - ">="
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
 requirements: []
 rubyforge_project: 
 rubygems_version: 2.4.5.2
@@ -451,6 +481,7 @@ test_files:
 - spec/support/markdown_pact.json
 - spec/support/missing_provider_states_output.txt
 - spec/support/options.json
+- spec/support/ruby_version_helpers.rb
 - spec/support/shared_examples_for_request.rb
 - spec/support/spec_support.rb
 - spec/support/stubbing.json

data/lib/pact/consumer_contract/http_consumer_contract_parser.rb

@@ -1,26 +0,0 @@
-module Pact
-  class HttpConsumerContractParser
-    include SymbolizeKeys
-
-    def call(hash)
-      hash = symbolize_keys(hash)
-      interactions = if hash[:interactions]
-        hash[:interactions].collect { |hash| Interaction.from_hash(hash)}
-      elsif hash[:messages]
-        hash[:messages].collect { |hash| Message.from_hash(hash)}
-      else
-        [] # or raise an error?
-      end
-
-      ConsumerContract.new(
-        :consumer => ServiceConsumer.from_hash(hash[:consumer]),
-        :provider => ServiceProvider.from_hash(hash[:provider]),
-        :interactions => interactions
-      )
-    end
-
-    def can_parse?(hash)
-      hash.key?('interactions') || hash.key?(:interactions)
-    end
-  end
-end