activeadmin 0.6.2 → 0.6.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: cfdd04852f078ce599c16f92be34746f188a2697
-  data.tar.gz: 0f59a8ade89160f9c78c23f8f34683b2bc3696b7
+  metadata.gz: ee588c2ccd71afa65ece9453d9cda98630bb23d5
+  data.tar.gz: 1b37441291f755166156baee1f9617f589a24d04
 SHA512:
-  metadata.gz: 61f32e02f4adfde7acf74a4c542344c47360b7e545460f3ea9a8b5145912c0847b90c54c566e554a2d6ca6b2fa3c58dca196615f079868213936bf53773901fb
-  data.tar.gz: 603678825d79769074c1a0b1e5df4faedd9b5c4e441ffb79c54b16817f8d545b621bec127d0bcb94c466deada6c9b038a6cbc0b633fcc192b828373ab5e608c9
+  metadata.gz: 4ec65879c01b007fe2b554bbaf18b24292a2830f3a6e7d382371fa9ddf950531f8364c9f8d3631488550134d55db7aa67745c77a31d8d5a6eac4cb9711897737
+  data.tar.gz: 8945d9f334cc26bf9e1459a144336cf2f3a9312fd7eb00efc8adbf52bdd874455260e3fa6e0fc4b541db97ec155a89bf1ae2a9061e256eee1ccd8649d6e92c36

data/activeadmin.gemspec

@@ -20,11 +20,16 @@ Gem::Specification.new do |s|
 
   s.add_dependency "arbre",               "~> 1.0"
   s.add_dependency "bourbon",             ">= 1.0.0", "< 4"
-  s.add_dependency "devise",              ">= 1.5.4", "< 4"
+  s.add_dependency "devise",              ">= 1.5.4", "< 4",
+    # Exclude Devise versions vulnerable to CVE-2013-0233
+      "!= 2.0.0", "!= 2.0.1", "!= 2.0.2", "!= 2.0.3", "!= 2.0.4",
+      "!= 2.1.0", "!= 2.1.1", "!= 2.1.2",
+      "!= 2.2.0", "!= 2.2.1", "!= 2.2.2"
+    #
   s.add_dependency "formtastic",          "~> 2.0"
   s.add_dependency "inherited_resources", "~> 1.3"
   s.add_dependency "jquery-rails",        ">= 1.0.0", "< 3"
-  s.add_dependency "kaminari",            "~> 0.13"
+  s.add_dependency "kaminari",            "~> 0.13", "!= 0.15.0"
   s.add_dependency "meta_search",         "~> 1.0"
   s.add_dependency "rails",               ">= 3.0.0", "< 4"
   s.add_dependency "sass",                "~> 3.1"

data/config/locales/el.yml

