activeadmin-xls 2.0.1 → 2.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d5dcd598421b522ad83b3ddd1a1a038b3d173f3e
-  data.tar.gz: c882e40a69baa02ef345c31001f77b5f2b291652
+  metadata.gz: c3e07f07dfdc40d3f51d3bf7ed071c2f11a204fd
+  data.tar.gz: 899009df0bbc02bc522b4c9f872d036e5ecb96b7
 SHA512:
-  metadata.gz: 5909fa865c0f9664b61d7771215faaf2695e2b6fe72c8de21b61d5286ba1c7213496d1271057ab9df6579f265e3203f0e40ccb9b7ca5ca227e0493709801e53c
-  data.tar.gz: 10ea87bd2f9c629b4c4f5acf58f37dcb89f2c8f263e58ba6b12c840d70b80922e00bc65af457495d08bfef5deff3d2b3278e442eb6ce443166b8b531e378f991
+  metadata.gz: ad917c6af301c4f86bcd51b16cd49e57e57bca0c74fa9ff437509298e02b9f3e73420601f5cd2138cf9c3be11bdf4541ee5de5711b91c7c514fa033cff840065
+  data.tar.gz: 2c5f38deffdb05f528e6248daf5e4785e58a91664b397e52c148bc07c454c00e61d51b0d4f8b6dec94b0304e5c068b2d19d36c596057d5b283cc5a9ebb483f07

data/.travis.yml

@@ -1,12 +1,13 @@
 language: ruby
 
 rvm:
-  - 2.2
+  - 2.6.5
 
 gemfile:
   - gemfiles/rails_42.gemfile
-  - gemfiles/rails_51.gemfile
+  - gemfiles/rails_52.gemfile
+  - gemfiles/rails_60.gemfile
 
 script:
   - bundle exec rake setup
-  - bundle exec rake
+  - bundle exec rake

data/CHANGELOG.md

@@ -2,6 +2,12 @@
 
 ## [Unreleased]
 
