rspec-contracts 0.0.2 → 0.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 87b15ff10f754beb89ee5b1d4243b8aea51ca5c3
-  data.tar.gz: b28190904c6dc5fd3c909ee73cdbb7c9dd4df3ac
+  metadata.gz: 2498fd054ba675910e806c20dd6ad10affc4a205
+  data.tar.gz: 647201f2dfc73ba118bd9f3f19fba37805e16f89
 SHA512:
-  metadata.gz: 27e3827e0404171952cdc793c8032caf74182e1621b2ad932c1d33cbf116ab63fd4ea8fcbbb4bde6bc8493f08c4ce4b9912341a02780b6d8e1eb2cb79cefe738
-  data.tar.gz: f3f091d6f3f01819b6122727b678992068ef2304f59e7036777ef4ce49200d43c9352ce106a9b95e12d5c8b0e71da657037da8ba921aece444f346db428246ec
+  metadata.gz: 58214e17ed15aee2ad8b9c2df684ae8c9be5bd37762198515b0f42dc47d82c791263732c60af30d1d89c20af5ea026d8634598c37389e5d7d6d61ac151eb59dc
+  data.tar.gz: dcaf8eb9cfe973ddc128040869409cb6c67359c09a93fa898cdb190bf309cd77a790702c2497fec9f6e9952be5251074f14e2511c6ef1c8ce52f0ce468ac925f

data/History.md

@@ -1,3 +1,9 @@
+### Version 0.0.3
+2014-3-30
+
+* Require one or more implementors (not all) to satisfy each message response
+* Support for yielded values
+
 ### Version 0.0.2
 2014-3-15
 

data/lib/rspec/contracts/interface_fulfillment.rb

@@ -13,7 +13,7 @@ module RSpec
       end
 
       def unfulfilled_messages
-        interface.unique_messages.reject{ |r| fulfilled_by_all? r }
+        interface.unique_messages.reject{ |r| fulfilled? r }
       end
 
       def messages_count
@@ -22,12 +22,20 @@ module RSpec
 
       private
 
+      def fulfilled?(message)
+        fulfilled_by_any?(message) && fulfilled_by_all?(message.without_response)
+      end
+
       def fulfilled_by_all?(message)
         @implementors.all?{ |i| fulfilled_by? message, i }
       end
 
+      def fulfilled_by_any?(message)
+        @implementors.any?{ |i| fulfilled_by? message, i }
+      end
+
       def fulfilled_by?(message, implementor)
-        implementor.messages.any? { |m| message.fully_described_by? m }
+        implementor.messages.any? { |m| message.described_by? m }
       end
     end
   end

data/lib/rspec/contracts/message.rb

@@ -1,28 +1,42 @@
+require "rspec/contracts/unspecified_response"
+
 module RSpec
   module Contracts
     class Message
-      attr_reader :method_name
-      attr_accessor :specifications
+      attr_reader :name
+      attr_accessor :arguments, :response
+
+      def initialize(name, arguments = nil)
+        @name = name
+        @arguments = arguments
+        @response = UnspecifiedResponse.new
+      end
+
+      def described_by?(message)
+        [:name, :arguments, :response].all? { |n| send "#{n}_described_by?", message }
+      end
+
+      def name_described_by?(message)
+        message.name == name
+      end
+
+      def arguments_described_by?(message)
+        arguments.nil? || arguments == message.arguments
+      end
 
-      def initialize(method_name, specifications = {})
-        @method_name = method_name
-        @specifications = specifications
+      def response_described_by?(message)
+        response.described_by? message.response
       end
 
-      def fully_described_by?(message)
-        return false if message.method_name != method_name
-        @specifications.each do |name, specification|
-          unless specification.fully_described_by? message.specifications[name]
-            return false
-          end
-        end
-        true
+      def without_response
+        self.class.new name, arguments
       end
 
       def to_hash
         {
-          :method_name => method_name,
-          :specifications => specifications.values.map(&:to_hash),
+          :name => name,
+          :arguments => arguments,
+          :response => response.to_hash,
         }
       end
     end

