Apipie · aussiDavid · Mar 17, 2021 · May 30, 2020 · Mar 17, 2021 · Jun 10, 2021
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -0,0 +1,50 @@
+# This workflow uses actions that are not certified by GitHub.
+# They are provided by a third-party and are governed by
+# separate terms of service, privacy policy, and support
+# documentation.
+# This workflow will download a prebuilt Ruby version, install dependencies and run tests with Rake
+# For more information see: https://github.com/marketplace/actions/setup-ruby-jruby-and-truffleruby
+
+name: build
+
+on: [push, pull_request]
+
+jobs:
+  test:
+    runs-on: ubuntu-20.04
+    strategy:
+      fail-fast: false
+      matrix:
+        ruby:
+          - 2.6
+          - 2.7
+          - '3.0'
+          - 3.1
+        gemfile:
+          - Gemfile.rails42
+          - Gemfile.rails52 # Min ruby 2.2.2
+          - Gemfile.rails60 # Min ruby 2.5.0
+          - Gemfile.rails61 # Min ruby 2.5.0
+        exclude:
+        - gemfile: Gemfile.rails42
+          ruby: 2.7
+        - gemfile: Gemfile.rails42
+          ruby: '3.0'
+        - gemfile: Gemfile.rails42
+          ruby: 3.1
+        - gemfile: Gemfile.rails52
+          ruby: 2.7
+        - gemfile: Gemfile.rails52
+          ruby: '3.0'
+        - gemfile: Gemfile.rails52
+          ruby: 3.1
+
+    env:
+      BUNDLE_GEMFILE: ${{ github.workspace }}/gemfiles/${{ matrix.gemfile }}
+    steps:
+    - uses: actions/checkout@v2
+    - uses: ruby/setup-ruby@v1
+      with:
+        ruby-version: ${{ matrix.ruby }}
+        bundler-cache: true
+    - run: bundle exec rspec
diff --git a/.travis.yml b/.travis.yml
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,13 @@
  Changelog
 ===========