+## 2.0.2
+
+### Changed
+
+* Remove ActiveAdmin runtime dependency version limit '<2' [#16] by [@reaper][]
+
 ## 2.0.1
 
 ### Fixed
@@ -61,7 +67,9 @@
 [#8]: https://github.com/thambley/activeadmin-xls/issues/8
 [#11]: https://github.com/thambley/activeadmin-xls/pull/11
 [#13]: https://github.com/thambley/activeadmin-xls/issues/13
+[#16]: https://github.com/thambley/activeadmin-xls/pull/16
 
 [@rewritten]: https://github.com/rewritten
 [@ejaypcanaria]: https://github.com/ejaypcanaria
-[@cpunion]: https://github.com/cpunion
+[@cpunion]: https://github.com/cpunion
+[@reaper]: https://github.com/reaper

data/Gemfile

@@ -4,15 +4,14 @@ gem 'spreadsheet', '~> 1.1', '>= 1.1.4'
 
 group :development, :test do
   gem 'rails-i18n' # Gives us default i18n for many languages
-  gem 'sqlite3', '~> 1.3.0'
   gem 'yard'
 end
 
 group :test do
+  gem 'codecov', require: false
   gem 'cucumber-rails', require: false
   gem 'database_cleaner'
   gem 'rspec-mocks', '~> 3.7'
   gem 'rspec-rails', '~> 3.7'
   gem 'simplecov', require: false
-  gem 'codecov', require: false
 end

data/README.md

@@ -22,7 +22,7 @@ Add the following to your Gemfile. All resource index views will now include a l
 gem 'activeadmin-xls', '~>2.0.0'
 ```
 
-For Active Admin 1.0, you will also have to update config/initializers/active_admin.rb.  Update the download\_links setting to include xls:
+For Active Admin 1.0 and above, you will also have to update config/initializers/active_admin.rb.  Update the download\_links setting to include xls:
 
 ```ruby
 config.download_links = %i[csv xml json xls]
@@ -146,18 +146,32 @@ BUNDLE_GEMFILE=gemfiles/rails_42.gemfile bundle exec rake setup
 BUNDLE_GEMFILE=gemfiles/rails_42.gemfile bundle exec rake
 ```
 
-### Rails 5.1
+### Rails 5.2
 
 ```text
-bundle install --gemfile=gemfiles/rails_51.gemfile
+bundle install --gemfile=gemfiles/rails_52.gemfile
 ```
 
 ```text
-BUNDLE_GEMFILE=gemfiles/rails_51.gemfile bundle exec rake setup
+BUNDLE_GEMFILE=gemfiles/rails_52.gemfile bundle exec rake setup
 ```
 
 ```text
-BUNDLE_GEMFILE=gemfiles/rails_51.gemfile bundle exec rake
+BUNDLE_GEMFILE=gemfiles/rails_52.gemfile bundle exec rake
+```
+
+### Rails 6.0
+
+```text
+bundle install --gemfile=gemfiles/rails_60.gemfile
+```
+
+```text
+BUNDLE_GEMFILE=gemfiles/rails_60.gemfile bundle exec rake setup
+```
+
+```text
+BUNDLE_GEMFILE=gemfiles/rails_60.gemfile bundle exec rake
 ```
 
 [Active Admin]:https://www.activeadmin.info/
@@ -174,4 +188,4 @@ BUNDLE_GEMFILE=gemfiles/rails_51.gemfile bundle exec rake
 [codecov_badge]: https://codecov.io/gh/thambley/activeadmin-xls/branch/master/graph/badge.svg
 [codecov]: https://codecov.io/gh/thambley/activeadmin-xls
 [inch_badge]: http://inch-ci.org/github/thambley/activeadmin-xls.svg?branch=master
-[inch]: http://inch-ci.org/github/thambley/activeadmin-xls
+[inch]: http://inch-ci.org/github/thambley/activeadmin-xls

data/activeadmin-xls.gemspec

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

data/gemfiles/rails_42.gemfile

@@ -6,9 +6,10 @@ ruby_minor_version = RUBY_VERSION.split('.')[1].to_i
 
 eval_gemfile(File.expand_path(File.join('..', 'Gemfile'), __dir__))
 
-gem 'activeadmin', '1.2.1'
+gem 'activeadmin', '1.4.3'
 gem 'devise', '~> 4.2'
-gem 'rails', '4.2.10'
+gem 'rails', '4.2.11'
+gem 'sqlite3', '~> 1.3.0'
 gem 'turbolinks', '~> 5.0.0'
 gem 'tzinfo-data'
 

data/gemfiles/{rails_51.gemfile → rails_52.gemfile}

@@ -6,10 +6,12 @@ ruby_minor_version = RUBY_VERSION.split('.')[1].to_i
 
 eval_gemfile(File.expand_path(File.join('..', 'Gemfile'), __dir__))
 
-gem 'activeadmin', '1.2.1'
-gem 'devise', '~> 4.2'
-gem 'rails', '5.1.5'
-gem 'turbolinks', '~> 5.0.0'
+gem 'activeadmin', '2.4.0'
+gem 'bootsnap', require: false
+gem 'devise', '~> 4.7'
+gem 'rails', ' ~> 5.2'
+gem 'sqlite3', '~> 1.4.0'
+gem 'turbolinks', '~> 5.2.0'
 gem 'tzinfo-data'
 
 group :test do
@@ -19,4 +21,4 @@ group :test do
   end
 end
 
-gemspec path: "../"
+gemspec path: "../"

data/gemfiles/rails_60.gemfile

@@ -0,0 +1,25 @@
+#!/usr/bin/env ruby
+source 'https://rubygems.org'
+
+ruby_major_version = RUBY_VERSION.split('.')[0].to_i
+ruby_minor_version = RUBY_VERSION.split('.')[1].to_i
+
+eval_gemfile(File.expand_path(File.join('..', 'Gemfile'), __dir__))
+
+gem 'activeadmin', '2.4.0'
+gem 'bootsnap', require: false
+gem 'devise', '~> 4.7'
+gem 'rails', '~> 6'
+gem 'sqlite3', '~> 1.4.0'
+gem 'turbolinks', '~> 5.2.0'
+gem 'tzinfo-data'
+gem 'webpacker', '~> 4.x'
+
+group :test do
+  gem 'shoulda-matchers', '~> 3.1'
+  if ruby_major_version > 2 || (ruby_major_version == 2 && ruby_minor_version > 1)
+    gem 'test-unit', '~> 3.0'
+  end
+end
+
+gemspec path: "../"

data/lib/active_admin/xls/version.rb

@@ -1,6 +1,6 @@
 module ActiveAdmin
   module Xls
     # ActiveAdmin XLS gem version
-    VERSION = '2.0.1'.freeze
+    VERSION = '2.0.2'.freeze
   end
 end

data/spec/xls/unit/resource_controller_spec.rb

@@ -3,7 +3,7 @@ describe Admin::CategoriesController, type: :controller do
   let(:mime) { Mime::Type.lookup_by_extension(:xls) }
 
   let(:filename) do
-    "#{controller.resource_class.to_s.downcase.pluralize}-#{Time.now.strftime('%Y-%m-%d')}.xls"
+    "categories-#{Time.now.strftime('%Y-%m-%d')}.xls"
   end
 
   it 'generates an xls filename' do
@@ -15,7 +15,7 @@ describe Admin::CategoriesController, type: :controller do
       request.accept = mime
       get :index
       disposition = "attachment; filename=\"#{filename}\""
-      expect(response.headers['Content-Disposition']).to eq(disposition)
+      expect(response.headers['Content-Disposition']).to start_with(disposition)
       expect(response.headers['Content-Transfer-Encoding']).to eq('binary')
     end
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: activeadmin-xls
 version: !ruby/object:Gem::Version
-  version: 2.0.1
+  version: 2.0.2
 platform: ruby
 authors:
 - Todd Hambley
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-03-02 00:00:00.000000000 Z
+date: 2019-10-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activeadmin
@@ -17,9 +17,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 1.0.0
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: '2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -27,9 +24,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 1.0.0
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: '2'
 - !ruby/object:Gem::Dependency
   name: spreadsheet
   requirement: !ruby/object:Gem::Requirement
@@ -63,7 +57,8 @@ files:
 - Rakefile
 - activeadmin-xls.gemspec
 - gemfiles/rails_42.gemfile
-- gemfiles/rails_51.gemfile
+- gemfiles/rails_52.gemfile
+- gemfiles/rails_60.gemfile
 - lib/active_admin/xls/builder.rb
 - lib/active_admin/xls/dsl.rb
 - lib/active_admin/xls/engine.rb