data/lib/rspec/contracts/message_group.rb

@@ -0,0 +1,27 @@
+require "rspec/contracts/message"
+
+module RSpec
+  module Contracts
+    class MessageGroup
+      def initialize(receiver, method_name, arguments = nil)
+        @receiver = receiver
+        add_message Message.new(method_name, arguments)
+      end
+
+      def add_message(message)
+        @message = message
+        @receiver.add_message @message
+      end
+
+      def set_arguments(arguments)
+        @message.arguments = arguments
+      end
+
+      def add_response(response)
+        add_message @message.without_response if @multiple_responses
+        @message.response = response
+        @multiple_responses = true
+      end
+    end
+  end
+end

data/lib/rspec/contracts/message_view.rb

@@ -7,9 +7,10 @@ module RSpec
       end
 
       def render
-        arg_string = @message.specifications[:arguments] ? "()" : ""
-        return_string = @message.specifications[:return_value] ? "and return #{@message.specifications[:return_value].value.inspect}" : ""
-        "Interface '#{@interface_name}' must respond to '#{@message.method_name}#{arg_string}' #{return_string}"
+        arg_string = @message.arguments ? "()" : ""
+        return_string = @message.response.respond_to?(:returned_value) ? "and return #{@message.response.returned_value.inspect}" : ""
+        yield_string = @message.response.respond_to?(:yielded_value) ? "and return #{@message.response.yielded_value.inspect}" : ""
+        "Interface '#{@interface_name}' must respond to '#{@message.name}#{arg_string}' #{return_string} #{yield_string}"
       end
     end
   end

data/lib/rspec/contracts/method_proxy.rb

@@ -1,5 +1,6 @@
-require "rspec/contracts/message"
-require "rspec/contracts/message_arguments"
+require "rspec/contracts/message_group"
+require "rspec/contracts/returned_response"
+require "rspec/contracts/yielded_response"
 
 module RSpec
   module Contracts
@@ -8,10 +9,8 @@ module RSpec
         new(*args)
       end
 
-      def add_message(options)
-        message = Message.new(@method_name, options)
-        @implementor.add_message message
-        message
+      def add_message(arguments)
+        MessageGroup.new @implementor, @method_name, arguments
       end
 
       private
@@ -27,9 +26,11 @@ module RSpec
         original_method = @proxied_class.instance_method @method_name
         method_proxy = self
         @proxied_class.send :define_method, @method_name do |*args|
-          message = method_proxy.add_message :arguments => MessageArguments.new(args)
-          return_value = original_method.bind(self).call(*args)
-          message.specifications[:return_value] = MessageReturn.new(return_value)
+          message_group = method_proxy.add_message args
+          return_value = original_method.bind(self).call(*args) do |*values|
+            message_group.add_response YieldedResponse.new(*values)
+          end
+          message_group.add_response ReturnedResponse.new(return_value)
           return_value
         end
       end

data/lib/rspec/contracts/mock_proxy.rb

@@ -1,6 +1,7 @@
 require "rspec/mocks"
-require "rspec/contracts/message"
-require "rspec/contracts/message_return"
+require "rspec/contracts/message_group"
+require "rspec/contracts/returned_response"
+require "rspec/contracts/yielded_response"
 
 module RSpec
   module Contracts
@@ -17,13 +18,20 @@ module RSpec
       attr_reader :message
 
       def initialize(interface, object, method_name, proxy)
-        @message = Message.new method_name
-        interface.add_message @message
+        @message_group = MessageGroup.new(interface, method_name)
         super(object, method_name, proxy)
       end
 
+      def set_arguments(arguments)
+        @message_group.set_arguments arguments
+      end
+
+      def add_response(response)
+        @message_group.add_response response
+      end
+
       def add_simple_stub(method_name, return_value)
-        @message.specifications[:return_value] = MessageReturn.new(return_value)
+        add_response ReturnedResponse.new(return_value)
         super
       end
 
