pact 0.1.37 → 1.0.0

data/Gemfile.lock

@@ -1,11 +1,10 @@
 PATH
   remote: .
   specs:
-    pact (0.1.37)
+    pact (2.0.0)
       awesome_print (~> 1.1.0)
-      capybara (~> 2.1.0)
       find_a_port (~> 1.0.1)
-      hashie (~> 2.0.5)
+      hashie (~> 2.0)
       json
       rack-test (~> 0.6.2)
       randexp (~> 0.1.7)
@@ -19,14 +18,8 @@ GEM
   specs:
     addressable (2.3.5)
     awesome_print (1.1.0)
-    capybara (2.1.0)
-      mime-types (>= 1.16)
-      nokogiri (>= 1.3.3)
-      rack (>= 1.0.0)
-      rack-test (>= 0.5.4)
-      xpath (~> 2.0)
     coderay (1.0.9)
-    crack (0.4.0)
+    crack (0.4.1)
       safe_yaml (~> 0.9.0)
     daemons (1.1.9)
     diff-lcs (1.2.4)
@@ -36,12 +29,8 @@ GEM
       multipart-post
     hashie (2.0.5)
     json (1.8.0)
-    method_source (0.8.1)
-    mime-types (1.24)
-    mini_portile (0.5.1)
+    method_source (0.8.2)
     multipart-post (1.2.0)
-    nokogiri (1.6.0)
-      mini_portile (~> 0.5.0)
     pry (0.9.12.2)
       coderay (~> 1.0.5)
       method_source (~> 0.8)
@@ -59,8 +48,8 @@ GEM
     rspec-expectations (2.14.2)
       diff-lcs (>= 1.1.3, < 2.0)
     rspec-mocks (2.14.3)
-    safe_yaml (0.9.4)
-    slop (3.4.5)
+    safe_yaml (0.9.5)
+    slop (3.4.6)
     thin (1.5.1)
       daemons (>= 1.0.9)
       eventmachine (>= 0.12.6)
@@ -69,8 +58,6 @@ GEM
     webmock (1.9.3)
       addressable (>= 2.2.7)
       crack (>= 0.3.2)
-    xpath (2.0.0)
-      nokogiri (~> 1.3)
 
 PLATFORMS
   ruby

data/example/zoo-app/Gemfile

@@ -1,11 +1,10 @@
 source 'https://rubygems.org'
-source 'http://rea-rubygems/'
 
 gem 'bundler', '~> 1.3.0'
 
 group :development, :test do
   gem 'rspec'
-  gem 'pact'
+  gem 'pact', path: '../../'
   gem 'pry'
 end
 

data/example/zoo-app/Gemfile.lock

@@ -1,6 +1,20 @@
+PATH
+  remote: ../../
+  specs:
+    pact (0.1.37)
+      awesome_print (~> 1.1.0)
+      capybara (~> 2.1.0)
+      find_a_port (~> 1.0.1)
+      hashie (~> 2.0.5)
+      json
+      rack-test (~> 0.6.2)
+      randexp (~> 0.1.7)
+      rspec (~> 2.12)
+      thin
+      thor
+
 GEM
   remote: https://rubygems.org/
-  remote: http://rea-rubygems/
   specs:
     awesome_print (1.1.0)
     capybara (2.1.0)
@@ -26,17 +40,6 @@ GEM
     multi_xml (0.5.5)
     nokogiri (1.6.0)
       mini_portile (~> 0.5.0)
-    pact (0.1.32)
-      awesome_print (~> 1.1.0)
-      capybara (~> 2.1.0)
-      find_a_port (~> 1.0.1)
-      hashie (~> 2.0.5)
-      json
-      rack-test (~> 0.6.2)
-      randexp (~> 0.1.7)
-      rspec (~> 2.12)
-      thin
-      thor
     pry (0.9.12.2)
       coderay (~> 1.0.5)
       method_source (~> 0.8)
@@ -70,7 +73,7 @@ DEPENDENCIES
   bundler (~> 1.3.0)
   httparty
   json (~> 1.6.8)
-  pact
+  pact!
   pry
   rack (~> 1.5.2)
   rake

data/example/zoo-app/spec/pacts/zoo_app-animal_service.json

