duckpond 1.1.1 → 1.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: bb40e8e7d8b6bdc3292b4ddfb0bc5548af7df234
-  data.tar.gz: 4ecca5d9961fc6accd02237c9cd136d8b3c729eb
+  metadata.gz: 7b810fdeab5df4f4ec189e29564679ca36a5def0
+  data.tar.gz: 2155f5a7e386b93b23b528681cf6e42434428372
 SHA512:
-  metadata.gz: 6665633fd874275fbcef6e1e292966849e5e558ac65230cc7fa78dbb26430b88ad8c0c0eb6e23730c2b397532fb31debbf02c493908f5e21143baf6b4553619f
-  data.tar.gz: 7d9d32e81cf6fd3fbb0b20986c552c0a3d37dd0b6a9ee9de266a427f3672455640f4c25cff2991ce16a93173cbff92a847980e1b38b297dc5d0186bcd1c6b8ff
+  metadata.gz: db69cd0d990921af13bc9f20074ccbe3cad89820b70a7337e32061a10c21adab8da60f5ae9d6d0956040a8f4454b6f71372f128123086314d965dc25a220d3a0
+  data.tar.gz: 9c388f4d94bb16176f8dcfe33def905b3df7a053bc4a537160130b2aed2c9bb3d26dc1b29d31c2aa06070efcea465295bb4b419a7a34f59cc52c03d0968f9064

data/Gemfile.lock

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

data/README.md

@@ -65,8 +65,8 @@ Contracts can be combined into composite "super contracts" - contracts which are
 various other contracts. This ties in with the reccomendation of preferring composition over inheritance:
 
     class MyCompositeConrtact < DuckPond::Contract
-      include_methods_from MyContract
-      include_methods_from MyOtherContract
+      include_clauses_from MyContract
+      include_clauses_from MyOtherContract
     end
 
 

data/lib/duckpond/clause/method_clause.rb

@@ -0,0 +1,32 @@
+#
+# MethodClause
+#
+# Satisfied if the subject responds to the method represented
+# by this clause.
+#
+module DuckPond
+  class MethodClause < Clause
+
+    attr_reader :method_name
+
+    #
+    # initialize
+    #
+    # Initialize method clauses with the method name as a symbol.
+    #
+    def initialize(method_name, opts = {})
+      @method_name = method_name
+      @options = opts
+    end
+
+    #
+    # satisfied_by?
+    #
+    # A subject satisfies a method clause if it responds to that method.
+    #
+    def satisfied_by?(subject)
+      subject.respond_to? @method_name
+    end
+
+  end
+end

data/lib/duckpond/clause.rb

@@ -0,0 +1,19 @@
+# 
+# Clause
+#
+# This class is intended to be inherited from.
+#
+module DuckPond
+  class Clause
+
+    #
+    # options
+    #
+    # A hash of options
+    #
+    def options
+      @options
+    end
+
+  end
+end

data/lib/duckpond/contract.rb

@@ -38,7 +38,7 @@ module DuckPond
       # Adds a method expectation to the contract
       #
       def has_method(method_name)
-        clauses << method_name
+        clauses << MethodClause.new(method_name)
       end
 
       #
@@ -48,7 +48,7 @@ module DuckPond
       #
       def include_clauses_from(other_contract)
         other_contract.each_clause do |other_clause|
-          has_method other_clause
+          has_method other_clause.method_name
         end
       end
 

data/lib/duckpond/inspection.rb

@@ -28,7 +28,7 @@ module DuckPond
     #
     def fulfilled_by?(contract)
       contract.each_clause do |clause|
-        return false unless @subject.respond_to? clause
+        return false unless clause.satisfied_by?(@subject)
       end
       true
     end

data/lib/duckpond/version.rb

@@ -1,3 +1,3 @@
 module DuckPond
-  VERSION = "1.1.1"
+  VERSION = "1.1.2"
 end

data/lib/duckpond.rb

