activeadmin 1.0.0.pre2 → 1.0.0.pre3

data/lib/active_admin/resource_controller/decorators.rb

@@ -28,7 +28,7 @@ module ActiveAdmin
 
       def decorate?
         case action_name
-        when 'new', 'edit'
+        when 'new', 'edit', 'create', 'update'
           form = active_admin_config.get_page_presenter :form
           form && form.options[:decorate] && decorator_class.present?
         else
@@ -67,7 +67,7 @@ module ActiveAdmin
         def self.wrap!(parent, name)
           ::Class.new parent do
             delegate :reorder, :page, :current_page, :total_pages, :limit_value,
-                     :total_count, :num_pages, :to_key, :group_values, :except,
+                     :total_count, :total_pages, :to_key, :group_values, :except,
                      :find_each, :ransack
 
             define_singleton_method(:name) { name }

data/lib/active_admin/resource_controller/streaming.rb

@@ -20,7 +20,12 @@ module ActiveAdmin
       def stream_resource(&block)
         headers['X-Accel-Buffering'] = 'no'
         headers['Cache-Control'] = 'no-cache'
-        self.response_body = Enumerator.new &block
+
+        if ActiveAdmin.application.disable_streaming_in.include? Rails.env
+          self.response_body = block['']
+        else
+          self.response_body = Enumerator.new &block
+        end
       end
 
       def csv_filename
@@ -28,6 +33,7 @@ module ActiveAdmin
       end
 
       def stream_csv
+        headers['Content-Type'] = 'text/csv; charset=utf-8' # In Rails 5 it's set to HTML??
         headers['Content-Disposition'] = %{attachment; filename="#{csv_filename}"}
         stream_resource &active_admin_config.csv_builder.method(:build).to_proc.curry[self]
       end

data/lib/active_admin/resource_dsl.rb

@@ -116,7 +116,8 @@ module ActiveAdmin
       title = options.delete(:title)
 
       controller do
-        before_filter(only: [name]) { @page_title = title } if title
+        callback = ActiveAdmin::Dependency.rails >= 4 ? :before_action : :before_filter
+        send(callback, only: [name]) { @page_title = title } if title
         define_method(name, &block || Proc.new{})
       end
     end
@@ -159,14 +160,19 @@ module ActiveAdmin
     delegate :before_save,    :after_save,    to: :controller
     delegate :before_destroy, :after_destroy, to: :controller
 
-    # Standard rails filters
-    delegate :before_filter,  :skip_before_filter, to: :controller
-    delegate :after_filter,   :skip_after_filter,  to: :controller
-    delegate :around_filter,  :skip_filter,        to: :controller
-    if Rails::VERSION::MAJOR == 4
-      delegate :before_action,  :skip_before_action, to: :controller
-      delegate :after_action,   :skip_after_action,  to: :controller
-      delegate :around_action,  :skip_action,        to: :controller
+    # This code defines both *_filter and *_action for Rails 3.2 to Rails 5.
+    actions = [
+      :before, :skip_before,
+      :after,  :skip_after,
+      :around, :skip
+    ]
+    destination = ActiveAdmin::Dependency.rails >= 4 ? :action : :filter
+    [:action, :filter].each do |name|
+      actions.each do |action|
+        define_method "#{action}_#{name}" do |*args, &block|
+          controller.public_send "#{action}_#{destination}", *args, &block
+        end
+      end
     end
 
     # Specify which actions to create in the controller

data/lib/active_admin/router.rb

@@ -24,7 +24,7 @@ module ActiveAdmin
             root namespace.root_to_options.merge(to: namespace.root_to)
           else
             namespace namespace.name do
-              root namespace.root_to_options.merge(to: namespace.root_to)
+              root namespace.root_to_options.merge(to: namespace.root_to, as: :root)
             end
           end
         end

data/lib/active_admin/scope.rb

@@ -29,10 +29,10 @@ module ActiveAdmin
 
       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.parameterize("_")
+        @id = ActiveAdmin::Dependency.rails.parameterize method.to_s
       else
         @scope_method ||= name.to_sym
