scorpio 0.5.0 → 0.6.0

data/scorpio.gemspec

@@ -13,29 +13,21 @@ Gem::Specification.new do |spec|
   spec.description   = 'ORM style REST client'
   spec.homepage      = "https://github.com/notEthan/scorpio"
   spec.license       = "AGPL-3.0"
-  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.test_files    = `git ls-files -z test`.split("\x0")
-  spec.bindir        = "exe"
-  spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
+
+  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.4.0"
-  spec.add_dependency "ur", "~> 0.2.0"
-  spec.add_dependency "faraday"
-  spec.add_development_dependency "rake"
-  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.4" # 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.5.0
+  version: 0.6.0
 platform: ruby
 authors:
 - Ethan
-autorequire: 
-bindir: exe
+autorequire:
+bindir: bin
 cert_chain: []
-date: 2020-07-06 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.4.0
+        version: 0.6.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.4.0
+        version: 0.6.0
 - !ruby/object:Gem::Dependency
   name: ur
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.2.0
+        version: 0.2.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.2.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: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '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.4'
-  type: :development
+        version: '2.3'
+  type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.4'
-- !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.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
@@ -274,6 +89,7 @@ files:
 - 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
@@ -281,20 +97,12 @@ files:
 - lib/scorpio/response.rb
 - lib/scorpio/ur.rb
 - lib/scorpio/version.rb
-- resources/icons/AGPL-3.0.png
 - scorpio.gemspec
-- test/blog.openapi2.yml
-- test/blog.openapi3.yml
-- test/blog.rb
-- test/blog.rest_description.yml
-- test/blog_scorpio_models.rb
-- test/scorpio_test.rb
-- test/test_helper.rb
 homepage: https://github.com/notEthan/scorpio
 licenses:
 - AGPL-3.0
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -309,15 +117,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.6
-signing_key: 
+rubygems_version: 3.1.2
+signing_key:
 specification_version: 4
 summary: Scorpio REST client
-test_files:
-- test/blog.openapi2.yml
-- test/blog.openapi3.yml
-- test/blog.rb
-- test/blog.rest_description.yml
-- test/blog_scorpio_models.rb
-- test/scorpio_test.rb
-- test/test_helper.rb
+test_files: []

data/.simplecov

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

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

data/test/blog.openapi2.yml

@@ -1,113 +0,0 @@
----
-swagger: '2.0'
-info:
-  title: Scorpio Blog
-  description: REST service for the Scorpio Blog
-  version: ''
-  contact: {}
-host: blog
-basePath: "/v1"
-schemes: ['https']
-consumes:
-- application/json
-produces:
-- application/json
-paths:
-  "/articles":
-    get:
-      tags:
-      - articles
-      operationId: articles.index
-      responses:
-        default:
-          description: default response
-          schema:
-            type: array
-            items:
-              "$ref": "#/definitions/articles"
-    post:
-      tags:
-      - articles
-      operationId: articles.post
-      parameters:
-      - name: body
-        in: body
-        required: true
-        schema:
-          "$ref": "#/definitions/articles"
-      responses:
-        default:
-          description: default response
-          schema:
-            "$ref": "#/definitions/articles"
-  "/articles_with_root":
-    get:
-      tags:
-      - articles
-      operationId: articles.index_with_root
-      responses:
-        default:
-          description: default response
-          schema:
-            type: object
-            properties:
-              articles:
-                type: array
-                items:
-                  "$ref": "#/definitions/articles"
-              best_article:
-                "$ref": "#/definitions/articles"
-              version:
-                type: string
-  "/articles/{id}":
-    get:
-      tags:
-      - articles
-      operationId: articles.read
-      parameters:
-      - name: id
-        in: path
-        required: true
-        type: string
-      responses:
-        default:
-          description: default response
-          schema:
-            "$ref": "#/definitions/articles"
-    patch:
-      tags:
-      - articles
-      operationId: articles.patch
-      parameters:
-      - name: id
-        in: path
-        required: true
-        type: string
-      - name: body
-        in: body
-        required: true
-        schema:
-          "$ref": "#/definitions/articles"
-      responses:
-        default:
-          description: default response
-          schema:
-            "$ref": "#/definitions/articles"
-  "/clean":
-    post:
-      tags:
-      - clean
-      operationId: clean
-      responses:
-        default:
-          description: default response
-definitions:
-  articles:
-    type: object
-    properties:
-      id:
-        type: integer
-      title:
-        type: string
-      author_id:
-        type: integer

data/test/blog.openapi3.yml

@@ -1,131 +0,0 @@
-openapi: 3.0.0
-servers:
-- url: "{scheme}://{host}:{port}/{basePath}"
-  variables:
-    scheme:
-      default: https
-    host:
-      default: blog.scorpio
-    port:
-      default: '443'
-    basePath:
-      enum:
-        - v1
-      default: v1
-info:
-  title: Scorpio Blog
-  description: REST service for the Scorpio Blog
-  version: ''
-  contact: {}
-paths:
-  /articles:
-    get:
-      tags:
-      - articles
-      operationId: articles.index
-      responses:
-        default:
-          description: default response
-          content:
-            application/json:
-              schema:
-                type: array
-                items:
-                  $ref: '#/components/schemas/articles'
-    post:
-      tags:
-      - articles
-      operationId: articles.post
-      responses:
-        default:
-          description: default response
-          content:
-            application/json:
-              schema:
-                $ref: '#/components/schemas/articles'
-      requestBody:
-        $ref: '#/components/requestBodies/articles'
-  /articles_with_root:
-    get:
-      tags:
-      - articles
-      operationId: articles.index_with_root
-      responses:
-        default:
-          description: default response
-          content:
-            application/json:
-              schema:
-                type: object
-                properties:
-                  articles:
-                    type: array
-                    items:
-                      $ref: '#/components/schemas/articles'
-                  best_article:
-                    $ref: '#/components/schemas/articles'
-                  version:
-                    type: string
-  '/articles/{id}':
-    get:
-      tags:
-      - articles
-      operationId: articles.read
-      parameters:
-        - name: id
-          in: path
-          required: true
-          schema:
-            type: string
-      responses:
-        default:
-          description: default response
-          content:
-            application/json:
-              schema:
-                $ref: '#/components/schemas/articles'
-    patch:
-      tags:
-      - articles
-      operationId: articles.patch
-      parameters:
-        - name: id
-          in: path
-          required: true
-          schema:
-            type: string
-      responses:
-        default:
-          description: default response
-          content:
-            application/json:
-              schema:
-                $ref: '#/components/schemas/articles'
-      requestBody:
-        $ref: '#/components/requestBodies/articles'
-  /clean:
-    post:
-      tags:
-      - clean
-      operationId: clean
-      responses:
-        default:
-          description: default response
-components:
-  requestBodies:
-    articles:
-      content:
-        application/json:
-          schema:
-            $ref: '#/components/schemas/articles'
-      required: true
-  schemas:
-    articles:
-      type: object
-      properties:
-        id:
-          type: integer
-        title:
-          type: string
-        author_id:
-          type: integer