@@ -0,0 +1,101 @@
+el:
+  active_admin:
+    dashboard: "Σελίδα διαχείρισης"
+    dashboard_welcome:
+      welcome: "Καλωσορίσατε στο Active Admin. Αυτή είναι η αρχική σελίδα διαχείρισης."
+      call_to_action: "Για να προσθέσετε ενότητες, ανατρέξτε στο αρχείο 'app/admin/dashboard.rb'"
+    view: "Προβολή"
+    edit: "Επεξεργασία"
+    delete: "Διαγραφή"
+    delete_confirmation: "Είστε σίγουρος πως θέλετε να το διαγράψετε;"
+    new_model: "Δημιουργία %{model}"
+    create_model: "Δημιουργία %{model}"
+    edit_model: "Επεξεργασία %{model}"
+    update_model: "Επεξεργασία %{model}"
+    delete_model: "Διαγραφή %{model}"
+    details: "Λεπτομέρειες %{model}"
+    cancel: "Ακύρωση"
+    empty: "Άδειο"
+    previous: "Προηγούμενη"
+    next: "Επόμενη"
+    download: "Κατέβασμα:"
+    has_many_new: "Προσθήκη Νέου %{model}"
+    has_many_delete: "Διαγραφή"
+    has_many_remove: "Αφαίρεση"
+    filters:
+      buttons:
+        filter: "Φίλτρα"
+        clear: "Καθαρισμός Φίλτρων"
+      predicates:
+        contains: "Περιέχει"
+        equals: "Είναι ίσο με"
+        starts_with: "Αρχίζει με"
+        ends_with: "Καταλήγει σε"
+        greater_than: "Μεγαλύτερο από"
+        less_than: "Μικρότερο από"
+    main_content: "Παρακαλώ υλοποιήστε την %{model}#main_content για να εμφανίσετε περιεχόμενο."
+    logout: "Αποσύνδεση"
+    powered_by: "Powered by %{active_admin} %{version}"
+    sidebars:
+      filters: "Φίλτρα"
+    pagination:
+      empty: "Δε βρέθηκαν %{model}"
+      one: "Εμφάνιζεται <b>1</b> %{model}"
+      one_page: "Εμφανίζονται <b>όλες οι %{n}</b> εγγραφές %{model}"
+      multiple: "Εμφανίζονται %{model} <b>%{from}&nbsp;-&nbsp;%{to}</b> από <b>%{total}</b> συνολικά"
+      multiple_without_total: "Εμφανίζονται %{model} <b>%{from}&nbsp;-&nbsp;%{to}</b>"
+      entry:
+        one: "εγγραφή"
+        other: "εγγραφές"
+    any: "Όλες οι εγγραφές"
+    blank_slate:
+      content: "Δεν υπάρχουν %{resource_name} ακόμα."
+      link: "Δημιουργήστε μία εγγραφή"
+    batch_actions:
+      button_label: "Μαζικές Ενέργειες"
+      delete_confirmation: "Είστε σίγουρος πως θέλετε να διαγράψετε αυτά τα %{plural_model}?"
+      succesfully_destroyed:
+        one: "Διαγράφηκε επιτυχώς 1 %{model}"
+        other: "Διαγράφηκαν επιτυχώς %{count} %{plural_model}"
+      selection_toggle_explanation: "(Αντιστροφή επιλογών)"
+      link: "Δημιουργήστε ένα"
+      action_label: "%{title} επιλεγμένων"
+      labels:
+        destroy: "Διαγραφή"
+    comments:
+      resource_type: "Τύπος Εγγραφής"
+      author_type: "Τύπος Συγγραφέα"
+      body: "Κείμενο"
+      author: "Συγγραφέας"
+      title: "Σχόλιο"
+      add: "Προσθήκη Σχολίου"
+      resource: "Εγγραφή"
+      no_comments_yet: "Δεν υπάρχει κανένα σχόλιο."
+      title_content: "Σχόλια (%{count})"
+      errors:
+        empty_text: "Το σχόλιο δε σώθηκε, το κείμενο ήταν κενό."
+    devise:
+      login:
+        title: "Σύνδεση"
+        remember_me: "Να με θυμάσαι"
+        submit: "Σύνδεση"
+      reset_password:
+        title: "Ξεχάσατε τον κωδικό σας;"
+        submit: "Επαναφορά κωδικού"
+      change_password:
+        title: "Αλλάξτε τον κωδικό σας"
+        submit: "Αλλαγή του κωδικού"
+      unlock:
+        title: "Αποστολή οδηγιών ξεκλειδώματος"
+        submit: "Αποστολή οδηγιών ξεκλειδώματος"
+      links:
+        sign_in: "Σύνδεση"
+        forgot_your_password: "Ξεχάσατε τον κωδικό σας;"
+        sign_in_with_omniauth_provider: "Σύνδεση με %{provider}"
+    access_denied:
+      message: "Δεν έχετε πρόσβαση για αυτή την ενέργεια."
+    index_list:
+      table: "Πίνακας"
+      block: "Λίστα"
+      grid: "Πλέγμα"
+      blog: "Blog"

data/config/locales/es_MX.yml

@@ -86,6 +86,11 @@ es_MX:
         sign_in: "registrarse"
         forgot_your_password: "¿Olvidó su contraseña?"
         sign_in_with_omniauth_provider: "Conéctate con %{provider}"
+    index_list:
+      table: "Tabla"
+      block: "Lista"
+      grid: "Cuadrícula"
+      blog: "Blog"
   views:
       pagination:
           truncate: "..."

data/config/locales/fr.yml

@@ -73,17 +73,31 @@ fr:
       errors:
         empty_text: "Le commentaire n'a pas été enregistré puisque le texte était vide."
     devise:
+      username:
+        title: "Nom d'utilisateur"
+      email:
+        title: "Email"
+      subdomain:
+        title: "Sous-domaine"
+      password:
+        title: "Mot de passe"
       login:
-        title: "login"
+        title: "Connection"
         remember_me: "Se souvenir de moi"
-        submit: "login"
+        submit: "Se connecter"
       reset_password:
-        title: "Vous avez oublié votre mot de passe?"
+        title: "Vous avez oublié votre mot de passe ?"
         submit: "Réinitialiser mon mot de passe"
       change_password:
         title: "Changez votre mot de passe"
         submit: "Changer mon mot de passe"
       links:
         sign_in: "Connectez-vous"
-        forgot_your_password: "Vous avez oublié votre mot de passe?"
+        forgot_your_password: "Vous avez oublié votre mot de passe ?"
         sign_in_with_omniauth_provider: "Connectez-vous avec %{provider}"
+    access_denied: "Vous n'êtes pas autorisé à executer cette action"
+    index_list:
+      table: "Tableau"
+      block: "Liste"
+      grid: "Grille"
+      blog: "Blog"

data/config/locales/ja.yml

@@ -44,7 +44,7 @@ ja:
       one_page: "<b>全 %{n}</b> 件の %{model} を表示しています"
       multiple: "全 <b>%{total}</b> 件中 <b>%{from}&nbsp;-&nbsp;%{to}</b> 件の %{model} を表示しています"
       multiple_without_total: "<b>%{from}&nbsp;-&nbsp;%{to}</b> 件の %{model} を表示しています"
-      entry: 
+      entry:
         one: "レコード"
         other: "レコード"
     any: "任意"