+## [v0.5.20](https://github.com/Apipie/apipie-rails/tree/v0.5.20) (2022-03-16)
+[Full Changelog](https://github.com/Apipie/apipie-rails/compare/v0.5.19...v0.5.20)
+* Update rel-eng (Oleh Fedorenko)
+* Deprecate travis, run tests on github actions [#740](https://github.com/Apipie/apipie-rails/pull/740) (Mathieu Jobin)
+* Update validator.rb [#739](https://github.com/Apipie/apipie-rails/pull/739) (Dmytro Budnyk)
+* Fix wrong number of arguments for recorder#process [#725](https://github.com/Apipie/apipie-rails/pull/725) (rob mathews)
+* Change "an" to "a" [#723](https://github.com/Apipie/apipie-rails/pull/723) (Naokimi)
+
 ## [v0.5.19](https://github.com/Apipie/apipie-rails/tree/v0.5.19) (2021-07-25)
 [Full Changelog](https://github.com/Apipie/apipie-rails/compare/v0.5.18...v0.5.19)
 * Add rel-eng notebook (Oleh Fedorenko)

diff --git a/Gemfile.rails41 b/Gemfile.rails41
diff --git a/Gemfile.rails50 b/Gemfile.rails50
diff --git a/Gemfile.rails51 b/Gemfile.rails51
diff --git a/Gemfile.rails60 b/Gemfile.rails60
diff --git a/Gemfile.rails61 b/Gemfile.rails61
diff --git a/apipie-rails.gemspec b/apipie-rails.gemspec
@@ -16,7 +16,8 @@ Gem::Specification.new do |s|
   s.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")
   s.require_paths = ["lib"]
 
-  s.add_dependency "rails", ">= 4.1"
+  s.add_dependency "actionpack", ">= 4.1"
+  s.add_dependency "activesupport", ">= 4.1"
   s.add_development_dependency "rspec-rails", "~> 3.0"
   s.add_development_dependency "sqlite3"
   s.add_development_dependency "minitest"

diff --git a/Gemfile.rails42 → gemfiles/Gemfile.rails42 b/Gemfile.rails42 → gemfiles/Gemfile.rails42
@@ -1,8 +1,9 @@
 source "https://rubygems.org"
 
-gemspec
+gemspec path: '..'
 
-gem 'rails', '~> 4.2.5'
+gem 'actionpack', '~> 4.2.5'
+gem 'activesupport', '~> 4.2.5'
 gem 'mime-types', '~> 2.99.3'
 gem 'sqlite3', '~> 1.3.6'
 
@@ -11,4 +12,4 @@ if Gem::Version.new(RUBY_VERSION) < Gem::Version.new('2.1.0')
   gem 'rdoc', '~> 4.2.2'
 end
 
-gem 'test_engine', path: 'spec/dummy/components/test_engine', group: :test
+gem 'test_engine', path: '../spec/dummy/components/test_engine', group: :test
diff --git a/gemfiles/Gemfile.rails42.lock b/gemfiles/Gemfile.rails42.lock
@@ -0,0 +1,122 @@
+PATH
+  remote: ../spec/dummy/components/test_engine
+  specs:
+    test_engine (0.0.1)
+
+PATH
+  remote: ..
+  specs:
+    apipie-rails (0.5.20)
+      actionpack (>= 4.1)
+      activesupport (>= 4.1)
+
+GEM
+  remote: https://rubygems.org/
+  specs:
+    RedCloth (4.3.2)
+    actionpack (4.2.11.3)
+      actionview (= 4.2.11.3)
+      activesupport (= 4.2.11.3)
+      rack (~> 1.6)
+      rack-test (~> 0.6.2)
+      rails-dom-testing (~> 1.0, >= 1.0.5)
+      rails-html-sanitizer (~> 1.0, >= 1.0.2)
+    actionview (4.2.11.3)
+      activesupport (= 4.2.11.3)
+      builder (~> 3.1)
+      erubis (~> 2.7.0)
+      rails-dom-testing (~> 1.0, >= 1.0.5)
+      rails-html-sanitizer (~> 1.0, >= 1.0.3)
+    activesupport (4.2.11.3)
+      i18n (~> 0.7)
+      minitest (~> 5.1)
+      thread_safe (~> 0.3, >= 0.3.4)
+      tzinfo (~> 1.1)
+    addressable (2.8.0)
+      public_suffix (>= 2.0.2, < 5.0)
+    builder (3.2.4)
+    concurrent-ruby (1.1.10)
+    crass (1.0.6)
+    diff-lcs (1.5.0)
+    erubis (2.7.0)
+    i18n (0.9.5)
+      concurrent-ruby (~> 1.0)
+    json-schema (2.8.1)
+      addressable (>= 2.4)
+    loofah (2.15.0)
+      crass (~> 1.0.2)
+      nokogiri (>= 1.5.9)
+    maruku (0.7.3)
+    mime-types (2.99.3)
+    mini_portile2 (2.8.0)
+    minitest (5.15.0)
+    nokogiri (1.13.3)
+      mini_portile2 (~> 2.8.0)
+      racc (~> 1.4)
+    psych (4.0.3)
+      stringio
+    public_suffix (4.0.6)
+    racc (1.6.0)
+    rack (1.6.13)
+    rack-test (0.6.3)
+      rack (>= 1.0)
+    rails-deprecated_sanitizer (1.0.4)
+      activesupport (>= 4.2.0.alpha)
+    rails-dom-testing (1.0.9)
+      activesupport (>= 4.2.0, < 5.0)
+      nokogiri (~> 1.6)
+      rails-deprecated_sanitizer (>= 1.0.1)
+    rails-html-sanitizer (1.4.2)
+      loofah (~> 2.3)
+    railties (4.2.11.3)
+      actionpack (= 4.2.11.3)
+      activesupport (= 4.2.11.3)
+      rake (>= 0.8.7)
+      thor (>= 0.18.1, < 2.0)
+    rake (13.0.6)
+    rdoc (6.4.0)
+      psych (>= 4.0.0)
+    rspec-core (3.9.3)
+      rspec-support (~> 3.9.3)
+    rspec-expectations (3.9.4)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.9.0)
+    rspec-mocks (3.9.1)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.9.0)
+    rspec-rails (3.9.1)
+      actionpack (>= 3.0)
+      activesupport (>= 3.0)
+      railties (>= 3.0)
+      rspec-core (~> 3.9.0)
+      rspec-expectations (~> 3.9.0)
+      rspec-mocks (~> 3.9.0)
+      rspec-support (~> 3.9.0)
+    rspec-support (3.9.4)
+    sqlite3 (1.3.13)
+    stringio (3.0.1)
+    thor (1.2.1)
+    thread_safe (0.3.6)
+    tzinfo (1.2.9)
+      thread_safe (~> 0.1)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  RedCloth
+  actionpack (~> 4.2.5)
+  activesupport (~> 4.2.5)
+  apipie-rails!
+  json-schema (~> 2.8)
+  maruku
+  mime-types (~> 2.99.3)
+  minitest
+  rake
+  rdoc
+  rspec-rails (~> 3.0)
+  sqlite3 (~> 1.3.6)
+  test_engine!
+
+BUNDLED WITH
+   1.17.3
diff --git a/gemfiles/Gemfile.rails52 b/gemfiles/Gemfile.rails52
@@ -0,0 +1,10 @@
+source "https://rubygems.org"
+
+gemspec path: '..'
+
+gem 'actionpack', '~> 5.2.6'
+gem 'activesupport', '~> 5.2.6'
+gem 'mime-types', '~> 2.99.3'
+gem 'rails-controller-testing'
+
+gem 'test_engine', path: '../spec/dummy/components/test_engine', group: :test
diff --git a/gemfiles/Gemfile.rails60 b/gemfiles/Gemfile.rails60
@@ -0,0 +1,17 @@
+source "https://rubygems.org"
+
+gemspec path: '..'
+
+gem 'actionpack', '~> 6.0.4'
+gem 'activesupport', '~> 6.0.4'
+gem 'mime-types', '~> 3.0'
+gem 'rails-controller-testing'
+gem 'rspec-rails', '~> 5.0'
+
+# net-smtp not included by default in Ruby 3.1
+# Will be fixed by https://github.com/mikel/mail/pull/1439
+if Gem.ruby_version >= Gem::Version.new("3.1.0")
+  gem 'net-smtp', require: false
+end
+
+gem 'test_engine', path: '../spec/dummy/components/test_engine', group: :test
diff --git a/gemfiles/Gemfile.rails61 b/gemfiles/Gemfile.rails61
@@ -0,0 +1,17 @@
+source "https://rubygems.org"
+
+gemspec path: '..'
+
+gem 'actionpack', '~> 6.1.5'
+gem 'activesupport', '~> 6.1.5'
+gem 'mime-types', '~> 3.0'
+gem 'rails-controller-testing'
+gem 'rspec-rails', '~> 5.0'
+
+# net-smtp not included by default in Ruby 3.1
+# Will be fixed by https://github.com/mikel/mail/pull/1439
+if Gem.ruby_version >= Gem::Version.new("3.1.0")
+  gem 'net-smtp', require: false
+end
+
+gem 'test_engine', path: '../spec/dummy/components/test_engine', group: :test
diff --git a/lib/apipie/extractor/recorder.rb b/lib/apipie/extractor/recorder.rb
@@ -160,6 +160,7 @@ def process(*, **) # action, parameters = nil, session = nil, flash = nil, http_
         ensure
           Apipie::Extractor.clean_call_recorder
         end
+        ruby2_keywords :process if respond_to?(:ruby2_keywords, true)
       end
     end
   end

diff --git a/lib/apipie/static_dispatcher.rb b/lib/apipie/static_dispatcher.rb
@@ -9,7 +9,9 @@ def initialize(root)
 
     def match?(path)
       # Replace all null bytes
-      path = ::Rack::Utils.unescape(path || '').gsub(/\x0/, '')
+      path = ::Rack::Utils.unescape(path || '')
+                          .encode(Encoding::UTF_8, invalid: :replace, replace: '')
+                          .gsub(/\x0/, '')
 
       full_path = path.empty? ? @root : File.join(@root, path)
       paths = "#{full_path}#{ext}"

diff --git a/lib/apipie/validator.rb b/lib/apipie/validator.rb
@@ -3,7 +3,7 @@ module Apipie
 
   module Validator
 
-    # to create new validator, inherit from Apipie::Validator::Base
+    # to create new validator, inherit from Apipie::Validator::BaseValidator
     # and implement class method build and instance method validate
     class BaseValidator
 

diff --git a/lib/apipie/version.rb b/lib/apipie/version.rb
@@ -1,3 +1,3 @@
 module Apipie
-  VERSION = "0.5.19"
+  VERSION = "0.5.20"
 end
-Original file line number
+Diff line change
@@ Expand Up @@
             ensure
               Apipie::Extractor.clean_call_recorder
             end
+            ruby2_keywords :process if respond_to?(:ruby2_keywords, true)
           end
         end
       end
@@ Expand Down @@