-        @id = name.to_s.parameterize("_")
+        @id = ActiveAdmin::Dependency.rails.parameterize name.to_s
       end
 
       @scope_method               = nil        if @scope_method == :all
@@ -41,7 +41,6 @@ module ActiveAdmin
       @show_count       = options.fetch(:show_count, true)
       @display_if_block = options[:if]      || proc{ true }
       @default_block    = options[:default] || proc{ false }
-
     end
 
     def name

data/lib/active_admin/version.rb

@@ -1,3 +1,3 @@
 module ActiveAdmin
-  VERSION = '1.0.0.pre2'
+  VERSION = '1.0.0.pre3'
 end

data/lib/active_admin/view_helpers/display_helper.rb

@@ -40,6 +40,25 @@ module ActiveAdmin
         resource.class.reflect_on_all_associations.map(&:name)
       end
 
+      def format_attribute(resource, attr)
+        value = find_value resource, attr
+        value = pretty_format value                    if attr.is_a? Symbol
+        value = Arbre::Context.new{ status_tag value } if boolean_attr? resource, attr
+        value
+      end
+
+      def find_value(resource, attr)
+        if attr.is_a? Proc
+          attr.call resource
+        elsif attr =~ /\A(.+)_id\z/ && reflection_for(resource, $1.to_sym)
+          resource.public_send $1
+        elsif resource.respond_to? attr
+          resource.public_send attr
+        elsif resource.respond_to? :[]
+          resource[attr]
+        end
+      end
+
       # Attempts to create a human-readable string for any object
       def pretty_format(object)
         case object
@@ -56,6 +75,18 @@ module ActiveAdmin
           end
         end
       end
+
+      def reflection_for(resource, method)
+        klass = resource.class
+        klass.reflect_on_association method if klass.respond_to? :reflect_on_association
+      end
+
+      def boolean_attr?(resource, attr)
+        if resource.class.respond_to? :columns_hash
+          column = resource.class.columns_hash[attr.to_s] and column.type == :boolean
+        end
+      end
+
     end
   end
 end

data/lib/active_admin/view_helpers/fields_for.rb

@@ -15,11 +15,12 @@ module ActiveAdmin
       #
       def fields_for_params(params, options = {})
         namespace = options[:namespace]
-        except = options[:except].is_a?(Array) ? options[:except] : [options[:except]]
+        except    = Array.wrap(options[:except]).map &:to_s
+        params    = params.respond_to?(:to_unsafe_h) ? params.to_unsafe_h : params
 
         params.flat_map do |k, v|
           next if namespace.nil? && %w(controller action commit utf8).include?(k.to_s)
-          next if except.map(&:to_s).include?(k.to_s)
+          next if except.include?(k.to_s)
 
           if namespace
             k = "#{namespace}[#{k}]"

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

@@ -5,7 +5,7 @@ module ActiveAdmin
       builder_method :attributes_table_for
 
       def build(obj, *attrs)
-        @collection     = is_array?(obj) ? obj : [obj]
+        @collection     = Array.wrap(obj)
         @resource_class = @collection.first.class
         options = { }
         options[:for] = @collection.first if single_record?
@@ -26,7 +26,7 @@ module ActiveAdmin
         if options[:class]
           classes << options[:class]
         elsif title.present?
-          classes << "row-#{title.to_s.parameterize('_')}"
+          classes << "row-#{ActiveAdmin::Dependency.rails.parameterize(title.to_s)}"
         end
         options[:class] = classes.join(' ')
 
@@ -79,33 +79,15 @@ module ActiveAdmin
       end
 
       def content_for(record, attr)
-        value = pretty_format find_attr_value(record, attr)
+        value = format_attribute record, attr
         value.blank? && current_arbre_element.children.to_s.empty? ? empty_value : value
-      end
-
-      def find_attr_value(record, attr)
-        if attr.is_a?(Proc)
-          attr.call(record)
-        elsif attr =~ /\A(.+)_id\z/ && reflection_for(record.class, $1.to_sym)
-          record.public_send $1
-        elsif record.respond_to? attr
-          record.public_send attr
-        elsif record.respond_to? :[]
-          record[attr]
-        end
-      end
-
-      def reflection_for(klass, method)
-        klass.reflect_on_association method if klass.respond_to? :reflect_on_association
+        # Don't add the same Arbre twice, while still allowing format_attribute to call status_tag
+        current_arbre_element << value unless current_arbre_element.children.include? value
       end
 
       def single_record?
         @single_record ||= @collection.size == 1
       end
