duckpond 1.1.2 → 1.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7b810fdeab5df4f4ec189e29564679ca36a5def0
-  data.tar.gz: 2155f5a7e386b93b23b528681cf6e42434428372
+  metadata.gz: ff44bdc5c03c542af79ff6a7a6c525ad67ca2b81
+  data.tar.gz: 8fda27a470b7ef9cd6744fa1a054a2bd96163b85
 SHA512:
-  metadata.gz: db69cd0d990921af13bc9f20074ccbe3cad89820b70a7337e32061a10c21adab8da60f5ae9d6d0956040a8f4454b6f71372f128123086314d965dc25a220d3a0
-  data.tar.gz: 9c388f4d94bb16176f8dcfe33def905b3df7a053bc4a537160130b2aed2c9bb3d26dc1b29d31c2aa06070efcea465295bb4b419a7a34f59cc52c03d0968f9064
+  metadata.gz: 338d11de6f3c7439d27c92937a150dcd6b2fb2346d556f874bad94a9609fd6cca31f2a6e08e6c6a1e39f35f11e3b9f41e8543d2dceb61af2ae66efa1b3621760
+  data.tar.gz: 5d6c89b8cdc59b2569a2816b422e2ea302ea7c2f70c08ae2229d8817081e44afd74938453a40f0cf26616d3d95da8a68b53b1157c03d9219d76f1c676b2916c0

data/lib/duckpond/clause/method_clause.rb

@@ -7,16 +7,8 @@
 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
+    def method_name
+      @options[:method_name]
     end
 
     #
@@ -25,7 +17,7 @@ module DuckPond
     # A subject satisfies a method clause if it responds to that method.
     #
     def satisfied_by?(subject)
-      subject.respond_to? @method_name
+      subject.respond_to? method_name
     end
 
   end

data/lib/duckpond/clause.rb

@@ -6,13 +6,13 @@
 module DuckPond
   class Clause
 
+    attr_reader :options
+
     #
-    # options
-    #
-    # A hash of options
+    # initialize
     #
-    def options
-      @options
+    def initialize(opts = {})
+      @options = opts
     end
 
   end

data/lib/duckpond/contract.rb

@@ -32,13 +32,23 @@ module DuckPond
         end
       end
 
+      #
+      # has_clause
+      #
+      # add a clause to the contract's list of clauses
+      #
+      def has_clause(clause_klass, opts = {})
+        clauses << clause_klass.new(opts)
+      end
+
+
       #
       # has_method
       #
-      # Adds a method expectation to the contract
+      # Adds a method clause to the contract
       #
-      def has_method(method_name)
-        clauses << MethodClause.new(method_name)
+      def has_method(method_name, opts = {})
+        has_clause MethodClause, opts.merge(:method_name => method_name)
       end
 
       #

data/lib/duckpond/version.rb

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

data/spec/clauses/method_clause_spec.rb

@@ -9,30 +9,18 @@ module DuckPond
     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)
+      context 'when constructed with a method name option' do
+        it 'adds that method name as an attribute' do
+          clause = MethodClause.new(:method_name => :foo)
           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) }
+        let(:clause) { MethodClause.new(:method_name => :length) }
 
         context 'when the subject responds to the clauses method' do 
           it 'returns true' do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: duckpond
 version: !ruby/object:Gem::Version
-  version: 1.1.2
+  version: 1.1.3
 platform: ruby
 authors:
 - Mikey Hogarth