Merge pull request #1464 from dblock/glaucocustodio-rails-5-compatibility

Add Rails 5 appraisal.

Author: dblock

.rubocop.yml

@@ -1,6 +1,7 @@
 AllCops:
   Include:
     - Dangerfile
+    - gemfiles/*.gemfile
 
   Exclude:
     - vendor/**/*

.travis.yml

@@ -8,6 +8,8 @@ matrix:
       gemfile: Gemfile
       before_script:
         - bundle exec danger
+    - rvm: 2.3.1
+      gemfile: gemfiles/rails_5.gemfile
     - rvm: 2.3.1
       gemfile: gemfiles/rack_1.5.2.gemfile
     - rvm: 2.3.0

Appraisals

@@ -7,6 +7,10 @@ appraise 'rails-4' do
   gem 'rails', '4.1.6'
 end
 
+appraise 'rails-5' do
+  gem 'rails', '5.0.0'
+end
+
 appraise 'rack-1.5.2' do
   gem 'rack', '1.5.2'
 end

Gemfile

@@ -26,7 +26,7 @@ group :test do
   gem 'rack-test'
   gem 'rspec', '~> 3.0'
   gem 'cookiejar'
-  gem 'rack-contrib'
+  gem 'rack-jsonp', require: 'rack/jsonp'
   gem 'mime-types', '< 3.0'
   gem 'danger', '~> 2.0'
 end

gemfiles/rack_1.5.2.gemfile

@@ -26,7 +26,7 @@ group :test do
   gem 'rack-test'
   gem 'rspec', '~> 3.0'
   gem 'cookiejar'
-  gem 'rack-contrib'
+  gem 'rack-jsonp', require: 'rack/jsonp'
   gem 'mime-types', '< 3.0'
   gem 'danger', '~> 2.0'
 end

gemfiles/rails_3.gemfile

@@ -27,7 +27,7 @@ group :test do
   gem 'rack-test'
   gem 'rspec', '~> 3.0'
   gem 'cookiejar'
-  gem 'rack-contrib'
+  gem 'rack-jsonp', require: 'rack/jsonp'
   gem 'mime-types', '< 3.0'
   gem 'danger', '~> 2.0'
 end

gemfiles/rails_4.gemfile

@@ -26,7 +26,7 @@ group :test do
   gem 'rack-test'
   gem 'rspec', '~> 3.0'
   gem 'cookiejar'
-  gem 'rack-contrib'
+  gem 'rack-jsonp', require: 'rack/jsonp'
   gem 'mime-types', '< 3.0'
   gem 'danger', '~> 2.0'
 end

gemfiles/rails_5.gemfile

@@ -0,0 +1,34 @@
+# This file was generated by Appraisal
+
+source 'https://rubygems.org'
+
+gem 'rails', '5.0.0'
+
+group :development, :test do
+  gem 'bundler'
+  gem 'rake'
+  gem 'rubocop', '0.39.0'
+end
+
+group :development do
+  gem 'guard'
+  gem 'guard-rspec'
+  gem 'guard-rubocop'
+  gem 'yard'
+  gem 'appraisal'
+  gem 'benchmark-ips'
+  gem 'redcarpet'
+end
+
+group :test do
+  gem 'grape-entity', '0.5.0'
+  gem 'maruku'
+  gem 'rack-test'
+  gem 'rspec', '~> 3.0'
+  gem 'cookiejar'
+  gem 'rack-jsonp', require: 'rack/jsonp'
+  gem 'mime-types', '< 3.0'
+  gem 'danger', '~> 2.0'
+end
+
+gemspec path: '../'

spec/grape/api_spec.rb

@@ -374,12 +374,17 @@ def subject.enable_root_route!
     end
 
     context 'format' do
+      module ApiSpec
+        class DummyFormatClass
+        end
+      end
+
       before(:each) do
-        allow_any_instance_of(Object).to receive(:to_json).and_return('abc')
-        allow_any_instance_of(Object).to receive(:to_txt).and_return('def')
+        allow_any_instance_of(ApiSpec::DummyFormatClass).to receive(:to_json).and_return('abc')
+        allow_any_instance_of(ApiSpec::DummyFormatClass).to receive(:to_txt).and_return('def')
 
         subject.get('/abc') do
-          Object.new
+          ApiSpec::DummyFormatClass.new
         end
       end
 
@@ -1312,7 +1317,9 @@ def self.io
     it 'defaults to a standard logger log format' do
       t = Time.at(100)
       allow(Time).to receive(:now).and_return(t)
-      expect(subject.io).to receive(:write).with("I, [#{Logger::Formatter.new.send(:format_datetime, t)}\##{Process.pid}]  INFO -- : this will be logged\n")
+      message = "this will be logged\n"
+      message = "I, [#{Logger::Formatter.new.send(:format_datetime, t)}\##{Process.pid}]  INFO -- : #{message}" if !defined?(Rails) || Gem::Version.new(Rails::VERSION::STRING) >= Gem::Version.new('4.0')
+      expect(subject.io).to receive(:write).with(message)
       subject.logger.info 'this will be logged'
     end
   end

spec/grape/entity_spec.rb

@@ -266,8 +266,6 @@ def initialize(args)
     end
 
     it 'presents with jsonp utilising Rack::JSONP' do
-      require 'rack/contrib'
-
       # Include JSONP middleware
       subject.use Rack::JSONP
 

spec/grape/integration/rack_spec.rb

@@ -22,7 +22,7 @@
       unless RUBY_PLATFORM == 'java'
         major, minor, patch = Rack.release.split('.').map(&:to_i)
         patch ||= 0 # rack <= 1.5.2 does not specify patch version
-        pending 'Rack 1.5.3 or 1.6.1 required' unless major >= 1 && ((minor == 5 && patch >= 3) || (minor >= 6))
+        pending 'Rack 1.5.3 or 1.6.1 required' unless major >= 2 || (major >= 1 && ((minor == 5 && patch >= 3) || (minor >= 6)))
       end
 
       expect(JSON.parse(app.call(env)[2].body.first)['params_keys']).to match_array('test')

spec/spec_helper.rb

@@ -6,14 +6,7 @@
 
 require 'rubygems'
 require 'bundler'
-Bundler.setup :default, :test
-
-require 'json'
-require 'rack/test'
-require 'base64'
-require 'cookiejar'
-require 'mime/types'
-require 'cgi'
+Bundler.require :default, :test
 
 Dir["#{File.dirname(__FILE__)}/support/*.rb"].each do |file|
   require file