-      
-      def is_array?(obj)
-        obj.respond_to?(:each) && obj.respond_to?(:first) && !obj.is_a?(Hash)
-      end
     end
 
   end

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

@@ -36,7 +36,7 @@ module ActiveAdmin
       # @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
+          a href: url_for(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

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

@@ -44,7 +44,7 @@ module ActiveAdmin
         @display_total  = options.delete(:pagination_total) { true }
         @per_page       = options.delete(:per_page)
 
-        unless collection.respond_to?(:num_pages)
+        unless collection.respond_to?(:total_pages)
           raise(StandardError, "Collection is not a paginated scope. Set collection.page(params[:page]).per(10) before calling :paginated_collection.")
         end
 
@@ -132,7 +132,7 @@ module ActiveAdmin
         end
 
         if @display_total
-          if collection.num_pages < 2
+          if collection.total_pages < 2
             case collection_size
             when 0; I18n.t("active_admin.pagination.empty",    model: entries_name)
             when 1; I18n.t("active_admin.pagination.one",      model: entry_name)
@@ -149,7 +149,7 @@ module ActiveAdmin
           end
         else
           # Do not display total count, in order to prevent a `SELECT count(*)`.
-          # To do so we must not call `collection.num_pages`
+          # To do so we must not call `collection.total_pages`
           offset = (collection.current_page - 1) * collection.limit_value
           I18n.t "active_admin.pagination.multiple_without_total",
                  model: entries_name,

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

@@ -46,7 +46,7 @@ module ActiveAdmin
 
       def title_image
         path = helpers.render_or_call_method_or_proc_on(self, @namespace.site_title_image)
-        helpers.image_tag(path, id: "site_title_image", alt: @namespace.site_title)
+        helpers.image_tag(path, id: "site_title_image", alt: title_text)
       end
 
     end

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

@@ -39,9 +39,9 @@ module ActiveAdmin
         end
 
         # Add a table cell for each item
-        @collection.each_with_index do |item, i|
-          within @tbody.children[i] do
-            build_table_cell col, item
+        @collection.each_with_index do |resource, index|
+          within @tbody.children[index] do
+            build_table_cell col, resource
           end
         end
       end
@@ -96,30 +96,11 @@ module ActiveAdmin
         end
       end
 
-      def build_table_cell(col, item)
+      def build_table_cell(col, resource)
         td class: col.html_class do
-          render_data col.data, item
-        end
-      end
-
-      def render_data(data, item)
-        value = if data.is_a? Proc
-          data.call item
-        elsif item.respond_to? data
-          item.public_send data
-        elsif item.respond_to? :[]
-          item[data]
-        end
-        value = pretty_format(value) if data.is_a?(Symbol)
-        value = status_tag value     if is_boolean? data, item
-        value
-      end
-
-      def is_boolean?(data, item)
-        if item.respond_to? :has_attribute?
-          item.has_attribute?(data) &&
-            item.column_for_attribute(data) &&
-            item.column_for_attribute(data).type == :boolean
+          html = format_attribute(resource, col.data)
+          # Don't add the same Arbre twice, while still allowing format_attribute to call status_tag
+          current_arbre_element << html unless current_arbre_element.children.include? html
         end
       end
 
@@ -166,7 +147,7 @@ module ActiveAdmin
           if @options.has_key?(:class)
             html_classes << @options.delete(:class)
           elsif @title.present?
-            html_classes << "col-#{@title.to_s.parameterize('_')}"
+            html_classes << "col-#{ActiveAdmin::Dependency.rails.parameterize(@title.to_s)}"
           end
           @html_class = html_classes.join(' ')
           @data = args[1] || args[0]

data/lib/active_admin/views/index_as_grid.rb

@@ -29,7 +29,7 @@ module ActiveAdmin
 
       def build(page_presenter, collection)
         @page_presenter = page_presenter
-        @collection = collection
+        @collection = collection.to_a
         add_class "index"
         build_table
       end
@@ -47,7 +47,7 @@ module ActiveAdmin
       def build_table
         resource_selection_toggle_panel if active_admin_config.batch_actions.any?
         table class: "index_grid" do
-          collection.in_groups_of(number_of_columns).each do |group|
+          @collection.in_groups_of(number_of_columns).each do |group|
             build_row(group)
           end
         end

data/lib/active_admin/views/index_as_table.rb

@@ -52,6 +52,8 @@ module ActiveAdmin
     # end
     # ```
     #
+    # ## Defining Actions
+    #
     # To setup links to View, Edit and Delete a resource, use the `actions` method:
     #
     # ```ruby
@@ -108,6 +110,18 @@ module ActiveAdmin
     # end
     # ```
     #
+    # In addition, you can insert the position of the row in the greater collection by using the index_column special command:
+    #
+    # ```ruby
+    # index do
+    #   selectable_column
+    #   index_column
+    #   column :title
+    # end
+    # ```
+    #
+    # index_column take an optional offset parameter to allow a developer to set the starting number for the index (default is 1).
+    #
     # ## Sorting
     #
     # When a column is generated from an Active Record attribute, the table is
@@ -218,7 +232,7 @@ module ActiveAdmin
       def default_table
         proc do
           selectable_column
-          id_column if resource_class.primary_key # View based Models have no primary_key
+          id_column if resource_class.primary_key
           resource_class.content_columns.each do |col|
             column col.name.to_sym
           end
@@ -244,12 +258,20 @@ module ActiveAdmin
           end
         end
 
+        def index_column(start_value = 1)
+          column '#', class: 'col-index', sortable: false do |resource|
+            @collection.offset_value + @collection.index(resource) + start_value
+          end
+        end
+
         # Display a column for the id
         def id_column
-          raise "#{resource_class.name} as no primary_key!" unless resource_class.primary_key
+          raise "#{resource_class.name} has no primary_key!" unless resource_class.primary_key
           column(resource_class.human_attribute_name(resource_class.primary_key), sortable: resource_class.primary_key) do |resource|
             if controller.action_methods.include?('show')
               link_to resource.id, resource_path(resource), class: "resource_id_link"
+            elsif controller.action_methods.include?('edit')
+              link_to resource.id, edit_resource_path(resource), class: "resource_id_link"
             else
               resource.id
             end

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

@@ -56,7 +56,7 @@ module ActiveAdmin
         end
 
         def build_unsupported_browser
-          if active_admin_namespace.unsupported_browser_matcher =~ env["HTTP_USER_AGENT"]
+          if active_admin_namespace.unsupported_browser_matcher =~ request.user_agent
             insert_tag view_factory.unsupported_browser
           end
         end

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

@@ -5,8 +5,12 @@ module ActiveAdmin
       class Form < Base
 
         def title
-          assigns[:page_title] || I18n.t("active_admin.#{normalized_action}_model",
-                                         model: active_admin_config.resource_label)
+          if form_presenter[:title]
+            render_or_call_method_or_proc_on(resource, form_presenter[:title])
+          else
+            assigns[:page_title] || I18n.t("active_admin.#{normalized_action}_model",
+                                      model: active_admin_config.resource_label)
+          end
         end
 
         def form_presenter

data/lib/active_admin/views/title_bar.rb

@@ -47,7 +47,7 @@ module ActiveAdmin
       end
 
       def build_action_items
-        insert_tag(view_factory.action_items, @action_items) if @action_items.any?
+        insert_tag(view_factory.action_items, @action_items)
       end
 
     end

data/lib/generators/active_admin/assets/templates/active_admin.scss

@@ -1,7 +1,7 @@
 // SASS variable overrides must be declared before loading up Active Admin's styles.
 //
 // To view the variables that Active Admin provides, take a look at
-// `app/assets/stylesheets/active_admin/mixins/_variables.css.scss` in the
+// `app/assets/stylesheets/active_admin/mixins/_variables.scss` in the
 // Active Admin source.
 //
 // For example, to change the sidebar width: