activeadmin-rb 1.4.0 → 1.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f1e7656215ed5ca4ff51b9bd4ac89611ae085d7505089481c41f44bf07613fb9
-  data.tar.gz: 4788b7c0e6969c2a0d5c40b1af4249b78af3bbb08ef8c57ea4173796a42fb00b
+  metadata.gz: 3a41a8ee3cc7e2785ddb82d531a92b44f96bd93228384fcf5641872ca9dbe482
+  data.tar.gz: e3ed462ae8748510d698ac1b79499ac295f8bc4b9667da0324e0e92c3d5df4d0
 SHA512:
-  metadata.gz: 3981aea6d17d9562bba6f205f6e85c4a25198a4542ef826f8a42c2b169a3519d93d58aa518a1d21f26b4c684c53a7518558edc7e383db0cfd03361b57c372823
-  data.tar.gz: 0a4a348a33e6744fd6502dde46f7509b72bc02cee36d7b70665a7379c422cb35ec2e7587216d2c1a158429f52f17cb1fae235c1a1801ee3d78b2c85efdcfc22a
+  metadata.gz: d7ab0bc94e0895c641b3b64ffd687e0783e9ffcd3cda1a4da783683934939e41a0bea6ba3a2d06e0f61ae5aacb121d3baadfd9726b10cb13caae29536ab50f2c
+  data.tar.gz: 0a0900dba255ecae449f82b5813dc0614a8b57f5b937b6fc94b784bf0d991dc13a7b88d9253c26e7d21064355ba52c7a3ae6c46c422ddc445739498f5b867135

data/.gitignore

@@ -11,7 +11,7 @@ pkg
 .bundle
 spec/rails
 Gemfile.lock
-gemfiles/rails_[3-5][0-9].gemfile.lock
+gemfiles/rails_*.gemfile.lock
 .test-rails-apps
 public
 .rspec

data/.travis.yml

@@ -10,25 +10,31 @@ bundler_args: --without development
 
 cache: bundler
 
+before_script:
+  - unset _JAVA_OPTIONS
+
 before_install:
   - PATH=$(npm bin):$PATH # needed to install phantomjs via npm
   - if [ $(phantomjs --version) != '2.1.1' ]; then npm install phantomjs-prebuilt@2.1; fi
-  - gem update --system # use the very latest Rubygems
+  - gem uninstall -v '>= 2' -i $(rvm gemdir)@global -ax bundler || true
+  - gem install bundler -v '< 2'
 
 script:
   - bundle exec rake
   - bundle exec rake docs:build
 
 rvm:
-  - jruby-9.1.15.0
-  - 2.3.8
-  - 2.5.1
+  - jruby-9.2.0.0
+  - 2.4
+  - 2.5.5
+  - 2.6
 
 gemfile:
   - gemfiles/rails_42.gemfile
   - gemfiles/rails_50.gemfile
   - gemfiles/rails_51.gemfile
   - gemfiles/rails_52.gemfile
+  - gemfiles/rails_60.gemfile
 
 env:
   global:
@@ -38,12 +44,11 @@ env:
 matrix:
   fast_finish: true
 
-  allow_failures:
-    - rvm: jruby-9.1.15.0
+  exclude:
+    - rvm: 2.4
+      gemfile: gemfiles/rails_60.gemfile
+    - rvm: 2.6
       gemfile: gemfiles/rails_42.gemfile
-    - rvm: jruby-9.1.15.0
-      gemfile: gemfiles/rails_50.gemfile
-    - rvm: jruby-9.1.15.0
-      gemfile: gemfiles/rails_51.gemfile
-    - rvm: jruby-9.1.15.0
-      gemfile: gemfiles/rails_52.gemfile
+
+  allow_failures:
+    - rvm: jruby-9.2.0.0

data/CHANGELOG.md

@@ -1,5 +1,13 @@
 # Changelog
 
+## 1.5.0 [☰](https://github.com/varyonic/activeadmin-rb/compare/v1.4.0...v1.5.0)
+
+### Enhancements
+
+#### Major
+
+* Rails 6.0 support. [#5702] by [@ionut998]
+ 
 ## 1.4.0 [☰](https://github.com/varyonic/activeadmin-rb/compare/v1.3.1...v1.4.0)
 
 ### Enhancements
@@ -98,7 +106,6 @@
 
 ### Deprecations
 
-* Deprecated `config.register_stylesheet` and `config.register_javascript`. Import your CSS and JS files in `active_admin.scss` or `active_admin.js`. [#5060] by [@javierjulio]
 * Deprecated `type` param from `status_tag` and related CSS classes [#4989] by [@javierjulio]
   * The method signature has changed from:
 
@@ -329,6 +336,7 @@ Please check [0-6-stable] for previous changes.
 [#5501]: https://github.com/activeadmin/activeadmin/pull/5501
 [#5516]: https://github.com/activeadmin/activeadmin/pull/5516
 [#5583]: https://github.com/activeadmin/activeadmin/pull/5583
+[#5702]: https://github.com/activeadmin/activeadmin/pull/5702
 
 [@5t111111]: https://github.com/5t111111
 [@aarek]: https://github.com/aarek
@@ -355,6 +363,7 @@ Please check [0-6-stable] for previous changes.
 [@glebtv]: https://github.com/glebtv
 [@gonzedge]: https://github.com/gonzedge
 [@innparusu95]: https://github.com/innparusu95
+[@ionut998]: https://github.com/ionut998
 [@jasl]: https://github.com/jasl
 [@javierjulio]: https://github.com/javierjulio
 [@jawa]: https://github.com/jawa

data/Gemfile

@@ -1,15 +1,9 @@
 source 'https://rubygems.org'
 
-# Trick to use https without warnings and without having to specify full URLs
-# TODO: Can be removed when Bundler 2.x is released.
-git_source(:github) do |repo_name|
-  repo_name = "#{repo_name}/#{repo_name}" unless repo_name.include?("/")
-  "https://github.com/#{repo_name}.git"
-end
-
 # Optional dependencies
 gem 'cancan'
 gem 'pundit'
+gem 'jruby-openssl', '~> 0.10.1', platforms: :jruby
 
 # Utility gems used in both development & test environments
 gem 'rake'
@@ -41,7 +35,7 @@ group :development do
 end
 
 group :test do
-  gem 'capybara', '< 3.0'
+  gem 'capybara'
   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', '~> 1.5', require: false
@@ -49,10 +43,8 @@ group :test do
   gem 'database_cleaner'
   gem 'jasmine'
   gem 'launchy'
-  gem 'rails-i18n' # Provides default i18n for many languages
   gem 'rspec-rails'
   gem 'i18n-spec'
-  gem 'shoulda-matchers', '<= 2.8.0'
-  gem 'sqlite3', platforms: :mri
+  gem 'sqlite3', '< 1.4', platforms: :mri
   gem 'poltergeist'
 end

data/activeadmin-rb.gemspec

@@ -16,7 +16,7 @@ Gem::Specification.new do |s|
 
   s.test_files = `git ls-files -- {spec,features}/*`.split("\n")
 
-  s.required_ruby_version = '>= 2.3'
+  s.required_ruby_version = '>= 2.4'
 
   s.add_dependency 'arbre', '>= 1.1.1'
   s.add_dependency 'coffee-rails'
@@ -24,8 +24,9 @@ Gem::Specification.new do |s|
   s.add_dependency 'formtastic_i18n'
   s.add_dependency 'inherited_resources', '>= 1.9.0'
   s.add_dependency 'jquery-rails', '>= 4.2.0'
+  s.add_dependency 'jquery-ui-rails', '~> 6.0'
   s.add_dependency 'kaminari', '>= 0.15'
-  s.add_dependency 'railties', '>= 4.2', '< 5.3'
+  s.add_dependency 'railties', '>= 4.2'
   s.add_dependency 'ransack', '>= 1.8.7'
   s.add_dependency 'sass', '~> 3.1'
   s.add_dependency 'sprockets', '< 4.1'

data/app/views/active_admin/devise/confirmations/new.html.erb

@@ -1,7 +1,7 @@
 <div id="login">
   <h2><%= active_admin_application.site_title(self) %> <%= title t('active_admin.devise.resend_confirmation_instructions.title') %></h2>
 
-  <%= devise_error_messages! %>
+  <%= render partial: "active_admin/devise/shared/error_messages", resource: resource %>
   <%= active_admin_form_for(resource, as: resource_name, url: confirmation_path(resource_name), html: { method: :post }) do |f|
     f.inputs do
       f.input :email

data/app/views/active_admin/devise/passwords/edit.html.erb

@@ -1,7 +1,7 @@
 <div id="login">
   <h2><%= active_admin_application.site_title(self) %> <%= title t('active_admin.devise.change_password.title') %></h2>
 
-  <%= devise_error_messages! %>
+  <%= render partial: "active_admin/devise/shared/error_messages", resource: resource %>
   <%= active_admin_form_for(resource, as: resource_name, url: password_path(resource_name), html: { method: :put }) do |f|
     f.inputs do
       f.input :password

data/app/views/active_admin/devise/passwords/new.html.erb

@@ -1,7 +1,7 @@
 <div id="login">
   <h2><%= active_admin_application.site_title(self) %> <%= title t('active_admin.devise.reset_password.title') %></h2>
 
-  <%= devise_error_messages! %>
+  <%= render partial: "active_admin/devise/shared/error_messages", resource: resource %>
   <%= active_admin_form_for(resource, as: resource_name, url: password_path(resource_name), html: { method: :post }) do |f|
     f.inputs do
       f.input :email

data/app/views/active_admin/devise/registrations/new.html.erb

@@ -2,7 +2,7 @@
   <h2><%= active_admin_application.site_title(self) %> <%= title t('active_admin.devise.sign_up.title') %></h2>
 
   <% scope = Devise::Mapping.find_scope!(resource_name) %>
-  <%= devise_error_messages! %>
+  <%= render partial: "active_admin/devise/shared/error_messages", resource: resource %>
   <%= active_admin_form_for(resource, as: resource_name, url: send(:"#{scope}_registration_path"), html: { id: "registration_new" }) do |f|
     f.inputs do
       resource.class.authentication_keys.each_with_index { |key, index|

data/app/views/active_admin/devise/shared/_error_messages.html.erb

@@ -0,0 +1,15 @@
+<% if resource.errors.any? %>
+  <div id="error_explanation">
+    <h2>
+      <%= I18n.t("errors.messages.not_saved",
+                 count: resource.errors.count,
+                 resource: resource.class.model_name.human.downcase)
+       %>
+    </h2>
+    <ul>
+      <% resource.errors.full_messages.each do |message| %>
+        <li><%= message %></li>
+      <% end %>
+    </ul>
+  </div>
+<% end %>

data/app/views/active_admin/devise/unlocks/new.html.erb

@@ -1,7 +1,7 @@
 <div id="login">
   <h2><%= active_admin_application.site_title(self) %> <%= title t('active_admin.devise.unlock.title') %></h2>
 
-  <%= devise_error_messages! %>
+  <%= render partial: "active_admin/devise/shared/error_messages", resource: resource %>
   <%= active_admin_form_for(resource, as: resource_name, url: unlock_path(resource_name), html: { method: :post }) do |f|
     f.inputs do
       f.input :email

data/docs/documentation.md

@@ -13,7 +13,7 @@ on Rails application. To install, simply add the following to your Gemfile:
 
 ```ruby
 # Gemfile
-gem 'activeadmin', github: 'activeadmin'
+gem 'activeadmin'
 ```
 
 After updating your bundle, run the installer

data/features/index/filters.feature

@@ -64,10 +64,10 @@ Feature: Index Filtering
     And I press "Filter"
 
     Then I follow "2"
-    Then I should see "Displaying Posts 3 - 4 of 7 in total"
+    Then I should see "Displaying Posts 3 - 4 of 7 in total"
 
     Then I follow "3"
-    Then I should see "Displaying Posts 5 - 6 of 7 in total"
+    Then I should see "Displaying Posts 5 - 6 of 7 in total"
 
   Scenario: Filtering posts while not on the first page
     Given 9 posts exist
@@ -78,7 +78,7 @@ Feature: Index Filtering
       end
     """
     When I follow "2"
-    Then I should see "Displaying Posts 6 - 9 of 9 in total"
+    Then I should see "Displaying Posts 6 - 9 of 9 in total"
 
     When I fill in "Title" with "Hello World 2"
     And I press "Filter"

data/features/index/pagination.feature

@@ -30,7 +30,7 @@ Feature: Index Pagination
     Given 3 posts exist
     When I am on the index page for posts
     Then I should see pagination with 2 pages
-    And I should see "Displaying Posts 1 - 2 of 3 in total"
+    And I should see "Displaying Posts 1 - 2 of 3 in total"
 
   Scenario: Viewing index with pagination disabled
     Given an index configuration of:
@@ -54,10 +54,10 @@ Feature: Index Pagination
     """
     Given 11 posts exist
     When I am on the index page for posts
-    Then I should see "Displaying Posts 1 - 10"
+    Then I should see "Displaying Posts 1 - 10"
     And I should not see "11 in total"
     And I should see the pagination "Next" link
 
     When I follow "Next"
-    Then I should see "Displaying Posts 11 - 11"
+    Then I should see "Displaying Posts 11 - 11"
     And I should not see the pagination "Next" link

data/features/registering_assets.feature

@@ -18,10 +18,8 @@ Feature: Registering Assets
   Scenario: Registering a CSS file
     Given a configuration of:
     """
-      ActiveSupport::Deprecation.silence do
-        ActiveAdmin.application.register_stylesheet "some-random-css.css", media: :print
-        ActiveAdmin.register Post
-      end
+      ActiveAdmin.application.register_stylesheet "some-random-css.css", media: :print
+      ActiveAdmin.register Post
     """
     When I am on the index page for posts
     Then I should see the css file "some-random-css" of media "print"
@@ -29,10 +27,8 @@ Feature: Registering Assets
   Scenario: Registering a JS file
     Given a configuration of:
     """
-      ActiveSupport::Deprecation.silence do
-        ActiveAdmin.application.register_javascript "some-random-js.js"
-        ActiveAdmin.register Post
-      end
+      ActiveAdmin.application.register_javascript "some-random-js.js"
+      ActiveAdmin.register Post
     """
     When I am on the index page for posts
     Then I should see the js file "some-random-js"

data/features/support/env.rb

@@ -55,6 +55,10 @@ require 'phantomjs/poltergeist'
 
 Capybara.javascript_driver = :poltergeist
 
+Capybara.server = :webrick
+
+Capybara.asset_host = 'http://localhost:3000'
+
 # Capybara defaults to XPath selectors rather than Webrat's default of CSS3. In
 # order to ease the transition to Capybara we set the default here. If you'd
 # prefer to use XPath just remove this line and adjust any selectors in your

data/gemfiles/rails_42.gemfile

@@ -6,6 +6,7 @@ gem "rails", "4.2.10"
 gem "devise", "~> 4.4" # required for Ruby 2.5, see devise/issues/4736
 gem "draper", "~> 2.1"
 gem "ransack", "~> 1.8.7" # 2.x for Rails 5.2+ only.
-gem "activerecord-jdbcsqlite3-adapter", platforms: :jruby
+gem "rails-i18n"
+gem "activerecord-jdbcsqlite3-adapter", "~> 1.3", platforms: :jruby
 
 gemspec path: "../"

data/gemfiles/rails_50.gemfile

@@ -6,6 +6,7 @@ gem "rails", "5.0.7"
 gem "devise", "~> 4.0"
 gem "draper", "~> 3.0"
 gem "ransack", "~> 1.8.7" # 2.x for Rails 5.2+ only.
-gem "activerecord-jdbcsqlite3-adapter", github: "jruby/activerecord-jdbc-adapter", platforms: :jruby
+gem "rails-i18n"
+gem "activerecord-jdbcsqlite3-adapter", "~> 50.0", platforms: :jruby
 
 gemspec path: "../"

data/gemfiles/rails_51.gemfile

@@ -6,6 +6,7 @@ gem "rails", "5.1.6"
 gem "devise", "~> 4.3"
 gem "draper", "~> 3.0"
 gem "ransack", "~> 1.8.7" # 2.x for Rails 5.2+ only.
-gem "activerecord-jdbcsqlite3-adapter", github: "jruby/activerecord-jdbc-adapter", platforms: :jruby
+gem "rails-i18n"
+gem "activerecord-jdbcsqlite3-adapter", "~> 51.0", platforms: :jruby
 
 gemspec path: "../"

data/gemfiles/rails_52.gemfile

@@ -7,6 +7,7 @@ gem "bootsnap"
 gem "devise", "~> 4.4"
 gem "draper", "~> 3.0"
 gem "ransack", "2.0" # 2.x for Rails 5.2+ only.
-gem "activerecord-jdbcsqlite3-adapter", "~> 51.0", platforms: :jruby
+gem "rails-i18n"
+gem "activerecord-jdbcsqlite3-adapter", ">= 52.0", platforms: :jruby
 
 gemspec path: "../"

data/gemfiles/rails_60.gemfile

@@ -0,0 +1,13 @@
+source "https://rubygems.org"
+
+eval_gemfile(File.expand_path(File.join("..", "Gemfile"), __dir__))
+
+gem "rails", ">= 6.0.x"
+gem "rails-i18n", ">= 6.0.x"
+gem "bootsnap"
+gem "devise", "~> 4.4"
+gem "draper", "~> 3.0"
+gem "ransack", ">= 2.0" # 2.x for Rails 5.2+ only.
+gem "activerecord-jdbcsqlite3-adapter", ">= 52.0", platforms: :jruby
+
+gemspec path: "../"

data/lib/active_admin.rb

@@ -8,6 +8,7 @@ require 'formtastic'
 require 'formtastic_i18n'
 require 'inherited_resources'
 require 'jquery-rails'
+require 'jquery-ui-rails'
 require 'coffee-rails'
 require 'arbre'
 

data/lib/active_admin/application.rb

@@ -171,9 +171,10 @@ module ActiveAdmin
     private
 
     def register_default_assets
-      stylesheets['active_admin.css'] = { media: 'screen' }
-      stylesheets['active_admin/print.css'] = { media: 'print' }
-      javascripts.add 'active_admin.js'
+      register_stylesheet 'active_admin.css',       media: 'screen'
+      register_stylesheet 'active_admin/print.css', media: 'print'
+
+      register_javascript 'active_admin.js'
     end
 
     # Since app/admin is alphabetically before app/models, we have to remove it

data/lib/active_admin/asset_registration.rb

@@ -2,10 +2,6 @@ module ActiveAdmin
   module AssetRegistration
 
     def register_stylesheet(path, options = {})
-      Deprecation.warn <<-MSG.strip_heredoc
-        The `register_stylesheet` config is deprecated and will be removed
-        in v2. Import your "#{path}" stylesheet in the active_admin.scss.
-      MSG
       stylesheets[path] = options
     end
 
@@ -18,10 +14,6 @@ module ActiveAdmin
     end
 
     def register_javascript(name)
-      Deprecation.warn <<-MSG.strip_heredoc
-        The `register_javascript` config is deprecated and will be removed
-        in v2. Import your "#{name}" javascript in the active_admin.js.
-      MSG
       javascripts.add name
     end
 

data/lib/active_admin/version.rb

@@ -1,3 +1,3 @@
 module ActiveAdmin
-  VERSION = '1.4.0'
+  VERSION = '1.5.0'
 end