duckpond 1.1.4 → 1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6b28a479d7cc232dbbd474d545caece0c5927ff8
-  data.tar.gz: ffd5f52ff703529d2c96ae47c680d85ab0367bde
+  metadata.gz: e412869c6899468637cccaf6debbf31ffef6fd7a
+  data.tar.gz: aaf49e52a9f2c35987260541a3c888d7cf89e7c6
 SHA512:
-  metadata.gz: 5ac93596986601000969400607f1cc2b2f57b78c0e539848a3df6f6cd55fbf11d5f170328a5b7daebf6493c37a27fc5b408f3f416d314b7d9e20df16ffa8ef71
-  data.tar.gz: 8af2817b6a54bd9954fc9b93a965b4699166ef898198283117e74b738d4291b873e48d2b84953aa49fe34681fe9a70bbb10eca9dca38e9e4d9e7c671533d2551
+  metadata.gz: f14ccc6e1268198efc50b0116e0fa4a4c0d4ec52ffeee97e4bf92f2fbf2396bf4a682614f08204310112a52fb24ec8b2c99ff7bb87e302b5bf8eb10d42c738b1
+  data.tar.gz: 42995441b44f631d907cec3d3e5d8849b2f0266cb84f16a01a627e2e202c042459b139ae9f2ad82dcb440630db0f267e08d8c1ac92aa55817049067da936a440

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    duckpond (1.1.3)
+    duckpond (1.1.4)
 
 GEM
   remote: https://rubygems.org/

data/README.md

@@ -86,6 +86,20 @@ five characters long (such as the word "Hello"):
       has_method :length, responds_with: 5
     end
 
+Finally, if you really want to get down and dirty with interrogating method results, you can use a block thusly (the result of calling the method will be yielded to the block):
+
+    class MyBlockContract < DuckPond::Contract
+      has_method :length do |method_result|
+        method_result == 5
+      end
+    end
+
+    class MyOtherBlockContract < DuckPond::Contract
+      has_method :include?, given_args: "Hell" do |method_result|
+        method_result == true
+      end
+    end
+
 Note: The method will only be *called* if you use the :reponds_with option. Otherwise, it just tests for the method's existence.
 
 In the real world, a contract might look like this:

data/lib/duckpond/clause/method_clause.rb

@@ -21,21 +21,26 @@ module DuckPond
       # Check the method actually exists.
       return false unless subject.respond_to? method_name
 
-      # If required, check the response from the method was what the user expected.
-      return false unless _responds_with?(subject, method_name, @options[:responds_with], @options[:given_args])
+      # Unless a block was given, or a response is required, we're done!
+      return true unless @options[:block] || @options[:responds_with]
 
+      # If we get this far, we need to tap into the result of the method
+      # call, as the user is interrogating it somehow.
+      response_when_called(subject, method_name, @options[:given_args])
+        .tap do |response_when_called|
+        if @options[:block]
+          return false unless @options[:block].call(response_when_called)
+        end
+        if @options[:responds_with]
+          return false unless response_when_called == @options[:responds_with]
+        end
+      end
       true
     end
 
     private 
-    #
-    # _responds_with?
-    #
-    # if a method response expectation was passed in, this just calls the method (with the arguments
-    # if given) and does an == compare with the subject.
-    #
-    def _responds_with?(subject, method, expected_result, args = [])
-      return expected_result ? subject.send(method_name, *args) == expected_result : true
+    def response_when_called(subject, method, args = [])
+      subject.send(method_name, *args)
     end
 
   end

data/lib/duckpond/clause.rb

@@ -11,9 +11,9 @@ module DuckPond
     #
     # initialize
     #
-    def initialize(opts = {})
+    def initialize(opts={}, block)
       @options = opts
+      @options[:block] = block
     end
-
   end
 end

data/lib/duckpond/contract.rb

@@ -37,8 +37,8 @@ module DuckPond
       #
       # add a clause to the contract's list of clauses
       #
-      def has_clause(clause_klass, opts = {})
-        clauses << clause_klass.new(opts)
+      def has_clause(clause_klass, opts = {}, &block)
+        clauses << clause_klass.new(opts, block)
       end
 
 
@@ -48,7 +48,11 @@ module DuckPond
       # Adds a method clause to the contract
       #
       def has_method(method_name, opts = {})
-        has_clause MethodClause, opts.merge(:method_name => method_name)
+        if block_given?
+          has_clause(MethodClause, opts.merge(:method_name => method_name), &Proc.new)
+        else
+          has_clause(MethodClause, opts.merge(:method_name => method_name))
+        end
       end
 
       #

data/lib/duckpond/version.rb

@@ -1,3 +1,3 @@
 module DuckPond