@@ -1,5 +1,5 @@
 {
-  "producer": {
+  "provider": {
     "name": "Animal Service"
   },
   "consumer": {
@@ -25,7 +25,7 @@
           ]
         }
       },
-      "producer_state": "there are alligators"
+      "provider_state": "there are alligators"
     },
     {
       "description": "a request for alligators",
@@ -47,7 +47,7 @@
           }
         ]
       },
-      "producer_state": "there are alligators"
+      "provider_state": "there are alligators"
     },
     {
       "description": "a request for alligator Mary",
@@ -69,7 +69,7 @@
           }
         ]
       },
-      "producer_state": "there is an alligator named Mary"
+      "provider_state": "there is an alligator named Mary"
     },
     {
       "description": "a request for alligators",
@@ -89,12 +89,12 @@
           "error": "Argh!!!"
         }
       },
-      "producer_state": "an error has occurred"
+      "provider_state": "an error has occurred"
     }
   ],
   "metadata": {
     "pact_gem": {
-      "version": "0.1.32"
+      "version": "0.1.37"
     }
   }
 }

data/lib/pact/consumer/app_manager.rb

@@ -1,10 +1,10 @@
 require 'thwait'
-require 'capybara'
 
 require 'net/http'
 require 'uri'
 require 'find_a_port'
 require 'pact/logging'
+require 'pact/consumer/server'
 
 module Pact
   module Consumer
@@ -110,9 +110,11 @@ module Pact
       end
 
       def kill
-        logger.info "Killing #{self}"
-        Process.kill(9, pid)
-        Process.wait(pid)
+        # TODO: need to work out how to kill
+        # logger.info "Killing #{self}"
+        # Process.kill(9, pid)
+        # Process.wait(pid)
+        # self.pid = nil
         self.pid = nil
       end
 
@@ -133,31 +135,9 @@ module Pact
       end
 
       def spawn
-        # following stolen from https://github.com/jwilger/kookaburra
         logger.info "Starting app #{self}..."
-        self.pid = fork do
-          begin
-            Capybara.server_port = port
-            Capybara::Server.new(app).boot
-
-            # This ensures that this forked process keeps running, because the
-            # actual server is started in a thread by Capybara.
-            ThreadsWait.all_waits(Thread.list)
-          rescue Exception => e
-            logger.error "Error starting up #{self}"
-            $stderr.puts "Error starting up #{self}"
-            raise e
-          end
-        end
-
-
-        wait_until do
-          begin
-            Net::HTTP.get_response(URI.parse("http://localhost:#{port}/index.html"))
-          rescue Errno::ECONNREFUSED
-            false
-          end
-        end
+        Pact::Server.new(app, port).boot
+        self.pid = 'unknown'
         logger.info "Started with pid #{pid}"
       end
 

data/lib/pact/consumer/consumer_contract_builder.rb

@@ -2,6 +2,7 @@ require 'uri'
 require 'json/add/regexp'
 require 'pact/logging'
 require 'pact/consumer/mock_service_client'
+require_relative 'interactions_filter'
 
 module Pact
   module Consumer
@@ -11,52 +12,35 @@ module Pact
       include Pact::Logging
 
       attr_reader :consumer_contract
-      attr_reader :mock_service_client
 
       def initialize(attributes)
-        @interactions = {}
-        @producer_state = nil
+        @interaction_builder = nil
+        @mock_service_client = MockServiceClient.new(attributes[:provider_name], attributes[:port])
         @consumer_contract = Pact::ConsumerContract.new(
           :consumer => ServiceConsumer.new(name: attributes[:consumer_name]),
-          :producer => ServiceProducer.new(name: attributes[:producer_name])
+          :provider => ServiceProvider.new(name: attributes[:provider_name])
           )
-        @mock_service_client = MockServiceClient.new(attributes[:producer_name], attributes[:port])
-        if attributes[:pactfile_write_mode] == :update && File.exist?(consumer_contract.pactfile_path)
-          load_existing_interactions
-        end
-      end
-
-      def load_existing_interactions
-        json = File.read(consumer_contract.pactfile_path)
-        if json.size > 0
-          existing_consumer_contract = Pact::ConsumerContract.from_json json
-          existing_consumer_contract.interactions.each do | interaction |
-            @interactions["#{interaction.description} given #{interaction.producer_state}"] = interaction
-          end
-          consumer_contract.interactions = @interactions.values
-        end
+        @consumer_contract.interactions = interactions_for_new_consumer_contract(attributes[:pactfile_write_mode])
+        @interactions_filter = filter(@consumer_contract.interactions, attributes[:pactfile_write_mode])
       end
 
