Merge pull request #18 from RadiusNetworks/rails5

Relax Rails version requirement to allow for 5

Author: csexton

.travis.yml

@@ -4,5 +4,4 @@ cache: bundler
 sudo: false
 script: bin/rake
 rvm:
-  - 2.1
-  - 2.2
+  - 2.3.1

app/controllers/kracken/application_controller.rb

@@ -1,10 +1,5 @@
 module Kracken
-  class SessionsController < ApplicationController
-    skip_before_filter :authenticate_user!, except: [:index]
-    skip_before_filter :handle_user_cache_cookie!, except: [:index]
-
-    def index
-    end
+  class SessionsController < ActionController::Base
 
     def create
       @user = user_class.find_or_create_from_auth_hash(auth_hash)

app/controllers/kracken/sessions_controller.rb

@@ -15,12 +15,12 @@ Gem::Specification.new do |s|
 
   s.files = Dir['{app,config,db,lib}/**/*', 'MIT-LICENSE', 'Rakefile', 'README.md']
 
-  s.add_dependency 'rails', '~> 4.0'
+  s.add_dependency 'rails', [">= 4.0", "< 6.0"]
   s.add_dependency 'omniauth', '~> 1.0'
   s.add_dependency 'faraday', '~> 0.8'
   s.add_dependency 'omniauth-oauth2', '~> 1.1'
 
-  s.add_development_dependency 'rspec-rails', '~> 3.4'
+  s.add_development_dependency 'rspec-rails', '~> 3.5'
   s.add_development_dependency 'pry'
   s.add_development_dependency 'pry-nav'
   s.add_development_dependency 'webmock'

kracken.gemspec

@@ -74,6 +74,14 @@ def verify_required_params(options = {})
         end
       end
 
+      def self.included(base)
+        base.instance_exec do
+          extend Macros
+
+          before_action :munge_chained_param_ids!
+        end
+      end
+
       module DataIntegrity
         # Scan each item in the data root and enforce it has an id set.
         def enforce_resource_ids!
@@ -118,7 +126,7 @@ def self.included(base)
           extend Macros
 
           before_action :munge_chained_param_ids!
-          skip_before_action :verify_authenticity_token
+          skip_before_action :verify_authenticity_token, raise: false
 
           if defined?(::ActiveRecord)
             rescue_from ::ActiveRecord::RecordNotFound do |error|

lib/kracken/controllers/json_api_compatible.rb

@@ -15,10 +15,18 @@ def self.included(base)
 
       # Customize the `authenticate_or_request_with_http_token` process:
       # http://api.rubyonrails.org/classes/ActionController/HttpAuthentication/Token/ControllerMethods.html#method-i-request_http_token_authentication
-      def request_http_token_authentication(realm = 'Application')
-        # Modified from https://github.com/rails/rails/blob/60d0aec7/actionpack/lib/action_controller/metal/http_authentication.rb#L490-L499
-        headers["WWW-Authenticate"] = %(Token realm="#{realm.gsub(/"/, "")}")
-        raise TokenUnauthorized, "Invalid Credentials"
+      #
+      # Modified from https://github.com/rails/rails/blob/60d0aec7/actionpack/lib/action_controller/metal/http_authentication.rb#L490-L499
+      if Rails::VERSION::MAJOR >= 5
+        def request_http_token_authentication(realm = 'Application', message = nil)
+          headers["WWW-Authenticate"] = %(Token realm="#{realm.gsub(/"/, "")}")
+          raise TokenUnauthorized, "Invalid Credentials"
+        end
+      else
+        def request_http_token_authentication(realm = 'Application')
+          headers["WWW-Authenticate"] = %(Token realm="#{realm.gsub(/"/, "")}")
+          raise TokenUnauthorized, "Invalid Credentials"
+        end
       end
 
     private

lib/kracken/controllers/token_authenticatable.rb

@@ -1,5 +1,5 @@
 class WelcomeController < ApplicationController
-  skip_before_filter :authenticate_user!, only: [:index]
+  skip_before_action :authenticate_user!, only: [:index]
 
   def index
   end

spec/dummy/app/controllers/welcome_controller.rb

@@ -20,7 +20,7 @@
   # config.action_dispatch.rack_cache = true
 
   # Disable Rails's static asset server (Apache or nginx will already do this).
-  config.serve_static_files = false
+  config.public_file_server.enabled = false
 
   # Compress JavaScripts and CSS.
   config.assets.js_compressor = :uglifier

spec/dummy/config/environments/production.rb

@@ -14,8 +14,15 @@
   config.eager_load = false
 
   # Configure static asset server for tests with Cache-Control for performance.
-  config.serve_static_files = true
-  config.static_cache_control = "public, max-age=3600"
+  if config.respond_to? :public_file_server
+    # Hot new Rails 5 Settings
+    config.public_file_server.enabled = true
+    config.public_file_server.headers = { 'Cache-Control' => 'public, max-age=3600' }
+  else
+    # Deprecated Rails 4 Settings
+    config.serve_static_files = true
+    config.static_cache_control = "public, max-age=3600"
+  end
 
   # Show full error reports and disable caching.
   config.consider_all_requests_local       = true

spec/dummy/config/environments/test.rb

@@ -18,7 +18,12 @@ def headers_with_token(token)
         stub_request(:get, "https://account.radiusnetworks.com/auth/radius/user.json?oauth_token=123")
           .to_return(status: 200, body: json)
 
-        get api_index_path, nil, headers_with_token("123")
+        # Temporary work around while we support versions of Rails before 4
+        if Rails::VERSION::MAJOR >= 5
+          get api_index_path, params: {}, headers: headers_with_token("123")
+        else
+          get api_index_path, {}, headers_with_token("123")
+        end
 
         expect(response.status).to be 200
       end