activeadmin 1.0.0.pre5 → 1.0.0

data/spec/unit/views/pages/show_spec.rb

@@ -17,10 +17,9 @@ RSpec.describe ActiveAdmin::Views::Pages::Show do
 
     context 'when you pass a block to main content' do
       let(:block) { lambda { } }
-      let(:resource_class) { double(columns: [double('column', name: 'field')]) }
-      let(:resource) { double('resource', class: resource_class) }
+      let(:resource) { double('resource') }
 
-      before { allow(page).to receive(:active_admin_config).and_return(double(comments?: false))}
+      before { allow(page).to receive(:active_admin_config).and_return(double(comments?: false, resource_columns: [:field]))}
 
       it 'appends it to the output' do
         expect(page).to receive(:attributes_table).with(:field).and_yield

data/tasks/lint.rake

@@ -0,0 +1,8 @@
+desc "Lints ActiveAdmin code base"
+task lint: "lint:rubocop"
+
+namespace :lint do
+  require "rubocop/rake_task"
+  desc "Checks ruby code style with RuboCop"
+  RuboCop::RakeTask.new
+end

metadata

@@ -1,35 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: activeadmin
 version: !ruby/object:Gem::Version
-  version: 1.0.0.pre5
+  version: 1.0.0
 platform: ruby
 authors:
 - Greg Bell
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-03-07 00:00:00.000000000 Z
+date: 2017-04-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: arbre
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.0'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.0.2
+        version: 1.1.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.0'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.0.2
+        version: 1.1.1
 - !ruby/object:Gem::Dependency
   name: bourbon
   requirement: !ruby/object:Gem::Requirement
@@ -92,14 +86,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.6'
+        version: '1.7'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.6'
+        version: '1.7'
 - !ruby/object:Gem::Dependency
   name: jquery-rails
   requirement: !ruby/object:Gem::Requirement
@@ -154,20 +148,20 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '3.2'
+        version: '4.2'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '5.1'
+        version: '5.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '3.2'
+        version: '4.2'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '5.1'
+        version: '5.2'
 - !ruby/object:Gem::Dependency
   name: ransack
   requirement: !ruby/object:Gem::Requirement
@@ -219,6 +213,7 @@ extra_rdoc_files: []
 files:
 - ".gitignore"
 - ".hound.yml"
+- ".rubocop.yml"
 - ".travis.yml"
 - ".yardopts"
 - Appraisals
@@ -393,6 +388,7 @@ files:
 - features/breadcrumb.feature
 - features/comments/commenting.feature
 - features/comments/viewing_index.feature
+- features/create_another.feature
 - features/dashboard.feature
 - features/decorators.feature
 - features/development_reloading.feature
@@ -459,7 +455,6 @@ files:
 - features/step_definitions/pagination_steps.rb
 - features/step_definitions/sidebar_steps.rb
 - features/step_definitions/site_title_steps.rb
-- features/step_definitions/symbol_leak_steps.rb
 - features/step_definitions/tab_steps.rb
 - features/step_definitions/table_steps.rb
 - features/step_definitions/user_steps.rb
@@ -469,15 +464,12 @@ files:
 - features/support/env.rb
 - features/support/paths.rb
 - features/support/selectors.rb
-- features/symbol_leak.feature
 - features/users/logging_in.feature
 - features/users/logging_out.feature
 - features/users/resetting_password.feature
-- gemfiles/rails_32.gemfile
-- gemfiles/rails_40.gemfile
-- gemfiles/rails_41.gemfile
 - gemfiles/rails_42.gemfile
 - gemfiles/rails_50.gemfile
+- gemfiles/rails_51.gemfile
 - lib/active_admin.rb
 - lib/active_admin/abstract_view_factory.rb
 - lib/active_admin/application.rb
@@ -556,6 +548,7 @@ files:
 - lib/active_admin/reloader.rb
 - lib/active_admin/resource.rb
 - lib/active_admin/resource/action_items.rb
