and-son 0.4.0 → 0.4.1

data/and-son.gemspec

@@ -19,6 +19,6 @@ Gem::Specification.new do |gem|
 
   gem.add_dependency("sanford-protocol",  ["~>0.6"])
 
-  gem.add_development_dependency("assert",        ["~>2.3"])
+  gem.add_development_dependency("assert",        ["~>2.9"])
   gem.add_development_dependency("assert-mocha",  ["~>1.0"])
 end

data/lib/and-son/stored_responses.rb

@@ -11,17 +11,19 @@ module AndSon
       @hash = {}
     end
 
-    def add(name, params = nil)
+    def add(name, params = nil, &response_block)
       request_data = RequestData.new(name, params || {})
-      response = yield
-      if !response.kind_of?(Sanford::Protocol::Response)
-        response = Sanford::Protocol::Response.new(200, response)
-      end
-      @hash[request_data] = AndSon::Response.new(response)
+      @hash[request_data] = response_block
     end
 
     def find(name, params = nil)
-      @hash[RequestData.new(name, params || {})]
+      response_block = @hash[RequestData.new(name, params || {})]
+      return if !response_block
+      response = response_block.call
+      if !response.kind_of?(Sanford::Protocol::Response)
+        response = Sanford::Protocol::Response.new(200, response)
+      end
+      AndSon::Response.new(response)
     end
 
     def remove(name, params = nil)

data/lib/and-son/version.rb

@@ -1,3 +1,3 @@
 module AndSon
-  VERSION = "0.4.0"
+  VERSION = "0.4.1"
 end

data/test/unit/and-son_tests.rb

@@ -3,7 +3,7 @@ require 'and-son'
 
 module AndSon
 
-  class BaseTests < Assert::Context
+  class UnitTests < Assert::Context
     desc "AndSon"
     subject{ AndSon }
 

data/test/unit/client_tests.rb

@@ -6,7 +6,7 @@ require 'and-son/client'
 
 class AndSon::Client
 
-  class BaseTests < Assert::Context
+  class UnitTests < Assert::Context
     include FakeServer::Helper
 
     desc "AndSon::Client"
@@ -73,7 +73,7 @@ class AndSon::Client
 
   end
 
-  class CallTest < BaseTests
+  class CallTest < UnitTests
     desc "call"
     setup do
       @connection = AndSon::Connection.new('localhost', 12001)

data/test/unit/response_tests.rb

@@ -3,7 +3,7 @@ require 'and-son/response'
 
 class AndSon::Response
 
-  class BaseTests < Assert::Context
+  class UnitTests < Assert::Context
     desc "AndSon::Response"
     setup do
       @protocol_response = Sanford::Protocol::Response.new([ 200, 'message' ], 'data')
@@ -26,7 +26,7 @@ class AndSon::Response
 
   end
 
-  class FailedResponseTests < BaseTests
+  class FailedResponseTests < UnitTests
     desc "given a failed response"
     setup do
       @protocol_response = Sanford::Protocol::Response.new([ 500, 'message' ])
@@ -45,7 +45,7 @@ class AndSon::Response
 
   end
 
-  class Response5xxTests < BaseTests
+  class Response5xxTests < UnitTests
     desc "given a 5xx response"
     setup do
       @protocol_response = Sanford::Protocol::Response.new(500)
@@ -61,7 +61,7 @@ class AndSon::Response
 
   end
 
-  class Response404Tests < BaseTests
+  class Response404Tests < UnitTests
     desc "given a 404 response"
     setup do
       @protocol_response = Sanford::Protocol::Response.new(404)
@@ -78,7 +78,7 @@ class AndSon::Response
 
   end
 
-  class Response400Tests < BaseTests
+  class Response400Tests < UnitTests
     desc "given a 400 response"
     setup do
       @protocol_response = Sanford::Protocol::Response.new(400)
@@ -95,7 +95,7 @@ class AndSon::Response
 
   end
 
-  class Response4xxTests < BaseTests
+  class Response4xxTests < UnitTests
     desc "given a 4xx response"
     setup do
       @protocol_response = Sanford::Protocol::Response.new(402)

data/test/unit/stored_responses_tests.rb

@@ -3,7 +3,7 @@ require 'and-son/stored_responses'
 
 class AndSon::StoredResponses
 
-  class BaseTest < Assert::Context
+  class UnitTests < Assert::Context
     desc "AndSon::StoredResponses"
     setup do
       @responses = AndSon::StoredResponses.new
@@ -14,7 +14,7 @@ class AndSon::StoredResponses
 
   end
 
-  class AddTest < BaseTest
+  class AddTest < UnitTests
     desc "add"
 
     should "allow adding responses given an name and optional params" do
@@ -46,11 +46,13 @@ class AndSon::StoredResponses
 
   end
 
-  class FindTest < BaseTest
+  class FindTest < UnitTests
     desc "find"
     setup do
       @responses.add('test', { 'id' => 1 }){ true }
       @responses.add('test'){ true }
+      @service_called = false
+      @responses.add('call_service'){ @service_called = true }
     end
 
     should "allow finding a response given a name and optional params" do
@@ -61,9 +63,15 @@ class AndSon::StoredResponses
       assert_equal true, response.data
     end
 
+    should "not call the response block until `find` is called" do
+      assert_false @service_called
+      subject.find('call_service')
+      assert_true @service_called
+    end
+
   end
 
-  class RemoveTest < BaseTest
+  class RemoveTest < UnitTests
     desc "remove"
     setup do
       @responses.add('test', { 'id' => 1 }){ true }

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: and-son
 version: !ruby/object:Gem::Version 
-  hash: 15
+  hash: 13
   prerelease: 
   segments: 
   - 0
   - 4
-  - 0
-  version: 0.4.0
+  - 1
+  version: 0.4.1
 platform: ruby
 authors: 
 - Collin Redding
@@ -16,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2013-10-14 00:00:00 Z
+date: 2014-03-10 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   version_requirements: &id001 !ruby/object:Gem::Requirement 
@@ -39,11 +39,11 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 5
+        hash: 17
         segments: 
         - 2
-        - 3
-        version: "2.3"
+        - 9
+        version: "2.9"
   type: :development
   requirement: *id002
   prerelease: false