drop support for ruby 1.9, activeadmin 0.6.6, and rails 3

add support for rails 5

Author: thambley

.travis.yml

@@ -4,8 +4,8 @@ rvm:
   - 2.2
 
 gemfile:
-  - gemfiles/rails_32.gemfile
   - gemfiles/rails_42.gemfile
+  - gemfiles/rails_51.gemfile
 
 script:
   - bundle exec rake setup

README.md

@@ -19,7 +19,7 @@ This gem borrows heavily from [activeadmin-axlsx] and [to_xls].
 Add the following to your Gemfile. All resource index views will now include a link for download directly to xls.
 
 ```ruby
-gem 'activeadmin-xls', '~>1.1.0'
+gem 'activeadmin-xls', '2.0.0-alpha'
 ```
 
 For Active Admin 1.0, you will also have to update config/initializers/active_admin.rb.  Update the download\_links setting to include xls:
@@ -132,32 +132,32 @@ Running specs for this gem requires that you construct a rails application.
 
 To execute the specs, navigate to the gem directory, run bundle install and run these to rake tasks:
 
-### Rails 3.2
+### Rails 4.2
 
 ```text
-bundle install --gemfile=gemfiles/rails_32.gemfile
+bundle install --gemfile=gemfiles/rails_42.gemfile
 ```
 
 ```text
-BUNDLE_GEMFILE=gemfiles/rails_32.gemfile bundle exec rake setup
+BUNDLE_GEMFILE=gemfiles/rails_42.gemfile bundle exec rake setup
 ```
 
 ```text
-BUNDLE_GEMFILE=gemfiles/rails_32.gemfile bundle exec rake
+BUNDLE_GEMFILE=gemfiles/rails_42.gemfile bundle exec rake
 ```
 
-### Rails 4.2
+### Rails 5.1
 
 ```text
-bundle install --gemfile=gemfiles/rails_42.gemfile
+bundle install --gemfile=gemfiles/rails_51.gemfile
 ```
 
 ```text
-BUNDLE_GEMFILE=gemfiles/rails_42.gemfile bundle exec rake setup
+BUNDLE_GEMFILE=gemfiles/rails_51.gemfile bundle exec rake setup
 ```
 
 ```text
-BUNDLE_GEMFILE=gemfiles/rails_42.gemfile bundle exec rake
+BUNDLE_GEMFILE=gemfiles/rails_51.gemfile bundle exec rake
 ```
 
 [Active Admin]:https://www.activeadmin.info/

activeadmin-xls.gemspec

@@ -21,9 +21,9 @@ Gem::Specification.new do |s|
 
   s.files = git_tracked_files - gem_ignored_files
 
-  s.add_runtime_dependency 'activeadmin', '>= 0.6.6', '< 2'
+  s.add_runtime_dependency 'activeadmin', '>= 1.0.0', '< 2'
   s.add_runtime_dependency 'spreadsheet', '~> 1.0'
 
-  s.required_ruby_version = '>= 1.9.2'
+  s.required_ruby_version = '>= 2.0.0'
   s.require_path = 'lib'
 end

gemfiles/rails_32.gemfile gemfiles/rails_51.gemfilegemfiles/rails_32.gemfile renamed to gemfiles/rails_51.gemfile

@@ -6,22 +6,14 @@ ruby_minor_version = RUBY_VERSION.split('.')[1].to_i
 
 eval_gemfile(File.expand_path(File.join('..', 'Gemfile'), __dir__))
 
-gem 'rails', '3.2.22.5'
-
-gem 'activeadmin', '0.6.6'
-
-group :assets do
-  gem 'coffee-rails', '~> 3.2.1'
-  gem 'sass-rails',   '~> 3.2.3'
-
-  # See https://github.com/sstephenson/execjs#readme for more supported runtimes
-  # gem 'therubyracer', :platforms => :ruby
-
-  gem 'uglifier', '>= 1.0.3'
-end
+gem 'activeadmin', '1.2.1'
+gem 'devise', '~> 4.2'
+gem 'rails', '5.1.5'
+gem 'turbolinks', '~> 5.0.0'
+gem 'tzinfo-data'
 
 group :test do
-  gem 'shoulda-matchers', '~> 2.8.0'
+  gem 'shoulda-matchers', '~> 3.1'
   if ruby_major_version > 2 || (ruby_major_version == 2 && ruby_minor_version > 1)
     gem 'test-unit', '~> 3.0'
   end