+- lib/active_admin/resource/attributes.rb
 - lib/active_admin/resource/belongs_to.rb
 - lib/active_admin/resource/controllers.rb
 - lib/active_admin/resource/includes.rb
@@ -642,7 +635,7 @@ files:
 - lib/generators/active_admin/page/page_generator.rb
 - lib/generators/active_admin/page/templates/page.rb
 - lib/generators/active_admin/resource/resource_generator.rb
-- lib/generators/active_admin/resource/templates/admin.rb
+- lib/generators/active_admin/resource/templates/admin.rb.erb
 - lib/ransack_ext.rb
 - spec/bug_report_templates_spec.rb
 - spec/javascripts/coffeescripts/jquery.aa.checkbox-toggler-spec.js.coffee
@@ -662,7 +655,6 @@ files:
 - spec/spec_helper.rb
 - spec/support/active_admin_integration_spec_helper.rb
 - spec/support/active_admin_request_helpers.rb
-- spec/support/deferred_garbage_collection.rb
 - spec/support/jslint.yml
 - spec/support/rails_template.rb
 - spec/support/rails_template_with_data.rb
@@ -723,6 +715,7 @@ files:
 - spec/unit/pretty_format_spec.rb
 - spec/unit/pundit_adapter_spec.rb
 - spec/unit/resource/action_items_spec.rb
+- spec/unit/resource/attributes_spec.rb
 - spec/unit/resource/includes_spec.rb
 - spec/unit/resource/menu_spec.rb
 - spec/unit/resource/naming_spec.rb
@@ -771,6 +764,7 @@ files:
 - spec/unit/views/pages/show_spec.rb
 - spec/unit/views/tabbed_navigation_spec.rb
 - tasks/docs.rake
+- tasks/lint.rake
 - tasks/local.rake
 - tasks/parallel_tests.rake
 - tasks/test.rake
@@ -787,12 +781,12 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 1.9.3
+      version: '2.1'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">"
+  - - ">="
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
 requirements: []
 rubyforge_project: 
 rubygems_version: 2.6.10
@@ -808,6 +802,7 @@ test_files:
 - features/breadcrumb.feature
 - features/comments/commenting.feature
 - features/comments/viewing_index.feature
+- features/create_another.feature
 - features/dashboard.feature
 - features/decorators.feature
 - features/development_reloading.feature
@@ -874,7 +869,6 @@ test_files:
 - features/step_definitions/pagination_steps.rb
 - features/step_definitions/sidebar_steps.rb
 - features/step_definitions/site_title_steps.rb
-- features/step_definitions/symbol_leak_steps.rb
 - features/step_definitions/tab_steps.rb
 - features/step_definitions/table_steps.rb
 - features/step_definitions/user_steps.rb
@@ -884,7 +878,6 @@ test_files:
 - features/support/env.rb
 - features/support/paths.rb
 - features/support/selectors.rb
-- features/symbol_leak.feature
 - features/users/logging_in.feature
 - features/users/logging_out.feature
 - features/users/resetting_password.feature
@@ -906,7 +899,6 @@ test_files:
 - spec/spec_helper.rb
 - spec/support/active_admin_integration_spec_helper.rb
 - spec/support/active_admin_request_helpers.rb
-- spec/support/deferred_garbage_collection.rb
 - spec/support/jslint.yml
 - spec/support/rails_template.rb
 - spec/support/rails_template_with_data.rb
@@ -967,6 +959,7 @@ test_files:
 - spec/unit/pretty_format_spec.rb
 - spec/unit/pundit_adapter_spec.rb
 - spec/unit/resource/action_items_spec.rb
+- spec/unit/resource/attributes_spec.rb
 - spec/unit/resource/includes_spec.rb
 - spec/unit/resource/menu_spec.rb
 - spec/unit/resource/naming_spec.rb

data/features/step_definitions/symbol_leak_steps.rb

@@ -1,3 +0,0 @@
-Then /^"(.*?)" shouldn't be a symbol$/ do |sym|
-  expect(Symbol.all_symbols.map &:to_s).to_not include(sym), 'symbol detected!'
-end

data/features/symbol_leak.feature

@@ -1,35 +0,0 @@
-Feature: User input shouldn't be symbolized
-
-  Background:
-    Given a configuration of:
-    """
-      ActiveAdmin.register Post
-    """
-    Given I am logged in
-    And 1 post exists
-
-  Scenario: The dashboard doesn't leak
-    Given I am on the dashboard with params "?really_long_malicious_key0"
-    Then "really_long_malicious_key0" shouldn't be a symbol
-
-  Scenario: The index page doesn't leak
-    Given I am on the index page for posts with params "?really_long_malicious_key1"
-    Then "really_long_malicious_key1" shouldn't be a symbol
-
-  @allow-rescue
-  Scenario: The filter query hash doesn't leak
-    Given I am on the index page for posts with params "?q[really_long_malicious_key2]"
-    Then "really_long_malicious_key2" shouldn't be a symbol
-
-  Scenario: The show page doesn't leak
-    Given I go to the first post show page with params "?really_long_malicious_key3"
-    Then "really_long_malicious_key3" shouldn't be a symbol
-
-  Scenario: The edit page doesn't leak
-    Given I go to the first post edit page with params "?really_long_malicious_key4"
-    Then "really_long_malicious_key4" shouldn't be a symbol
-
-  @allow-rescue
-  Scenario: Batch Actions don't leak
-    Given I POST to "admin/posts/batch_action" with params "?batch_action=really_long_malicious_key5"
-    Then "really_long_malicious_key5" shouldn't be a symbol

data/gemfiles/rails_32.gemfile

@@ -1,54 +0,0 @@
-# This file was generated by Appraisal
-
-source "https://rubygems.org"
-
-gem "cancan"
-gem "pundit"
-gem "thor", "<= 0.19.1"
-gem "rake"
-gem "parallel_tests", "< 2.10"
-gem "pry"
-gem "rails", "3.2.22"
-gem "jquery-ui-rails", "~> 4.0"
-gem "devise", "~> 3.5"
-gem "inherited_resources"
-gem "test-unit", "~> 3.0"
-gem "draper", "~> 2.1"
-gem "activerecord-jdbcsqlite3-adapter", :platforms => :jruby
-
-group :development do
-  gem "better_errors", :platforms => [:ruby_20, :ruby_21, :ruby_22, :ruby_23, :ruby_24]
-  gem "binding_of_caller", :platforms => :mri
-  gem "rack-mini-profiler"
-  gem "yard"
-  gem "redcarpet", :platforms => :mri
-  gem "kramdown", :platforms => :jruby
-  gem "appraisal", :require => false
-end
-
-group :test do
-  gem "capybara"
-  gem "simplecov", :require => false
-  gem "codecov", :require => false
-  gem "cucumber-rails", :require => false
-  gem "cucumber", "1.3.20"
-  gem "database_cleaner"
-  gem "jasmine"
-  gem "jslint_on_rails"
-  gem "launchy"
-  gem "rails-i18n"
-  gem "rspec-rails"
-  gem "i18n-spec"
-  gem "shoulda-matchers", "<= 2.8.0"
-  gem "sqlite3", :platforms => :mri
-  gem "poltergeist"
-end
-
-platforms :ruby_19 do
-  gem "kaminari", "~> 0.15"
-  gem "mime-types", "< 3"
-  gem "nokogiri", "< 1.7"
-  gem "public_suffix", "< 1.5"
-end
-
-gemspec :path => "../"

data/gemfiles/rails_40.gemfile

