rester 0.3.0 → 0.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 781dcd45b4ea9347717fba375241286931b28444
-  data.tar.gz: 3319242e32b49c30316711918748809e736880fa
+  metadata.gz: a486ccadfe2ebef7a59324907fd282d8895a6e6c
+  data.tar.gz: cfeda2d0d5d1f029ef4108d1855c017803de5446
 SHA512:
-  metadata.gz: 6d81ef7d638acb74488d729ccb22e41d749b6aa55afc00b8236d8ca84e1fd80e2798ca7e300a3c8a89e6af73a7bd9eacc913fa113d0b9f8331bd2031c271ab69
-  data.tar.gz: d2d00b634e8e052a15d0b819f813b417184722234253e5cc92cd8bd69b3f196a1d75d1fd5a26eb5e186c81930a3b134573f3a225cd2708ec0a3ede31fde44fde
+  metadata.gz: 456cd0d730812c7b1f643bda679c45ad83e83f091ab3cc2a59d2040044bdcc7e17ceed70aacc38272b620617e8efbbc76656bf9a3ca69c291fe2a458af5076c2
+  data.tar.gz: 5e930154548a07aafe4e828c92a1a70b1655657701b2968eabace6d733c40700c2858ff9131ccc01194a6dcba9c494e845ea9e48a890af121233a22f28552812

data/lib/rester/client/adapters/stub_adapter.rb

@@ -41,49 +41,50 @@ module Rester
         _request('DELETE', path, params)
       end
 
-      def context
-        @_context
-      end
-
-      def context=(context)
-        @_context = context
-      end
-
       def with_context(context, &block)
-        self.context = context
+        @_context = context
         yield block
-        self.context = nil
+        @_context = nil
       end
 
       private
 
       def _request(verb, path, params)
-        _validate_request(verb, path, params)
-
-        # At this point, the 'request' is valid by matching a corresponding
-        # request in the stub yaml file. Grab the response from the file and
-        # reset the context
-        response = stub[path][verb][context]['response']
-        context = nil
+        response = _process_request(path, verb, params)
         [response['code'], response['body'].to_json]
       end
 
-      def _validate_request(verb, path, params)
+      def _process_request(path, verb, params)
         fail Errors::StubError, "#{path} not found" unless stub[path]
         fail Errors::StubError, "#{verb} #{path} not found" unless stub[path][verb]
 
+        context = @_context || _find_context_by_params(path, verb, params)
+
         unless (action = stub[path][verb][context])
           fail Errors::StubError,
             "#{verb} #{path} with context '#{context}' not found"
         end
 
         # Verify body, if there is one
-        if (request = action['request'])
-          unless Utils.symbolize_keys(request) == params
-            fail Errors::StubError,
-              "#{verb} #{path} with context '#{context}' params don't match stub"
-          end
+        request = action['request'] || {}
+        unless Utils.symbolize_keys(request) == params
+          fail Errors::StubError,
+            "#{verb} #{path} with context '#{context}' params don't match stub. Expected: #{request} Got: #{params}"
         end
+
+        # At this point, the 'request' is valid by matching a corresponding
+        # request in the stub yaml file. Grab the response from the file and
+        # reset the context
+        stub[path][verb][context]['response']
+      end
+
+      ##
+      # Find the first request object with the same params as what's passed in.
+      # Useful for testing without having to set the context.
+      def _find_context_by_params(path, verb, params)
+        (stub[path][verb].find { |context, action|
+          Utils.symbolize_keys(action['request'] || {}) == params
+        } || []).first
       end
     end # StubAdapter
   end # Client::Adapters

data/lib/rester/version.rb

@@ -1,3 +1,3 @@
 module Rester
-  VERSION = '0.3.0'
+  VERSION = '0.3.1'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rester
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.3.1
 platform: ruby
 authors:
 - Robert Honer
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-11-10 00:00:00.000000000 Z
+date: 2015-11-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rack