activeadmin 1.4.2 → 1.4.3

data/gemfiles/rails_51.gemfile

@@ -2,7 +2,7 @@ source "https://rubygems.org"
 
 eval_gemfile(File.expand_path(File.join("..", "Gemfile.common"), __dir__))
 
-gem "rails", "5.1.6"
+gem "rails", "~> 5.1.6"
 gem "devise", "~> 4.3"
 gem "draper", "~> 3.0"
 gem "activerecord-jdbcsqlite3-adapter", "~> 51.0", platforms: :jruby

data/gemfiles/rails_51.gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: ..
   specs:
-    activeadmin (1.4.2)
+    activeadmin (1.4.3)
       arbre (>= 1.1.1)
       coffee-rails
       formtastic (~> 3.1)
@@ -17,48 +17,48 @@ PATH
 GEM
   remote: https://rubygems.org/
   specs:
-    actioncable (5.1.6)
-      actionpack (= 5.1.6)
+    actioncable (5.1.6.1)
+      actionpack (= 5.1.6.1)
       nio4r (~> 2.0)
       websocket-driver (~> 0.6.1)
-    actionmailer (5.1.6)
-      actionpack (= 5.1.6)
-      actionview (= 5.1.6)
-      activejob (= 5.1.6)
+    actionmailer (5.1.6.1)
+      actionpack (= 5.1.6.1)
+      actionview (= 5.1.6.1)
+      activejob (= 5.1.6.1)
       mail (~> 2.5, >= 2.5.4)
       rails-dom-testing (~> 2.0)
-    actionpack (5.1.6)
-      actionview (= 5.1.6)
-      activesupport (= 5.1.6)
+    actionpack (5.1.6.1)
+      actionview (= 5.1.6.1)
+      activesupport (= 5.1.6.1)
       rack (~> 2.0)
       rack-test (>= 0.6.3)
       rails-dom-testing (~> 2.0)
       rails-html-sanitizer (~> 1.0, >= 1.0.2)
-    actionview (5.1.6)
-      activesupport (= 5.1.6)
+    actionview (5.1.6.1)
+      activesupport (= 5.1.6.1)
       builder (~> 3.1)
       erubi (~> 1.4)
       rails-dom-testing (~> 2.0)
       rails-html-sanitizer (~> 1.0, >= 1.0.3)
-    activejob (5.1.6)
-      activesupport (= 5.1.6)
+    activejob (5.1.6.1)
+      activesupport (= 5.1.6.1)
       globalid (>= 0.3.6)
-    activemodel (5.1.6)
-      activesupport (= 5.1.6)
+    activemodel (5.1.6.1)
+      activesupport (= 5.1.6.1)
     activemodel-serializers-xml (1.0.2)
       activemodel (> 5.x)
       activesupport (> 5.x)
       builder (~> 3.1)
-    activerecord (5.1.6)
-      activemodel (= 5.1.6)
-      activesupport (= 5.1.6)
+    activerecord (5.1.6.1)
+      activemodel (= 5.1.6.1)
+      activesupport (= 5.1.6.1)
       arel (~> 8.0)
     activerecord-jdbc-adapter (51.2-java)
       activerecord (~> 5.1.0)
     activerecord-jdbcsqlite3-adapter (51.2-java)
       activerecord-jdbc-adapter (= 51.2)
       jdbc-sqlite3 (~> 3.8, < 3.30)
-    activesupport (5.1.6)
+    activesupport (5.1.6.1)
       concurrent-ruby (~> 1.0, >= 1.0.2)
       i18n (>= 0.7, < 2)
       minitest (~> 5.1)
@@ -68,20 +68,13 @@ GEM
     arbre (1.1.1)
       activesupport (>= 3.0.0)
     arel (8.0.0)
-    ast (2.4.0)
     backports (3.11.4)
     bcrypt (3.1.12)
     bcrypt (3.1.12-java)
-    better_errors (2.5.0)
-      coderay (>= 1.0.0)
-      erubi (>= 1.0.0)
-      rack (>= 0.9.0)
-    binding_of_caller (0.8.0)
-      debug_inspector (>= 0.0.1)
     builder (3.2.3)
     byebug (10.0.2)
     cancan (1.6.10)
-    capybara (3.10.0)
+    capybara (3.12.0)
       addressable
       mini_mime (>= 0.1.3)
       nokogiri (~> 1.8)
@@ -91,10 +84,6 @@ GEM
       xpath (~> 3.2)
     childprocess (0.9.0)
       ffi (~> 1.0, >= 1.0.11)
