activeadmin 0.4.0 → 0.4.1

data/features/sidebar_sections.feature

@@ -76,6 +76,51 @@ Feature: Sidebar Sections
     When I follow "New Post"
     Then I should see a sidebar titled "Help"
 
+  Scenario: Create a sidebar for only one action with if clause that returns false
+    Given a configuration of:
+    """
+    ActiveAdmin.register Post do
+      sidebar :help, :only => :index, :if => proc{ current_active_admin_user.nil? } do
+        "Need help? Email us at help@example.com"
+      end
+    end
+    """
+    When I am on the index page for posts
+    Then I should not see a sidebar titled "Help"
+
+    When I follow "View"
+    Then I should not see a sidebar titled "Help"
+
+    When I follow "Edit Post"
+    Then I should not see a sidebar titled "Help"
+
+    When I am on the index page for posts
+    When I follow "New Post"
+    Then I should not see a sidebar titled "Help"
+
+  Scenario: Create a sidebar for only one action with if clause that returns true
+    Given a configuration of:
+    """
+    ActiveAdmin.register Post do
+      sidebar :help, :only => :show, :if => proc{ !current_active_admin_user.nil? } do
+        "Need help? Email us at help@example.com"
+      end
+    end
+    """
+    When I am on the index page for posts
+    Then I should not see a sidebar titled "Help"
+
+    When I follow "View"
+    Then I should see a sidebar titled "Help"
+    Then I should see /Need help/ within the "Help" sidebar
+
+    When I follow "Edit Post"
+    Then I should not see a sidebar titled "Help"
+
+    When I am on the index page for posts
+    When I follow "New Post"
+    Then I should not see a sidebar titled "Help"
+
   Scenario: Create a sidebar with deep content
     Given a configuration of:
     """

data/features/step_definitions/action_item_steps.rb

@@ -1,3 +1,7 @@
 Then /^I should see an action item link to "([^"]*)"$/ do |link|
   page.should have_css('.action_item a', :text => link)
 end
+
+Then /^I should not see an action item link to "([^"]*)"$/ do |link|
+  page.should_not have_css('.action_item a', :text => link)
+end

data/features/step_definitions/factory_steps.rb

@@ -6,10 +6,11 @@ Given /^a post with the title "([^"]*)" and body "([^"]*)" exists$/ do |title, b
   Post.create! :title => title, :body => body
 end
 
-Given /^a post with the title "([^"]*)" written by "([^"]*)" exists$/ do |title, author_name|
+Given /^a (published )?post with the title "([^"]*)" written by "([^"]*)" exists$/ do |published, title, author_name|
   first, last = author_name.split(' ')
   author = User.find_or_create_by_first_name_and_last_name(first, last, :username => author_name.gsub(' ', '').underscore)
-  Post.create! :title => title, :author => author
+  published_at = published ? Time.now : nil
+  Post.create! :title => title, :author => author, :published_at => published_at
 end
 
 Given /^(\d+)( published)? posts? exists?$/ do |count, published|

data/features/step_definitions/filter_steps.rb

@@ -0,0 +1,17 @@
+Then /^I should see a select filter for "([^"]*)"$/ do |label|
+  page.should have_css(".filter_select label", :text => label)
+end
+
+Then /^I should see a string filter for "([^"]*)"$/ do |label|
+  page.should have_css(".filter_string label", :text => "Search #{label}")
+end
+
+Then /^I should see a date range filter for "([^"]*)"$/ do |label|
+  page.should have_css(".filter_date_range label", :text => label)
+end
+
+Then /^I should see the following filters:$/ do |table|
+  table.rows_hash.each do |label, type|
+    step "I should see a #{type} filter for \"#{label}\""
+  end
+end

data/features/step_definitions/format_steps.rb

@@ -14,6 +14,10 @@ Then /^I should see a link to download "([^"]*)"$/ do |format_type|
   page.should have_css("#index_footer a", :text => format_type)
 end
 
+Then /^I should not see a link to download "([^"]*)"$/ do |format_type|
+  page.should_not have_css("#index_footer a", :text => format_type)
+end
+
 # Check first rows of the displayed CSV.
 Then /^I should download a CSV file for "([^"]*)" containing:$/ do |resource_name, table|
   page.response_headers['Content-Type'].should == 'text/csv; charset=utf-8'

data/features/step_definitions/index_scope_steps.rb

@@ -19,6 +19,11 @@ Then /^I should see the scope "([^"]*)" with the count (\d+)$/ do |name, count|
   step %{I should see "#{count}" within ".scopes .#{name.gsub(" ", "").underscore.downcase} .count"}
 end
 
+Then /^I should see the scope "([^"]*)" with no count$/ do |name|
+  page.should have_css(".scopes .#{name.gsub(" ", "").underscore.downcase}")
+  page.should_not have_css(".scopes .#{name.gsub(" ", "").underscore.downcase} .count")
+end
+
 Then /^I should see (\d+) ([\w]*) in the table$/ do |count, resource_type|
   begin
     page.should have_css("table##{resource_type} tr > td:first", :count => count.to_i)

data/lib/active_admin/arbre/html/tag.rb

@@ -73,11 +73,19 @@ module Arbre
       end
 
       def to_s
-        indent("<#{tag_name}#{attributes_html}>", content, "</#{tag_name}>").html_safe
+        indent(opening_tag, content, closing_tag).html_safe
       end
 
       private
 
+      def opening_tag
+        "<#{tag_name}#{attributes_html}>"
+      end
+
+      def closing_tag
+        "</#{tag_name}>"
+      end
+
       INDENT_SIZE = 2
       
       def indent(open_tag, child_content, close_tag)

data/lib/active_admin/helpers/optional_display.rb

@@ -14,9 +14,19 @@ module ActiveAdmin
   # to ensure that the display options are setup correctly
 
   module OptionalDisplay
-    def display_on?(action)
-      return @options[:only].include?(action.to_sym) if @options[:only]
-      return !@options[:except].include?(action.to_sym) if @options[:except]
+    def display_on?(action, render_context = nil)
+      return false if @options[:only] && !@options[:only].include?(action.to_sym)
+      return false if @options[:except] && @options[:except].include?(action.to_sym)
+      if @options[:if]
+        symbol_or_proc = @options[:if]
+        return case symbol_or_proc
+        when Symbol, String
+          self.send(symbol_or_proc)
+        when Proc
+            render_context ? render_context.instance_exec(&symbol_or_proc) : instance_exec(&symbol_or_proc)
+        else symbol_or_proc
+        end
+      end
       true
     end
 

data/lib/active_admin/locales/da.yml

@@ -1,6 +1,7 @@
 da:
   active_admin:
     dashboard_welcome:
+      dashboard: "Kontrolpanel"
       welcome: "Velkommen til Active Admin. Dette er standardoversigtssiden."
       call_to_action: "Rediger 'app/admin/dashboards.rb' for at tilføje nye elementer til oversigtssiden."
     view: "Vis"
@@ -26,3 +27,17 @@ da:
     less_than: "mindre end"
     main_content: "Implementer venligst %{model}#main_content for at vise noget indhold."
     logout: "Log ud"
+    sidebars:
+      filters: "Filtre"
+    pagination:
+      empty: "Ingen %{model} fundet"
+      one: "Viser <b>1</b> %{model}"
+      one_page: "Viser <b>alle %{n}</b> %{model}"
+      multiple: "Viser %{model} <b>%{from}&nbsp;-&nbsp;%{to}</b> af <b>%{total}</b> i alt"
+      entry:
+        one: "post"
+        other: "poster"
+    any: "Alle"
+    blank_slate:
+      content: "Der er ingen %{resource_name} endnu."
+      link: "Opret"

data/lib/active_admin/locales/es.yml

@@ -34,7 +34,23 @@ es:
       one: "Mostrando <b>1</b> %{model}"
       one_page: "Mostrando <b>todos(as) los(as) %{n}</b> %{model}"
       multiple: "Mostrando %{model} <b>%{from}&nbsp;-&nbsp;%{to}</b> de un total de <b>%{total}</b>"
-    any: "Todos"
+    any: "Cualquiera"
     blank_slate:
       content: "No hay %{resource_name} aún."
-      link: "Crea uno(a)"
+      link: "Crea uno(a)"
+  views:
+      pagination:
+          truncate: "..."
+          first: "Inicio"
+          previous: "Anterior"
+          next: "Siguiente"
+          last: "Ultimo"
+  formtastic:
+    yes: "Sí"
+    no: "No"
+    create: "Guardar %{model}"
+    update: "Guardar %{model}"
+    submit: "Aceptar"
+    cancel: "Cancelar"
+    reset: "Resetear %{model}"
+    required: "requerido"

data/lib/active_admin/locales/he_il.yml

@@ -0,0 +1,45 @@
+he_il:
+  active_admin:
+    dashboard: פנל ניהול
+    dashboard_welcome:
+      welcome: "ברוכים הבאים לאקטיב אדמין. זהו פנל הניהול"
+      call_to_action: "כדי להוסיף אזורים בפנל הניהול, אנא בדוק את,  'app/admin/dashboards.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: "מחיקה"
+    filter: "סינון"
+    clear_filters: "איפוס שדות"
+    search_field: "חיפוש %{field}"
+    equal_to: "שווה ל"
+    greater_than: "גדול מ"
+    less_than: "פחות מ"
+    main_content: "יש ליישם את התוכן של %{כדי להציג אותו כאן content."
+    logout: "התנתקות"
+    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> בסך הכל"
+      entry:
+        one: "רשומה בודדה"
+        other: "רשומות"
+    any: "Any"
+    blank_slate:
+      content: "כרגע אין עוד אף %{resource_name}."
+      link: "צור אחד"

data/lib/active_admin/menu_item.rb

@@ -1,16 +1,6 @@
 module ActiveAdmin
   class MenuItem
 
-
-    # Generates a route using the rails application url helpers
-    #
-    # @param [Symbol] named_route
-    #
-    # @returns [String] The generated route
-    def self.generate_url(named_route)
-      Rails.application.routes.url_helpers.send(named_route)
-    end
-
     attr_accessor :name, :url, :priority, :parent, :display_if_block
 
     def initialize(name, url, priority = 10, options = {})
@@ -41,16 +31,6 @@ module ActiveAdmin
       name.downcase.gsub( " ", '_' ).gsub( /[^a-z0-9_]/, '' )
     end
 
-    def url
-      case @url
-      when Symbol
-        generated = self.class.generate_url(@url) # Call the named route
-      else
-        generated = @url
-      end
-      @cached_url[@url] ||= generated
-    end
-
     # Returns an array of the ancestory of this menu item
     # The first item is the immediate parent fo the item
     def ancestors
@@ -76,6 +56,5 @@ module ActiveAdmin
       @display_if_block || lambda { |_| true }
     end
 
-
   end
 end

data/lib/active_admin/page.rb

@@ -15,11 +15,15 @@ module ActiveAdmin
     # The name of the page
     attr_reader :name
 
+    # An array of custom actions defined for this page
+    attr_reader :page_actions
+
     module Base
       def initialize(namespace, name, options)
         @namespace = namespace
         @name = name
         @options = options
+        @page_actions = []
       end
     end
 
@@ -60,6 +64,11 @@ module ActiveAdmin
 
     def add_default_sidebar_sections
     end
+    
+    # Clears all the custom actions this page knows about
+    def clear_page_actions!
+      @page_actions = []
+    end
 
   end
 end

data/lib/active_admin/page_controller.rb

@@ -11,5 +11,9 @@ module ActiveAdmin
     def index(options={}, &block)
       render "active_admin/page/index"
     end
+    
+    def clear_page_actions!
+      active_admin_config.clear_page_actions!
+    end
   end
 end

data/lib/active_admin/page_dsl.rb

@@ -17,5 +17,12 @@ module ActiveAdmin
     def content(options = {}, &block)
       config.set_page_presenter :index, ActiveAdmin::PagePresenter.new(options, &block)
     end
+    
+    def page_action(name, options = {}, &block)
+      config.page_actions << ControllerAction.new(name, options)
+      controller do
+        define_method(name, &block || Proc.new{})
+      end
+    end
   end
 end

data/lib/active_admin/reloader.rb

@@ -70,7 +70,6 @@ module ActiveAdmin
 
       class FileUpdateChecker < ::ActiveSupport::FileUpdateChecker
         def paths
-          Rails.logger.info [@files, @paths].inspect
           # hack to support both Rails 3.1 and 3.2
           @files || @paths
         end

data/lib/active_admin/resource.rb

@@ -2,6 +2,7 @@ require 'active_admin/resource/action_items'
 require 'active_admin/resource/controllers'
 require 'active_admin/resource/menu'
 require 'active_admin/resource/page_presenters'
+require 'active_admin/resource/pagination'
 require 'active_admin/resource/naming'
 require 'active_admin/resource/scopes'
 require 'active_admin/resource/sidebars'
@@ -59,6 +60,7 @@ module ActiveAdmin
     include Base
     include Controllers
     include PagePresenters
+    include Pagination
     include ActionItems
     include Naming
     include Scopes
@@ -75,6 +77,10 @@ module ActiveAdmin
       resource_class.quoted_table_name
     end
 
+    def resource_quoted_column_name(column)
+      resource_class.connection.quote_column_name(column)
+    end
+
     # Returns the named route for an instance of this resource
     def route_instance_path
       [route_prefix, controller.resources_configuration[:self][:route_instance_name], 'path'].compact.join('_').to_sym

data/lib/active_admin/resource/action_items.rb

@@ -33,8 +33,8 @@ module ActiveAdmin
       # @param [String, Symbol] action the action to retrieve action items for
       #
       # @return [Array] Array of ActionItems for the controller actions
-      def action_items_for(action)
-        action_items.select{|item| item.display_on?(action) }
+      def action_items_for(action, render_context = nil)
+        action_items.select{|item| item.display_on?(action, render_context) }
       end
 
       # Clears all the existing action items for this resource

data/lib/active_admin/resource/pagination.rb

@@ -0,0 +1,19 @@
+module ActiveAdmin
+
+  class Resource
+    module Pagination
+
+      # The default number of records to display per page
+      attr_accessor :per_page
+
+      # Enable / disable pagination (defaults to true)
+      attr_accessor :paginate
+
+      def initialize(*args)
+        super
+        @paginate = true
+        @per_page = namespace.default_per_page
+      end
+    end
+  end
+end

data/lib/active_admin/resource/sidebars.rb

@@ -18,8 +18,8 @@ module ActiveAdmin
         @sidebar_sections = []
       end
 
-      def sidebar_sections_for(action)
-        sidebar_sections.select{|section| section.display_on?(action) }
+      def sidebar_sections_for(action, render_context = nil)
+        sidebar_sections.select{|section| section.display_on?(action, render_context) }
       end
 
       def sidebar_sections?

data/lib/active_admin/resource_controller/callbacks.rb

@@ -30,7 +30,19 @@ module ActiveAdmin
       end
 
       def update_resource(object, attributes)
-        object.attributes = attributes
+        # Inherited resources 1.3.0 calls the method passing an array instead of a parameters hash.
+        # The array contains in the first position the parameters which update the object and in the second position
+        # possibly contains the role, it's optional, to use in mass assignment. This feature is provided by Rails 3.1
+        if attributes.is_a?(Array)
+          if object.respond_to?(:assign_attributes)
+            object.assign_attributes(*attributes)
+          else
+            object.attributes = attributes[0]
+          end
+        else
+          object.attributes = attributes
+        end
+
         run_update_callbacks object do
           save_resource(object)
         end