@@ -75,6 +75,14 @@ ja:
       errors:
         empty_text: "テキストが空のため、コメントは保存されませんでした。"
     devise:
+      username:
+        title: "ユーザ名"
+      email:
+        title: "メールアドレス"
+      subdomain:
+        title: "サブドメイン"
+      password:
+        title: "パスワード"
       login:
         title: "ログイン"
         remember_me: "次回から自動的にログイン"

data/features/belongs_to.feature

@@ -20,6 +20,9 @@ Feature: Belongs To
     And I should not see a menu item for "Users"
     And I should see "Displaying 1 Post"
     And I should see a link to "Users" in the breadcrumb
+    And I should see a link to "Jane Doe" in the breadcrumb
+    When I follow "Edit"
+    Then I should see a link to "Hello World" in the breadcrumb
 
   Scenario: Viewing a child resource page
     Given a configuration of:

data/features/step_definitions/user_steps.rb

@@ -32,9 +32,11 @@ Given /^an admin user "([^"]*)" exists$/ do |email|
   ensure_user_created(email)
 end
 
-Given /^an admin user "([^"]*)" exists with( expired)? reset password token "(.*?)"$/ do |email, expired, token|
-  user = ensure_user_created(email)
-  user.reset_password_token   = token
-  user.reset_password_sent_at = 1.minute.ago unless expired
-  user.save
+Given /^"([^"]*)" requests a pasword reset with token "([^"]*)"( but it expires)?$/ do |email, token, expired|
+  visit new_admin_user_password_path
+  fill_in 'Email', with: email
+  Devise.stub(:friendly_token){ token }
+  click_button "Reset My Password"
+
+  AdminUser.where(email: email).first.update_attribute :reset_password_sent_at, 1.month.ago if expired
 end

data/features/support/env.rb

@@ -34,6 +34,8 @@ autoload :ActiveAdmin, 'active_admin'
 
 require 'cucumber/rails'
 
+require 'cucumber/rspec/doubles'
+
 require 'capybara/rails'
 require 'capybara/cucumber'
 require 'capybara/session'

data/features/support/paths.rb

@@ -16,7 +16,7 @@ module NavigationHelpers
       "/admin/posts/new"
     when /the login page/
       "/admin/login"
-    when /the admin password reset form with reset password token "([^"]*)"/
+    when /the admin password reset form with token "([^"]*)"/
       "/admin/password/edit?reset_password_token=#{$1}"
 
     # the index page for posts in the root namespace

data/features/users/resetting_password.feature

@@ -18,16 +18,16 @@ Feature: User Resetting Password
     Then I should see "You will receive an email with instructions about how to reset your password in a few minutes."
 
   Scenario: Changing password after resetting
-    Given an admin user "admin@example.com" exists with reset password token "123reset"
-    When I go to the admin password reset form with reset password token "123reset"
+    When "admin@example.com" requests a pasword reset with token "foobarbaz"
+    When I go to the admin password reset form with token "foobarbaz"
     And I fill in "Password" with "password"
     And I fill in "Password confirmation" with "password"
     And I press "Change my password"
     Then I should see "success"
 
   Scenario: Changing password after resetting with errors
-    Given an admin user "admin@example.com" exists with expired reset password token "123reset"
-    When I go to the admin password reset form with reset password token "123reset"
+    When "admin@example.com" requests a pasword reset with token "foobarbaz" but it expires
+    When I go to the admin password reset form with token "foobarbaz"
     And I fill in "Password" with "password"
     And I fill in "Password confirmation" with "wrong"
     And I press "Change my password"

data/lib/active_admin/comments.rb

@@ -1,4 +1,3 @@
-require 'active_admin/comments/comment'
 require 'active_admin/comments/views'
 require 'active_admin/comments/show_page_helper'
 require 'active_admin/comments/namespace_helper'
@@ -18,6 +17,11 @@ ActiveAdmin::Resource.send :include, ActiveAdmin::Comments::ResourceHelper
 # Add the module to the show page
 ActiveAdmin.application.view_factory.show_page.send :include, ActiveAdmin::Comments::ShowPageHelper
 
+# Load the model as soon as it's referenced. By that point, Rails & Kaminari will be ready
+module ActiveAdmin
+  autoload :Comment, 'active_admin/comments/comment'
+end
+
 # Walk through all the loaded resources after they are loaded
 ActiveAdmin.after_load do |app|
   app.namespaces.values.each do |namespace|

data/lib/active_admin/comments/comment.rb

@@ -1,11 +1,6 @@
-require 'kaminari/models/active_record_extension'
-
 module ActiveAdmin
-
-  # manually initialize kaminari for this model
-  ::ActiveRecord::Base.send :include, Kaminari::ActiveRecordExtension
-
   class Comment < ActiveRecord::Base
+
     belongs_to :resource, :polymorphic => true
     belongs_to :author,   :polymorphic => true
 

data/lib/active_admin/filters/forms.rb