-      def given(producer_state)
-        @producer_state = producer_state
-        self
+      def given(provider_state)
+        interaction_builder.given(provider_state)
       end
 
       def upon_receiving(description)
-        interaction_builder = InteractionBuilder.new(description, @producer_state)
-        producer = self
-        interaction_builder.on_interaction_fully_defined do | interaction |
-          producer.handle_interaction_fully_defined(interaction)
-        end
-        @interactions["#{description} given #{@producer_state}"] ||= interaction_builder.interaction
-        consumer_contract.interactions = @interactions.values
-        interaction_builder
+        interaction_builder.upon_receiving(description)
       end
 
-      def handle_interaction_fully_defined interaction
-        mock_service_client.add_expected_interaction interaction
-        @producer_state = nil
-        consumer_contract.update_pactfile
+      def interaction_builder
+        @interaction_builder ||=
+        begin
+          interaction_builder = InteractionBuilder.new
+          interaction_builder.on_interaction_fully_defined do | interaction |
+            self.handle_interaction_fully_defined(interaction)
+          end
+          interaction_builder
+        end
       end
 
       def verify example_description
@@ -69,10 +53,55 @@ module Pact
         mock_service_client.wait_for_interactions wait_max_seconds, poll_interval
       end
 
+      def handle_interaction_fully_defined interaction
+        interactions_filter << interaction
+        mock_service_client.add_expected_interaction interaction #TODO: What will happen if duplicate added?
+        consumer_contract.update_pactfile
+        self.interaction_builder = nil
+      end
+
       private
 
-      def filenamify name
-        name.downcase.gsub(/\s/, '_')
+      attr_reader :mock_service_client
+      attr_reader :interactions_filter
+      attr_writer :interaction_builder
+
+      def interactions_for_new_consumer_contract pactfile_write_mode
+        pactfile_write_mode == :update ? existing_interactions : []
+      end
+
+      def filter interactions, pactfile_write_mode
+        if pactfile_write_mode == :update
+          UpdatableInteractionsFilter.new(interactions)
+        else
+          DistinctInteractionsFilter.new(interactions)
+        end
+      end
+
+      def log_and_puts msg
+        $stderr.puts msg
+        logger.warn msg
+      end
+
+      def existing_interactions
+        interactions = []
+        if pactfile_exists?
+          begin
+            interactions = existing_consumer_contract.interactions
+          rescue StandardError => e
+            log_and_puts "Could not load existing consumer contract from #{consumer_contract.pactfile_path} due to #{e}"
+            log_and_puts "Creating a new file."
+          end
+        end
+        interactions
+      end
+
+      def pactfile_exists?
+        File.exist?(consumer_contract.pactfile_path)
+      end
+
+      def existing_consumer_contract
+        Pact::ConsumerContract.from_json(File.read(consumer_contract.pactfile_path))
       end
 
     end

data/lib/pact/consumer/dsl.rb

@@ -3,6 +3,15 @@ require_relative 'consumer_contract_builders'
 module Pact::Consumer
    module DSL
 
+      module Configuration
+        def add_provider_verification &block
+          provider_verifications << block
+        end
+        def provider_verifications
+          @provider_verifications ||= []
+        end
+      end
+
       def service_consumer name, &block
         ServiceConsumerDSL.new(name, &block).create_service_consumer
       end
@@ -11,7 +20,7 @@ module Pact::Consumer
 
         def initialize name, &block
           @name = name
-          consumer = Pact::Consumer::ServiceConsumer.new name: @name
+          consumer = Pact::ServiceConsumer.new name: @name
           @app = nil
           @port = nil
           instance_eval(&block)
@@ -31,7 +40,7 @@ module Pact::Consumer
         end
 
         def has_pact_with service_provider_name, &block
-          Producer.new(service_provider_name, @name, &block).create_consumer_contract_builder
+          Provider.new(service_provider_name, @name, &block).create_consumer_contract_builder
         end
 
         def create_service_consumer