-    codecov (0.1.13)
-      json
-      simplecov
-      url
     coderay (1.1.2)
     coffee-rails (4.2.2)
       coffee-script (>= 2.2.0)
@@ -128,7 +117,6 @@ GEM
     cucumber-tag_expressions (1.1.1)
     cucumber-wire (0.0.1)
     database_cleaner (1.7.0)
-    debug_inspector (0.0.3)
     devise (4.5.0)
       bcrypt (~> 3.0)
       orm_adapter (~> 0.1)
@@ -156,29 +144,13 @@ GEM
     has_scope (0.7.2)
       actionpack (>= 4.1)
       activesupport (>= 4.1)
-    highline (2.0.0)
     i18n (1.1.1)
       concurrent-ruby (~> 1.0)
-    i18n-spec (0.6.0)
-      iso
-    i18n-tasks (0.9.25)
-      activesupport (>= 4.0.2)
-      ast (>= 2.1.0)
-      erubi
-      highline (>= 2.0.0)
-      i18n
-      parser (>= 2.2.3.0)
-      rainbow (>= 2.2.2, < 4.0)
-      terminal-table (>= 1.5.1)
     inherited_resources (1.9.0)
       actionpack (>= 4.2, < 5.3)
       has_scope (~> 0.6)
       railties (>= 4.2, < 5.3)
       responders
-    iso (0.2.2)
-      i18n
-    jaro_winkler (1.5.1)
-    jaro_winkler (1.5.1-java)
     jasmine (2.9.0)
       jasmine-core (>= 2.9.0, < 3.0.0)
       phantomjs
@@ -205,7 +177,6 @@ GEM
       activerecord
       kaminari-core (= 1.1.1)
     kaminari-core (1.1.1)
-    kramdown (1.17.0)
     launchy (2.4.3)
       addressable (~> 2.3)
     launchy (2.4.3-java)
@@ -216,20 +187,13 @@ GEM
       nokogiri (>= 1.5.9)
     mail (2.7.1)
       mini_mime (>= 0.1.1)
-    mdl (0.4.0)
-      kramdown (~> 1.12, >= 1.12.0)
-      mixlib-cli (~> 1.7, >= 1.7.0)
-      mixlib-config (~> 2.2, >= 2.2.1)
-    method_source (0.9.0)
+    method_source (0.9.2)
     mime-types (3.2.2)
       mime-types-data (~> 3.2015)
     mime-types-data (3.2018.0812)
     mini_mime (1.0.1)
     mini_portile2 (2.3.0)
     minitest (5.11.3)
-    mixlib-cli (1.7.0)
-    mixlib-config (2.2.13)
-      tomlrb
     multi_json (1.13.1)
     multi_test (0.1.2)
     nio4r (2.3.1)
@@ -241,10 +205,7 @@ GEM
     parallel (1.12.1)
     parallel_tests (2.26.0)
       parallel
-    parser (2.5.1.2)
-      ast (~> 2.4.0)
     phantomjs (2.1.1.0)
-    powerpack (0.1.2)
     pry (0.11.3)
       coderay (~> 1.1.0)
       method_source (~> 0.9.0)
@@ -258,22 +219,20 @@ GEM
     public_suffix (3.0.3)
     pundit (2.0.0)
       activesupport (>= 3.0.0)
-    rack (2.0.5)
-    rack-mini-profiler (1.0.0)
-      rack (>= 1.2.0)
+    rack (2.0.6)
     rack-test (1.1.0)
       rack (>= 1.0, < 3)
-    rails (5.1.6)
-      actioncable (= 5.1.6)
-      actionmailer (= 5.1.6)
-      actionpack (= 5.1.6)
-      actionview (= 5.1.6)
-      activejob (= 5.1.6)
-      activemodel (= 5.1.6)
-      activerecord (= 5.1.6)
-      activesupport (= 5.1.6)
+    rails (5.1.6.1)
+      actioncable (= 5.1.6.1)
+      actionmailer (= 5.1.6.1)
+      actionpack (= 5.1.6.1)
+      actionview (= 5.1.6.1)
+      activejob (= 5.1.6.1)
+      activemodel (= 5.1.6.1)
+      activerecord (= 5.1.6.1)
+      activesupport (= 5.1.6.1)
       bundler (>= 1.3.0)
-      railties (= 5.1.6)
+      railties (= 5.1.6.1)
       sprockets-rails (>= 2.0.0)
     rails-dom-testing (2.0.3)
       activesupport (>= 4.2.0)