@@ -66,12 +66,10 @@ module ActiveAdmin
         form_for search, options do |f|
           filters.group_by{ |o| o[:attribute] }.each do |attribute, array|
             opts     = array.last # grab last-defined `filter` call from DSL
-            should   = opts.delete(:if)     || proc{ true }
-            shouldnt = opts.delete(:unless) || proc{ false }
+            next if opts.key?(:if)     && !call_method_or_proc_on(self, opts[:if])
+            next if opts.key?(:unless) &&  call_method_or_proc_on(self, opts[:unless])
 
-            if call_method_or_proc_on(self, should) && !call_method_or_proc_on(self, shouldnt)
-              f.filter attribute, opts
-            end
+            f.filter attribute, opts.except(:if, :unless)
           end
 
           buttons = content_tag :div, :class => "buttons" do

data/lib/active_admin/filters/resource_extension.rb

@@ -13,8 +13,7 @@ module ActiveAdmin
       #
       # @return [Array] Filters that apply for this resource
       def filters
-        return [] unless filters_enabled?
-        filter_lookup
+        filters_enabled? ? filter_lookup : []
       end
 
       # Setter to enable / disable filters on this resource.

data/lib/active_admin/resource_collection.rb

@@ -4,14 +4,19 @@ module ActiveAdmin
   class ResourceCollection
     include Enumerable
     extend Forwardable
-    def_delegators :@resources, :empty?, :has_key?, :keys, :values, :[]=
+    def_delegators :@collection, :empty?, :has_key?, :keys, :values, :size
 
     def initialize
-      @resources = {}
+      @collection = {}
     end
 
     def add(resource)
-      @resources[resource.resource_name] ||= resource
+      if match = @collection[resource.resource_name]
+        raise_if_mismatched! match, resource
+        match
+      else
+        @collection[resource.resource_name] = resource
+      end
     end
 
     # Changes `each` to pass in the value, instead of both the key and value.
@@ -19,23 +24,46 @@ module ActiveAdmin
       values.each &block
     end
 
-    # Finds a resource based on the resource name, the resource class, or the base class.
-    def [](klass)
-      if match = @resources[klass]
-        match
-      elsif match = real_resources.detect{ |r| [r.resource_name.to_s, r.resource_class.to_s].include? klass.to_s }
-        match
-      elsif klass.respond_to? :base_class
-        real_resources.detect{ |r| r.resource_class.to_s == klass.base_class.to_s }
-      end
+    def [](obj)
+      @collection[obj] || find_resource(obj)
     end
 
     private
 
-    # REFACTOR: ResourceCollection currently stores Resource and Page objects. That doesn't
-    # make sense, because by definition a ResourceCollection is a collection of resources.
-    def real_resources
-      select{ |r| r.respond_to? :resource_class }
+    # Finds a resource based on the resource name, resource class, or base class.
+    def find_resource(obj)
+      resources.detect do |r|
+        r.resource_name.to_s == obj.to_s || r.resource_class.to_s == obj.to_s
+      end ||
+      if obj.respond_to? :base_class
+        resources.detect{ |r| r.resource_class.to_s == obj.base_class.to_s }
+      end
+    end
+
+    def resources
+      select{ |r| r.class <= Resource } # can otherwise be a Page
+    end
+
+    def raise_if_mismatched!(existing, given)
+      if existing.class != given.class
+        raise IncorrectClass.new existing, given
+      elsif given.class <= Resource && existing.resource_class != given.resource_class
+        raise ConfigMismatch.new existing, given
+      end
+    end
+
+    class IncorrectClass < StandardError
+      def initialize(existing, given)
+        super "You're trying to register #{given.resource_name} which is a #{given.class}, " +
+              "but #{existing.resource_name}, a #{existing.class} has already claimed that name."
+      end
+    end
+
+    class ConfigMismatch < StandardError
+      def initialize(existing, given)
+        super "You're trying to register #{given.resource_class} as #{given.resource_name}, " +
+              "but the existing #{existing.class} config was built for #{existing.resource_class}!"
+      end
     end
 
   end

data/lib/active_admin/resource_controller/data_access.rb

@@ -267,18 +267,23 @@ module ActiveAdmin
       end
 
       def apply_pagination(chain)
-        page_method = Kaminari.config.page_method_name
-        page_param  = params[Kaminari.config.param_name]
+        page_method_name = Kaminari.config.page_method_name
+        page = params[Kaminari.config.param_name]
 
-        chain.send(page_method, page_param).per(per_page)
+        chain.send(page_method_name, page).per(per_page)
       end
 
       def per_page
+        return max_csv_records if request.format == 'text/csv'
         return max_per_page if active_admin_config.paginate == false
 
         @per_page || active_admin_config.per_page
       end
 
+      def max_csv_records
+        10_000
+      end
+
       def max_per_page
         10_000
       end

data/lib/active_admin/version.rb

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

data/lib/active_admin/view_helpers/breadcrumb_helper.rb

@@ -12,8 +12,9 @@ module ActiveAdmin
           # 2. try using the model name translation
           # 3. default to calling `titlecase` on the URL fragment
           if part =~ /\A(\d+|[a-f0-9]{24})\z/ && parts[index-1]
