scorpio 0.4.5 → 0.6.0

data/lib/scorpio.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require "scorpio/version"
 require "jsi"
 require "ur"
@@ -20,12 +22,9 @@ module Scorpio
 
   proc { |v| define_singleton_method(:error_classes_by_status) { v } }.call({})
   # Scorpio::Error encompasses certain Scorpio-defined errors encountered in using Scorpio.
-  # at the moment this only includes HTTPError[^1], but will likely cover errors in schemas and
-  # other things in the future.
-  #
-  # [^1]: unless I have, since writing this, implemented other things but forgotten to update this
-  # comment, which does seem likely enough.
-  class Error < StandardError; end
+  class Error < StandardError
+  end
+
   class HTTPError < Error
     # for HTTPError subclasses representing a single status, sets and/or returns the represented status.
     #

data/scorpio.gemspec

@@ -12,29 +12,22 @@ Gem::Specification.new do |spec|
   spec.summary       = 'Scorpio REST client'
   spec.description   = 'ORM style REST client'
   spec.homepage      = "https://github.com/notEthan/scorpio"
-  spec.license       = "MIT"
-  ignore_files = %w(.gitignore .travis.yml Gemfile test)
-  ignore_files_re = %r{\A(#{ignore_files.map { |f| Regexp.escape(f) }.join('|')})(/|\z)}
-  spec.files         = `git ls-files -z`.split("\x0").reject { |f| f.match(ignore_files_re) }
-  spec.bindir        = "exe"
-  spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
+  spec.license       = "AGPL-3.0"
+
+  spec.files = [
+    'LICENSE.md',
+    'CHANGELOG.md',
+    'README.md',
+    '.yardopts',
+    'scorpio.gemspec',
+    *Dir['lib/**/*'],
+    *Dir['documents/**/*'],
+  ].reject { |f| File.lstat(f).ftype == 'directory' }
+
   spec.require_paths = ["lib"]
 
-  spec.add_dependency "jsi", "~> 0.2.0"
-  spec.add_dependency "ur", "~> 0.1.0"
-  spec.add_dependency "faraday"
-  spec.add_development_dependency "rake", "~> 10.0"
-  spec.add_development_dependency "minitest", "~> 5.0"
-  spec.add_development_dependency "minitest-around"
-  spec.add_development_dependency "minitest-reporters"
-  spec.add_development_dependency "sinatra", "~> 1.0"
-  spec.add_development_dependency "rack", "~> 1.0"
-  spec.add_development_dependency "rack-accept"
-  spec.add_development_dependency "rack-test"
-  spec.add_development_dependency "api_hammer"
-  spec.add_development_dependency "activerecord"
-  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"
-  spec.add_development_dependency "yard"
+  spec.add_dependency "jsi", "~> 0.6.0"
+  spec.add_dependency "ur", "~> 0.2.1"
+  spec.add_dependency "faraday", "< 2.0"
+  spec.add_dependency "addressable", '~> 2.3'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: scorpio
 version: !ruby/object:Gem::Version
-  version: 0.4.5
+  version: 0.6.0
 platform: ruby
 authors:
 - Ethan
-autorequire: 
-bindir: exe
+autorequire:
+bindir: bin
 cert_chain: []
-date: 2019-12-26 00:00:00.000000000 Z
+date: 2022-02-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: jsi
@@ -16,238 +16,56 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.2.0
+        version: 0.6.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.2.0
+        version: 0.6.0
 - !ruby/object:Gem::Dependency
   name: ur
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.1.0
+        version: 0.2.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.1.0
+        version: 0.2.1
 - !ruby/object:Gem::Dependency
   name: faraday
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "<"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '2.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "<"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '2.0'
 - !ruby/object:Gem::Dependency
-  name: rake
+  name: addressable
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '10.0'
-- !ruby/object:Gem::Dependency
-  name: minitest
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '5.0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '5.0'
-- !ruby/object:Gem::Dependency
-  name: minitest-around
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: minitest-reporters
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: sinatra
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.0'
-- !ruby/object:Gem::Dependency
-  name: rack
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.0'
-- !ruby/object:Gem::Dependency
-  name: rack-accept
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: rack-test
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: api_hammer
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: activerecord
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: sqlite3
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 1.3.6
-  type: :development
+        version: '2.3'
+  type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.3.6
-- !ruby/object:Gem::Dependency
-  name: database_cleaner
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: simplecov
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: yard
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
+        version: '2.3'
 description: ORM style REST client
 email:
 - ethan@unth.net
@@ -255,13 +73,10 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- ".simplecov"
 - ".yardopts"
 - CHANGELOG.md
-- LICENSE.txt
+- LICENSE.md
 - README.md
-- Rakefile
-- bin/documents_to_yml.rb
 - documents/github.com/OAI/OpenAPI-Specification/blob/oas3-schema/schemas/v3.0/schema.yaml
 - documents/swagger.io/v2/schema.json
 - documents/swagger.io/v2/schema.yml
@@ -273,6 +88,8 @@ files:
 - lib/scorpio/openapi/document.rb
 - lib/scorpio/openapi/operation.rb
 - lib/scorpio/openapi/operations_scope.rb
+- lib/scorpio/openapi/reference.rb
+- lib/scorpio/openapi/tag.rb
 - lib/scorpio/openapi/v3/server.rb
 - lib/scorpio/pickle_adapter.rb
 - lib/scorpio/request.rb
@@ -283,9 +100,9 @@ files:
 - scorpio.gemspec
 homepage: https://github.com/notEthan/scorpio
 licenses:
-- MIT
+- AGPL-3.0
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -300,8 +117,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
-signing_key: 
+rubygems_version: 3.1.2
+signing_key:
 specification_version: 4
 summary: Scorpio REST client
 test_files: []

data/.simplecov

@@ -1 +0,0 @@
-SimpleCov.start

data/LICENSE.txt

@@ -1,21 +0,0 @@
-The MIT License (MIT)
-
-Copyright (c) 2016 Ethan
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-THE SOFTWARE.

data/Rakefile

@@ -1,10 +0,0 @@
-require "rake/testtask"
-
-Rake::TestTask.new(:test) do |t|
-  t.libs << "test"
-  t.libs << "lib"
-  t.test_files = FileList['test/**/*_test.rb']
-end
-
-require 'wwtd/tasks'
-task 'default' => 'wwtd:local'

data/bin/documents_to_yml.rb

@@ -1,33 +0,0 @@
-#!/usr/bin/env ruby
-
-require 'pathname'
-require 'json'
-require 'yaml'
-
-root = Pathname.new(__FILE__).dirname.join('..')
-
-document_dirs = [root.join('documents'), root.join('test/documents')]
-documents = document_dirs.map { |d| Pathname.glob(d.join('**/*')) }.inject([], &:+)
-json_documents = documents.select { |p| p.file? && !['.yml', '.yaml'].include?(p.extname) }
-
-json_documents.each do |file|
-  begin
-    json_contents = JSON.parse(file.read)
-    yaml = YAML.dump(json_contents, line_width: -1)
-    yaml_filepath = Pathname.new(file.to_path.chomp('.json') + '.yml')
-    if yaml_filepath.exist?
-      contents = yaml_filepath.read
-      if contents == yaml
-        puts "#{yaml_filepath.to_path} unchanged"
-      else
-        yaml_filepath.write(yaml)
-        puts "#{yaml_filepath.to_path} changed; updated"
-      end
-    else
-      yaml_filepath.write(yaml)
-      puts "#{yaml_filepath.to_path} created"
-    end
-  rescue JSON::ParserError
-    puts "#{file.to_path}: not json"
-  end
-end