@@ -283,14 +242,12 @@ GEM
     rails-i18n (5.1.1)
       i18n (>= 0.7, < 2)
       railties (>= 5.0, < 6)
-    railties (5.1.6)
-      actionpack (= 5.1.6)
-      activesupport (= 5.1.6)
+    railties (5.1.6.1)
+      actionpack (= 5.1.6.1)
+      activesupport (= 5.1.6.1)
       method_source
       rake (>= 0.8.7)
       thor (>= 0.18.1, < 2.0)
-    rainbow (2.2.2)
-      rake
     rake (12.3.1)
     ransack (2.1.0)
       actionpack (>= 5.0)
@@ -300,8 +257,7 @@ GEM
     rb-fsevent (0.10.3)
     rb-inotify (0.9.10)
       ffi (>= 0.5.0, < 2)
-    redcarpet (3.4.0)
-    regexp_parser (1.2.0)
+    regexp_parser (1.3.0)
     request_store (1.4.1)
       rack (>= 1.4)
     responders (2.4.0)
@@ -324,15 +280,6 @@ GEM
       rspec-mocks (~> 3.8.0)
       rspec-support (~> 3.8.0)
     rspec-support (3.8.0)
-    rubocop (0.59.2)
-      jaro_winkler (~> 1.5.1)
-      parallel (~> 1.10)
-      parser (>= 2.5, != 2.5.1.1)
-      powerpack (~> 0.1)
-      rainbow (>= 2.2.2, < 4.0)
-      ruby-progressbar (~> 1.7)
-      unicode-display_width (~> 1.0, >= 1.0.1)
-    ruby-progressbar (1.10.0)
     rubyzip (1.2.2)
     sass (3.7.2)
       sass-listen (~> 4.0.0)
@@ -357,16 +304,11 @@ GEM
       activesupport (>= 4.0)
       sprockets (>= 3.0.0)
     sqlite3 (1.3.13)
-    terminal-table (1.8.0)
-      unicode-display_width (~> 1.1, >= 1.1.1)
-    thor (0.20.0)
+    thor (0.20.3)
     thread_safe (0.3.6)
     thread_safe (0.3.6-java)
-    tomlrb (1.2.7)
     tzinfo (1.2.5)
       thread_safe (~> 0.1)
-    unicode-display_width (1.4.0)
-    url (0.3.2)
     warden (1.2.7)
       rack (>= 1.0)
     websocket-driver (0.6.5)
@@ -376,7 +318,6 @@ GEM
     websocket-extensions (0.1.3)
     xpath (3.2.0)
       nokogiri (~> 1.8)
-    yard (0.9.16)
 
 PLATFORMS
   java
@@ -385,39 +326,28 @@ PLATFORMS
 DEPENDENCIES
   activeadmin!
   activerecord-jdbcsqlite3-adapter (~> 51.0)
-  better_errors
-  binding_of_caller
   cancan
   capybara (~> 3.10)
-  codecov
   cucumber
   cucumber-rails (~> 1.5)
   database_cleaner
   devise (~> 4.3)
   draper (~> 3.0)
-  i18n-spec
-  i18n-tasks
   jasmine
   jasmine-core (= 2.9.1)
   jruby-openssl (~> 0.10.1)
-  kramdown
   launchy
-  mdl (= 0.4.0)
   parallel_tests (~> 2.26)
   pry
   pry-byebug
   pundit
-  rack-mini-profiler (>= 0.10.1)
-  rails (= 5.1.6)
+  rails (~> 5.1.6)
   rails-i18n
   rake
-  redcarpet
   rspec-rails
-  rubocop (= 0.59.2)
   selenium-webdriver
   simplecov
   sqlite3
-  yard
 
 BUNDLED WITH
    1.17.1

data/lib/active_admin/batch_actions/controller.rb

@@ -7,7 +7,7 @@ module ActiveAdmin
         if action_present?
           selection  =            params[:collection_selection] || []
           inputs     = JSON.parse params[:batch_action_inputs]  || '{}'
-          valid_keys = StringSymbolOrProcSetting.new(current_batch_action.inputs).value(self).try(:keys)
+          valid_keys = MethodOrProcHelper.render_in_context(self, current_batch_action.inputs).try(:keys)
           inputs     = inputs.with_indifferent_access.slice *valid_keys
           instance_exec selection, inputs, &current_batch_action.block
         else

data/lib/active_admin/resource_controller/scoping.rb