lib/active_admin/xls/engine.rb

@@ -14,7 +14,7 @@ class Engine < ::Rails::Engine
         ActiveAdmin::ResourceDSL.send :include, ActiveAdmin::Xls::DSL
         ActiveAdmin::Resource.send :include, ActiveAdmin::Xls::ResourceExtension
         ActiveAdmin::ResourceController.send(
-          :include,
+          :prepend,
           ActiveAdmin::Xls::ResourceControllerExtension
         )
       end

lib/active_admin/xls/resource_controller_extension.rb

@@ -2,18 +2,15 @@ module ActiveAdmin
   module Xls
     # Extends the resource controller to respond to xls requests
     module ResourceControllerExtension
-      def self.included(base)
-        base.send :alias_method_chain, :per_page, :xls
-        base.send :alias_method_chain, :index, :xls
-        base.send :alias_method_chain, :rescue_active_admin_access_denied, :xls
-        base.send :respond_to, :xls
+      def self.prepended(base)
+        base.send :respond_to, :xls, only: :index
       end
 
       # Patches index to respond to requests with xls mime type by
       # sending a generated xls document serializing the current
       # collection
-      def index_with_xls
-        index_without_xls do |format|
+      def index
+        super do |format|
           format.xls do
             xls = active_admin_config.xls_builder.serialize(xls_collection,
                                                             view_context)
@@ -31,7 +28,7 @@ def index_with_xls
       # configure activeadmin to respond propertly to xls requests
       #
       # param exception [Exception] unauthorized access error
-      def rescue_active_admin_access_denied_with_xls(exception)
+      def rescue_active_admin_access_denied(exception)
         if request.format == Mime::Type.lookup_by_extension(:xls)
           respond_to do |format|
             format.xls do
@@ -40,23 +37,10 @@ def rescue_active_admin_access_denied_with_xls(exception)
             end
           end
         else
-          rescue_active_admin_access_denied_without_xls(exception)
+          super(exception)
         end
       end
 
-      # Patches per_page to use the CSV record max for pagination
-      # when the format is xls
-      #
-      # @return [Integer] maximum records per page
-      def per_page_with_xls
-        if request.format == Mime::Type.lookup_by_extension(:xls)
-          return max_per_page if respond_to?(:max_per_page, true)
-          active_admin_config.max_per_page
-        end
-
-        per_page_without_xls
-      end
-
       # Returns a filename for the xls file using the collection_name
       # and current date such as 'my-articles-2011-06-24.xls'.
       #
@@ -70,11 +54,7 @@ def xls_filename
       # It uses the find_collection function if it is available, and uses
       # collection if find_collection isn't available.
       def xls_collection
-        if method(:find_collection).arity.zero?
-          collection
-        else
-          find_collection except: :pagination
-        end
+        find_collection except: :pagination
       end
     end
   end

lib/active_admin/xls/version.rb

@@ -1,6 +1,6 @@
 module ActiveAdmin
   module Xls
     # ActiveAdmin XLS gem version
-    VERSION = '1.1.0'.freeze
+    VERSION = '2.0.0-alpha'.freeze
   end
 end

spec/support/rails_template.rb

@@ -24,24 +24,43 @@
             "\ncucumber:\n  secret_key_base: #{cucumber_secret}"
 end
 
+base_record = if Rails::VERSION::MAJOR >= 5
+                'ApplicationRecord'
+              else
+                'ActiveRecord::Base'
+              end
+
 # Generate some test models
 generate :model, 'post title:string body:text published_at:datetime author_id:integer category_id:integer'
-inject_into_file 'app/models/post.rb', "  belongs_to :author, class_name: 'User'\n  belongs_to :category\n  accepts_nested_attributes_for :author\n", after: "class Post < ActiveRecord::Base\n"
-# Rails 3.2.3 model generator declare attr_accessible
-if Rails::VERSION::MAJOR == 3
-  inject_into_file 'app/models/post.rb',
-                   "  attr_accessible :author\n",
-                   before: 'end'
-end
+post_model_setup = if Rails::VERSION::MAJOR >= 5
+                     <<-MODEL
+  belongs_to :author, class_name: 'User'
+  belongs_to :category, optional: true
+  accepts_nested_attributes_for :author
+MODEL
+                   else
+                     <<-MODEL
+  belongs_to :author, class_name: 'User'
+  belongs_to :category
+  accepts_nested_attributes_for :author
+MODEL
+                   end
+inject_into_file 'app/models/post.rb',
+                 post_model_setup,
+                 after: "class Post < #{base_record}\n"
+
 generate :model, 'user type:string first_name:string last_name:string username:string age:integer'
 inject_into_file 'app/models/user.rb',
                  "  has_many :posts, foreign_key: 'author_id'\n",
