shokkenki-consumer 1.0.1 → 1.1.0

data/lib/shokkenki/consumer/dsl/order.rb

@@ -1,6 +1,6 @@
-require 'shokkenki/term/core_ext'
 require_relative '../model/interaction'
 require_relative '../model/fixture'
+require_relative '../model/request'
 require_relative 'http_methods'
 require_relative 'term_dsl'
 
@@ -22,13 +22,7 @@ module Shokkenki
         end
 
         def receive details
-          raise "No request method has been specified." unless details.has_key?(:method)
-          raise "The request method must be a symbol." unless @request_details = details[:method].is_a?(Symbol)
-
-          raise "No request path has been specified." unless details.has_key?(:path)
-          raise "The request path must be a string." unless details[:path].is_a?(String)
-
-          @request_details = details
+          @request_details = Shokkenki::Consumer::Model::Request.new details
           self
         end
 
@@ -53,8 +47,8 @@ module Shokkenki
         def to_interaction
           Shokkenki::Consumer::Model::Interaction.new(
             :label => @interaction_label,
-            :request => @request_details.to_shokkenki_term,
-            :response => @response_details.to_shokkenki_term,
+            :request => @request_details,
+            :response => @response_details,
             :fixtures => @fixtures
           )
         end

data/lib/shokkenki/consumer/model/interaction.rb

@@ -1,3 +1,5 @@
+require 'shokkenki/term/core_ext'
+
 module Shokkenki
   module Consumer
     module Model
@@ -6,9 +8,9 @@ module Shokkenki
         attr_reader :label, :request, :response, :time, :fixtures
 
         def initialize attributes
-          @label = attributes[:label]
-          @request = attributes[:request]
-          @response = attributes[:response]
+          @request = attributes[:request].to_shokkenki_term
+          @label = attributes[:label] || attributes[:request].label
+          @response = attributes[:response].to_shokkenki_term
           @fixtures = attributes[:fixtures]
           @time = Time.now
         end
@@ -17,9 +19,9 @@ module Shokkenki
           hash = {
             :request => @request.to_hash,
             :response => @response.to_hash,
-            :time => @time.utc.iso8601
+            :time => @time.utc.iso8601,
+            :label => @label
           }
-          hash.merge!(:label => @label) if @label
           hash.merge!(:fixtures => @fixtures.map{ |f| f.to_hash }) if @fixtures
           hash
         end

data/lib/shokkenki/consumer/model/patronage.rb

@@ -10,11 +10,11 @@ module Shokkenki
         def initialize attributes
           @provider = attributes[:provider]
           @consumer = attributes[:consumer]
-          @interactions = []
+          @interactions = {}
         end
 
         def add_interaction interaction
-          @interactions << interaction
+          @interactions[interaction.label] = interaction
           @provider.stub_interaction interaction
         end
 
@@ -22,7 +22,7 @@ module Shokkenki
           Ticket.new(
             :consumer => @consumer,
             :provider => @provider,
-            :interactions => @interactions
+            :interactions => @interactions.values
           )
         end
       end

data/lib/shokkenki/consumer/model/request.rb

@@ -0,0 +1,26 @@
+module Shokkenki
+  module Consumer
+    module Model
+      class Request < Hash
+
+        def initialize attributes
+          raise "No request method has been specified." unless attributes.has_key?(:method)
+          raise "The request method must be a symbol." unless attributes[:method].is_a?(Symbol)
+
+          raise "No request path has been specified." unless attributes.has_key?(:path)
+          raise "The request path must be a string." unless attributes[:path].is_a?(String)
+          merge! attributes
+        end
+
+        def label
+          query = " ? #{self[:query].to_json}" if self[:query]
+          headers = " headers: #{self[:headers].to_json}" if self[:headers]
+          "#{self[:method]} #{self[:path]}#{query}#{headers}"
+        end
+
+      end
+    end
+  end
+end
+
+

data/lib/shokkenki/consumer/rspec/rspec_configuration.rb

@@ -4,6 +4,11 @@ require 'rspec'
 
 RSpec.configure do |config|
   config.treat_symbols_as_metadata_keys_with_true_values = true
+
+  if config.respond_to?(:backtrace_inclusion_patterns)
+    config.backtrace_inclusion_patterns << /shokkenki\-consumer/
+  end
+
   config.include(
     Shokkenki::Consumer::RSpec::ExampleGroupBinding,
     :shokkenki_consumer => lambda{ |x| true }

data/lib/shokkenki/consumer/version.rb

@@ -1,7 +1,7 @@
 module Shokkenki
   module Consumer
     module Version
-      STRING = '1.0.1'
+      STRING = '1.1.0'
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: shokkenki-consumer
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 1.1.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-02-25 00:00:00.000000000 Z
+date: 2014-03-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json
@@ -98,7 +98,7 @@ dependencies:
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 1.0.0
+        version: 1.1.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -106,7 +106,7 @@ dependencies:
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 1.0.0
+        version: 1.1.0
 - !ruby/object:Gem::Dependency
   name: rack
   requirement: !ruby/object:Gem::Requirement
@@ -220,6 +220,7 @@ files:
 - lib/shokkenki/consumer/model/interaction.rb
 - lib/shokkenki/consumer/model/patronage.rb
 - lib/shokkenki/consumer/model/provider.rb
+- lib/shokkenki/consumer/model/request.rb
 - lib/shokkenki/consumer/model/role.rb
 - lib/shokkenki/consumer/model/simplification.rb
 - lib/shokkenki/consumer/model/ticket.rb
@@ -265,11 +266,11 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 1445690267303160436
+      hash: 268067568248106092
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.23
 signing_key: 
 specification_version: 3
-summary: shokkenki-consumer-1.0.1
+summary: shokkenki-consumer-1.1.0
 test_files: []