-            config = active_admin_config.belongs_to_config.try(:target) || active_admin_config
-            name   = display_name config.find_resource(part)
+            parent = active_admin_config.belongs_to_config.try :target
+            config = parent && parent.resource_name.route_key == parts[index-1] ? parent : active_admin_config
+            name   = display_name config.find_resource part
           end
           name ||= I18n.t "activerecord.models.#{part.singularize}", :count => 1.1, :default => part.titlecase
 

data/lib/active_admin/views/pages/index.rb

@@ -123,7 +123,7 @@ module ActiveAdmin
 
         def render_blank_slate
           blank_slate_content = I18n.t("active_admin.blank_slate.content", :resource_name => active_admin_config.plural_resource_label)
-          if controller.action_methods.include?('new')
+          if controller.action_methods.include?('new') && authorized?(ActiveAdmin::Auth::CREATE, active_admin_config.resource_class)
             blank_slate_content += " " + link_to(I18n.t("active_admin.blank_slate.link"), new_resource_path)
           end
           insert_tag(view_factory.blank_slate, blank_slate_content)

data/spec/support/rails_template.rb

@@ -107,8 +107,3 @@ namespace :parallel do
 end
 }
 
-# If using Devise after 3.1, this is required for the tests to pass:
-require 'devise/version'
-if Devise::VERSION.to_f >= 3.1
-  inject_into_file 'config/initializers/devise.rb', "\n  config.allow_insecure_token_lookup = true", after: 'Devise.setup do |config|'
-end

data/spec/unit/filters/filter_form_builder_spec.rb

@@ -308,34 +308,32 @@ describe ActiveAdmin::Filters::ViewHelper do
   end
 
   describe "conditional display" do
-
-    context "with :if block" do
-      let(:body) do
-        filter :body,   :if => proc{true}
-        filter :author, :if => proc{false}
-      end
-
-      it "should be displayed if true" do
-        body.should have_tag("input", :attributes => { :name => "q[body_contains]"})
-      end
-
-      it "should NOT be displayed if false" do
-        body.should_not have_tag("input", :attributes => { :name => "q[author_id_eq]"})
-      end
-    end
-
-    context "with :unless block" do
-      let(:body) do
-        filter :created_at, :unless => proc{false}
-        filter :updated_at, :unless => proc{true}
-      end
-
-      it "should be displayed if false" do
-        body.should have_tag("input", :attributes => { :name => "q[created_at_gte]"})
-      end
-
-      it "should NOT be displayed if true" do
-        body.should_not have_tag("input", :attributes => { :name => "q[updated_at_gte]"})
+    [:if, :unless].each do |verb|
+      should   = verb == :if ? "should"     : "shouldn't"
+      if_true  = verb == :if ? :should      : :should_not
+      if_false = verb == :if ? :should_not  : :should
+      context "with #{verb.inspect} proc" do
+        it "#{should} be displayed if true" do
+          body = filter :body, verb => proc{ true }
+          body.send if_true, have_tag("input", attributes: {name: "q[body_contains]"})
+        end
+        it "#{should} be displayed if false" do
+          body = filter :body, verb => proc{ false }
+          body.send if_false, have_tag("input", attributes: {name: "q[body_contains]"})
+        end
+        it "should still be hidden on the second render" do
+          filters = [attribute: :body, verb => proc{ verb == :unless }]
+          2.times do
+            body = render_filter scope, filters
+            body.should_not have_tag "input", attributes: {name: "q[body_contains]"}
+          end
+        end
+        it "should successfully keep rendering other filters after one is hidden" do
+          filters = [{attribute: :body, verb => proc{ verb == :unless }}, {attribute: :author}]
+          body    = render_filter scope, filters
+          body.should_not have_tag "input",  attributes: {name: "q[body_contains]"}
+          body.should     have_tag "select", attributes: {name: "q[author_id_eq]"}
+        end
       end
     end
   end

data/spec/unit/resource_collection_spec.rb

@@ -1,13 +1,19 @@
 require 'spec_helper'
 require 'active_admin/resource_collection'
 
-include ActiveAdmin
-
 describe ActiveAdmin::ResourceCollection do
   let(:application) { ActiveAdmin::Application.new }
-  let(:namespace)   { ActiveAdmin::Namespace.new(application, :admin) }
-
-  let(:collection){ ResourceCollection.new }
+  let(:namespace)   { ActiveAdmin::Namespace.new application, :admin }
+  let(:collection)  { ActiveAdmin::ResourceCollection.new }
+
+  it { should respond_to :[]       }
+  it { should respond_to :add      }
+  it { should respond_to :each     }
+  it { should respond_to :has_key? }
+  it { should respond_to :keys     }
+  it { should respond_to :values   }
+  it { should respond_to :size     }
+  it { should respond_to :to_a     }
 
   it "should have no resources when new" do
     collection.should be_empty
@@ -25,7 +31,7 @@ describe ActiveAdmin::ResourceCollection do
     collection.keys.should == [resource.resource_name]
   end
 