-                 after: "class User < ActiveRecord::Base\n"
+                 after: "class User < #{base_record}\n"
+
 generate :model, 'publisher --migration=false --parent=User'
+
 generate :model, 'category name:string description:text'
 inject_into_file 'app/models/category.rb',
                  "  has_many :posts\n  accepts_nested_attributes_for :posts\n",
-                 after: "class Category < ActiveRecord::Base\n"
+                 after: "class Category < #{base_record}\n"
+
 generate :model, 'store name:string'
 
 # Generate a model with string ids
@@ -65,13 +84,7 @@ def set_id
 
 inject_into_file 'app/models/tag.rb',
                  id_model_setup,
-                 after: "class Tag < ActiveRecord::Base\n"
-
-if Rails::VERSION::MAJOR == 3 && Rails::VERSION::MINOR == 1 # Rails 3.1 Gotcha
-  gsub_file 'app/models/tag.rb',
-            /self\.primary_key.*$/,
-            'define_attr_method :primary_key, :id'
-end
+                 after: "class Tag < #{base_record}\n"
 
 # Configure default_url_options in test environment
 inject_into_file(
@@ -97,25 +110,14 @@ def set_id
 
 $LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
 
-if Rails::VERSION::MAJOR == 3
-  # we need this routing path, named "logout_path", for testing
-  route <<-ROUTE
-  devise_scope :user do
-    match '/admin/logout' => 'active_admin/devise/sessions#destroy', as: :logout
-  end
-  ROUTE
-end
-
 generate :'active_admin:install'
 
 run 'rm -r test'
 run 'rm -r spec'
 
-if Rails::VERSION::MAJOR > 3
-  inject_into_file 'config/initializers/active_admin.rb',
-                   "  config.download_links = %i[csv xml json xls]\n",
-                   after: "  # == Download Links\n"
-end
+inject_into_file 'config/initializers/active_admin.rb',
+                 "  config.download_links = %i[csv xml json xls]\n",
+                 after: "  # == Download Links\n"
 
 # Setup a root path for devise
 route "root to: 'admin/dashboard#index'"

spec/xls/unit/resource_controller_spec.rb

@@ -1,22 +1,7 @@
 require 'spec_helper'
-describe ActiveAdmin::ResourceController do
+describe Admin::CategoriesController, type: :controller do
   let(:mime) { Mime::Type.lookup_by_extension(:xls) }
 
-  let(:request) do
-    ActionController::TestRequest.new.tap do |test_request|
-      test_request.accept = mime
-    end
-  end
-
-  let(:response) { ActionController::TestResponse.new }
-
-  let(:controller) do
-    Admin::CategoriesController.new.tap do |controller|
-      controller.request = request
-      controller.response = response
-    end
-  end
-
   let(:filename) do
     "#{controller.resource_class.to_s.downcase.pluralize}-#{Time.now.strftime('%Y-%m-%d')}.xls"
   end
@@ -27,26 +12,11 @@
 
   context 'when making requests with the xls mime type' do
     it 'returns xls attachment when requested' do
-      controller.send :index
+      request.accept = mime
+      get :index
       disposition = "attachment; filename=\"#{filename}\""
       expect(response.headers['Content-Disposition']).to eq(disposition)
       expect(response.headers['Content-Transfer-Encoding']).to eq('binary')
     end
-
-    it 'returns max_csv_records for per_page' do
-      # this might need to go away!
-      max_csv_records = if controller.respond_to?(:max_csv_records, true)
-                          controller.send(:max_csv_records)
-                        else
-                          controller.send(:per_page)
-                        end
-      expect(controller.send(:per_page)).to eq(max_csv_records)
-    end
-
-    it 'uses the default per_page when we do not specify xls mime type' do
-      controller.request.accept = 'text/html'
-      aa_default_per_page = ActiveAdmin.application.default_per_page
-      expect(controller.send(:per_page)).to eq(aa_default_per_page)
-    end
   end
 end