heroics 0.1.2 → 0.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 935d4099ef19b7d1edd7f04bd8545d0f2a9d0a3dea2433005148854654a9efb9
-  data.tar.gz: afb94092e02a8ee403c4e2b2b7b0326c59f310376ce1175db13a18f185a56bdc
+  metadata.gz: 7c22cae116c9a2293b7b053e5276c17dc433b35399849ce6f4717fb379259e50
+  data.tar.gz: b6e31b9e048d1081728ca7f0a42ba28427412804c5fada5fe6b58ca52f18adb7
 SHA512:
-  metadata.gz: aa084cff8f5819cc23375f0764c878a44113bd094d1b47997438b2fa8e89e24f56e5ac1fa5dab9341fae077cc329e3d1fac4a5ec26a74e859bfeec50e2951a6b
-  data.tar.gz: 7417de326cf4f11b9f7dc73df4d4397fcfde7f130a34ed4b287226d1c0a536fee1e2f013a15ddb4c596453fc49167d6a218d630ac54059890ad0411e7d32412d
+  metadata.gz: e5f03e286db9c6262d09707b5614b376055dbdf8921b3807d19f9ea8415310918b740bc6c77ed515cf699e07150a82313671d642b1ce4f88fbf77674364f76af
+  data.tar.gz: efb4ece6a80ff3a28641884117a05e07e82a485dcf7ac0ac0a4d51be43de6672caef5f4849e0d4b0ecc138212124c3ba4a33c39889b17f73da0e0b9ee81fd6ff

data/.github/workflows/check_changelog.yml

@@ -6,7 +6,9 @@ jobs:
   build:
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v1
+    - uses: actions/checkout@v6
+      with:
+        fetch-depth: 0
     - name: Check that CHANGELOG is touched
       run: |
         cat $GITHUB_EVENT_PATH | jq .pull_request.title |  grep -i '\[\(\(changelog skip\)\|\(ci skip\)\)\]' ||  git diff remotes/origin/${{ github.base_ref }} --name-only | grep CHANGELOG.md

data/.github/workflows/ci.yml

@@ -0,0 +1,24 @@
+name: CI
+
+on:
+  push:
+
+jobs:
+  test:
+    runs-on: ubuntu-latest
+    strategy:
+      fail-fast: false
+      matrix:
+        ruby-version: ['3.1', '3.2', '3.3', '3.4', '4.0']
+
+    steps:
+      - uses: actions/checkout@v6
+
+      - name: Set up Ruby ${{ matrix.ruby-version }}
+        uses: ruby/setup-ruby@v1
+        with:
+          ruby-version: ${{ matrix.ruby-version }}
+          bundler-cache: true
+
+      - name: Run tests
+        run: bundle exec rake

data/CHANGELOG.md