@@ -33,17 +41,18 @@ module RSpec
     end
 
     class ContractMessageExpectation < Mocks::MessageExpectation
-      def contract_message
-        @method_double.message
-      end
-
       def with(*args)
-        contract_message.specifications[:arguments] = MessageArguments.new(args)
+        @method_double.set_arguments args
         super
       end
 
       def and_return(*args)
-        contract_message.specifications[:return_value] = MessageReturn.new(args.first)
+        args.each { |value| @method_double.add_response ReturnedResponse.new(value) }
+        super
+      end
+
+      def and_yield(*args)
+        @method_double.add_response YieldedResponse.new(*args)
         super
       end
     end

data/lib/rspec/contracts/returned_response.rb

@@ -0,0 +1,19 @@
+module RSpec
+  module Contracts
+    class ReturnedResponse
+      attr_reader :returned_value
+
+      def initialize(value)
+        @returned_value = value
+      end
+
+      def described_by?(response)
+        response.respond_to?(:returned_value) && (returned_value == response.returned_value)
+      end
+
+      def to_hash
+        {:returned_value => returned_value}
+      end
+    end
+  end
+end

data/lib/rspec/contracts/unspecified_response.rb

@@ -0,0 +1,13 @@
+module RSpec
+  module Contracts
+    class UnspecifiedResponse
+      def described_by?(response)
+        true
+      end
+
+      def to_hash
+        {}
+      end
+    end
+  end
+end

data/lib/rspec/contracts/version.rb

@@ -1,5 +1,5 @@
 module RSpec
   module Contracts
-    VERSION = "0.0.2"
+    VERSION = "0.0.3"
   end
 end

data/lib/rspec/contracts/yielded_response.rb

@@ -0,0 +1,19 @@
+module RSpec
+  module Contracts
+    class YieldedResponse
+      attr_reader :yielded_values
+
+      def initialize(*values)
+        @yielded_values = values
+      end
+
+      def described_by?(response)
+        response.respond_to?(:yielded_values) && (yielded_values == response.yielded_values)
+      end
+
+      def to_hash
+        {:yielded_values => yielded_values}
+      end
+    end
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rspec-contracts
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
 platform: ruby
 authors:
 - Brian Auton
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-03-15 00:00:00.000000000 Z
+date: 2014-03-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
@@ -73,13 +73,15 @@ files:
 - lib/rspec/contracts/interface_group.rb
 - lib/rspec/contracts/interface_proxy.rb
 - lib/rspec/contracts/message.rb
-- lib/rspec/contracts/message_arguments.rb
-- lib/rspec/contracts/message_return.rb
+- lib/rspec/contracts/message_group.rb
 - lib/rspec/contracts/message_view.rb
 - lib/rspec/contracts/method_proxy.rb
 - lib/rspec/contracts/mock_proxy.rb
 - lib/rspec/contracts/mocks_syntax.rb
+- lib/rspec/contracts/returned_response.rb
+- lib/rspec/contracts/unspecified_response.rb
 - lib/rspec/contracts/version.rb
+- lib/rspec/contracts/yielded_response.rb
 homepage: http://github.com/brianauton/rspec-contracts
 licenses:
 - MIT

data/lib/rspec/contracts/message_arguments.rb

@@ -1,19 +0,0 @@
-module RSpec
-  module Contracts
-    class MessageArguments
-      attr_reader :arguments
-
-      def initialize(arguments)
-        @arguments = arguments
-      end
-
-      def fully_described_by?(other)
-        other && (arguments == other.arguments)
-      end
-
-      def to_hash
-        {:arguments => arguments}
-      end
-    end
-  end
-end

data/lib/rspec/contracts/message_return.rb

@@ -1,19 +0,0 @@
-module RSpec
-  module Contracts
-    class MessageReturn
-      attr_reader :value
-
-      def initialize(value)
-        @value = value
-      end
-
-      def fully_described_by?(other)
-        other && (value == other.value)
-      end
-
-      def to_hash
-        {:value => value}
-      end
-    end
-  end
-end