vigia 0.2.3 → 0.2.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3c5a64fc8e29c2baf38e81587d991a0e62dedf24
-  data.tar.gz: dc220251eff74b8feaed637d4d2a4802936301d3
+  metadata.gz: 8722e96d1e6af556c120af443297ce37858d92d6
+  data.tar.gz: c018d6fd8b5a6f89f089bd0e06e950018be721e2
 SHA512:
-  metadata.gz: 1161a4e2a69ac0e9973c264233df0bc5c5be9619145281e8462b61386cfaba1805684340e242caa3cddaf7bb4534e35dcb507353ddea81078f5407090fc45811
-  data.tar.gz: aa904625ce42d4eb35c1c8d5c91c0ad3537661bff22c98b6a1121c1529bec72a7283309f3adbeb68d86bd58406ee7f0947d22d09fcbd5e60d543dde9401f0071
+  metadata.gz: 48a7844f8d51d4c0acfb9884586b79ab336b833d5914f78f7333acee0ca86fccf6167afe3212919f7563a264c86d67b441ba8f40073962298c14ab3c1f5b0d85
+  data.tar.gz: 562b1162f366fe61099cd0eb9530389374cf5cf9f76b5d9dc20ef1ae3d8aa4bd845ef5a8f8a1a1b8fd178d2f6a1cef06f7a0a9f05b27d7eb8b23c93e6c9dca1c

data/lib/vigia/adapter.rb

@@ -22,6 +22,14 @@ module Vigia
       end
     end
 
+    def with_payload?(method)
+      [ :post, :patch, :put, :delete ].include?(method.to_s.downcase.to_sym)
+    end
+
+    def required_payload?(method)
+      [ :post, :patch, :put ].include?(method.to_s.downcase.to_sym)
+    end
+
     class Structure
       class << self
         def generate(adapter, structure)

data/lib/vigia/adapters/blueprint.rb

@@ -45,7 +45,7 @@ module Vigia
             method:       -> { action.method },
             uri_template: -> { resource.uri_template },
             parameters:   -> { adapter.parameters_for(resource, action) },
-            payload:      -> { adapter.payload_for(transactional_example, response) if adapter.with_payload?(action) }
+            payload:      -> { adapter.payload_for(transactional_example, response) if adapter.with_payload?(action.method) }
           },
           expectations: {
             code:    -> { response.name.to_i },
@@ -61,7 +61,7 @@ module Vigia
             method:       -> { action.method },
             uri_template: -> { resource.uri_template },
             parameters:   -> { adapter.required_parameters_for(resource, action) },
-            payload:      -> { adapter.payload_for(transactional_example, response) if adapter.with_payload?(action) }
+            payload:      -> { adapter.payload_for(transactional_example, response) if adapter.with_payload?(action.method) }
           },
           expectations: {
             code:    -> { response.name.to_i },
@@ -71,7 +71,7 @@ module Vigia
 
       def headers_for(action, transactional_example, response, include_payload = true)
         headers  = headers_for_response(response)
-        headers += headers_for_payload(transactional_example, response) if with_payload?(action) && include_payload
+        headers += headers_for_payload(transactional_example, response) if with_payload?(action.method) && include_payload
         compile_headers(headers)
       end
 
@@ -87,13 +87,16 @@ module Vigia
         end
       end
 
-      def with_payload?(action)
-        %w(POST PUT PATCH).include? action.method
-      end
-
       def payload_for(transactional_example, response)
         payload = get_payload(transactional_example, response)
-        payload.body
+
+        if required_payload?(transactional_example.action.method) && payload.nil?
+          raise "Unable to load payload for response #{ response.name }"
+        elsif payload.nil?
+          nil
+        else
+          payload.body
+        end
       end
 
       def inspector object
@@ -184,14 +187,16 @@ module Vigia
 
       def headers_for_payload(transactional_example, response)
         payload = get_payload(transactional_example, response)
+
+        return [] if payload.nil?
+
         [ *payload.headers.collection ].flatten
       end
 
       def get_payload(transactional_example, response)
         index = transactional_example.responses.index(response)
-        transactional_example.requests.fetch(index)
-      rescue => e
-        raise "Unable to load payload for response #{ response.name }"
+
+        index.nil? ? nil : transactional_example.requests.at(index)
       end
     end
   end

data/lib/vigia/adapters/raml.rb

@@ -76,11 +76,17 @@ module Vigia
         return unless with_payload?(method.name)
 
         payload = request_body_for(method, body)
-        payload.example || payload.schema.value
-      end
 
-      def with_payload?(method_name)
-        [ :post, :put, :patch ].include?(method_name.to_s.downcase.to_sym)
+        case
+        when required_payload?(method.name) && payload.nil?
+          raise(
+            "An example body cannot be found for method #{ method.name } #{ method.parent.resource_path }"
+          )
+        when payload.nil?
+          nil
+        else
+          payload.example || payload.schema.value
+        end
       end
 
       private
@@ -103,8 +109,8 @@ module Vigia
       end
 
       def request_body_for(method, response_body)
-        body = response_body.name == '*/*' ? method.bodies.values.first : method.bodies[response_body.name]
-        body ||raise("An example body cannot be found for method #{ method.name } #{ method.parent.resource_path }")
+        response_body.name == '*/*' ?
+          method.bodies.values.first : method.bodies[response_body.name]
       end
 
       def query_parameters(method)

data/lib/vigia/version.rb

@@ -1,5 +1,5 @@
 # encoding: utf-8
 
 module Vigia
-  VERSION = "0.2.3"
+  VERSION = "0.2.4"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: vigia
 version: !ruby/object:Gem::Version
-  version: 0.2.3
+  version: 0.2.4
 platform: ruby
 authors:
 - David Tapiador
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-03-22 00:00:00.000000000 Z
+date: 2016-04-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake