activeadmin 1.2.1 → 1.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 168e2543c7194997fc761400f0c846da32cf6efc
-  data.tar.gz: e329bd016b402f20b119611a16b7753417d28225
+SHA256:
+  metadata.gz: 5ca5fd70f2979d7363d85cfd1312f56c334b6ee9a7c36ef61c7ec211cf7ed193
+  data.tar.gz: a93debc41630a1cfac29b878e60b06c1d997f6208e9009dc38557717eb5d69b4
 SHA512:
-  metadata.gz: 9001bf292733c65ea736a38e728c4fc4c9ccf0179fdd2dc99bb19f1e2c7007f40b5693c67fead61a55dd5187fa09979f31fe868ec79d6f060b881e6f9d46d636
-  data.tar.gz: a0251c53c84b1beea54c3a7f880a8c1349e9f7643f7d3b1cf4293e2800b76d6f6951b63fbe0b9f79eb66e18c1700390c92032c80523e22ccedf5288e306a3caa
+  metadata.gz: dc85aab7f53bc85d5203f4f25dc807fddad5913319aaad847784f0379de9686bd6ebe75487fa8da5a931f313807524bfdbc88c16d31929de3431e9e13f694889
+  data.tar.gz: 653914dd03260168fb059d3591d0411e750b2266b171e85dfcb1753cf6805d05b51c2a37c5401bc13ddc42a6fa28650c095dac6cedb45a559aa9527f65204f64

data/.travis.yml

@@ -21,7 +21,7 @@ script:
   - bundle exec rake docs:build
 
 rvm:
-  - jruby-9.1.12.0
+  - jruby-9.1.15.0
   - 2.2.8
   - 2.3.5
   - 2.4.2
@@ -30,20 +30,22 @@ gemfile:
   - gemfiles/rails_42.gemfile
   - gemfiles/rails_50.gemfile
   - gemfiles/rails_51.gemfile
+  - gemfiles/rails_52.gemfile
 
 env:
   global:
     - JRUBY_OPTS="-J-Xmx1024m --dev --debug"
-    - JAVA_OPTS="-Djava.security.egd=file:/dev/./urandom"
     - COVERAGE=true
 
 matrix:
   fast_finish: true
 
   allow_failures:
-    - rvm: jruby-9.1.12.0
+    - rvm: jruby-9.1.15.0
       gemfile: gemfiles/rails_42.gemfile
-    - rvm: jruby-9.1.12.0
+    - rvm: jruby-9.1.15.0
       gemfile: gemfiles/rails_50.gemfile
-    - rvm: jruby-9.1.12.0
+    - rvm: jruby-9.1.15.0
       gemfile: gemfiles/rails_51.gemfile
+    - rvm: jruby-9.1.15.0
+      gemfile: gemfiles/rails_52.gemfile

data/CHANGELOG.md

@@ -1,5 +1,13 @@
 # Changelog
 
+## 1.3.0 [☰](https://github.com/activeadmin/activeadmin/compare/v1.2.1...v1.3.0)
+
+### Enhancements
+
+#### Major
+
+* Rails 5.2 support [#5343][] by [@varyonic][], [#5399][], [#5401][] by [@zorab47][].
+
 ## 1.2.1 [☰](https://github.com/activeadmin/activeadmin/compare/v1.2.0...v1.2.1)
 
 ### Bug Fixes

data/CONTRIBUTING.md

@@ -32,7 +32,7 @@ least version `1.14.3`.
 Select the Gemfile for your preferred Rails version, preferably the latest:
 
 ```sh
-export BUNDLE_GEMFILE=gemfiles/rails_51.gemfile
+export BUNDLE_GEMFILE=gemfiles/rails_52.gemfile
 ```
 
 Now install the development dependencies:

data/Gemfile

@@ -41,10 +41,10 @@ group :development do
 end
 
 group :test do
-  gem 'capybara'
+  gem 'capybara', '< 3.0'
   gem 'simplecov', require: false # Test coverage generator. Go to /coverage/ after running tests
   gem 'codecov', require: false # Test coverage website. Go to https://codecov.io
-  gem 'cucumber-rails', require: false
+  gem 'cucumber-rails', '~> 1.5', require: false
   gem 'cucumber'
   gem 'database_cleaner'
   gem 'jasmine'

data/activeadmin.gemspec

@@ -22,10 +22,10 @@ Gem::Specification.new do |s|
   s.add_dependency 'coffee-rails'
   s.add_dependency 'formtastic', '~> 3.1'
   s.add_dependency 'formtastic_i18n'
-  s.add_dependency 'inherited_resources', '~> 1.7'
+  s.add_dependency 'inherited_resources', '>= 1.7.0'
   s.add_dependency 'jquery-rails', '>= 4.2.0'
-  s.add_dependency 'kaminari', '>= 0.15', '< 2.0'
-  s.add_dependency 'railties', '>= 4.2', '< 5.2'
+  s.add_dependency 'kaminari', '>= 0.15'
+  s.add_dependency 'railties', '>= 4.2', '< 5.3'
   s.add_dependency 'ransack', '~> 1.3'
   s.add_dependency 'sass', '~> 3.1'
   s.add_dependency 'sprockets', '< 4.1'

data/gemfiles/rails_52.gemfile

@@ -0,0 +1,11 @@
+source "https://rubygems.org"
+
+eval_gemfile(File.expand_path(File.join("..", "Gemfile"), __dir__))
+
+gem "rails", "~> 5.2.x"
+gem "bootsnap"
+gem "devise", "~> 4.4"
+gem "draper", "~> 3.0"
+gem "activerecord-jdbcsqlite3-adapter", "~> 51.0", platforms: :jruby
+
+gemspec path: "../"

data/lib/active_admin/order_clause.rb

@@ -16,7 +16,7 @@ module ActiveAdmin
     end
 
     def apply(chain)
-      chain.reorder(sql)
+      chain.reorder(Arel.sql sql)
     end
 
     def to_sql

data/lib/active_admin/version.rb

@@ -1,3 +1,3 @@
 module ActiveAdmin
-  VERSION = '1.2.1'
+  VERSION = '1.3.0'
 end

data/spec/unit/authorization/controller_authorization_spec.rb

@@ -13,13 +13,13 @@ RSpec.describe "Controller Authorization", type: :controller do
   it "should authorize the index action" do
     expect(authorization).to receive(:authorized?).with(auth::READ, Post).and_return true
     get :index
-    expect(response).to be_success
+    expect(response).to be_successful
   end
 
   it "should authorize the new action" do
     expect(authorization).to receive(:authorized?).with(auth::CREATE, an_instance_of(Post)).and_return true
     get :new
-    expect(response).to be_success
+    expect(response).to be_successful
   end
 
   it "should authorize the create action with the new resource" do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: activeadmin
 version: !ruby/object:Gem::Version
-  version: 1.2.1
+  version: 1.3.0
 platform: ruby
 authors:
 - Greg Bell
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-01-10 00:00:00.000000000 Z
+date: 2018-04-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: arbre
@@ -70,16 +70,16 @@ dependencies:
   name: inherited_resources
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.7'
+        version: 1.7.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.7'
+        version: 1.7.0
 - !ruby/object:Gem::Dependency
   name: jquery-rails
   requirement: !ruby/object:Gem::Requirement
@@ -101,9 +101,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0.15'
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: '2.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -111,9 +108,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0.15'
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: '2.0'
 - !ruby/object:Gem::Dependency
   name: railties
   requirement: !ruby/object:Gem::Requirement
@@ -123,7 +117,7 @@ dependencies:
         version: '4.2'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '5.2'
+        version: '5.3'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -133,7 +127,7 @@ dependencies:
         version: '4.2'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '5.2'
+        version: '5.3'
 - !ruby/object:Gem::Dependency
   name: ransack
   requirement: !ruby/object:Gem::Requirement
@@ -455,6 +449,7 @@ files:
 - gemfiles/rails_42.gemfile
 - gemfiles/rails_50.gemfile
 - gemfiles/rails_51.gemfile
+- gemfiles/rails_52.gemfile
 - lib/active_admin.rb
 - lib/active_admin/abstract_view_factory.rb
 - lib/active_admin/application.rb
@@ -801,7 +796,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.8
+rubygems_version: 2.7.6
 signing_key: 
 specification_version: 4
 summary: The administration framework for Ruby on Rails.