@@ -1,53 +0,0 @@
-# This file was generated by Appraisal
-
-source "https://rubygems.org"
-
-gem "cancan"
-gem "pundit"
-gem "thor", "<= 0.19.1"
-gem "rake"
-gem "parallel_tests", "< 2.10"
-gem "pry"
-gem "rails", "4.0.13"
-gem "jquery-ui-rails", "~> 5.0"
-gem "devise", "~> 3.5"
-gem "inherited_resources"
-gem "draper", "~> 2.1"
-gem "activerecord-jdbcsqlite3-adapter", :platforms => :jruby
-
-group :development do
-  gem "better_errors", :platforms => [:ruby_20, :ruby_21, :ruby_22, :ruby_23, :ruby_24]
-  gem "binding_of_caller", :platforms => :mri
-  gem "rack-mini-profiler"
-  gem "yard"
-  gem "redcarpet", :platforms => :mri
-  gem "kramdown", :platforms => :jruby
-  gem "appraisal", :require => false
-end
-
-group :test do
-  gem "capybara"
-  gem "simplecov", :require => false
-  gem "codecov", :require => false
-  gem "cucumber-rails", :require => false
-  gem "cucumber", "1.3.20"
-  gem "database_cleaner"
-  gem "jasmine"
-  gem "jslint_on_rails"
-  gem "launchy"
-  gem "rails-i18n"
-  gem "rspec-rails"
-  gem "i18n-spec"
-  gem "shoulda-matchers", "<= 2.8.0"
-  gem "sqlite3", :platforms => :mri
-  gem "poltergeist"
-end
-
-platforms :ruby_19 do
-  gem "kaminari", "~> 0.15"
-  gem "mime-types", "< 3"
-  gem "nokogiri", "< 1.7"
-  gem "public_suffix", "< 1.5"
-end
-
-gemspec :path => "../"

data/gemfiles/rails_41.gemfile

@@ -1,53 +0,0 @@
-# This file was generated by Appraisal
-
-source "https://rubygems.org"
-
-gem "cancan"
-gem "pundit"
-gem "thor", "<= 0.19.1"
-gem "rake"
-gem "parallel_tests", "< 2.10"
-gem "pry"
-gem "rails", "4.1.16"
-gem "jquery-ui-rails", "~> 5.0"
-gem "devise", "~> 3.5"
-gem "inherited_resources"
-gem "draper", "~> 2.1"
-gem "activerecord-jdbcsqlite3-adapter", :platforms => :jruby
-
-group :development do
-  gem "better_errors", :platforms => [:ruby_20, :ruby_21, :ruby_22, :ruby_23, :ruby_24]
-  gem "binding_of_caller", :platforms => :mri
-  gem "rack-mini-profiler"
-  gem "yard"
-  gem "redcarpet", :platforms => :mri
-  gem "kramdown", :platforms => :jruby
-  gem "appraisal", :require => false
-end
-
-group :test do
-  gem "capybara"
-  gem "simplecov", :require => false
-  gem "codecov", :require => false
-  gem "cucumber-rails", :require => false
-  gem "cucumber", "1.3.20"
-  gem "database_cleaner"
-  gem "jasmine"
-  gem "jslint_on_rails"
-  gem "launchy"
-  gem "rails-i18n"
-  gem "rspec-rails"
-  gem "i18n-spec"
-  gem "shoulda-matchers", "<= 2.8.0"
-  gem "sqlite3", :platforms => :mri
-  gem "poltergeist"
-end
-
-platforms :ruby_19 do
-  gem "kaminari", "~> 0.15"
-  gem "mime-types", "< 3"
-  gem "nokogiri", "< 1.7"
-  gem "public_suffix", "< 1.5"
-end
-
-gemspec :path => "../"

data/spec/support/deferred_garbage_collection.rb

@@ -1,19 +0,0 @@
-class DeferredGarbageCollection
-
-  DEFERRED_GC_THRESHOLD = (ENV['DEFER_GC'] || 15.0).to_f
-
-  @@last_gc_run = Time.now
-
-  def self.start
-    GC.disable
-  end
-
-  def self.reconsider
-    if Time.now - @@last_gc_run >= DEFERRED_GC_THRESHOLD
-      GC.enable
-      GC.start
-      GC.disable
-      @@last_gc_run = Time.now
-    end
-  end
-end