rails-rfc6570 2.1.0 → 2.2.0

data/spec/rfc6570_spec.rb

@@ -1,10 +1,11 @@
+# frozen_string_literal: true
+
 require 'spec_helper'
 
 ActiveSupport::Inflector.inflections(:en) do |inflect|
   inflect.acronym 'API'
 end
 
-
 Dummy::Application.routes.draw do
   get '/' => 'api#index', as: :root
 
@@ -25,7 +26,7 @@ class APIController < ApplicationController
     render json: rfc6570_routes
   end
 
-  rfc6570_params action: [:param1, :param2]
+  rfc6570_params action: %i[param1 param2]
   def action
     render json: {
       ref: action_url,
@@ -33,7 +34,7 @@ class APIController < ApplicationController
       template_url: action_url_rfc6570,
       template_path: action_path_rfc6570,
       partial: test6_rfc6570.partial_expand(title: 'TITLE'),
-      expand: test6_rfc6570.expand(capture: %w(a b), title: 'TITLE')
+      expand: test6_rfc6570.expand(capture: %w[a b], title: 'TITLE')
     }
   end
 
@@ -54,7 +55,7 @@ describe Rails::RFC6570, type: :request do
     before { get '/' }
 
     it 'should return list of all parsed and named routes' do
-      expect(json.keys).to match_array %w(root action test1 test2 test3 test4 test5 test6)
+      expect(json.keys).to match_array %w[root action test1 test2 test3 test4 test5 test6]
     end
 
     it 'should include known parameters' do
@@ -102,7 +103,7 @@ describe Rails::RFC6570, type: :request do
     end
 
     it 'should allow to return and render path templates' do
-      expect(json['template_path']).to eq "/action{?param1,param2}"
+      expect(json['template_path']).to eq '/action{?param1,param2}'
     end
 
     it 'should allow to return and render partial expanded templates' do
@@ -113,18 +114,18 @@ describe Rails::RFC6570, type: :request do
       expect(json['expand']).to eq "#{host}/path/a/b/TITLE"
     end
 
-    context 'with origin_script_name' do
-      let(:headers) { {'__OSN' => '/fuubar'} }
+    if Rails::VERSION::MAJOR >= 5
+      context 'with origin_script_name' do
+        let(:headers) { {'__OSN' => '/fuubar'} }
 
-      before do
-        if Rails::VERSION::MAJOR >= 5
+        before do
           # Consistency check with normal URL helper
           expect(json['ref']).to eq "#{host}/fuubar/action"
         end
-      end
 
-      it 'prefixes origin script name' do
-        expect(json['template']).to eq "#{host}/fuubar/action{?param1,param2}"
+        it 'prefixes origin script name' do
+          expect(json['template']).to eq "#{host}/fuubar/action{?param1,param2}"
+        end
       end
     end
   end

data/spec/spec_helper.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 # Coverage
 require 'coveralls'
 Coveralls.wear! do
@@ -13,11 +15,13 @@ Rails.backtrace_cleaner.remove_silencers!
 
 # Requires supporting ruby files with custom matchers and macros, etc,
 # in spec/support/ and its subdirectories.
-Dir[File.expand_path('../support/**/*.rb', __FILE__)].each { |f| require f }
+Dir[File.expand_path('../support/**/*.rb', __FILE__)].each {|f| require f }
 
 # Checks for pending migrations before tests are run.
 # If you are not using ActiveRecord, you can remove this line.
-ActiveRecord::Migration.check_pending! if defined?(ActiveRecord::Migration) && Rails::VERSION::MAJOR >= 4
+if defined?(ActiveRecord::Migration) && Rails::VERSION::MAJOR >= 4
+  ActiveRecord::Migration.check_pending!
+end
 
 RSpec.configure do |config|
   config.order = 'random'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rails-rfc6570
 version: !ruby/object:Gem::Version
-  version: 2.1.0
+  version: 2.2.0
 platform: ruby
 authors:
 - Jan Graichen
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-11-06 00:00:00.000000000 Z
+date: 2018-04-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: actionpack
@@ -19,7 +19,7 @@ dependencies:
         version: '4.2'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '5.2'
+        version: '6'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -29,7 +29,7 @@ dependencies:
         version: '4.2'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '5.2'
+        version: '6'
 - !ruby/object:Gem::Dependency
   name: addressable
   requirement: !ruby/object:Gem::Requirement
@@ -58,7 +58,7 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.5'
-description: Pragmatical access to your Rails routes as RFC6570 URI templates.
+description: 
 email:
 - jg@altimos.de
 executables: []
@@ -123,7 +123,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.13
+rubygems_version: 2.7.3
 signing_key: 
 specification_version: 4
 summary: Pragmatical access to your Rails routes as RFC6570 URI templates.