-  describe "adding a new resource" do
+  describe "#add" do
     let(:resource){ mock :resource_name => "MyResource" }
 
     it "should return the resource" do
@@ -50,11 +56,42 @@ describe ActiveAdmin::ResourceCollection do
       collection.add(resource); collection.add(resource)
       collection.values.should == [resource]
     end
+
+    it "shouldn't allow a resource name mismatch to occur" do
+      expect {
+        ActiveAdmin.register Category
+        ActiveAdmin.register Post, as: "Category"
+      }.to raise_error ActiveAdmin::ResourceCollection::ConfigMismatch
+    end
+
+    it "shouldn't allow a Page/Resource mismatch to occur" do
+      expect {
+        ActiveAdmin.register User
+        ActiveAdmin.register_page 'User'
+      }.to raise_error ActiveAdmin::ResourceCollection::IncorrectClass
+    end
+
+    describe "should store both renamed and non-renamed resources" do
+      let(:resource) { ActiveAdmin::Resource.new namespace, Category }
+      let(:renamed)  { ActiveAdmin::Resource.new namespace, Category, as: "Subcategory" }
+
+      it "when the renamed version is added first" do
+        collection.add renamed
+        collection.add resource
+        collection.values.should include(resource, renamed)
+      end
+
+      it "when the renamed version is added last" do
+        collection.add resource
+        collection.add renamed
+        collection.values.should include(resource, renamed)
+      end
+    end
   end
 
   describe "#[]" do
-    let(:resource)              { Resource.new(namespace, resource_class) }
-    let(:inherited_resource)    { Resource.new(namespace, inherited_resource_class) }
+    let(:resource)              { ActiveAdmin::Resource.new namespace, resource_class }
+    let(:inherited_resource)    { ActiveAdmin::Resource.new namespace, inherited_resource_class }
 
     let(:resource_class)           { User }
     let(:inherited_resource_class) { Publisher }
@@ -102,7 +139,7 @@ describe ActiveAdmin::ResourceCollection do
     end
 
     context "with a renamed resource" do
-      let(:renamed_resource) { Resource.new(namespace, resource_class, :as => name) }
+      let(:renamed_resource) { ActiveAdmin::Resource.new namespace, resource_class, as: name }
       let(:name)             { "Administrators" }
 
       before do
@@ -123,31 +160,6 @@ describe ActiveAdmin::ResourceCollection do
     end
   end
 
-  describe ".add" do
-    let(:resource)         { Resource.new(namespace, Category) }
-    let(:resource_renamed) { Resource.new(namespace, Category, as: "Subcategory") }
-
-    context "when renamed resource is added first" do
-      before do
-        collection.add(resource_renamed)
-        collection.add(resource)
-      end
-
-      it "contains both resources" do
-        collection.values.should include(resource, resource_renamed)
-      end
-    end
-
-    context "when resource is added first" do
-      before do
-        collection.add(resource)
-        collection.add(resource_renamed)
-      end
-
-      it "contains both resources" do
-        collection.values.should include(resource, resource_renamed)
-      end
-    end
-  end
+  pending "specs for subclasses of Page and Resource"
 
 end

data/spec/unit/view_helpers/breadcrumbs_spec.rb

@@ -11,14 +11,16 @@ describe "Breadcrumbs" do
     # Mock link to and return a hash
     def link_to(name, url); {:name => name, :path => url}; end
 
-    let(:post) { mock(:display_name => 'Hello World') }
-
-    let(:post_config) { stub(find_resource: post) }
+    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') }
 
     let :active_admin_config do
-      active_admin_config = stub
-      active_admin_config.stub_chain(:belongs_to_config, :target).and_return post_config
-      active_admin_config
+      post_config
     end
 
     let(:trail) { breadcrumb_links(path) }
@@ -31,8 +33,8 @@ describe "Breadcrumbs" do
       end
     end
 
-    context "when path '/admin/posts'" do
-      let(:path) { "/admin/posts" }
+    context "when path '/admin/users'" do
+      let(:path) { "/admin/users" }
 
       it "should have one item" do
         trail.size.should == 1
@@ -43,8 +45,8 @@ describe "Breadcrumbs" do
       end
     end
 
-    context "when path '/admin/posts/1'" do
-      let(:path) { "/admin/posts/1" }
+    context "when path '/admin/users/1'" do
+      let(:path) { "/admin/users/1" }
 
       it "should have 2 items" do
         trail.size.should == 2
@@ -53,14 +55,14 @@ describe "Breadcrumbs" 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"
+      it "should have a link to /admin/users" do
+        trail[1][:name].should == "Users"
+        trail[1][:path].should == "/admin/users"
       end
     end
 
-    context "when path '/admin/posts/1/comments'" do
-      let(:path) { "/admin/posts/1/comments" }
+    context "when path '/admin/users/1/posts'" do
+      let(:path) { "/admin/users/1/posts" }
 
       it "should have 3 items" do
         trail.size.should == 3
