scorpio 0.3.0 → 0.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1d6cc227b5ff884c520333ce9f3fd11f864dd8c58d1978a593195d98a63d61a1
-  data.tar.gz: e514788a47ac0ff2be11ae8fa926b5a5534156aa60e82c9afc71bfb842c419e5
+  metadata.gz: fb674493cc2557d4679ac5eb54e8734251cddd9005410ad6f5a2c5f1db662380
+  data.tar.gz: 1bd8308607be18331a71be7cd74627b0138aad7b6d575c887ec4f9d05d263e5c
 SHA512:
-  metadata.gz: 1035f4e7181d230cfc455cdfa2ce71f62d511b859134fae21661261e5793f0b09e03f16c4ce588f27ff9abb2d882013a1b677ea476c41f9b0e425abdb850a63e
-  data.tar.gz: 411ed1f50c74cc73f053146ece609452bf84a250d93a1874a33df0c0dc20088df06ee4446e8070be8d75dfad397b8437370794dc20f26763460fefda86490747
+  metadata.gz: e81ef200e242f7cc3a616e628bf3eaa68029effbeb0c25c7f76d2e0760e7493b2d57a3b04be492c2f674b51453c2d92a015099dbc6ed9d82a3bc478e27bd6630
+  data.tar.gz: 17f680366d8e6c8ef67d8755a643fdaea7ad9b4fbb4e6d86b3d603df92628fc450353b26f11a86d27b2317d0609bd36f743be22b56c7547630c2b815928f27fb

data/CHANGELOG.md

@@ -1,3 +1,6 @@
+# v0.3.1
+- miscellaneous minor fixes and improvements
+
 # v0.3.0
 - OpenAPI v3 support
 - classes Request/Response, OpenAPI::Operation, OpenAPI::Document handle a request. ResourceBase relies on these.

data/bin/documents_to_yml.rb

@@ -3,7 +3,8 @@
 require 'pathname'
 require 'json'
 require 'yaml'
-Pathname.glob('documents/**/*').select { |p| p.file? && !['.yml', '.yaml'].include?(p.extname) }.each do |file|
+
+Pathname.glob(Pathname.new(__FILE__).dirname.join('../documents/**/*')).select { |p| p.file? && !['.yml', '.yaml'].include?(p.extname) }.each do |file|
   begin
     json_contents = JSON.parse(file.read)
     yaml = YAML.dump(json_contents, line_width: -1)

data/lib/scorpio.rb

@@ -1,6 +1,8 @@
 require "scorpio/version"
 require "jsi"
 require "ur"
+require "addressable"
+require "faraday"
 require "pathname"
 require "pp"
 
@@ -19,7 +21,7 @@ module Scorpio
   proc { |v| define_singleton_method(:error_classes_by_status) { v } }.call({})
   class Error < StandardError; end
   class HTTPError < Error
-    define_singleton_method(:status) do |status = nil|
+    def self.status(status = nil)
       if status
         @status = status
         Scorpio.error_classes_by_status[status] = self

data/lib/scorpio/request.rb

@@ -192,11 +192,13 @@ module Scorpio
       JSI.class_for_schema(request_schema(media_type: media_type))
     end
 
-    def faraday_connection(yield_ur)
+    def faraday_connection(yield_ur = nil)
       Faraday.new do |faraday_connection|
         faraday_builder.call(faraday_connection)
-        ::Ur::Faraday # autoload trigger
-        faraday_connection.response(:yield_ur, ur_class: Scorpio::Ur, logger: self.logger, &yield_ur)
+        if yield_ur
+          ::Ur::Faraday # autoload trigger
+          faraday_connection.response(:yield_ur, ur_class: Scorpio::Ur, logger: self.logger, &yield_ur)
+        end
         faraday_connection.adapter(*faraday_adapter)
       end
     end

data/lib/scorpio/resource_base.rb

@@ -1,6 +1,3 @@
-require 'addressable/template'
-require 'faraday'
-
 module Scorpio
   # see also Faraday::Env::MethodsWithBodies
   METHODS_WITH_BODIES = %w(post put patch options)
@@ -150,8 +147,10 @@ module Scorpio
         rescue NameError
         end
         define_singleton_method(:tag_name) { tag_name }
-        define_singleton_method(:tag_name=) do |_|
-          raise(ArgumentError, "tag_name may not be overridden. it is been set to #{tag_name.inspect}")
+        define_singleton_method(:tag_name=) do |tag_name|
+          unless tag_name == self.tag_name
+            raise(ArgumentError, "tag_name may not be overridden (to #{tag_name.inspect}). it is been set to #{self.tag_name.inspect}")
+          end
         end
         update_dynamic_methods
       end

data/lib/scorpio/ur.rb

@@ -2,15 +2,6 @@ module Scorpio
   class Ur < ::Ur
     attr_accessor :scorpio_request
 
-    def class_for_schema(schema)
-      jsi_class_for_schema = super
-      if jsi_class_for_schema == ::Ur::Response
-        Scorpio::Response
-      else
-        jsi_class_for_schema
-      end
-    end
-
     def raise_on_http_error
       error_class = Scorpio.error_classes_by_status[response.status]
       error_class ||= if (400..499).include?(response.status)
@@ -21,7 +12,7 @@ module Scorpio
         HTTPError
       end
       if error_class
-        message = "Error calling operation #{scorpio_request.operation.operationId} on #{self}:\n" + response.body
+        message = "Error calling operation #{scorpio_request.operation.operationId}:\n" + response.body
         raise(error_class.new(message).tap do |e|
           e.ur = self
           e.response_object = response.body_object
@@ -29,5 +20,15 @@ module Scorpio
       end
       nil
     end
+
+    private
+    def class_for_schema(schema)
+      jsi_class_for_schema = super
+      if jsi_class_for_schema == ::Ur::Response
+        Scorpio::Response
+      else
+        jsi_class_for_schema
+      end
+    end
   end
 end

data/lib/scorpio/version.rb

@@ -1,3 +1,3 @@
 module Scorpio
-  VERSION = "0.3.0"
+  VERSION = "0.3.1"
 end

data/scorpio.gemspec

@@ -33,7 +33,7 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "rack-test"
   spec.add_development_dependency "api_hammer"
   spec.add_development_dependency "activerecord"
-  spec.add_development_dependency "sqlite3"
+  spec.add_development_dependency "sqlite3", "~> 1.3.6" # loosen this in accordance with active_record/connection_adapters/sqlite3_adapter.rb
   spec.add_development_dependency "database_cleaner"
   spec.add_development_dependency "simplecov"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: scorpio
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.3.1
 platform: ruby
 authors:
 - Ethan
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-01-30 00:00:00.000000000 Z
+date: 2019-02-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: jsi
@@ -196,16 +196,16 @@ dependencies:
   name: sqlite3
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.3.6
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.3.6
 - !ruby/object:Gem::Dependency
   name: database_cleaner
   requirement: !ruby/object:Gem::Requirement
@@ -287,7 +287,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.7.7
+rubygems_version: 2.7.8
 signing_key: 
 specification_version: 4
 summary: Scorpio REST client