scorpio 0.0.1 → 0.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 55d580a59cb3f4bfb5e14d22b3346ce4b5788bab
-  data.tar.gz: 61d98721cca646e140e98ee92db03b7f407e9c6b
+  metadata.gz: 22844b5d53c060f169a666bb1d0d2648cd82248b
+  data.tar.gz: 8b5a502e30aa099bdefed739a3be484eaf554f0e
 SHA512:
-  metadata.gz: 639ffe35d820fc2e5a4248a633fbd82398038f60faea79cbc5fba9efe699515b826753231e2ea513842cc726822809a0e1b25abdd26316ac970857097318fafd
-  data.tar.gz: d9593590fa2c85f55ead1b6cd41ac5deac54020be3accaca4251e029e19170a04266cb94066b7c8473c7b02732b85209dd333fc75de11154035ec8860e2a9d57
+  metadata.gz: 1ae0e2820929636321a1dfd4b6cfaf155d45ed3b9bff22f11a6d21a35e6ded3b0e51b5499833e8e097f8bdd2f20d6b29348b29de25573b10dc2a2b91b16c5dce
+  data.tar.gz: 0f52f15981cf3e840c6381100afb59b8aad162e8ee6d906e5b95352050ad49ff2ea916d4e931a824f681d1e2b2985f9d9b9b42cddc9c05adf84c97fd6d4adafb

data/CHANGELOG.md

@@ -1,3 +1,7 @@
+# v0.0.2
+
+- Scorpio::Model minor bugfixes and refactoring
+
 # v0.0.1
 
 - initial Scorpio::Model

data/lib/scorpio/model.rb

@@ -1,9 +1,12 @@
 require 'addressable/template'
 require 'json-schema'
+require 'faraday_middleware'
 
 module Scorpio
   # see also Faraday::Env::MethodsWithBodies
   METHODS_WITH_BODIES = %w(post put patch options)
+  class RequestSchemaFailure < Error
+  end
 
   class Model
     class << self
@@ -225,20 +228,21 @@ module Scorpio
           end
         end
 
-        response = connection.run_request(http_method, url, body, nil).tap do |response|
-          error_class = Scorpio.error_classes_by_status[response.status]
-          error_class ||= if (400..499).include?(response.status)
-            ClientError
-          elsif (500..599).include?(response.status)
-            ServerError
-          elsif !response.success?
-            HTTPError
-          end
-          if error_class
-            message = "Error calling #{method_name} on #{self}:\n" + (response.env[:raw_body] || response.env.body)
-            raise error_class.new(message).tap { |e| e.response = response }
-          end
+        response = connection.run_request(http_method, url, body, nil)
+
+        error_class = Scorpio.error_classes_by_status[response.status]
+        error_class ||= if (400..499).include?(response.status)
+          ClientError
+        elsif (500..599).include?(response.status)
+          ServerError
+        elsif !response.success?
+          HTTPError
+        end
+        if error_class
+          message = "Error calling #{method_name} on #{self}:\n" + (response.env[:raw_body] || response.env.body)
+          raise error_class.new(message).tap { |e| e.response = response }
         end
+
         response_schema = method_desc['response']
         response_object_to_instances(response.body, response_schema, 'persisted' => true)
       end
@@ -314,7 +318,7 @@ module Scorpio
       end
 
       def request_schema_fail(object, schema)
-        raise("object does not conform to schema.\nobject = #{object.inspect}\nschema = #{JSON.pretty_generate(schema, quirks_mode: true)}")
+        raise(RequestSchemaFailure, "object does not conform to schema.\nobject = #{object.inspect}\nschema = #{JSON.pretty_generate(schema, quirks_mode: true)}")
       end
 
       def response_object_to_instances(object, schema, initialize_options = {})
@@ -330,7 +334,7 @@ module Scorpio
                   pattern_schema
                 end ||
                 schema['additionalProperties']
-              {key => response_object_to_instances(value, schema_for_value)}
+              {key => response_object_to_instances(value, schema_for_value, initialize_options)}
             end.inject(object.class.new, &:update)
             model = models_by_schema_id[schema['id']]
             if model
@@ -340,7 +344,7 @@ module Scorpio
             end
           elsif schema['type'] == 'array' && MODULES_FOR_JSON_SCHEMA_TYPES['array'].any? { |m| object.is_a?(m) }
             object.map do |element|
-              response_object_to_instances(element, schema['items'])
+              response_object_to_instances(element, schema['items'], initialize_options)
             end
           else
             object

data/lib/scorpio/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: scorpio
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
 platform: ruby
 authors:
 - Ethan
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-03-29 00:00:00.000000000 Z
+date: 2017-04-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faraday
@@ -286,7 +286,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.8
+rubygems_version: 2.6.11
 signing_key: 
 specification_version: 4
 summary: Scorpio REST client