@@ -69,29 +71,29 @@ describe "Breadcrumbs" 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"
+      it "should have a link to /admin/users" do
+        trail[1][:name].should == "Users"
+        trail[1][:path].should == "/admin/users"
       end
 
-      context "when Post.find(1) doesn't exist" do
-        before { post_config.stub(find_resource: nil) }
-        it "should have a link to /admin/posts/1" do
+      context "when User.find(1) doesn't exist" do
+        before { user_config.stub(find_resource: nil) }
+        it "should have a link to /admin/users/1" do
           trail[2][:name].should == "1"
-          trail[2][:path].should == "/admin/posts/1"
+          trail[2][:path].should == "/admin/users/1"
         end
       end
 
-      context "when Post.find(1) does exist" do
-        it "should have a link to /admin/posts/1 using display name" do
-          trail[2][:name].should == "Hello World"
-          trail[2][:path].should == "/admin/posts/1"
+      context "when User.find(1) does exist" do
+        it "should have a link to /admin/users/1 using display name" do
+          trail[2][:name].should == "Jane Doe"
+          trail[2][:path].should == "/admin/users/1"
         end
       end
     end
 
-    context "when path '/admin/posts/4e24d6249ccf967313000000/comments'" do
-      let(:path) { "/admin/posts/4e24d6249ccf967313000000/comments" }
+    context "when path '/admin/users/4e24d6249ccf967313000000/posts'" do
+      let(:path) { "/admin/users/4e24d6249ccf967313000000/posts" }
 
       it "should have 3 items" do
         trail.size.should == 3
@@ -100,32 +102,32 @@ describe "Breadcrumbs" 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"
+      it "should have a link to /admin/users" do
+        trail[1][:name].should == "Users"
+        trail[1][:path].should == "/admin/users"
       end
 
-      context "when Post.find(4e24d6249ccf967313000000) doesn't exist" do
-        before { post_config.stub(find_resource: nil) }
-        it "should have a link to /admin/posts/4e24d6249ccf967313000000" do
+      context "when User.find(4e24d6249ccf967313000000) doesn't exist" do
+        before { user_config.stub(find_resource: nil) }
+        it "should have a link to /admin/users/4e24d6249ccf967313000000" do
           trail[2][:name].should == "4e24d6249ccf967313000000"
-          trail[2][:path].should == "/admin/posts/4e24d6249ccf967313000000"
+          trail[2][:path].should == "/admin/users/4e24d6249ccf967313000000"
         end
       end
 
-      context "when Post.find(4e24d6249ccf967313000000) does exist" do
+      context "when User.find(4e24d6249ccf967313000000) does exist" do
         before do
-          post_config.stub(:find_resource => mock(:display_name => 'Hello :)'))
+          user_config.stub find_resource: double(display_name: 'Hello :)')
         end
-        it "should have a link to /admin/posts/4e24d6249ccf967313000000 using display name" do
+        it "should have a link to /admin/users/4e24d6249ccf967313000000 using display name" do
           trail[2][:name].should == "Hello :)"
-          trail[2][:path].should == "/admin/posts/4e24d6249ccf967313000000"
+          trail[2][:path].should == "/admin/users/4e24d6249ccf967313000000"
         end
       end
     end
 
-    context "when path '/admin/posts/1/coments/1'" do
-      let(:path) { "/admin/posts/1/comments/1" }
+    context "when path '/admin/users/1/coments/1'" do
+      let(:path) { "/admin/users/1/posts/1" }
 
       it "should have 4 items" do
         trail.size.should == 4
@@ -134,17 +136,45 @@ describe "Breadcrumbs" 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"
+      it "should have a link to /admin/users" do
+        trail[1][:name].should == "Users"
+        trail[1][:path].should == "/admin/users"
+      end
+      it "should have a link to /admin/users/1" do
+        trail[2][:name].should == "Jane Doe"
+        trail[2][:path].should == "/admin/users/1"
+      end
+      it "should have a link to /admin/users/1/posts" do
+        trail[3][:name].should == "Posts"
+        trail[3][:path].should == "/admin/users/1/posts"
+      end
+    end
+
+    context "when path '/admin/users/1/coments/1/edit'" do
+      let(:path) { "/admin/users/1/posts/1/edit" }
+
+      it "should have 5 items" do
+        trail.size.should == 5
+      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/users" do
+        trail[1][:name].should == "Users"
+        trail[1][:path].should == "/admin/users"
+      end
+      it "should have a link to /admin/users/1" do
+        trail[2][:name].should == "Jane Doe"
+        trail[2][:path].should == "/admin/users/1"
       end
-      it "should have a link to /admin/posts/1" do
-        trail[2][:name].should == "Hello World"
-        trail[2][:path].should == "/admin/posts/1"
+      it "should have a link to /admin/users/1/posts" do
+        trail[3][:name].should == "Posts"
+        trail[3][:path].should == "/admin/users/1/posts"
       end
-      it "should have a link to /admin/posts/1/comments" do
-        trail[3][:name].should == "Comments"
-        trail[3][:path].should == "/admin/posts/1/comments"
+      it "should have a link to /admin/users/1/posts/1" do
+        trail[4][:name].should == "Hello World"
+        trail[4][:path].should == "/admin/users/1/posts/1"
       end
     end
 