@@ -2,5 +2,8 @@ require 'duckpond/version'
 require 'duckpond/contract'
 require 'duckpond/inspection'
 
+require 'duckpond/clause'
+require 'duckpond/clause/method_clause'
+
 module DuckPond
 end

data/spec/clauses/method_clause_spec.rb

@@ -0,0 +1,51 @@
+require 'spec_helper'
+
+module DuckPond
+  describe MethodClause do
+    describe 'Class' do
+      it 'inherits from Clause' do
+        expect(described_class.ancestors).to include Clause
+      end
+    end
+
+    describe 'Constructor' do
+      context 'when passed a method name' do
+        it 'constructs a clause with that method name' do
+          expect(MethodClause.new(:foo).method_name).to eq :foo
+        end
+      end
+      context 'when passed a method name and some options' do
+        it 'constructs a clause with that method name and those options' do
+          clause = MethodClause.new(:foo, :my => :options)
+          expect(clause.method_name).to eq :foo
+          expect(clause.options[:my]).to eq :options
+        end
+      end
+    end
+
+    describe 'Instance Methods' do
+      
+      describe '#method_name' do
+        it 'returns the method name the clause was constructed with' do
+          expect(MethodClause.new(:foo).method_name).to eq :foo
+        end
+      end
+
+      describe '#satisfied_by?' do
+        let(:clause) { MethodClause.new(:length) }
+
+        context 'when the subject responds to the clauses method' do 
+          it 'returns true' do
+            expect(clause.satisfied_by? 'Hello').to eq true
+          end
+        end
+        context 'when the subject responds to the clauses method' do 
+          it 'returns false' do
+            expect(clause.satisfied_by? 42).to eq false
+          end
+        end
+      end
+    end
+
+  end
+end

data/spec/contract_spec.rb

@@ -12,7 +12,6 @@ module DuckPond
       end
     end
 
-
     #
     # see spec/classes/length_contract.rb
     #
@@ -28,6 +27,7 @@ module DuckPond
         end
       end
     end
+
     describe 'fulfills!' do
       context 'when the object is fulfilled by the contract' do
         it 'returns true' do
@@ -45,7 +45,7 @@ module DuckPond
       it 'returns the clauses for this contract' do
         clauses = LengthContract.clauses
         expect(clauses.length).to eq 1
-        expect(clauses).to include :length
+        expect(clauses.map(&:method_name)).to include :length
       end
     end
   end
@@ -57,8 +57,8 @@ module DuckPond
     it 'retains its parents quackings' do
       clauses = CompositeContract.clauses
       expect(clauses.length).to eq 2 
-      expect(clauses).to include :length
-      expect(clauses).to include :chunky_bacon
+      expect(clauses.map(&:method_name)).to include :length
+      expect(clauses.map(&:method_name)).to include :chunky_bacon
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: duckpond
 version: !ruby/object:Gem::Version
-  version: 1.1.1
+  version: 1.1.2
 platform: ruby
 authors:
 - Mikey Hogarth
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-06-22 00:00:00.000000000 Z
+date: 2014-06-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -53,16 +53,18 @@ files:
 - LICENSE
 - README.md
 - Rakefile
-- docs/.the_solution.txt.swp
 - docs/the_problem.txt
 - docs/the_solution.txt
 - duckpond.gemspec
 - lib/duckpond.rb
+- lib/duckpond/clause.rb
+- lib/duckpond/clause/method_clause.rb
 - lib/duckpond/contract.rb
 - lib/duckpond/inspection.rb
 - lib/duckpond/version.rb
 - spec/classes/contracts/composite_contract.rb
 - spec/classes/contracts/length_contract.rb
+- spec/clauses/method_clause_spec.rb
 - spec/contract_spec.rb
 - spec/inspection_spec.rb
 - spec/spec_helper.rb
@@ -86,14 +88,14 @@ 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/clauses/method_clause_spec.rb
 - spec/contract_spec.rb
 - spec/inspection_spec.rb
 - spec/spec_helper.rb
-has_rdoc: