activeadmin 0.5.1 → 0.6.0

data/lib/active_admin/scope.rb

@@ -1,7 +1,7 @@
 module ActiveAdmin
   class Scope
 
-    attr_reader :name, :scope_method, :id, :scope_block, :display_if_block, :show_count
+    attr_reader :scope_method, :id, :scope_block, :display_if_block, :show_count
 
     # Create a Scope
     #
@@ -13,32 +13,42 @@ module ActiveAdmin
     #   Scope.new('Published', :public)
     #   # => Scope with name 'Published' and scope method :public
     #
-    #   Scope.new('Published', :public, :if => proc { current_admin_user.can?( :manage, active_admin_config.resource_class ) } ) { |articles| articles.where(:published => true) }
-    #   # => Scope with name 'Published' and scope method :public, optionally displaying the scope per the :if block, using a block
+    #   Scope.new 'Published', :public, :if => proc { current_admin_user.can? :manage, resource_class } do |articles| 
+    #     articles.where :published => true
+    #   end
+    #   # => Scope with name 'Published' and scope method :public, optionally displaying the scope per the :if block
     #
     #   Scope.new('Published') { |articles| articles.where(:published => true) }
     #   # => Scope with name 'Published' using a block to scope
     #
+    #   Scope.new ->{Date.today.strftime '%A'}, :published_today
+    #   # => Scope with dynamic title using the :published_today scope method
+    #
     def initialize(name, method = nil, options = {}, &block)
-      @name = name.is_a?( String ) ? name : name.to_s.titleize
-      @scope_method = method
-      # Scope ':all' means no scoping
-      @scope_method ||= name.to_sym unless name.to_sym == :all
-      @scope_method = nil if method && method.to_s == 'all'
-      @id = @name.gsub(' ', '').underscore
-      if block_given?
-        @scope_method = nil
-        @scope_block = block
+      @name, @scope_method = name, method.try(:to_sym)
+
+      if name.is_a? Proc
+        raise "A string/symbol is required as the second argument if your label is a proc." unless method
+        @id = method.to_s.gsub(' ', '').underscore
+      else
+        @scope_method ||= name.to_sym
+        @id = name.to_s.gsub(' ', '').underscore
       end
 
-      @show_count = options[:show_count].nil? ? true : options[:show_count]
-      @display_if_block = options[:if]
+      @scope_method               = nil        if @scope_method == :all
+      @scope_method, @scope_block = nil, block if block_given?
+
+      @show_count       = options[:show_count].nil? ? true : options[:show_count]
+      @display_if_block = options[:if] || proc{ true }
     end
 
-    # Returns the display if block. If the block was not explicitly defined
-    # a default block always returning true will be returned.
-    def display_if_block
-      @display_if_block || proc{ true }
+    def name
+      case @name
+        when Proc   then @name.call.to_s
+        when String then @name
+        when Symbol then @name.to_s.titleize
+        else             @name.to_s
+      end
     end
 
   end

data/lib/active_admin/version.rb

@@ -1,3 +1,3 @@
 module ActiveAdmin
-  VERSION = '0.5.1'
+  VERSION = '0.6.0'
 end

data/lib/active_admin/view_factory.rb

@@ -6,7 +6,6 @@ module ActiveAdmin
     # Register Helper Renderers
     register  :global_navigation    => ActiveAdmin::Views::TabbedNavigation,
               :site_title           => ActiveAdmin::Views::SiteTitle,
-              :utility_navigation   => ActiveAdmin::Views::UtilityNav,
               :action_items         => ActiveAdmin::Views::ActionItems,
               :title_bar            => ActiveAdmin::Views::TitleBar,
               :header               => ActiveAdmin::Views::Header,

data/lib/active_admin/view_helpers/breadcrumb_helper.rb

@@ -3,28 +3,22 @@ module ActiveAdmin
     module BreadcrumbHelper
 
       # Returns an array of links to use in a breadcrumb
-      def breadcrumb_links(path = nil)
-        path ||= request.fullpath
-        parts = path.gsub(/^\//, '').split('/')
-        parts.pop unless %w{ create update }.include?(params[:action])
-        crumbs = []
-        parts.each_with_index do |part, index|
-          name = nil
-          if part =~ /^\d|^[a-f0-9]{24}$/ && (parent = parts[index - 1])
-            begin
-              parent_class = parent.singularize.camelcase.constantize
-              obj = parent_class.find(part[/^[a-f0-9]{24}$/] ? part : part.to_i)
-              name = display_name(obj)
-            rescue
-              # ignored
-            end
-          end
+      def breadcrumb_links(path = request.path)
+        parts = path[1..-1].split('/')                        # remove leading "/" and split up URL path
+        parts.pop unless params[:action] =~ /^create|update$/ # remove last if not create/update
 
-          name ||= I18n.t("activerecord.models.#{part.singularize}", :count => 1.1, :default => part.titlecase)
+        parts.each_with_index.map do |part, index|
+          # If an object (users/23), look it up via ActiveRecord and capture its name.
+          # If name is nil, look up the model translation, using `titlecase` as the backup.
+          if part =~ /^\d|^[a-f0-9]{24}$/ && parent = parts[index-1]
+            klass = parent.singularize.camelcase.constantize rescue nil
+            obj   = klass.find_by_id(part) if klass
+            name  = display_name(obj)      if obj
+          end
+          name ||= I18n.t "activerecord.models.#{part.singularize}", :count => 1.1, :default => part.titlecase
 
-          crumbs << link_to( name, "/" + parts[0..index].join('/'))
+          link_to name, '/' + parts[0..index].join('/')
         end
-        crumbs
       end
 
     end

data/lib/active_admin/view_helpers/fields_for.rb

@@ -38,6 +38,8 @@ module ActiveAdmin
             end
           when nil
           	{ k => '' }
+          when TrueClass,FalseClass
+            { k => v }
           else
             raise "I don't know what to do with #{v.class} params: #{v.inspect}"
           end

data/lib/active_admin/view_helpers/form_helper.rb

@@ -11,7 +11,7 @@ module ActiveAdmin
       def hidden_field_tags_for(params, options={})
         fields_for_params(params, options).map do |kv|
           k, v = kv.first
-          hidden_field_tag k, v
+          hidden_field_tag k, v, :id => sanitize_to_id("hidden_active_admin_#{k}")
         end.join("\n").html_safe
       end
     end

data/lib/active_admin/view_helpers/method_or_proc_helper.rb

@@ -1,24 +1,64 @@
 module MethodOrProcHelper
 
+  # 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.
+  #
+  # Calling with a Symbol:
+  #
+  #     call_method_or_exec_proc(:to_s) #=> will call #to_s
+  #
+  # Calling with a Proc
+  #
+  #     my_proc = Proc.new{ to_s }
+  #     call_method_or_exec_proc(my_proc) #=> will instance_exec in self
+  #
+  def call_method_or_exec_proc(symbol_or_proc, *args)
+    case symbol_or_proc
+    when Symbol, String
+      send(symbol_or_proc, *args)
+    when Proc
+      instance_exec(*args, &symbol_or_proc)
+    end
+  end
+
   # Many times throughout the views we want to either call a method on an object
   # or instance_exec a proc passing in the object as the first parameter. This
-  # method takes care of this functionality.
+  # method wraps that pattern.
+  #
+  # Calling with a Symbol:
   #
-  #   call_method_or_proc_on(@my_obj, :size) same as @my_obj.size
-  # OR
-  #   proc = Proc.new{|s| s.size }
-  #   call_method_or_proc_on(@my_obj, proc)
+  #     call_method_or_proc_on(@my_obj, :size) same as @my_obj.size
   #
-  def call_method_or_proc_on(obj, symbol_or_proc, options = {})
-    exec = options[:exec].nil? ? true : options[:exec]
+  # Calling with a Proc:
+  #
+  #     proc = Proc.new{|s| s.size }
+  #     call_method_or_proc_on(@my_obj, proc)
+  #
+  # By default, the Proc will be instance_exec'd within self. If you would rather
+  # not instance exec, but just call the Proc, then pass along `:exec => false` in
+  # the options hash.
+  #
+  #     proc = Proc.new{|s| s.size }
+  #     call_method_or_proc_on(@my_obj, proc, :exec => false)
+  #
+  # You can pass along any necessary arguments to the method / Proc as arguments. For 
+  # example:
+  #
+  #     call_method_or_proc_on(@my_obj, :find, 1) #=> @my_obj.find(1)
+  #
+  def call_method_or_proc_on(receiver, *args)
+    options = { :exec => true }.merge(args.extract_options!)
+
+    symbol_or_proc = args.shift
+
     case symbol_or_proc
     when Symbol, String
-      obj.send(symbol_or_proc.to_sym)
+      receiver.send(symbol_or_proc.to_sym, *args)
     when Proc
-      if exec
-        instance_exec(obj, &symbol_or_proc)
+      if options[:exec]
+        instance_exec(receiver, *args, &symbol_or_proc)
       else
-        symbol_or_proc.call(obj)
+        symbol_or_proc.call(receiver, *args)
       end
     end
   end
@@ -35,4 +75,19 @@ module MethodOrProcHelper
       string_symbol_or_proc
     end
   end
+
+  # This method is different from the others in that it calls `instance_eval` on the reciever,
+  # passing it the proc. This evaluates the proc in the context of the reciever, thus changing
+  # what `self` means inside the proc.
+  def render_in_context(context, obj)
+    context ||= self # default to `self`
+    case obj
+    when Proc
+      context.instance_exec &obj
+    when Symbol
+      context.send obj
+    else
+      obj
+    end
+  end
 end

data/lib/active_admin/views/components/attributes_table.rb

@@ -17,13 +17,16 @@ module ActiveAdmin
         attrs.each {|attr| row(attr) }
       end
 
-      def row(attr, &block)
-        @table << tr do
+      def row(*args, &block)
+        title   = args[0]
+        options = args.extract_options!
+        options[:class] ||= :row
+        @table << tr(options) do
           th do
-            header_content_for(attr)
+            header_content_for(title)
           end
           td do
-            content_for(block || attr)
+            content_for(block || title)
           end
         end
       end

data/lib/active_admin/views/components/index_list.rb

@@ -0,0 +1,68 @@
+require 'active_admin/helpers/collection'
+
+module ActiveAdmin
+	module Views
+
+    # Renders a collection of index views available to the resource
+    # as a list with a separator
+		class IndexList < ActiveAdmin::Component
+      builder_method :index_list_renderer
+
+      include ::ActiveAdmin::Helpers::Collection
+
+      def default_class_name
+        "indexes table_tools_segmented_control"
+      end
+
+      def tag_name
+        'ul'
+      end
+
+      # Builds the links for presenting different index views to the user
+      #
+      # @param [Array] index_classes The class constants that represent index page presenters 
+      def build(index_classes)
+        unless current_filter_search_empty?
+          index_classes.each do |index_class|
+            build_index_list(index_class)
+          end
+        end
+      end
+
+      protected
+
+      # Builds the individual link and HTML classes for each index page presenter
+      #
+      # @param [Class] index_class The class on which to build the link and html classes
+      def build_index_list(index_class)
+        li :class => classes_for_index(index_class) do
+          a :href => url_for(params.merge(:as => index_class.index_name.to_sym)), :class => "table_tools_button" do
+            name = index_class.index_name
+            I18n.t("active_admin.index_list.#{name}", :default => name.to_s.titleize)
+          end
+        end
+      end
+
+      def classes_for_index(index_class)
+        classes = ["index"]
+        classes << "selected" if current_index?(index_class)
+        classes.join(" ")
+      end
+
+      def current_index?(index_class)
+        if params[:as]
+          params[:as] == index_class.index_name
+        else
+          active_admin_config.default_index_class == index_class
+        end
+      end
+
+      def current_filter_search_empty?
+        params.include?(:q) && collection_is_empty?
+      end
+
+		end
+	end
+end
+
+

data/lib/active_admin/views/components/paginated_collection.rb

@@ -29,13 +29,12 @@ module ActiveAdmin
 
       # Builds a new paginated collection component
       #
-      # @param [Array] collection  A "paginated" collection from kaminari
-      # @param [Hash]  options     These options will be passed on to the page_entries_info
-      #                            method.
-      #                            Useful keys:
-      #                              :entry_name - The name to display for this resource collection
-      #                              :param_name - Parameter name for page number in the links (:page by default)
-      #                              :download_links - Set to false to skip download format links
+      # collection => A paginated collection from kaminari
+      # options    => These options will be passed to `page_entries_info`
+      #   entry_name     => The name to display for this resource collection
+      #   param_name     => Parameter name for page number in the links (:page by default)
+      #   download_links => Download links override (false or [:csv, :pdf])
+      #
       def build(collection, options = {})
         @collection = collection
         @param_name     = options.delete(:param_name)
@@ -45,7 +44,6 @@ module ActiveAdmin
           raise(StandardError, "Collection is not a paginated scope. Set collection.page(params[:page]).per(10) before calling :paginated_collection.")
         end
         
-      
         @contents = div(:class => "paginated_collection_contents")
         build_pagination_with_formats(options)
         @built = true
@@ -66,7 +64,13 @@ module ActiveAdmin
         div :id => "index_footer" do
           build_pagination
           div(page_entries_info(options).html_safe, :class => "pagination_information")
-          build_download_format_links unless @download_links == false
+
+          if @download_links.is_a?(Array) && !@download_links.empty?
+            build_download_format_links @download_links
+          else
+            build_download_format_links unless @download_links == false
+          end
+
         end
       end
 

data/lib/active_admin/views/components/scopes.rb

@@ -21,10 +21,8 @@ module ActiveAdmin
       end
 
       def build(scopes, options = {})
-        unless current_filter_search_empty?
-          scopes.each do |scope|
-            build_scope(scope, options) if call_method_or_proc_on(self, scope.display_if_block)
-          end
+        scopes.each do |scope|
+          build_scope(scope, options) if call_method_or_proc_on(self, scope.display_if_block)
         end
       end
 
@@ -57,10 +55,6 @@ module ActiveAdmin
         end
       end
 
-      def current_filter_search_empty?
-        params.include?(:q) && collection_is_empty?
-      end
-
       # Return the count for the scope passed in.
       def get_scope_count(scope)
         collection_size(scope_chain(scope, collection_before_scope))

data/lib/active_admin/views/components/table_for.rb

@@ -79,7 +79,7 @@ module ActiveAdmin
       def build_table_body
         @tbody = tbody do
           # Build enough rows for our collection
-          @collection.each{|_| tr(:class => cycle('odd', 'even'), :id => dom_id(_)) }
+          @collection.each{|elem| tr(:class => cycle('odd', 'even'), :id => dom_id(elem)) }
         end
       end
 

data/lib/active_admin/views/footer.rb

@@ -10,7 +10,7 @@ module ActiveAdmin
       private
 
       def powered_by_message
-        para t('active_admin.powered_by',
+        para I18n.t('active_admin.powered_by',
           :active_admin => link_to("Active Admin", "http://www.activeadmin.info"),
           :version => ActiveAdmin::VERSION).html_safe
       end

data/lib/active_admin/views/header.rb

@@ -7,6 +7,7 @@ module ActiveAdmin
 
         @namespace = namespace
         @menu = menu
+        @utility_menu = @namespace.fetch_menu(:utility_navigation)
 
         build_site_title
         build_global_navigation
@@ -19,11 +20,11 @@ module ActiveAdmin
       end
 
       def build_global_navigation
-        insert_tag view_factory.global_navigation, @menu, :class => 'header-item' 
+        insert_tag view_factory.global_navigation, @menu, :class => 'header-item tabs' 
       end
 
       def build_utility_navigation
-        insert_tag view_factory.utility_navigation, @namespace
+        insert_tag view_factory.global_navigation, @utility_menu, :id => "utility_nav", :class => 'header-item tabs' 
       end
 
     end

data/lib/active_admin/views/index_as_block.rb

@@ -27,6 +27,10 @@ module ActiveAdmin
         end
       end
 
+      def self.index_name
+        "block"
+      end
+
     end
   end
 end