metadata

@@ -1,177 +1,249 @@
 --- !ruby/object:Gem::Specification
 name: activeadmin
 version: !ruby/object:Gem::Version
-  version: 0.6.2
+  version: 0.6.3
 platform: ruby
 authors:
 - Greg Bell
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-10-21 00:00:00.000000000 Z
+date: 2014-01-30 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'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.0'
 - !ruby/object:Gem::Dependency
   name: bourbon
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 1.0.0
-    - - <
+    - - "<"
       - !ruby/object:Gem::Version
         version: '4'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 1.0.0
-    - - <
+    - - "<"
       - !ruby/object:Gem::Version
         version: '4'
 - !ruby/object:Gem::Dependency
   name: devise
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 1.5.4
-    - - <
+    - - "<"
       - !ruby/object:Gem::Version
         version: '4'
+    - - "!="
+      - !ruby/object:Gem::Version
+        version: 2.0.0
+    - - "!="
+      - !ruby/object:Gem::Version
+        version: 2.0.1
+    - - "!="
+      - !ruby/object:Gem::Version
+        version: 2.0.2
+    - - "!="
+      - !ruby/object:Gem::Version
+        version: 2.0.3
+    - - "!="
+      - !ruby/object:Gem::Version
+        version: 2.0.4
+    - - "!="
+      - !ruby/object:Gem::Version
+        version: 2.1.0
+    - - "!="
+      - !ruby/object:Gem::Version
+        version: 2.1.1
+    - - "!="
+      - !ruby/object:Gem::Version
+        version: 2.1.2
+    - - "!="
+      - !ruby/object:Gem::Version
+        version: 2.2.0
+    - - "!="
+      - !ruby/object:Gem::Version
+        version: 2.2.1
+    - - "!="
+      - !ruby/object:Gem::Version
+        version: 2.2.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 1.5.4
-    - - <
+    - - "<"
       - !ruby/object:Gem::Version
         version: '4'
+    - - "!="
+      - !ruby/object:Gem::Version
+        version: 2.0.0
+    - - "!="
+      - !ruby/object:Gem::Version
+        version: 2.0.1
+    - - "!="
+      - !ruby/object:Gem::Version
+        version: 2.0.2
+    - - "!="
+      - !ruby/object:Gem::Version
+        version: 2.0.3
+    - - "!="
+      - !ruby/object:Gem::Version
+        version: 2.0.4
+    - - "!="
+      - !ruby/object:Gem::Version
+        version: 2.1.0
+    - - "!="
+      - !ruby/object:Gem::Version
+        version: 2.1.1
+    - - "!="
+      - !ruby/object:Gem::Version
+        version: 2.1.2
+    - - "!="
+      - !ruby/object:Gem::Version
+        version: 2.2.0
+    - - "!="
+      - !ruby/object:Gem::Version
+        version: 2.2.1
+    - - "!="
+      - !ruby/object:Gem::Version
+        version: 2.2.2
 - !ruby/object:Gem::Dependency
   name: formtastic
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '2.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '2.0'
 - !ruby/object:Gem::Dependency
   name: inherited_resources
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.3'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.3'
 - !ruby/object:Gem::Dependency
   name: jquery-rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 1.0.0
-    - - <
+    - - "<"
       - !ruby/object:Gem::Version
         version: '3'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 1.0.0
-    - - <
+    - - "<"
       - !ruby/object:Gem::Version
         version: '3'
 - !ruby/object:Gem::Dependency
   name: kaminari
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0.13'
+    - - "!="
+      - !ruby/object:Gem::Version
+        version: 0.15.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0.13'
+    - - "!="
+      - !ruby/object:Gem::Version
+        version: 0.15.0
 - !ruby/object:Gem::Dependency
   name: meta_search
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.0'
 - !ruby/object:Gem::Dependency
   name: rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 3.0.0
-    - - <
+    - - "<"
       - !ruby/object:Gem::Version
         version: '4'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 3.0.0
-    - - <
+    - - "<"
       - !ruby/object:Gem::Version
         version: '4'
 - !ruby/object:Gem::Dependency
   name: sass
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '3.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '3.1'
 description: The administration framework for Ruby on Rails.
@@ -181,10 +253,10 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .document
-- .gitignore
-- .travis.yml
-- .yardopts
+- ".document"
+- ".gitignore"
+- ".travis.yml"
+- ".yardopts"
 - CHANGELOG.md
 - CONTRIBUTING.md
 - Gemfile
@@ -278,6 +350,7 @@ files:
 - config/locales/da.yml
 - config/locales/de-CH.yml
 - config/locales/de.yml
+- config/locales/el.yml
 - config/locales/en-GB.yml
 - config/locales/en.yml
 - config/locales/es.yml
@@ -686,17 +759,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.6
+rubygems_version: 2.2.1
 signing_key: 
 specification_version: 4
 summary: The administration framework for Ruby on Rails.