pact 1.1.0.rc3 → 1.1.0.rc4

data/CHANGELOG.md

@@ -1,44 +1,52 @@
 Do this to generate your change history
 
-    git log --pretty=format:'  * %h - %s (%an, %ad)'
+  git log --pretty=format:'  * %h - %s (%an, %ad)'
+
+### 1.1.0.rc4 (1 May 2014)
+
+  * 5e1b78d - Display / in logs when path is empty https://github.com/realestate-com-au/pact/issues/14 (Beth, Thu May 1 22:09:29 2014 +1000)
+  * 01c5414 - Fixing doc generation bug where Pact::Terms were being displayed https://github.com/realestate-com-au/pact/issues/13 (Beth, Thu May 1 21:41:11 2014 +1000)
+  * 292a14b - Cleaning doc dir before generating new docs as per https://github.com/realestate-com-au/pact/issues/11 (Beth, Tue Apr 29 12:44:47 2014 +1000)
+  * 73c15dd - Changed default doc_dir to ./doc/pacts as per https://github.com/realestate-com-au/pact/issues/12 (Beth, Tue Apr 29 12:33:57 2014 +1000)
+  * 78ca78c - Fixed bug where log_dir was being ignored when set to a non default value (Beth, Tue Apr 29 07:50:32 2014 +1000)
 
 ### 1.1.0.rc3 (28 April 2014)
 
-    * 41fa409 - Cleaned up consumer after spec failure message (Beth, Sun Apr 27 22:18:03 2014 +1000)
-    * 8593fa9 - Updated zoo-app example (Beth, Sun Apr 27 20:54:51 2014 +1000)
-    * 716e3a8 - Added standalone consumer spec and spec for VerificationGet (Beth, Thu Apr 24 10:15:17 2014 +1000)
-    * c0f9bc6 - Copied RSpec::Expectations::Differ to Pact::Matchers::Differ - safer than trying to override behaviour (Beth, Thu Apr 24 09:17:58 2014 +
-    * 0eeb032 - Changing default diff_formatter to unix (Beth, Thu Apr 24 08:19:15 2014 +1000)
-    * ace5d4d - Update README.md (bethesque, Wed Apr 23 20:59:24 2014 +1000)
-    * 24efef6 - Update configuration.md (bethesque, Wed Apr 23 20:51:00 2014 +1000)
-    * 2d862b7 - Update best-practices.md (bethesque, Wed Apr 23 07:33:01 2014 +1000)
-    * ff8dfd2 - Updated doco (Beth, Tue Apr 22 21:45:17 2014 +1000)
-    * 88e4572 - Moving best practices into its own file (Beth, Tue Apr 22 21:28:36 2014 +1000)
-    * 5a3b92c - Moving provider state documentation out of main README into it's own file. (Beth, Tue Apr 22 19:59:48 2014 +1000)
-    * 1d568c4 - Updated configuration documentation (Beth, Tue Apr 22 13:06:47 2014 +1000)
-    * be1412e - Added configuration documentation (Beth, Tue Apr 22 13:04:33 2014 +1000)
-    * 9f9d178 - Added HAL raq (Beth, Tue Apr 22 12:51:42 2014 +1000)
-    * d9b6479 - Renamed ListOfPathsFormatter to ListDiffFormatter (Beth, Tue Apr 22 12:48:57 2014 +1000)
-    * 6b82402 - Renamed NestedJsonDiffFormatter to EmbeddedDiffFormatter (Beth, Tue Apr 22 12:45:50 2014 +1000)
-    * def8afd - Merge branch 'master' into release-1.1.0 (bethesque, Tue Apr 22 09:13:41 2014 +1000)
-    * 789a471 - Added generated docs to zoo-app (bethesque, Tue Apr 15 17:20:08 2014 +1000)
-    * f5da7ab - Improved header match failure message (bethesque, Tue Apr 15 09:39:12 2014 +1000)
-    * 1179489 - Stopped RSpec turning failure message lines that should be white to red (bethesque, Mon Apr 14 21:41:55 2014 +1000)
-    * ddad510 - Added type and regexp matching output to ListOfPathsFormatter (bethesque, Mon Apr 14 13:43:08 2014 +1000)
-    * b007248 - Added class based matching output to plus_and_minus diff formatter (bethesque, Sat Apr 12 21:20:43 2014 +1000)
-    * f7910a1 - Swapped colored for term-ansicolor, as the colored mixins clash with other gems (bethesque, Sat Apr 12 20:37:57 2014 +1000)
-    * 93bfbdb - Fixing failing tests caused by JRuby inserting a blank line between the braces of an empty hash. Moved ActiveSupportSupport into shared
-    * da16f95 - Added after hook to allow customisation of Doc::Generator (bethesque, Sat Apr 12 18:46:04 2014 +1000)
-    * 85a6fe3 - Breaking up configuration files into separate files (bethesque, Sat Apr 12 11:21:56 2014 +1000)
-    * 7515360 - Merge branch 'doc' into release-1.1.0 (bethesque, Sat Apr 12 10:37:51 2014 +1000)
-    * 1200481 - Removed pact_gem key from pact fixtures (bethesque, Wed Apr 9 22:19:02 2014 +1000)
-    * 72d791b - Ordered rendering of keys in markdown (bethesque, Wed Apr 9 22:15:01 2014 +1000)
-    * 000b223 - Hiding headers and body from docs when they are empty (bethesque, Wed Apr 9 21:46:02 2014 +1000)
-    * 7f6ed91 - Changing request key ordering so it makes more sense when reading it (bethesque, Wed Apr 9 21:45:31 2014 +1000)
-    * 65054a8 - Added index rendering (bethesque, Wed Apr 9 19:38:55 2014 +1000)
-    * 9426565 - Refactoring generation code. Fixed rendering of interaction in markdown when ActiveSupport is loaded (bethesque, Wed Apr 9 18:20:53 2014 +100
-    * 73d0dbf - WIP refactoring generator code (bethesque, Wed Apr 9 17:03:14 2014 +1000)
-    * 7d1d07b - WIP tests and refactor doc generator (bethesque, Wed Apr 9 13:36:46 2014 +1000)
+  * 41fa409 - Cleaned up consumer after spec failure message (Beth, Sun Apr 27 22:18:03 2014 +1000)
+  * 8593fa9 - Updated zoo-app example (Beth, Sun Apr 27 20:54:51 2014 +1000)
+  * 716e3a8 - Added standalone consumer spec and spec for VerificationGet (Beth, Thu Apr 24 10:15:17 2014 +1000)
+  * c0f9bc6 - Copied RSpec::Expectations::Differ to Pact::Matchers::Differ - safer than trying to override behaviour (Beth, Thu Apr 24 09:17:58 2014 +
+  * 0eeb032 - Changing default diff_formatter to unix (Beth, Thu Apr 24 08:19:15 2014 +1000)
+  * ace5d4d - Update README.md (bethesque, Wed Apr 23 20:59:24 2014 +1000)
+  * 24efef6 - Update configuration.md (bethesque, Wed Apr 23 20:51:00 2014 +1000)
+  * 2d862b7 - Update best-practices.md (bethesque, Wed Apr 23 07:33:01 2014 +1000)
+  * ff8dfd2 - Updated doco (Beth, Tue Apr 22 21:45:17 2014 +1000)
+  * 88e4572 - Moving best practices into its own file (Beth, Tue Apr 22 21:28:36 2014 +1000)
+  * 5a3b92c - Moving provider state documentation out of main README into it's own file. (Beth, Tue Apr 22 19:59:48 2014 +1000)
+  * 1d568c4 - Updated configuration documentation (Beth, Tue Apr 22 13:06:47 2014 +1000)
+  * be1412e - Added configuration documentation (Beth, Tue Apr 22 13:04:33 2014 +1000)
+  * 9f9d178 - Added HAL raq (Beth, Tue Apr 22 12:51:42 2014 +1000)
+  * d9b6479 - Renamed ListOfPathsFormatter to ListDiffFormatter (Beth, Tue Apr 22 12:48:57 2014 +1000)
+  * 6b82402 - Renamed NestedJsonDiffFormatter to EmbeddedDiffFormatter (Beth, Tue Apr 22 12:45:50 2014 +1000)
+  * def8afd - Merge branch 'master' into release-1.1.0 (bethesque, Tue Apr 22 09:13:41 2014 +1000)
+  * 789a471 - Added generated docs to zoo-app (bethesque, Tue Apr 15 17:20:08 2014 +1000)
+  * f5da7ab - Improved header match failure message (bethesque, Tue Apr 15 09:39:12 2014 +1000)
+  * 1179489 - Stopped RSpec turning failure message lines that should be white to red (bethesque, Mon Apr 14 21:41:55 2014 +1000)
+  * ddad510 - Added type and regexp matching output to ListOfPathsFormatter (bethesque, Mon Apr 14 13:43:08 2014 +1000)
+  * b007248 - Added class based matching output to plus_and_minus diff formatter (bethesque, Sat Apr 12 21:20:43 2014 +1000)
+  * f7910a1 - Swapped colored for term-ansicolor, as the colored mixins clash with other gems (bethesque, Sat Apr 12 20:37:57 2014 +1000)
+  * 93bfbdb - Fixing failing tests caused by JRuby inserting a blank line between the braces of an empty hash. Moved ActiveSupportSupport into shared
+  * da16f95 - Added after hook to allow customisation of Doc::Generator (bethesque, Sat Apr 12 18:46:04 2014 +1000)
+  * 85a6fe3 - Breaking up configuration files into separate files (bethesque, Sat Apr 12 11:21:56 2014 +1000)
+  * 7515360 - Merge branch 'doc' into release-1.1.0 (bethesque, Sat Apr 12 10:37:51 2014 +1000)
+  * 1200481 - Removed pact_gem key from pact fixtures (bethesque, Wed Apr 9 22:19:02 2014 +1000)
+  * 72d791b - Ordered rendering of keys in markdown (bethesque, Wed Apr 9 22:15:01 2014 +1000)
+  * 000b223 - Hiding headers and body from docs when they are empty (bethesque, Wed Apr 9 21:46:02 2014 +1000)
+  * 7f6ed91 - Changing request key ordering so it makes more sense when reading it (bethesque, Wed Apr 9 21:45:31 2014 +1000)
+  * 65054a8 - Added index rendering (bethesque, Wed Apr 9 19:38:55 2014 +1000)
+  * 9426565 - Refactoring generation code. Fixed rendering of interaction in markdown when ActiveSupport is loaded (bethesque, Wed Apr 9 18:20:53 2014 +100
+  * 73d0dbf - WIP refactoring generator code (bethesque, Wed Apr 9 17:03:14 2014 +1000)
+  * 7d1d07b - WIP tests and refactor doc generator (bethesque, Wed Apr 9 13:36:46 2014 +1000)
 
 ### 1.0.39 (8 April 2014)
 

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    pact (1.1.0.rc3)
+    pact (1.1.0.rc4)
       awesome_print (~> 1.1)
       find_a_port (~> 1.0.1)
       json

data/example/zoo-app/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: ../../
   specs:
-    pact (1.1.0.rc2)
+    pact (1.1.0.rc3)
       awesome_print (~> 1.1)
       find_a_port (~> 1.0.1)
       json

data/lib/pact/configuration.rb

@@ -21,23 +21,28 @@ module Pact
     attr_accessor :log_dir
     attr_accessor :doc_dir
     attr_accessor :reports_dir
-    attr_accessor :logger
+    attr_writer :logger
     attr_accessor :tmp_dir
     attr_writer :pactfile_write_mode
 
     attr_accessor :error_stream
     attr_accessor :output_stream
 
-    def log_path
-      log_dir + "/pact.log"
+    def self.default_configuration
+      c = Configuration.new
+      c.pact_dir = File.expand_path('./spec/pacts')
+      c.tmp_dir = File.expand_path('./tmp/pacts')
+      c.log_dir = default_log_dir
+      c.pactfile_write_mode = :overwrite
+      c.reports_dir = File.expand_path('./reports/pacts')
+      c.doc_dir = File.expand_path("./doc/pacts")
+      c.output_stream = $stdout
+      c.error_stream = $stderr
+      c
     end
 
-    def pactfile_write_mode
-      if @pactfile_write_mode == :smart
-        is_rake_running? ? :overwrite : :update
-      else
-        @pactfile_write_mode
-      end
+    def logger
+      @logger ||= create_logger
     end
 
     def doc_generator= doc_generator
@@ -72,16 +77,39 @@ module Pact
       end
     end
 
+    def log_path
+      log_dir + "/pact.log"
+    end
+
+    def pactfile_write_mode
+      if @pactfile_write_mode == :smart
+        is_rake_running? ? :overwrite : :update
+      else
+        @pactfile_write_mode
+      end
+    end
+
     private
 
+    def self.default_log_dir
+      File.expand_path("./log")
+    end
+
     #Would love a better way of determining this! It sure won't work on windows.
     def is_rake_running?
       `ps -ef | grep rake | grep #{Process.ppid} | grep -v 'grep'`.size > 0
     end
+
+    def create_logger
+      FileUtils::mkdir_p log_dir
+      logger = Logger.new(log_path)
+      logger.level = Logger::DEBUG
+      logger
+    end
   end
 
   def self.configuration
-    @configuration ||= default_configuration
+    @configuration ||= Configuration.default_configuration
   end
 
   def self.configure
@@ -90,34 +118,7 @@ module Pact
   end
 
   def self.clear_configuration
-    @configuration = default_configuration
-  end
-
-  private
-
-  def self.default_configuration
-    c = Configuration.new
-    c.pact_dir = File.expand_path('./spec/pacts')
-    c.tmp_dir = File.expand_path('./tmp/pacts')
-    c.log_dir = default_log_dir
-    c.logger = default_logger c.log_path
-    c.pactfile_write_mode = :overwrite
-    c.reports_dir = File.expand_path('./reports/pacts')
-    c.doc_dir = File.expand_path("./doc")
-    c.output_stream = $stdout
-    c.error_stream = $stderr
-    c
-  end
-
-  def self.default_log_dir
-    File.expand_path("./log")
-  end
-
-  def self.default_logger path
-    FileUtils::mkdir_p File.dirname(path)
-    logger = Logger.new(path)
-    logger.level = Logger::DEBUG
-    logger
+    @configuration = nil
   end
 
 end

data/lib/pact/consumer/mock_service/interaction_post.rb

@@ -23,9 +23,9 @@ module Pact
         interaction = Interaction.from_hash(JSON.load(env['rack.input'].string))
         interaction_list.add interaction
         logger.info "Registered expected interaction #{interaction.request.method_and_path}"
-        logger.debug JSON.pretty_generate interaction
+        logger.debug JSON.pretty_generate JSON.parse(interaction.to_json)
         [200, {}, ['Added interaction']]
       end
     end
   end
-end
+end

data/lib/pact/consumer/mock_service/interaction_replay.rb

@@ -29,8 +29,8 @@ module Pact
 
       def find_response request_hash
         actual_request = Request::Actual.from_hash(request_hash)
-        logger.info "#{name} received request #{actual_request.method_and_path}"
-        logger.debug JSON.pretty_generate actual_request
+        logger.info "Received request #{actual_request.method_and_path}"
+        logger.debug pretty_generate actual_request
         candidate_interactions = interaction_list.find_candidate_interactions actual_request
         matching_interactions = find_matching_interactions actual_request, from: candidate_interactions
 
@@ -52,8 +52,8 @@ module Pact
       def handle_matched_interaction interaction
         interaction_list.register_matched interaction
         response = response_from(interaction.response)
-        logger.info "Found matching response on #{name}:"
-        logger.ap interaction.response
+        logger.info "Found matching response for #{interaction.request.method_and_path}"
+        logger.debug pretty_generate(interaction.response)
         response
       end
 
@@ -66,8 +66,10 @@ module Pact
       end
 
       def handle_more_than_one_matching_interaction actual_request, matching_interactions
-        logger.error "Multiple interactions found on #{name}:"
-        logger.ap matching_interactions.collect(&:as_json)
+        logger.error "Multiple interactions found for #{actual_request.method_and_path}:"
+        matching_interactions.each do | interaction |
+          logger.debug pretty_generate(interaction)
+        end
         multiple_interactions_found_response actual_request, matching_interactions
       end
 
@@ -119,6 +121,11 @@ module Pact
       def logger_info_ap msg
         logger.info msg
       end
+
+      #Doesn't seem to reliably pretty generate unless we go to JSON and back again :(
+      def pretty_generate object
+        JSON.pretty_generate(JSON.parse(object.to_json))
+      end
     end
   end
-end
+end

data/lib/pact/doc/generator.rb

@@ -18,7 +18,7 @@ module Pact
       end
 
       def call
-        ensure_target_dir_exists
+        ensure_target_dir_exists_and_is_clean
         write_index if consumer_contracts.any?
         write_doc_files
         perform_after_hook
@@ -68,7 +68,8 @@ module Pact
         after.call(pact_dir, target_dir, consumer_contracts)
       end
 
-      def ensure_target_dir_exists
+      def ensure_target_dir_exists_and_is_clean
+        FileUtils.rm_rf target_dir
         FileUtils.mkdir_p target_dir
       end
 

data/lib/pact/doc/interaction_view_model.rb

@@ -66,7 +66,7 @@ module Pact
       attr_reader :interaction, :consumer_contract
 
       def clean_request
-        ordered_clean_hash Reification.from_term(interaction.request).to_hash
+        ordered_clean_hash Reification.from_term(interaction.request)
       end
 
       def clean_response

data/lib/pact/reification.rb

@@ -17,6 +17,8 @@ module Pact
           mem << from_term(term)
           mem
         end
+      when term.is_a?(Pact::Request::Base)
+        from_term(term.to_hash)
       else
         term
       end

data/lib/pact/shared/request.rb

@@ -41,20 +41,11 @@ module Pact
       end
 
       def method_and_path
-        "#{method.upcase} #{path}"
+        "#{method.upcase} #{display_path}"
       end
 
       def full_path
-        fp = ''
-        if path.empty?
-          fp << "/"
-        else
-          fp << path
-        end
-        if query && !query.empty?
-          fp << ("?" + (query.kind_of?(Pact::Term) ? query.generate : query))
-        end
-        fp
+        display_path + display_query
       end
 
       protected
@@ -67,6 +58,14 @@ module Pact
         keep_keys = [:method, :path, :headers, :query]
         as_json.reject{ |key, value| !keep_keys.include? key }
       end
+
+      def display_path
+        path.empty? ? "/" : path
+      end
+
+      def display_query
+        (query.nil? || query.empty?) ? '' : "?#{Pact::Reification.from_term(query)}"
+      end
     end
   end
 end

data/lib/pact/version.rb

@@ -1,3 +1,3 @@
 module Pact
-  VERSION = "1.1.0.rc3"
+  VERSION = "1.1.0.rc4"
 end

data/spec/lib/pact/configuration_spec.rb

@@ -25,6 +25,37 @@ describe Pact do
   describe Pact::Configuration do
     let(:configuration) { Pact::Configuration.new }
 
+    describe "log_dir" do
+      it "sets the location of the logs" do
+        expect(Logger).to receive(:new).with("./tmp/logs/pact.log").and_call_original
+        Pact.configure do | config |
+          config.log_dir = "./tmp/logs"
+        end
+        Pact.configuration.logger
+      end
+    end
+
+    describe "logger" do
+      it "sets the location of the logs to log_dir by default" do
+        expect(Logger).to receive(:new).with(File.expand_path("./log/pact.log")).and_call_original
+        Pact.configuration.logger
+      end
+      it "defaults to DEBUG" do
+        expect(Pact.configuration.logger.level).to eq Logger::DEBUG
+      end
+    end
+
+    describe "doc_dir" do
+      it "defaults to ./doc/pacts" do
+        expect(Pact.configuration.doc_dir).to eq File.expand_path("./doc/pacts")
+      end
+
+      it "can be changed" do
+        Pact.configuration.doc_dir = "newdir"
+        expect(Pact.configuration.doc_dir).to eq "newdir"
+      end
+    end
+
     describe "doc_generator" do
 
       context "with a symbol" do

data/spec/lib/pact/doc/generator_spec.rb

@@ -34,6 +34,22 @@ module Pact
 
       subject { Generator.new(pact_dir, doc_dir, options) }
 
+      context "when there are existing files" do
+        let(:existing_doc_file_path) { File.join(doc_dir, doc_type, "leftover") }
+
+        before do
+          FileUtils.mkdir_p File.dirname(existing_doc_file_path)
+          FileUtils.touch existing_doc_file_path
+        end
+
+        it "clears the existing files" do
+          expect(File.exist?(existing_doc_file_path)).to be_true
+          subject.call
+          expect(File.exist?(existing_doc_file_path)).to be_false
+        end
+      end
+
+
       it "creates an index" do
         expect(index_renderer).to receive(:call).with("Some Consumer", {"Some Provider"=>"Some Consumer - Some Provider.md"})
         subject.call
@@ -63,7 +79,6 @@ module Pact
 
       end
 
-
     end
   end
 end

data/spec/lib/pact/doc/interaction_view_model_spec.rb

@@ -64,6 +64,16 @@ module Pact
             expect(subject.request).to_not include("headers")
           end
         end
+
+        context "when a Pact::Term is present" do
+          let(:consumer_contract) { Pact::ConsumerContract.from_uri './spec/support/interaction_view_model_with_terms.json'}
+          let(:interaction) { consumer_contract.interactions.first }
+
+          it "uses the generated value" do
+            expect(subject.request).to_not include("Term")
+            expect(subject.request).to include("sunny")
+          end
+        end
       end
 
       describe "response" do
@@ -104,6 +114,16 @@ module Pact
             expect(subject.response).to_not include("headers")
           end
         end
+
+        context "when a Pact::Term is present" do
+          let(:consumer_contract) { Pact::ConsumerContract.from_uri './spec/support/interaction_view_model_with_terms.json'}
+          let(:interaction) { consumer_contract.interactions.first }
+
+          it "uses the generated value" do
+            expect(subject.response).to_not include("Term")
+            expect(subject.response).to include("rainy")
+          end
+        end
       end
 
 

data/spec/lib/pact/reification_spec.rb

@@ -39,5 +39,17 @@ module Pact
 
     end
 
+    context "when reifying a Request" do
+
+      let(:request){ Pact::Request::Expected.from_hash(method: 'get', path: '/', body: Pact::Term.new(generate: "sunny", matcher: /sun/))}
+
+      subject { Reification.from_term(request) }
+
+      it "turns it into a hash before reifying it" do
+        expect(subject[:body]).to eq("sunny")
+      end
+
+    end
+
   end
 end

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

@@ -23,6 +23,57 @@ module Pact
         end
       end
 
+      describe "#full_path" do
+
+        subject { TestRequest.new("get", "/something", {}, {some: "things"} , query).full_path }
+
+        context "with a query that is a Pact::Term" do
+          let(:query) { Pact::Term.new(generate: "some=things", matcher: /some/) }
+          it "reifies and appends the query" do
+            expect(subject).to eq("/something?some=things")
+          end
+        end
+
+        context "with a query that is a string" do
+          let(:query) { "some=things" }
+          it "appends the query" do
+            expect(subject).to eq("/something?some=things")
+          end
+        end
+
+        context "with an empty query" do
+          let(:query) { "" }
+          it "does include a query" do
+            expect(subject).to eq("/something")
+          end
+        end
+
+        context "with a nil query" do
+          let(:query) { nil }
+          it "does not include a query" do
+            expect(subject).to eq("/something")
+          end
+        end
+      end
+
+      describe "#method_and_path" do
+        context "with an empty path" do
+          subject { TestRequest.new("get", "", {}, {} , "").method_and_path }
+
+          it "includes a slash" do
+            expect(subject).to eq("GET /")
+          end
+        end
+
+        context "with a path" do
+          subject { TestRequest.new("get", "/something", {}, {} , "").method_and_path }
+
+          it "includes the path" do
+            expect(subject).to eq("GET /something")
+          end
+        end
+      end
+
     end
   end
 end

data/spec/support/interaction_view_model_with_terms.json

@@ -0,0 +1,50 @@
+{
+    "provider": {
+        "name": "a provider"
+    },
+    "consumer": {
+        "name": "a consumer"
+    },
+    "interactions": [
+        {
+            "description": "an interaction with terms",
+            "request": {
+                "method": "post",
+                "path": "/path",
+                "query": "some=thing",
+                "headers": {
+                    "key": "a header"
+                },
+                "body": {
+                    "term": {
+                      "json_class": "Pact::Term",
+                      "data": {
+                        "generate": "sunny",
+                        "matcher": {
+                          "json_class": "Regexp",
+                          "o": 0,
+                          "s": "sun"
+                        }
+                      }
+                    }
+                }
+            },
+            "response": {
+                "status": 200,
+                "body": {
+                    "term": {
+                      "json_class": "Pact::Term",
+                      "data": {
+                        "generate": "rainy",
+                        "matcher": {
+                          "json_class": "Regexp",
+                          "o": 0,
+                          "s": "rain"
+                        }
+                      }
+                    }
+                }
+            }
+        }
+    ]
+}

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: pact
 version: !ruby/object:Gem::Version
-  version: 1.1.0.rc3
+  version: 1.1.0.rc4
   prerelease: 6
 platform: ruby
 authors:
@@ -13,7 +13,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-04-28 00:00:00.000000000 Z
+date: 2014-05-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: randexp
@@ -322,8 +322,8 @@ files:
 - example/zoo-app/Gemfile
 - example/zoo-app/Gemfile.lock
 - example/zoo-app/Rakefile
-- example/zoo-app/doc/markdown/README.md
-- example/zoo-app/doc/markdown/Zoo App - Animal Service.md
+- example/zoo-app/doc/pacts/markdown/README.md
+- example/zoo-app/doc/pacts/markdown/Zoo App - Animal Service.md
 - example/zoo-app/lib/zoo_app/animal_service_client.rb
 - example/zoo-app/lib/zoo_app/models/alligator.rb
 - example/zoo-app/spec/pacts/zoo_app-animal_service.json
@@ -518,6 +518,7 @@ files:
 - spec/support/generated_index.md
 - spec/support/generated_markdown.md
 - spec/support/interaction_view_model.json
+- spec/support/interaction_view_model_with_terms.json
 - spec/support/markdown_pact.json
 - spec/support/missing_provider_states_output.txt
 - spec/support/pact_helper.rb
@@ -544,9 +545,6 @@ required_ruby_version: !ruby/object:Gem::Requirement
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: -2322515558717640410
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -638,6 +636,7 @@ test_files:
 - spec/support/generated_index.md
 - spec/support/generated_markdown.md
 - spec/support/interaction_view_model.json
+- spec/support/interaction_view_model_with_terms.json
 - spec/support/markdown_pact.json
 - spec/support/missing_provider_states_output.txt
 - spec/support/pact_helper.rb