@@ -48,13 +57,13 @@ module Pact::Consumer
 
 
       #OLD ####
-      def with_producer name, &block
-         Producer.new(name, &block).create_consumer_contract_builder
+      def with_provider name, &block
+         Provider.new(name, &block).create_consumer_contract_builder
       end
 
-      alias_method :with_service_provider, :with_producer
+      alias_method :with_service_provider, :with_provider
 
-      class Producer
+      class Provider
          def initialize name, consumer_name = Pact.configuration.consumer.name, &block
             @name = name
             @service = nil
@@ -80,7 +89,7 @@ module Pact::Consumer
         def consumer_contract_builder_from_attributes
           consumer_contract_builder_fields = {
             :consumer_name => @consumer_name,
-            :producer_name => @name,
+            :provider_name => @name,
             :pactfile_write_mode => Pact.configuration.pactfile_write_mode
             }
           @service.configure_consumer_contract_builder consumer_contract_builder_fields
@@ -111,7 +120,7 @@ module Pact::Consumer
          def configure_consumer_contract_builder consumer_contract_builder_fields
             validate
             unless @standalone
-              AppManager.instance.register_mock_service_for consumer_contract_builder_fields[:producer_name], "http://localhost:#{@port}"
+              AppManager.instance.register_mock_service_for consumer_contract_builder_fields[:provider_name], "http://localhost:#{@port}"
             end
             consumer_contract_builder = Pact::Consumer::ConsumerContractBuilder.new consumer_contract_builder_fields.merge({port: @port})
             create_mock_services_module_method consumer_contract_builder
@@ -121,7 +130,7 @@ module Pact::Consumer
 
 
         def setup_verification consumer_contract_builder
-          Pact.configuration.add_producer_verification do | example_description |
+          Pact.configuration.add_provider_verification do | example_description |
             consumer_contract_builder.verify example_description
           end
         end
@@ -144,4 +153,5 @@ module Pact::Consumer
    end
 end
 
-Pact.send(:extend, Pact::Consumer::DSL)
+Pact.send(:extend, Pact::Consumer::DSL)
+Pact::Configuration.send(:include, Pact::Consumer::DSL::Configuration)

data/lib/pact/consumer/interaction_builder.rb

@@ -0,0 +1,42 @@
+require 'net/http'
+require 'pact/reification'
+require 'pact/request'
+require 'pact/consumer_contract/interaction'
+
+module Pact
+  module Consumer
+    class InteractionBuilder
+
+      attr_reader :interaction
+
+      def initialize
+        @interaction = Interaction.new
+      end
+
+      def upon_receiving description
+        @interaction.description = description
+        self
+      end
+
+      def given provider_state
+        @interaction.provider_state = provider_state.nil? ? nil : provider_state.to_s
+        self
+      end
+
+      def with(request_details)
+        interaction.request = Request::Expected.from_hash(request_details)
+        self
+      end
+
+      def will_respond_with(response)
+        interaction.response = response
+        @callback.call interaction
+        self
+      end
+
+      def on_interaction_fully_defined &block
+        @callback = block
+      end
+    end
+  end
+end

data/lib/pact/consumer/interactions_filter.rb

@@ -0,0 +1,41 @@
+module Pact
+   module Consumer
+
+      #TODO: think of a better word than filter
+      class InteractionsFilter
+         def initialize interactions = []
+            @interactions = interactions
+         end
+
+         def index_of interaction
+            @interactions.find_index{ |i| i.matches_criteria?(description: interaction.description, provider_state: interaction.provider_state)}
+         end
+      end
+
+      class UpdatableInteractionsFilter < InteractionsFilter
+
+         def << interaction
+            if (ndx = index_of(interaction))
+               @interactions[ndx] = interaction
+            else
+               @interactions << interaction
+            end
+         end
+
+      end
+
+      class DistinctInteractionsFilter < InteractionsFilter
+
+         def << interaction
+            if (ndx = index_of(interaction))
+               if @interactions[ndx] != interaction
+                  raise "Interaction with same description (#{interaction.description}) and provider state (#{interaction.provider_state}) already exists"
+               end
+            else
+               @interactions << interaction
+            end
+         end
+      end
+
+   end
+end