hobby-test 0.0.10 → 0.0.11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d8458ed1ffd8443b82a6fc382a497b96feb14b42
-  data.tar.gz: 33653124f8590fe390a2108bfd41120e9f155030
+  metadata.gz: 29df4b3baa9ab923470c3b0037484388ede86cd0
+  data.tar.gz: 561ceb2489957310e329a4bf001690d071b709e5
 SHA512:
-  metadata.gz: 2f05c3da947e890629949f511e72b75ce3f0af7340ec6a3a0a481c42e6cdcea1952433bd143e6fbfe61d81d1f134addf139243825861309a8c642bae7401a796
-  data.tar.gz: 892acc511a23567fc8c2f30d08921d2ac87060b1748c05e518e89c717787b3076c4db493ba96e2047cdd1c12e5367c57abfa8efb6e3abe13b03b90410a86a6aa
+  metadata.gz: 4b0f32b2ce5cb602dd25729282364035515fbf9cbe7ef3db66a7aad7e24203e09f5d489e81846c30d38043ac071b9ff2ffe2ca6272a7a3b292f0ac3178b7e5a6
+  data.tar.gz: f410b9a126e19e0413c2cbfd2eb9a7e3d9ae7ee5256a811a7d8b873dbd6410fdd4ec0ba4e8d56053377f104c6c92c34a580da43b28b3297fac3a827595126598

data/lib/hobby/test.rb

@@ -86,16 +86,25 @@ module Hobby
           end
         end
       
+        response, global_format = hash.values_at :response, :format
         verb, params = hash.find &Key[Request::VERBS, :include?]
-        @request = Request.new [verb, params, *hash[:format]]
-        @asserts = (hash[:response]&.map &Assert) || []
+      
+        @response_format = response&.delete :format
+      
+        @request = Request.new verb, params, global_format
+        @asserts = (response&.map &Assert) || []
       end
       
       def [] env
+        request_report = @request.perform_in env
+      
+        response = env.last_response
+        response.format = @response_format if @response_format
+      
         Report.new \
-          request: (@request.perform_in env),
-          asserts: @asserts.map(&[env]),
-          response: env.last_response
+          request: request_report,
+          response: response,
+          asserts: @asserts.map(&[env])
       end
     
       class Assert
@@ -189,9 +198,21 @@ module Hobby
     
       class Request < OpenStruct
         VERBS = %i[delete get head options patch post put]
-        def initialize triple
-          @verb, hash, @format = triple
-          super hash
+        def initialize verb, params, format
+          @verb = verb
+        
+          if local_format = params.delete('format')
+            @format = case local_format
+                      when 'json' then JSON
+                      when 'text' then nil
+                      else
+                        raise "Wrong format #{local_format}."
+                      end
+          else
+            @format = format
+          end
+        
+          super params
         end
         attr_reader :verb
         
@@ -246,6 +267,15 @@ module Hobby
         end
         attr_reader :format
         
+        def format= string
+          case string
+          when 'json' then JSON
+          when 'text' then nil
+          else
+            raise "Wrong format #{string}."
+          end
+        end
+        
         def body
           @body ||= if format
                       format.load @excon_response.body

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: hobby-test
 version: !ruby/object:Gem::Version
-  version: 0.0.10
+  version: 0.0.11
 platform: ruby
 authors:
 - Anatoly Chernow
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-05-11 00:00:00.000000000 Z
+date: 2017-05-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: excon