@@ -15,7 +15,7 @@ module ActiveAdmin
       # Collection can be scoped conditionally with an :if or :unless proc.
       def begin_of_association_chain
         return nil unless active_admin_config.scope_to?(self)
-        StringSymbolOrProcSetting.new(active_admin_config.scope_to_method).value(self)
+        MethodOrProcHelper.render_in_context(self, active_admin_config.scope_to_method)
       end
 
       # Overriding from InheritedResources::BaseHelpers

data/lib/active_admin/version.rb

@@ -1,3 +1,3 @@
 module ActiveAdmin
-  VERSION = '1.4.2'
+  VERSION = '1.4.3'
 end

data/lib/active_admin/view_helpers/method_or_proc_helper.rb

@@ -1,4 +1,5 @@
 module MethodOrProcHelper
+  extend self
 
   # This method will either call the symbol on self or instance_exec the Proc
   # within self. Any args will be passed along to the method dispatch.

data/tasks/application_generator.rb

@@ -1,3 +1,5 @@
+require 'fileutils'
+
 module ActiveAdmin
   class ApplicationGenerator
     attr_reader :rails_env, :template
@@ -11,7 +13,7 @@ module ActiveAdmin
       if File.exist? app_dir
         puts "test app #{app_dir} already exists; skipping test app generation"
       else
-        system "mkdir -p #{base_dir}"
+        FileUtils.mkdir_p base_dir
         args = %W(
           -m spec/support/#{template}.rb
           --skip-bootsnap
@@ -26,7 +28,7 @@ module ActiveAdmin
 
         env = { 'BUNDLE_GEMFILE' => ENV['BUNDLE_GEMFILE'], 'RAILS_ENV' => rails_env }
 
-        Bundler.with_original_env { Kernel.system(env, command) }
+        Bundler.with_original_env { abort unless Kernel.system(env, command) }
       end
 
       app_dir

data/tasks/gemfiles.rake

@@ -2,7 +2,7 @@ desc "Bundle all Gemfiles"
 task :bundle do |_t, opts|
   ["Gemfile", *Dir.glob("gemfiles/*.gemfile")].each do |gemfile|
     Bundler.with_original_env do
-      system({ "BUNDLE_GEMFILE" => gemfile }, "bundle", *opts)
+      sh({ "BUNDLE_GEMFILE" => gemfile }, "bundle", *opts)
     end
   end
 end

data/tasks/lint.rake

@@ -78,7 +78,7 @@ namespace :lint do
   task :mdl do
     puts "Running mdl..."
 
-    abort unless system("mdl", "--git-recurse", ".")
+    sh("mdl", "--git-recurse", ".")
   end
 
   desc "Check for unnecessary trailing whitespace across all repo files"
@@ -99,7 +99,7 @@ namespace :lint do
   task :rspec do
     puts "Linting project files..."
 
-    abort unless system(
+    sh(
       { "COVERAGE" => "true" },
       "rspec",
       "spec/gemfiles_spec.lint.rb",

data/tasks/release.rake

@@ -0,0 +1,6 @@
+require "chandler/tasks"
+
+#
+# Add chandler as a prerequisite for `rake release`
+#
+task "release:rubygem_push" => "chandler:push"

data/tasks/test.rake

@@ -1,4 +1,3 @@
-require 'parallel'
 require_relative "application_generator"
 
 desc "Run the full suite using parallel_tests to run on multiple cores"
@@ -11,7 +10,7 @@ end
 
 desc "Run the specs in parallel"
 task :spec do
-  system("parallel_rspec --serialize-stdout --verbose spec/")
+  sh("parallel_rspec --serialize-stdout --combine-stderr --verbose spec/")
 end
 
 namespace :spec do
@@ -19,7 +18,7 @@ namespace :spec do
   %i(unit request).each do |type|
     desc "Run the #{type} specs in parallel"
     task type do
-      system("parallel_rspec --serialize-stdout --verbose spec/#{type}")
+      sh("parallel_rspec --serialize-stdout --combine-stderr --verbose spec/#{type}")
     end
   end
 
@@ -32,12 +31,12 @@ namespace :cucumber do
 
   desc "Run the standard cucumber scenarios in parallel"
   task :regular do
-    system("parallel_cucumber --serialize-stdout --verbose features/")
+    sh("parallel_cucumber --serialize-stdout --combine-stderr --verbose features/")
   end
 
   desc "Run the cucumber scenarios that test reloading"
   task :reloading do
-    system("cucumber --profile class-reloading")
+    sh("cucumber --profile class-reloading")
   end
 
 end