scorpio 0.0.2 → 0.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 22844b5d53c060f169a666bb1d0d2648cd82248b
-  data.tar.gz: 8b5a502e30aa099bdefed739a3be484eaf554f0e
+  metadata.gz: ec3a7a7b122c8c4b3791f1b22db539efd241dc33
+  data.tar.gz: dbdf6eeaf02f1830326aa4e1ec0c10649fd1107e
 SHA512:
-  metadata.gz: 1ae0e2820929636321a1dfd4b6cfaf155d45ed3b9bff22f11a6d21a35e6ded3b0e51b5499833e8e097f8bdd2f20d6b29348b29de25573b10dc2a2b91b16c5dce
-  data.tar.gz: 0f52f15981cf3e840c6381100afb59b8aad162e8ee6d906e5b95352050ad49ff2ea916d4e931a824f681d1e2b2985f9d9b9b42cddc9c05adf84c97fd6d4adafb
+  metadata.gz: 623f45a68e0d16d10bd561f8d511c45a842f0f456a34f3a4ae0acae75ad1b4800af9ca3ca36eb8119d07e370975a5ce97c38455a216021a3f2ddd96677259197
+  data.tar.gz: 14d553f686f25457c4e7257d8dee188b4d3c5ed4fef4646d041b9eef23eafaddcd2ed231c4d1a1348b4c5c8846c18f5905b350077ccc4677452423b0df821afb

data/lib/scorpio/model.rb

@@ -189,13 +189,14 @@ module Scorpio
       end
 
       def call_api_method(method_name, call_params: nil, model_attributes: nil)
-        call_params = Scorpio.stringify_symbol_keys(call_params || {})
+        call_params = Scorpio.stringify_symbol_keys(call_params) if call_params.is_a?(Hash)
         model_attributes = Scorpio.stringify_symbol_keys(model_attributes || {})
         method_desc = api_description['resources'][self.resource_name]['methods'][method_name]
         http_method = method_desc['httpMethod'].downcase.to_sym
         path_template = Addressable::Template.new(method_desc['path'])
-        template_params = model_attributes.merge(call_params)
-        missing_variables = path_template.variables - call_params.keys - model_attributes.keys
+        template_params = model_attributes
+        template_params = template_params.merge(call_params) if call_params.is_a?(Hash)
+        missing_variables = path_template.variables - template_params.keys
         if missing_variables.any?
           raise(ArgumentError, "path #{method_desc['path']} for method #{method_name} requires attributes " +
             "which were missing: #{missing_variables.inspect}")
@@ -209,21 +210,34 @@ module Scorpio
         url = Addressable::URI.parse(base_url) + path
         # assume that call_params must be included somewhere. model_attributes are a source of required things
         # but not required to be here.
-        other_params = call_params.reject { |k, _| path_template.variables.include?(k) }
+        other_params = call_params
+        if other_params.is_a?(Hash)
+          other_params.reject! { |k, _| path_template.variables.include?(k) }
+        end
 
         method_desc = (((api_description['resources'] || {})[resource_name] || {})['methods'] || {})[method_name]
         request_schema = deref_schema(method_desc['request'])
         if request_schema
           # TODO deal with model_attributes / call_params better in nested whatever
-          body = request_body_for_schema(model_attributes.merge(call_params), request_schema)
-          body.update(call_params)
+          if call_params.nil?
+            body = request_body_for_schema(model_attributes, request_schema)
+          elsif call_params.is_a?(Hash)
+            body = request_body_for_schema(model_attributes.merge(call_params), request_schema)
+            body.update(call_params)
+          else
+            body = call_params
+          end
         else
-          if other_params.any?
-            if METHODS_WITH_BODIES.any? { |m| m == http_method.downcase }
+          if other_params
+            if METHODS_WITH_BODIES.any? { |m| m.to_s == http_method.downcase.to_s }
               body = other_params
             else
-              # TODO pay more attention to 'parameters' api method attribute
-              url.query_values = other_params
+              if other_params.is_a?(Hash)
+                # TODO pay more attention to 'parameters' api method attribute
+                url.query_values = other_params
+              else
+                raise
+              end
             end
           end
         end
@@ -244,7 +258,8 @@ module Scorpio
         end
 
         response_schema = method_desc['response']
-        response_object_to_instances(response.body, response_schema, 'persisted' => true)
+        source = {'method_name' => method_name, 'call_params' => call_params, 'url' => url.to_s}
+        response_object_to_instances(response.body, response_schema, 'persisted' => true, 'source' => source)
       end
 
       def request_body_for_schema(object, schema)

data/lib/scorpio/version.rb

@@ -1,3 +1,3 @@
 module Scorpio
-  VERSION = "0.0.2"
+  VERSION = "0.0.3"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: scorpio
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
 platform: ruby
 authors:
 - Ethan
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-04-11 00:00:00.000000000 Z
+date: 2017-05-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faraday