-  VERSION = "1.1.4"
+  VERSION = "1.2"
 end

data/spec/classes/contracts/specific_include_behaviour_contract.rb

@@ -0,0 +1,5 @@
+class SpecificIncludeBehaviourContract < DuckPond::Contract
+  has_method :include?, given_args: "Hell" do |method_result|
+    method_result == true
+  end
+end

data/spec/classes/contracts/specific_length_behaviour_contract.rb

@@ -0,0 +1,7 @@
+class SpecificLengthBehaviourContract < DuckPond::Contract
+
+  has_method :length do |method_result|
+    method_result == 5
+  end
+
+end

data/spec/classes/contracts/specific_length_contract.rb

@@ -0,0 +1,7 @@
+class SpecificLengthContract < DuckPond::Contract
+
+  has_method :length, responds_with: 5
+
+  has_method :include?, responds_with: true, given_args: "Hell"
+
+end

data/spec/clauses/method_clause_spec.rb

@@ -11,7 +11,7 @@ module DuckPond
     describe 'Constructor' do
       context 'when constructed with a method name option' do
         it 'adds that method name as an attribute' do
-          clause = MethodClause.new(:method_name => :foo)
+          clause = MethodClause.new({:method_name => :foo}, nil)
           expect(clause.method_name).to eq :foo
         end
       end
@@ -20,7 +20,7 @@ module DuckPond
     describe 'Instance Methods' do
      
       describe '#satisfied_by?' do
-        let(:clause) { MethodClause.new(:method_name => :length) }
+        let(:clause) { MethodClause.new({:method_name => :length}, nil) }
 
         context 'when the subject responds to the clauses method' do 
           it 'returns true' do

data/spec/contract_spec.rb

@@ -53,11 +53,25 @@ module DuckPond
   #
   # see spec/classes/specific_length_contract.rb
   #
-  describe SpecificLenghtContract do
+  describe SpecificLengthContract do
     it 'checks a methods response is correct' do
-      expect(SpecificLenghtContract.fulfills?("Hello")).to eq true
-      expect(SpecificLenghtContract.fulfills?("Yello")).to eq false
-      expect(SpecificLenghtContract.fulfills?("Goodbye")).to eq false
+      expect(SpecificLengthContract.fulfills?("Hello")).to eq true
+      expect(SpecificLengthContract.fulfills?("Yello")).to eq false
+      expect(SpecificLengthContract.fulfills?("Goodbye")).to eq false
+    end
+  end
+
+  describe SpecificLengthBehaviourContract do
+    it 'checks the given block against the subjects method repsonse' do
+      expect(SpecificLengthBehaviourContract.fulfills?('Hello')).to eq true
+      expect(SpecificLengthBehaviourContract.fulfills?('Goodbye')).to eq false
+    end
+  end
+
+  describe SpecificIncludeBehaviourContract do
+    it 'checks the given block against the subjects method response' do
+      expect(SpecificIncludeBehaviourContract.fulfills?('Hello')).to eq true
+      expect(SpecificLengthBehaviourContract.fulfills?('Goodbye')).to eq false  
     end
   end
 

data/spec/spec_helper.rb

@@ -1,6 +1,9 @@
 require 'duckpond'
 require 'classes/contracts/length_contract'
 require 'classes/contracts/specific_length_contract'
+require 'classes/contracts/specific_length_behaviour_contract'
+require 'classes/contracts/specific_include_behaviour_contract'
+
 require 'classes/contracts/composite_contract'
 require 'coveralls'
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: duckpond
 version: !ruby/object:Gem::Version
-  version: 1.1.4
+  version: '1.2'
 platform: ruby
 authors:
 - Mikey Hogarth
@@ -64,6 +64,9 @@ files:
 - lib/duckpond/version.rb
 - spec/classes/contracts/composite_contract.rb
 - spec/classes/contracts/length_contract.rb
+- spec/classes/contracts/specific_include_behaviour_contract.rb
+- spec/classes/contracts/specific_length_behaviour_contract.rb
+- spec/classes/contracts/specific_length_contract.rb
 - spec/clauses/method_clause_spec.rb
 - spec/contract_spec.rb
 - spec/inspection_spec.rb
@@ -88,15 +91,17 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.1.10
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: Explicit duck-typing for ruby
 test_files:
 - spec/classes/contracts/composite_contract.rb
 - spec/classes/contracts/length_contract.rb
+- spec/classes/contracts/specific_include_behaviour_contract.rb
+- spec/classes/contracts/specific_length_behaviour_contract.rb
+- spec/classes/contracts/specific_length_contract.rb
 - spec/clauses/method_clause_spec.rb
 - spec/contract_spec.rb
 - spec/inspection_spec.rb
 - spec/spec_helper.rb
-has_rdoc: