activeadmin 0.6.6 → 1.0.0.pre1

data/lib/active_admin/view_helpers/fields_for.rb

@@ -17,7 +17,7 @@ module ActiveAdmin
         namespace = options[:namespace]
         except = options[:except].is_a?(Array) ? options[:except] : [options[:except]]
 
-        params.map do |k, v|
+        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)
 
@@ -31,19 +31,19 @@ module ActiveAdmin
           when Symbol
             { k => v.to_s }
           when Hash
-            fields_for_params(v, :namespace => k)
+            fields_for_params(v, namespace: k)
           when Array
             v.map do |v|
               { "#{k}[]" => v }
             end
           when nil
-          	{ k => '' }
+            { k => '' }
           when TrueClass,FalseClass
             { k => v }
           else
             raise "I don't know what to do with #{v.class} params: #{v.inspect}"
           end
-        end.flatten.compact
+        end.compact
       end
     end
   end

data/lib/active_admin/view_helpers/flash_helper.rb

@@ -3,9 +3,10 @@ module ActiveAdmin
     module FlashHelper
 
       # Returns all the flash keys to display in any Active Admin view.
-      # This method removes the :timedout key that Devise uses by default
-      def active_admin_flash_messages
-        @active_admin_flash_messages ||= flash.to_hash.except(:timedout)
+      # This method removes the :timedout key that Devise uses by default.
+      # Note Rails >= 4.1 normalizes keys to strings automatically.
+      def flash_messages
+        @flash_messages ||= flash.to_hash.with_indifferent_access.except(*active_admin_application.flash_keys_to_except)
       end
 
     end

data/lib/active_admin/view_helpers/form_helper.rb

@@ -3,22 +3,18 @@ module ActiveAdmin
     module FormHelper
 
       def active_admin_form_for(resource, options = {}, &block)
-        options = Marshal.load( Marshal.dump(options) )
-        options[:builder] ||= ActiveAdmin::FormBuilder
-
-        if ! options.fetch(:decorate, true)
-          resource = resource.model
-        end
-
-        semantic_form_for resource, options, &block
+        Arbre::Context.new({}, self) do
+          active_admin_form_for resource, options, &block
+        end.content
       end
 
       def hidden_field_tags_for(params, options={})
         fields_for_params(params, options).map do |kv|
           k, v = kv.first
-          hidden_field_tag k, v, :id => sanitize_to_id("hidden_active_admin_#{k}")
+          hidden_field_tag k, v, id: sanitize_to_id("hidden_active_admin_#{k}")
         end.join("\n").html_safe
       end
+
     end
   end
 end

data/lib/active_admin/view_helpers/method_or_proc_helper.rb

@@ -25,7 +25,7 @@ module MethodOrProcHelper
   # or instance_exec a proc passing in the object as the first parameter. This
   # method wraps that pattern.
   #
-  # Calling with a Symbol:
+  # Calling with a String or Symbol:
   #
   #     call_method_or_proc_on(@my_obj, :size) same as @my_obj.size
   #
@@ -35,11 +35,11 @@ module MethodOrProcHelper
   #     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
+  # 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)
+  #     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:
@@ -47,13 +47,13 @@ module MethodOrProcHelper
   #     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!)
+    options = { exec: true }.merge(args.extract_options!)
 
     symbol_or_proc = args.shift
 
     case symbol_or_proc
     when Symbol, String
-      receiver.send(symbol_or_proc.to_sym, *args)
+      receiver.public_send symbol_or_proc.to_sym, *args
     when Proc
       if options[:exec]
         instance_exec(receiver, *args, &symbol_or_proc)
@@ -85,7 +85,7 @@ module MethodOrProcHelper
     when Proc
       context.instance_exec *args, &obj
     when Symbol
-      context.send obj, *args
+      context.public_send obj, *args
     else
       obj
     end

data/lib/active_admin/views/action_items.rb

@@ -5,8 +5,8 @@ module ActiveAdmin
 
       def build(action_items)
         action_items.each do |action_item|
-          span :class => "action_item" do
-            instance_eval(&action_item.block)
+          span class: "action_item" do
+            instance_exec(&action_item.block)
           end
         end
       end

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

@@ -8,7 +8,7 @@ module ActiveAdmin
 
 
       def build(*args, &block)
-        @contents = ul :class => "popover_contents"
+        @contents = ul class: "popover_contents"
 
         options = args.extract_options!
 

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

@@ -0,0 +1,123 @@
+module ActiveAdmin
+  module Views
+    class FormtasticProxy < ::Arbre::Rails::Forms::FormBuilderProxy
+      def split_string_on(string, match)
+        return "" unless string && match
+        part_1 = string.split(Regexp.new("#{match}\\z")).first
+        [part_1, match]
+      end
+
+      def opening_tag
+        @opening_tag || ""
+      end
+
+      def closing_tag
+        @closing_tag || ""
+      end
+
+      def to_s
+        opening_tag << children.to_s << closing_tag
+      end
+    end
+    
+    class ActiveAdminForm < FormtasticProxy
+      builder_method :active_admin_form_for
+
+      def build(resource, options = {}, &block)
+        @resource = resource
+        options = options.deep_dup
+        options[:builder] ||= ActiveAdmin::FormBuilder
+        form_string = semantic_form_for(resource, options) do |f|
+          @form_builder = f
+        end
+
+        @opening_tag, @closing_tag = split_string_on(form_string, "</form>")
+        instance_eval(&block) if block_given?
+
+        # Rails 4 sets multipart automatically if a file field is present,
+        # but the form tag has already been rendered before the block eval.
+        if multipart? && @opening_tag !~ /multipart/
+          @opening_tag.sub!(/<form/, '<form enctype="multipart/form-data"')
+        end
+      end
+
+      def inputs(*args, &block)
+        if block_given? && block.arity == 0
+          wrapped_block = proc do
+            wrap_it = form_builder.already_in_an_inputs_block ? true : false
+            form_builder.already_in_an_inputs_block = true
+            form_builder.template.assign('has_many_block'=> true)
+            content = form_builder.template.capture do
+              block.call
+            end
+            form_builder.already_in_an_inputs_block = wrap_it
+            content
+          end
+          insert_tag(SemanticInputsProxy, form_builder, *args, &wrapped_block)
+        else
+          proxy_call_to_form(:inputs, *args, &block)
+        end
+      end
+
+      def input(*args)
+        proxy_call_to_form :input, *args
+      end
+
+      def actions(*args, &block)
+        block_given? ?
+          insert_tag(SemanticActionsProxy, form_builder, *args, &block) :
+          actions(*args) { commit_action_with_cancel_link }
+      end
+
+      def commit_action_with_cancel_link
+        action(:submit)
+        cancel_link
+      end
+
+      def has_many(*args, &block)
+        insert_tag(HasManyProxy, form_builder, *args, &block)
+      end
+
+      def multipart?
+        form_builder && form_builder.multipart?
+      end
+
+      def object
+        form_builder.object
+      end
+
+      def form_buffers
+        raise "'form_buffers' has been removed from ActiveAdmin::FormBuilder, please read https://github.com/activeadmin/activeadmin/blob/master/docs/5-forms.md for details."
+      end
+    end
+
+    class SemanticInputsProxy < FormtasticProxy
+      def build(form_builder, *args, &block)
+        options = args.extract_options!
+        legend = args.shift
+        legend_tag = legend ? "<legend><span>#{legend}</span></legend>" : ""
+        klasses = ["inputs"]
+        klasses << options[:class] if options[:class]
+        @opening_tag = "<fieldset class=\"#{klasses.join(" ")}\">#{legend_tag}<ol>"
+        @closing_tag = "</ol></fieldset>"
+        super(*(args << options), &block)
+      end
+    end
+
+    class SemanticActionsProxy < FormtasticProxy
+      def build(form_builder, *args, &block)
+        @opening_tag = "<fieldset class=\"actions\"><ol>"
+        @closing_tag = "</ol></fieldset>"
+        super(*args, &block)
+      end
+    end
+
+    class HasManyProxy < FormtasticProxy
+      def build(form_builder, *args, &block)
+        assoc = args[0]
+        builder_options = args[1] || {}
+        text_node form_builder.has_many(*args, &block)
+      end
+    end
+  end
+end

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

@@ -4,12 +4,14 @@ module ActiveAdmin
     class AttributesTable < ActiveAdmin::Component
       builder_method :attributes_table_for
 
-      attr_reader :resource
-
-      def build(record, *attrs)
-        @record = record
-        super(:for => @record)
+      def build(obj, *attrs)
+        @collection     = is_array?(obj) ? obj : [obj]
+        @resource_class = @collection.first.class
+        options = { }
+        options[:for] = @collection.first if single_record?
+        super(options)
         @table = table
+        build_colgroups
         rows(*attrs)
       end
 
@@ -20,13 +22,22 @@ module ActiveAdmin
       def row(*args, &block)
         title   = args[0]
         options = args.extract_options!
-        options[:class] ||= :row
+        classes = [:row]
+        if options[:class]
+          classes << options[:class]
+        elsif title.present?
+          classes << "row-#{title.to_s.parameterize('_')}"
+        end
+        options[:class] = classes.join(' ')
+
         @table << tr(options) do
           th do
             header_content_for(title)
           end
-          td do
-            content_for(block || title)
+          @collection.each do |record|
+            td do
+              content_for(record, block || title)
+            end
           end
         end
       end
@@ -37,33 +48,64 @@ module ActiveAdmin
         'attributes_table'
       end
 
+      # Build Colgroups
+      #
+      # Colgroups are only necessary for a collection of records; not
+      # a single record.
+      def build_colgroups
+        return if single_record?
+        reset_cycle(self.class.to_s)
+        within @table do
+          col # column for row headers
+          @collection.each do |record|
+            classes = Arbre::HTML::ClassList.new
+            classes << cycle(:even, :odd, name: self.class.to_s)
+            classes << dom_class_name_for(record)
+            col(id: dom_id_for(record), class: classes)
+          end
+        end
+      end
+
       def header_content_for(attr)
-        if @record.class.respond_to?(:human_attribute_name)
-          @record.class.human_attribute_name(attr, :default => attr.to_s.titleize)
+        if @resource_class.respond_to?(:human_attribute_name)
+          @resource_class.human_attribute_name(attr, default: attr.to_s.titleize)
         else
           attr.to_s.titleize
         end
       end
 
       def empty_value
-        span I18n.t('active_admin.empty'), :class => "empty"
+        span I18n.t('active_admin.empty'), class: "empty"
       end
 
-      def content_for(attr)
-        previous = current_arbre_element.to_s
-        value    = pretty_format find_attr_value attr
-        value.blank? && previous == current_arbre_element.to_s ? empty_value : value
+      def content_for(record, attr)
+        value = pretty_format find_attr_value(record, attr)
+        value.blank? && current_arbre_element.children.to_s.empty? ? empty_value : value
       end
 
-      def find_attr_value(attr)
+      def find_attr_value(record, attr)
         if attr.is_a?(Proc)
-          attr.call(@record)
-        elsif attr.to_s[/\A(.+)_id\z/] && @record.respond_to?($1.to_sym)
-          @record.send($1.to_sym)
-        else
-          @record.send(attr.to_sym)
+          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
+      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/blank_slate.rb

@@ -9,7 +9,7 @@ module ActiveAdmin
       end
 
       def build(content)
-        super(span(content.html_safe, :class => "blank_slate"))
+        super(span(content.html_safe, class: "blank_slate"))
       end
 
     end

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

@@ -12,7 +12,7 @@ module ActiveAdmin
     # To display columns, use the #columns method. Within the block, call the
     # #column method to create a new column.
     #
-    # To createa a two column layout:
+    # To create a two column layout:
     #
     #     colums do
     #       column do
@@ -29,7 +29,7 @@ module ActiveAdmin
     # To make a column span multiple, pass the :span option to the column method:
     #
     #     colums do
-    #       column :span => 2 do
+    #       column span: 2 do
     #         span "Column # 1
     #       end
     #       column do
@@ -50,7 +50,7 @@ module ActiveAdmin
     # To overcome this, columns include a :max_width and :min_width option.
     #
     #     colums do
-    #       column :max_width => "200px", :min_width => "100px" do
+    #       column max_width: "200px", min_width: "100px" do
     #         span "Column # 1
     #       end
     #       column do
@@ -63,7 +63,6 @@ module ActiveAdmin
     class Columns < ActiveAdmin::Component
       builder_method :columns
 
-
       # For documentation, please take a look at Column#build
       def column(*args, &block)
         insert_tag Column, *args, &block
@@ -115,7 +114,7 @@ module ActiveAdmin
 
       # @param [Hash] options An options hash for the column
       #
-      # @options options [Integer] :span The columns this column should span
+      # @option options [Integer] :span The columns this column should span
       def build(options = {})
         options = options.dup
         @span_size = options.delete(:span) || 1
@@ -133,11 +132,11 @@ module ActiveAdmin
         styles << "width: #{column_with_span_width}%;"
 
         if max_width
-          styles << "max-width: #{max_width};"
+          styles << "max-width: #{safe_width(max_width)};"
         end
 
         if min_width
-          styles << "min-width: #{min_width};"
+          styles << "min-width: #{safe_width(min_width)};"
         end
 
         styles << "margin-right: #{margin_width}%;" unless is_last_column
@@ -145,6 +144,13 @@ module ActiveAdmin
         set_attribute :style, styles.join(" ")
       end
 
+      private
+
+      # Converts values without a '%' or 'px' suffix to a pixel value
+      def safe_width(width)
+        width.to_s.gsub(/\A(\d+)\z/, '\1px')
+      end
+
     end
   end
 end