activeadmin 0.6.3 → 0.6.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ee588c2ccd71afa65ece9453d9cda98630bb23d5
-  data.tar.gz: 1b37441291f755166156baee1f9617f589a24d04
+  metadata.gz: 329a21beba665a20492d87c4154a6a762c557822
+  data.tar.gz: addbedade80ec32dda5cfa1b142dce11c44d7187
 SHA512:
-  metadata.gz: 4ec65879c01b007fe2b554bbaf18b24292a2830f3a6e7d382371fa9ddf950531f8364c9f8d3631488550134d55db7aa67745c77a31d8d5a6eac4cb9711897737
-  data.tar.gz: 8945d9f334cc26bf9e1459a144336cf2f3a9312fd7eb00efc8adbf52bdd874455260e3fa6e0fc4b541db97ec155a89bf1ae2a9061e256eee1ccd8649d6e92c36
+  metadata.gz: c146ca594b7a6e616639dbd44843e201c819a5f8e44c2fc8c6a27afc49b03f5a239fd665abbc531c1d0d617c8fd70ab7c71898526620ae9b92d508b6dc25c96b
+  data.tar.gz: f3edbd454acd02b042cbd8b87950f13bcd813f3df3cf0d03fd1cce18f1a806f48a8129d1a6e9450fed08771187ae20bd735cd70a5c9604d1f31390189d109fde

data/CHANGELOG.md