@@ -1,3 +1,15 @@
+## HEAD (unreleased)
+
+## 0.1.4
+
+- Migrate from TravisCI to GitHub Actions
+- removed erubis dependency
+- removed MultiJson dependency
+
+- ## 0.1.3
+
+- Fix `base64` deprecation warning for Ruby 3.4 (https://github.com/interagent/heroics/pull/107)
+
 ## 0.1.2
 
 - Add support for Ruby 3.0 (https://github.com/interagent/heroics/pull/101)

data/README.md

@@ -1,4 +1,4 @@
-[![Build Status](https://travis-ci.org/interagent/heroics.png?branch=master)](https://travis-ci.org/interagent/heroics)
+[![CI](https://github.com/interagent/heroics/actions/workflows/ci.yml/badge.svg)](https://github.com/interagent/heroics/actions/workflows/ci.yml)
 # Heroics
 
 Ruby HTTP client generator for APIs represented with JSON schema.

data/heroics.gemspec

@@ -21,15 +21,15 @@ Gem::Specification.new do |spec|
   spec.require_paths = ['lib']
 
   spec.add_development_dependency 'bundler'
-  spec.add_development_dependency 'minitest', '4.7.5'
+  spec.add_development_dependency 'minitest'
   spec.add_development_dependency 'netrc'
+  spec.add_development_dependency 'pry'
   spec.add_development_dependency 'rake'
   spec.add_development_dependency 'yard'
-  spec.add_development_dependency 'pry'
 
-  spec.add_dependency 'erubis', '~> 2.0'
+  spec.add_dependency 'base64'
   spec.add_dependency 'excon'
-  spec.add_dependency 'multi_json', '>= 1.9.2'
+  spec.add_dependency 'json'
   spec.add_dependency 'moneta'
   spec.add_dependency 'webrick'
 end

data/lib/heroics/client_generator.rb

@@ -4,12 +4,12 @@ module Heroics
   # option if you want to ship a gem or generate API documentation using Yard.
   def self.generate_client
     filename = File.dirname(__FILE__) + '/views/client.erb'
-    eruby = Erubis::Eruby.new(File.read(filename))
+    eruby = ERB.new(File.read(filename))
     context = build_context(Heroics::Configuration.defaults.module_name,
       Heroics::Configuration.defaults.schema,
       Heroics::Configuration.defaults.base_url,
       Heroics::Configuration.defaults.options)
-    eruby.evaluate(context)
+    eruby.result_with_hash(context)
   end
 
   private
@@ -37,7 +37,7 @@ module Heroics
       default_headers: options.fetch(:default_headers, {}),
       cache: options.fetch(:cache, {}),
       description: schema.description,
-      schema: MultiJson.dump(schema.schema, pretty:true),
+      schema: JSON.pretty_generate(schema.schema),
       resources: resources
     }
   end

data/lib/heroics/command.rb

@@ -38,7 +38,7 @@ Description:
   #{description}
 USAGE
       if example_body
-        example_body = MultiJson.dump(example_body, pretty: true)
+        example_body = JSON.pretty_generate(example_body)
         example_body = example_body.lines.map do |line|
           "  #{line}"
         end.join
@@ -60,7 +60,7 @@ USAGE
       result = @client.send(resource_name).send(name, *parameters)
       result = result.to_a if result.instance_of?(Enumerator)
       if result && !result.instance_of?(String)
-        result = MultiJson.dump(result, pretty: true)
+        result = JSON.pretty_generate(result)
       end
       @output.puts(result) unless result.nil?
     end

data/lib/heroics/configuration.rb

@@ -40,7 +40,7 @@ module Heroics
     end
 
     def schema_filepath=(schema_filepath)
-      @schema = Heroics::Schema.new(MultiJson.decode(open(schema_filepath).read))
+      @schema = Heroics::Schema.new(JSON.parse(open(schema_filepath).read))
     end
 
     def module_name=(module_name)

data/lib/heroics/link.rb

@@ -58,7 +58,7 @@ module Heroics
           if body.is_a?(Hash)
             query = body
           else
-            query = MultiJson.load(body)
+            query = JSON.parse(body)
           end
           body = nil
         end
@@ -71,7 +71,7 @@ module Heroics
                                     expects: [200, 201, 202, 204, 206])
       content_type = response.headers['Content-Type']
       if content_type && content_type =~ /application\/.*json/
-        body = MultiJson.load(response.body)
+        body = JSON.parse(response.body)
         if response.status == 206
           next_range = response.headers['Next-Range']
           Enumerator.new do |yielder|
@@ -89,7 +89,7 @@ module Heroics
                                             method: @link_schema.method,
                                             path: path, headers: headers,
                                             expects: [200, 201, 206])
-              body = MultiJson.load(response.body)
+              body = JSON.parse(response.body)
               next_range = response.headers['Next-Range']
             end
           end

data/lib/heroics/schema.rb

@@ -150,7 +150,7 @@ module Heroics
       when 'application/x-www-form-urlencoded'
         URI.encode_www_form(body)
       when /application\/.*json/
-        MultiJson.dump(body)
+        JSON.generate(body)
       end
     end
 
@@ -244,7 +244,7 @@ module Heroics
                            [value['$ref'], key]
                          end]
       parameters.map do |parameter|
-        definition_name = ::URI::DEFAULT_PARSER.unescape(parameter[2..-3])
+        definition_name = ::URI::RFC2396_PARSER.unescape(parameter[2..-3])
         if definitions.has_key?(definition_name)
           definitions[definition_name]
         else
@@ -273,7 +273,7 @@ module Heroics
     def resolve_parameter_details(parameters)
       parameters.map do |parameter|
         # URI decode parameters and strip the leading '{(' and trailing ')}'.
-        parameter = ::URI::DEFAULT_PARSER.unescape(parameter[2..-3])
+        parameter = ::URI::RFC2396_PARSER.unescape(parameter[2..-3])
 
         # Split the path into components and discard the leading '#' that
         # represents the root of the schema.
@@ -356,7 +356,7 @@ module Heroics
   def self.download_schema(url, options={})
     default_headers = options.fetch(:default_headers, {})
     response = Excon.get(url, headers: default_headers, expects: [200, 201])
-    Schema.new(MultiJson.load(response.body))
+    Schema.new(JSON.parse(response.body))
   end
 
   # A representation of a parameter.

data/lib/heroics/version.rb

@@ -1,4 +1,4 @@
 # frozen_string_literal: true
 module Heroics
-  VERSION = '0.1.2'
+  VERSION = '0.1.4'
 end

data/lib/heroics/views/client.erb

@@ -11,7 +11,7 @@ require 'heroics'
 require 'uri'
 require 'moneta'
 
-module <%= @module_name %>
+module <%= module_name %>
   # Get a Client configured to use HTTP Basic or header-based authentication.
   #
   # @param api_key [String] The API key to use when connecting.
@@ -75,7 +75,7 @@ module <%= @module_name %>
     if options[:default_headers]
       final_options[:default_headers].merge!(options[:default_headers])
     end
-    final_options[:cache] = options[:cache] || <%= @cache %>
+    final_options[:cache] = options[:cache] || <%= cache %>
     final_options[:url] = options[:url] if options[:url]
     final_options[:user] = options[:user] if options[:user]
     final_options
@@ -83,21 +83,21 @@ module <%= @module_name %>
 
   # Get the default options.
   def self.default_options
-    default_headers = <%= @default_headers %>
+    default_headers = <%= default_headers %>
     {
       default_headers: default_headers,
-      url:             "<%= @url %>"
+      url:             "<%= url %>"
     }
   end
 
   private_class_method :default_options, :custom_options
 
-  # <%= @description %>
+  # <%= description %>
   class Client
     def initialize(client)
       @client = client
     end
-    <% for resource in @resources %>
+    <% for resource in resources %>
 
     # <%= resource.description %>
     #
@@ -109,7 +109,7 @@ module <%= @module_name %>
   end
 
   private
-  <% for resource in @resources %>
+  <% for resource in resources %>
 
   # <%= resource.description %>
   class <%= resource.class_name %>
@@ -132,7 +132,7 @@ module <%= @module_name %>
   end
   <% end %>
 
-  SCHEMA = Heroics::Schema.new(MultiJson.load(<<-'HEROICS_SCHEMA'))
-<%= @schema %>
+  SCHEMA = Heroics::Schema.new(JSON.parse(<<-'HEROICS_SCHEMA'))
+<%= schema %>
 HEROICS_SCHEMA
 end

data/lib/heroics.rb

@@ -1,8 +1,8 @@
 # frozen_string_literal: true
 require 'base64'
-require 'erubis'
+require 'erb'
 require 'excon'
-require 'multi_json'
+require 'json'
 require 'uri'
 require 'webrick'
 require 'zlib'

metadata

@@ -1,15 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: heroics
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.1.4
 platform: ruby
 authors:
 - geemus
 - jkakar
-autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-01-27 00:00:00.000000000 Z
+date: 1980-01-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -29,16 +28,16 @@ dependencies:
   name: minitest
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 4.7.5
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 4.7.5
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: netrc
   requirement: !ruby/object:Gem::Requirement
@@ -54,7 +53,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: rake
+  name: pry
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -68,7 +67,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: yard
+  name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -82,7 +81,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: pry
+  name: yard
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -96,19 +95,19 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: erubis
+  name: base64
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: excon
   requirement: !ruby/object:Gem::Requirement
@@ -124,19 +123,19 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: multi_json
+  name: json
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.9.2
+        version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.9.2
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: moneta
   requirement: !ruby/object:Gem::Requirement
@@ -176,8 +175,8 @@ extensions: []
 extra_rdoc_files: []
 files:
 - ".github/workflows/check_changelog.yml"
+- ".github/workflows/ci.yml"
 - ".gitignore"
-- ".travis.yml"
 - CHANGELOG.md
 - CONTRIBUTING.md
 - CONTRIBUTORS.md
@@ -207,7 +206,6 @@ homepage: https://github.com/interagent/heroics
 licenses:
 - MIT
 metadata: {}
-post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -222,8 +220,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.4
-signing_key:
+rubygems_version: 4.0.3
 specification_version: 4
 summary: A Ruby client generator for HTTP APIs described with a JSON schema
 test_files: []

data/.travis.yml

@@ -1,6 +0,0 @@
-sudo: false
-language: ruby
-rvm:
-  - 2.1.10
-  - 2.2.6
-  - 2.3.3