@@ -1,4 +1,25 @@
-## Master (unreleased) - [compare](https://github.com/gregbell/active_admin/compare/v0.6.0...master)
+## 0-6-stable (unreleased) - [compare](https://github.com/gregbell/active_admin/compare/v0.6.4...0-6-stable)
+
+## 0.6.4 - [compare](https://github.com/gregbell/active_admin/compare/v0.6.3...v0.6.4)
+
+* Restore compatibility with Formtastic 2.0 by [@seanlinsley][]
+* Backport of [#3489][] by [@timoschilling][]
+* Backport of [#3659][] by [@timoschilling][]
+
+## 0.6.3 - [compare](https://github.com/gregbell/active_admin/compare/v0.6.2...v0.6.3)
+
+* __Reinstitutes the 10k limit for CSV exports__ [#2847][] by [@seanlinsley][]
+* Blacklists Devise versions vulnerable to CVE-2013-0233 [#2744][] by [@jjarmoc][]
+* Autoloads the Comments model so it respects user's Kaminari config 77c97d27 by [@seanlinsley][]
+* Hides the blank slate link if user doesn't have permissions [#2588][] by [@seanlinsley][]
+* Fixes incorrect breadcrumb on edit pages [#2601][] by [@shekibobo][]
+* Resurrects `ResourceMismatchError` b1c28cdb by [@seanlinsley][]
+* Keeps filter conditions from being deleted fa0edec4 by [@seanlinsley][]
+* Translations by [@teoulas][], [@tricknotes][], [@givanse][], and [@pcreux][] :heart:
+
+## 0.6.2 - [compare](https://github.com/gregbell/active_admin/compare/v0.6.1...v0.6.2)
+
+* Patches MetaSearch bug for attributes ending in "ne" d5db9ff4 by [@seanlinsley][]
 
 ## 0.6.1 - [compare](https://github.com/gregbell/active_admin/compare/v0.6.0...v0.6.1)
 
@@ -904,6 +925,8 @@ of the highlights. 250 commits. Enough said.
 [#2419]: https://github.com/gregbell/active_admin/issues/2419
 [#2420]: https://github.com/gregbell/active_admin/issues/2420
 [#2454]: https://github.com/gregbell/active_admin/issues/2454
+[#3489]: https://github.com/gregbell/active_admin/issues/3489
+[#3659]: https://github.com/gregbell/active_admin/issues/3659
 [@Bishop]: https://github.com/Bishop
 [@BoboFraggins]: https://github.com/BoboFraggins
 [@DMajrekar]: https://github.com/DMajrekar
@@ -992,6 +1015,7 @@ of the highlights. 250 commits. Enough said.
 [@stereoscott]: https://github.com/stereoscott
 [@sunny]: https://github.com/sunny
 [@tank-bohr]: https://github.com/tank-bohr
+[@timoschilling]: https://github.com/timoschilling
 [@tinynumbers]: https://github.com/tinynumbers
 [@tracedwax]: https://github.com/tracedwax
 [@tricknotes]: https://github.com/tricknotes

data/Gemfile

@@ -27,7 +27,7 @@ group :development do
 end
 
 group :development, :test do
-  gem 'haml', '~> 3.1.7',  :require => false
+  # gem 'haml', '~> 3.1.7',  :require => false
   gem 'rake', '~> 10.0.2', :require => false
   gem 'rails-i18n' # Provides default i18n for many languages
   gem 'rdiscount'  # Markdown implementation (for yard)

data/README.rdoc

@@ -2,10 +2,10 @@
 
 Active Admin is a Ruby on Rails framework for creating elegant backends for website administration.
 
-{<img src="https://secure.travis-ci.org/gregbell/active_admin.png?branch=master" />}[http://travis-ci.org/gregbell/active_admin]
-{<img src="https://codeclimate.com/github/gregbell/active_admin.png" />}[https://codeclimate.com/github/gregbell/active_admin]
-{<img src="https://gemnasium.com/gregbell/active_admin.png" />}[https://gemnasium.com/gregbell/active_admin]
-{<img src="https://coveralls.io/repos/gregbell/active_admin/badge.png?branch=master" />}[https://coveralls.io/r/gregbell/active_admin?branch=master]
+{<img src="https://secure.travis-ci.org/activeadmin/activeadmin.png?branch=0-6-stable" />}[http://travis-ci.org/activeadmin/activeadmin]
+{<img src="https://codeclimate.com/github/activeadmin/activeadmin.png" />}[https://codeclimate.com/github/activeadmin/activeadmin]
+{<img src="https://gemnasium.com/activeadmin/activeadmin.png" />}[https://gemnasium.com/activeadmin/activeadmin]
+{<img src="https://coveralls.io/repos/activeadmin/activeadmin/badge.png?branch=master" />}[https://coveralls.io/r/activeadmin/activeadmin?branch=0-6-stable]
 {<img src="http://badgr.co/gittip/activeadmin.png" />}[https://www.gittip.com/activeadmin/]
 
 == Documentation & Support

data/features/users/resetting_password.feature

@@ -15,7 +15,8 @@ Feature: User Resetting Password
     And I follow "Forgot your password?"
     When I fill in "Email" with "admin@example.com"
     And I press "Reset My Password"
-    Then I should see "You will receive an email with instructions about how to reset your password in a few minutes."
+    Then I should see "You will receive an email with instructions"
+    And I should see "how to reset your password in a few minutes."
 
   Scenario: Changing password after resetting
     When "admin@example.com" requests a pasword reset with token "foobarbaz"

data/lib/active_admin/engine.rb

@@ -2,7 +2,12 @@ module ActiveAdmin
   class Engine < ::Rails::Engine
     if Rails.version > "3.1"
       initializer "ActiveAdmin precompile hook", :group => :all do |app|
-        app.config.assets.precompile += %w(active_admin.js active_admin.css active_admin/print.css)
+        ActiveAdmin.application.stylesheets.each do |path, _|
+          app.config.assets.precompile << path
+        end
+        ActiveAdmin.application.javascripts.each do |path|
+          app.config.assets.precompile << path
+        end
       end
     end
   end

data/lib/active_admin/inputs/filter_boolean_input.rb

@@ -27,6 +27,10 @@ module ActiveAdmin
         /(is_true|is_false|is_present|is_blank|is_null|is_not_null)\z/
       end
 
+      def boolean_checked?(value, checked_value)
+        defined?(super) ? super : ActionView::Helpers::InstanceTag.check_box_checked?(value, checked_value)
+      end
+
     end
   end
 end

data/lib/active_admin/version.rb

@@ -1,3 +1,3 @@
 module ActiveAdmin
-  VERSION = '0.6.3'
+  VERSION = '0.6.4'
 end

data/lib/active_admin/view_helpers/breadcrumb_helper.rb

@@ -18,7 +18,12 @@ module ActiveAdmin
           end
           name ||= I18n.t "activerecord.models.#{part.singularize}", :count => 1.1, :default => part.titlecase
 
-          link_to name, '/' + parts[0..index].join('/')
+          # Don't create a link if the resource's show action is disabled
+          if !config || config.defined_actions.include?(:show)
+            link_to name, '/' + parts[0..index].join('/')
+          else
+            name
+          end
         end
       end
 

data/spec/spec_helper.rb

@@ -171,5 +171,8 @@ unless ENV['DEFER_GC'] == '0' || ENV['DEFER_GC'] == 'false'
   RSpec.configure do |config|
     config.before(:all) { DeferredGarbageCollection.start }
     config.after(:all)  { DeferredGarbageCollection.reconsider }
+    config.filter_run focus: true
+    config.filter_run_excluding skip: true
+    config.run_all_when_everything_filtered = true
   end
 end

data/spec/unit/view_helpers/breadcrumbs_spec.rb

@@ -11,13 +11,14 @@ describe "Breadcrumbs" do
     # Mock link to and return a hash
     def link_to(name, url); {:name => name, :path => url}; end
 
-    let(:user)        { double  display_name: 'Jane Doe' }
-    let(:user_config) { double  find_resource: user,
-                                resource_name: double(route_key: 'users') }
-    let(:post)        { double  display_name: 'Hello World' }
-    let(:post_config) { double  find_resource: post,
-                                belongs_to_config: double(target: user_config),
-                                resource_name: double(route_key: 'posts') }
+    actions = ActiveAdmin::BaseController::ACTIVE_ADMIN_ACTIONS
+
+    let(:user)        { double display_name: 'Jane Doe' }
+    let(:user_config) { double find_resource: user, resource_name: double(route_key: 'users'),
+                               defined_actions: actions }
+    let(:post)        { double display_name: 'Hello World' }
+    let(:post_config) { double find_resource: post, resource_name: double(route_key: 'posts'),
+                               defined_actions: actions, belongs_to_config: double(target: user_config) }
 
     let :active_admin_config do
       post_config
@@ -178,5 +179,28 @@ describe "Breadcrumbs" do
       end
     end
 
+    context "when the 'show' action is disabled" do
+      let(:post_config) { double find_resource: post, resource_name: double(route_key: 'posts'),
+                                 defined_actions: actions - [:show], # this is the change
+                                 belongs_to_config: double(target: user_config) }
+
+      let(:path) { "/admin/posts/1/edit" }
+
+      it "should have 3 items" do
+        trail.size.should == 3
+      end
+      it "should have a link to /admin" do
+        trail[0][:name].should == "Admin"
+        trail[0][:path].should == "/admin"
+      end
+      it "should have a link to /admin/posts" do
+        trail[1][:name].should == "Posts"
+        trail[1][:path].should == "/admin/posts"
+      end
+      it "should not link to the show view for the post" do
+        trail[2].should == "Hello World"
+      end
+    end
+
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: activeadmin
 version: !ruby/object:Gem::Version
-  version: 0.6.3
+  version: 0.6.4
 platform: ruby
 authors:
 - Greg Bell
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-01-30 00:00:00.000000000 Z
+date: 2015-01-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: arbre
@@ -769,7 +769,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.1
+rubygems_version: 2.4.5
 signing_key: 
 specification_version: 4
 summary: The administration framework for Ruby on Rails.