express_admin 1.6.3 → 1.6.4

data/app/components/express_admin/layout_components/sidebar_region.rb

@@ -1,4 +1,8 @@
 module ExpressAdmin
-  class SidebarRegion < LayoutComponent
+  module Components
+    module Layout
+      class SidebarRegion < LayoutComponent
+      end
+    end
   end
 end

data/app/components/express_admin/layout_components/v_box.rb

@@ -1,4 +1,8 @@
 module ExpressAdmin
-  class VBox < LayoutComponent
+  module Components
+    module Layout
+      class VBox < LayoutComponent
+      end
+    end
   end
 end

data/app/components/express_admin/main_region.rb

@@ -1,4 +1,8 @@
 module ExpressAdmin
-  class MainRegion < ExpressTemplates::Components::Container
+  module Components
+    module Layout
+      class MainRegion < ExpressTemplates::Components::Container
+      end
+    end
   end
 end

data/app/components/express_admin/page_header.rb

@@ -1,17 +1,21 @@
 module ExpressAdmin
-  class PageHeader < ExpressTemplates::Components::Base
+  module Components
+    module Presenters
+      class PageHeader < ExpressTemplates::Components::Base
 
-    contains -> {
-      if content_for?(:page_header)
-        h1 {
-          content_for(:page_header)
+        contains -> {
+          if content_for?(:page_header)
+            h1 {
+              content_for(:page_header)
+            }
+          end
+          if content_for?(:page_header_lead)
+            para(class: 'lead') {
+              content_for(:page_header_lead)
+            }
+          end
         }
       end
-      if content_for?(:page_header_lead)
-        para(class: 'lead') {
-          content_for(:page_header_lead)
-        }
-      end
-    }
+    end
   end
 end

data/app/components/express_admin/smart_form.rb

@@ -1,121 +1,125 @@
 require 'rails/generators/generated_attribute'
 
 module ExpressAdmin
-  class SmartForm < ExpressTemplates::Components::Forms::ExpressForm
-    TIMESTAMPS = %w(updated_at created_at)
-
-    has_option :virtual, 'Override the list of virtual attributes of the resource to be displayed', type: :array,
-      values: -> (*) { resource_class.respond_to?(:virtual_attributes) ? resource_class.virtual_attributes : [] }
-    has_option :exclude, 'Attributes not to be included in the form', type: :array
-    has_option :only, 'Respects the order the attributes are listed in', type: :array
-    has_option :show_timestamps, 'Set to true to show timestamps as labels'
-
-    contains {
-      # TODO: taken from express_form. should be inherited?
-      div(style: 'display:none') {
-        add_child helpers.utf8_enforcer_tag
-        add_child helpers.send(:method_tag, resource.persisted? ? :put : :post)
-        helpers.send(:token_tag)
-      }
-
-      filter_by_name(editable_attributes).each do |attrib|
-        form_field_for(attrib)
-      end
-      filter_by_name(has_many_through_associations).each do |assoc|
-        select_collection(assoc.name, nil, nil, class: 'select2')
-      end
-      if show_timestamps?
-        filter_by_name(timestamp_attributes).each do |timestamp|
-          div {
-            label {
-              "#{timestamp.name.titleize}: #{resource.try(timestamp.name.to_sym)}"
-            }
+  module Components
+    module Forms
+      class SmartForm < ExpressTemplates::Components::Forms::ExpressForm
+        TIMESTAMPS = %w(updated_at created_at)
+
+        has_option :virtual, 'Override the list of virtual attributes of the resource to be displayed', type: :array,
+          values: -> (*) { resource_class.respond_to?(:virtual_attributes) ? resource_class.virtual_attributes : [] }
+        has_option :exclude, 'Attributes not to be included in the form', type: :array
+        has_option :only, 'Respects the order the attributes are listed in', type: :array
+        has_option :show_timestamps, 'Set to true to show timestamps as labels'
+
+        contains {
+          # TODO: taken from express_form. should be inherited?
+          div(style: 'display:none') {
+            add_child helpers.utf8_enforcer_tag
+            add_child helpers.send(:method_tag, resource.persisted? ? :put : :post)
+            helpers.send(:token_tag)
           }
-        end
-      end
-      submit(class: 'button')
-    }
-
-
-    def form_field_for(attrib)
-      field_type_substitutions = {'text_area'       => 'textarea',
-                                  'datetime_select' => 'datetime',
-                                  'check_box'       => 'checkbox'}
-      field_type = attrib.field_type.to_s.sub(/_field$/,'')
-      field_type = "password" if attrib.name.match(/password/)
-      if relation = attrib.name.match(/(\w+)_id$/).try(:[], 1)
-          # TODO: should allow select2 override
-          select(attrib.name.to_sym, options: config["#{relation}_collection".to_sym], select2: true)
-      else
-        if field_type == 'text_area'
-          if attrib.name == 'definition'
-            # TODO allow other fields aside from layout.definition
-            base_styles = "position: relative; height: 300px;"
-            target = [attributes[:class].to_a.last, attrib.name].join("_")
-            textarea attrib.name.to_sym, rows: 10, class: "hide", hidden: true
-            content_tag(:div, '', id: "ace_#{attrib.name}", class: "ace-input", style: base_styles, data: { target: target })
+
+          filter_by_name(editable_attributes).each do |attrib|
+            form_field_for(attrib)
+          end
+          filter_by_name(has_many_through_associations).each do |assoc|
+            select_collection(assoc.name, nil, nil, class: 'select2')
+          end
+          if show_timestamps?
+            filter_by_name(timestamp_attributes).each do |timestamp|
+              div {
+                label {
+                  "#{timestamp.name.titleize}: #{resource.try(timestamp.name.to_sym)}"
+                }
+              }
+            end
+          end
+          submit(class: 'button')
+        }
+
+
+        def form_field_for(attrib)
+          field_type_substitutions = {'text_area'       => 'textarea',
+                                      'datetime_select' => 'datetime',
+                                      'check_box'       => 'checkbox'}
+          field_type = attrib.field_type.to_s.sub(/_field$/,'')
+          field_type = "password" if attrib.name.match(/password/)
+          if relation = attrib.name.match(/(\w+)_id$/).try(:[], 1)
+              # TODO: should allow select2 override
+              select(attrib.name.to_sym, options: config["#{relation}_collection".to_sym], select2: true)
           else
-            textarea attrib.name.to_sym, rows: 10
+            if field_type == 'text_area'
+              if attrib.name == 'definition'
+                # TODO allow other fields aside from layout.definition
+                base_styles = "position: relative; height: 300px;"
+                target = [attributes[:class].to_a.last, attrib.name].join("_")
+                textarea attrib.name.to_sym, rows: 10, class: "hide", hidden: true
+                content_tag(:div, '', id: "ace_#{attrib.name}", class: "ace-input", style: base_styles, data: { target: target })
+              else
+                textarea attrib.name.to_sym, rows: 10
+              end
+            else
+              self.send((field_type_substitutions[field_type] || field_type), attrib.name.to_sym)
+            end
           end
-        else
-          self.send((field_type_substitutions[field_type] || field_type), attrib.name.to_sym)
         end
-      end
-    end
 
-    protected
+        protected
 
-      def resource_attributes
-        super.map do |attrib|
-          field_definition = [attrib.name, attrib.type] # index not important here for now
-          Rails::Generators::GeneratedAttribute.parse(field_definition.join(":"))
-        end
-      end
+          def resource_attributes
+            super.map do |attrib|
+              field_definition = [attrib.name, attrib.type] # index not important here for now
+              Rails::Generators::GeneratedAttribute.parse(field_definition.join(":"))
+            end
+          end
 
-      def editable_attributes
-        non_timestamp_attributes + virtual_attributes
-      end
+          def editable_attributes
+            non_timestamp_attributes + virtual_attributes
+          end
 
-      def virtual_attributes
-        (config[:virtual]||[]).map do |attrib_name|
-          Rails::Generators::GeneratedAttribute.parse("#{attrib_name}:string")
-        end
-      end
+          def virtual_attributes
+            (config[:virtual]||[]).map do |attrib_name|
+              Rails::Generators::GeneratedAttribute.parse("#{attrib_name}:string")
+            end
+          end
 
-      def excluded_attributes
-        excl = [:id]
-        excl += config[:exclude] if config[:exclude]
-        excl
-      end
+          def excluded_attributes
+            excl = [:id]
+            excl += config[:exclude] if config[:exclude]
+            excl
+          end
 
-      def timestamp_attributes
-        resource_attributes.select {|attrib| TIMESTAMPS.include?(attrib.name) }
-      end
+          def timestamp_attributes
+            resource_attributes.select {|attrib| TIMESTAMPS.include?(attrib.name) }
+          end
 
-      def show_timestamps?
-        !!config[:show_timestamps]
-      end
+          def show_timestamps?
+            !!config[:show_timestamps]
+          end
 
-      def non_timestamp_attributes
-        resource_attributes.reject {|attrib| TIMESTAMPS.include?(attrib.name) }
-      end
+          def non_timestamp_attributes
+            resource_attributes.reject {|attrib| TIMESTAMPS.include?(attrib.name) }
+          end
 
-      def has_many_through_associations
-        resource_class.reflect_on_all_associations(:has_many).select do |assoc|
-          assoc.options.keys.include?(:through)
-        end
-      end
+          def has_many_through_associations
+            resource_class.reflect_on_all_associations(:has_many).select do |assoc|
+              assoc.options.keys.include?(:through)
+            end
+          end
 
-      def filter_by_name(attribs)
-        if config[:only]
-          # if using :only, we respect the order
-          config[:only].map do |only|
-            attribs.detect {|attrib| only.to_s.eql?(attrib.name)} || nil
-          end.compact
-        else
-          attribs
-        end.reject {|attrib| (excluded_attributes).map(&:to_s).include? attrib.name }
-      end
+          def filter_by_name(attribs)
+            if config[:only]
+              # if using :only, we respect the order
+              config[:only].map do |only|
+                attribs.detect {|attrib| only.to_s.eql?(attrib.name)} || nil
+              end.compact
+            else
+              attribs
+            end.reject {|attrib| (excluded_attributes).map(&:to_s).include? attrib.name }
+          end
 
+      end
+    end
   end
-end
+end

data/app/components/express_admin/smart_table.rb

@@ -1,192 +1,204 @@
 module ExpressAdmin
-  class SmartTable < ExpressTemplates::Components::Configurable
-    include ExpressTemplates::Components::Capabilities::Resourceful
-
-    tag :table
-
-    MAX_COLS_TO_SHOW_IDX = 5
-
-    attr :columns
-
-    has_option :scrollable, 'Set to true if the table should be scrollable', type: :boolean, default: false
-    has_option :show_actions, 'Set to true if table has actions for each row'
-    has_option :row_class, 'Add a class to each table row'
-
-    column_defs = {}
-    column_defs[:array] = {description: "List of fields to include in the table as columns",
-                           options: -> { resource.columns.map(&:name)} }
-    column_defs[:hash] = {description: "Hash of column names (titles) and how to calculate the cell values."}
-
-    has_option :columns, 'Specify the columns.  May provide as a hash with values used to provide cell values as a proc.',
-                         type: [:array, :hash],
-                         values: -> (*) {
-                           options = resource_class.columns.map(&:name)
-                           resource_class.columns.map(&:name).each do |name|
-                             options << if name.match(/(\w+)_at$/)
-                                          "#{name}_in_words"
-                                        else
-                                          "#{name}_link"
-                                        end
-                           end
-                           options = options + resource_class.instance_methods.grep(/_count$/).map(&:to_s)
-                         }
-
-    contains -> {
-      thead {
-        tr {
-          display_columns.each do |column|
-            th(class: column.name) {
-              column.title
+  module Components
+    module Presenters
+      class SmartTable < ExpressTemplates::Components::Configurable
+        include ExpressTemplates::Components::Capabilities::Resourceful
+
+        tag :table
+
+        MAX_COLS_TO_SHOW_IDX = 5
+
+        attr :columns
+
+        has_option :scrollable, 'Set to true if the table should be scrollable', type: :boolean, default: false
+        has_option :show_actions, 'Set to true if table has actions for each row'
+        has_option :row_class, 'Add a class to each table row'
+
+        column_defs = {}
+        column_defs[:array] = {description: "List of fields to include in the table as columns",
+                               options: -> { resource.columns.map(&:name)} }
+        column_defs[:hash] = {description: "Hash of column names (titles) and how to calculate the cell values."}
+
+        has_option :columns, 'Specify the columns.  May provide as a hash with values used to provide cell values as a proc.',
+                             type: [:array, :hash],
+                             values: -> (*) {
+                               options = resource_class.columns.map(&:name)
+                               resource_class.columns.map(&:name).each do |name|
+                                 options << if name.match(/(\w+)_at$/)
+                                              "#{name}_in_words"
+                                            else
+                                              "#{name}_link"
+                                            end
+                               end
+                               options = options + resource_class.instance_methods.grep(/_count$/).map(&:to_s)
+                             }
+
+        contains -> {
+          thead {
+            tr {
+              display_columns.each do |column|
+                th(class: column.name) {
+                  column.title
+                }
+              end
+              actions_header if should_show_actions?
+              hidden_columns_header_indicator if columns_hidden?
             }
-          end
-          actions_header if should_show_actions?
-          hidden_columns_header_indicator if columns_hidden?
-        }
-      }
-      tbody {
-        stored_member_assigns = assigns[collection_member_name.to_sym]
-        collection.each do |item|
-          assigns[collection_member_name.to_sym] = item
-          tr(id: row_id(item), class: row_class(item)) {
-            display_columns.each do |column|
-              td(class: column.name) {
-                cell_value(item, column.accessor)
+          }
+          tbody {
+            stored_member_assigns = assigns[collection_member_name.to_sym]
+            collection.each do |item|
+              assigns[collection_member_name.to_sym] = item
+              tr(id: row_id(item), class: row_class(item)) {
+                display_columns.each do |column|
+                  td(class: column.name) {
+                    cell_value(item, column.accessor)
+                  }
+                end
+                actions_column(item) if should_show_actions?
+                hidden_column_cell if columns_hidden?
               }
-            end
-            actions_column(item) if should_show_actions?
-            hidden_column_cell if columns_hidden?
+              assigns[collection_member_name.to_sym] = stored_member_assigns
+            end ; nil
           }
-          assigns[collection_member_name.to_sym] = stored_member_assigns
-        end ; nil
-      }
-
-      scroll_table if !!config[:scrollable]
-    }
-
-    before_build -> {
-      _initialize_columns
-      add_class 'table striped'
-    }
-
-    def scroll_table
-      script {
-        %Q($('\##{config[:id]}').scrollTableBody())
-      }
-    end
 
-    def actions_header
-      th(class: 'actions') { 'Actions' }
-    end
+          scroll_table if !!config[:scrollable]
+        }
 
-    def should_show_actions?
-      !!config[:show_actions]
-    end
+        before_build -> {
+          _initialize_columns
+          add_class 'table striped'
+        }
 
-    def should_show_delete?(item)
-      if item.respond_to?(:can_delete?) && item.can_delete?
-        true
-      elsif !item.respond_to?(:can_delete?)
-        true
-      else
-        false
-      end
-    end
+        def scroll_table
+          script {
+            %Q($('\##{config[:id]}').scrollTableBody())
+          }
+        end
 
-    def actions_column(item)
-      td {
-        if should_show_delete?(item)
-          link_to 'Delete', resource_path(item), method: :delete, data: {confirm: 'Are you sure?'}, class: 'button small secondary'
+        def actions_header
+          th(class: 'actions') { 'Actions' }
         end
-      }
-    end
 
-    def row_class(item)
-      if config[:row_class].try(:respond_to?, :call)
-        config[:row_class].call(item)
-      else
-        item.eql?(resource) ? 'current' : ''
-      end
-    end
+        def should_show_actions?
+          !!config[:show_actions]
+        end
 
-    def row_id(item)
-      "#{collection_member_name}:#{item.to_param}"
-    end
+        def should_show_delete?(item)
+          if item.respond_to?(:can_delete?) && item.can_delete?
+            true
+          elsif !item.respond_to?(:can_delete?)
+            true
+          else
+            false
+          end
+        end
 
-    def cell_value(item, accessor)
-      value = if accessor.respond_to?(:call)
-                begin
-                  accessor.call(item).try(:html_safe)
-                rescue
-                  'Error: '+$!.to_s
-                end
-              elsif attrib = accessor.to_s.match(/(\w+)_link$/).try(:[], 1)
-                # TODO: only works with non-namespaced routes
-                helpers.link_to item.send(attrib), resource_path(item)
-              elsif attrib = accessor.to_s.match(/(\w+)_in_words/).try(:[], 1)
-                item.send(attrib) ? (helpers.time_ago_in_words(item.send(attrib))+' ago') : 'never'
-              else
-                if relation_name = accessor.to_s.match(/(.*)_id$/).try(:[], 1)
-                  reflection = resource_class.reflect_on_association(relation_name.to_sym)
-                end
+        def actions_column(item)
+          td {
+            if should_show_delete?(item)
+              link_to 'Delete', resource_path(item), method: :delete, data: {confirm: 'Are you sure?'}, class: 'button small secondary'
+            end
+          }
+        end
 
-                if reflection
-                  relation = item.send(relation_name)
-                  relation.try(:name) || relation.to_s
-                else
-                  item.send(accessor)
-                end
-              end
-      current_arbre_element.add_child value
-    end
+        def row_class(item)
+          if config[:row_class].try(:respond_to?, :call)
+            config[:row_class].call(item)
+          else
+            item.eql?(resource) ? 'current' : ''
+          end
+        end
 
-    def display_columns
-      specified_columns? ? @columns : @columns.slice(1..MAX_COLS_TO_SHOW_IDX)
-    end
+        def row_id(item)
+          "#{collection_member_name}:#{item.to_param}"
+        end
 
-    def columns_hidden?
-      !specified_columns? && columns.size > MAX_COLS_TO_SHOW_IDX+1
-    end
+        def cell_value(item, accessor)
+          value = if accessor.respond_to?(:call)
+                    begin
+                      accessor.call(item).try(:html_safe)
+                    rescue
+                      'Error: '+$!.to_s
+                    end
+                  elsif attrib = accessor.to_s.match(/(\w+)_link$/).try(:[], 1)
+                    # TODO: only works with non-namespaced routes
+                    helpers.link_to item.send(attrib), resource_path(item)
+                  elsif attrib = accessor.to_s.match(/(\w+)_in_words/).try(:[], 1)
+                    if item.send(attrib)
+                      if item.send(attrib) < DateTime.now
+                        "#{helpers.time_ago_in_words(item.send(attrib))} ago"
+                      else
+                        helpers.time_ago_in_words(item.send(attrib))
+                      end
+                    else
+                      'never'
+                    end
+                  else
+                    if relation_name = accessor.to_s.match(/(.*)_id$/).try(:[], 1)
+                      reflection = resource_class.reflect_on_association(relation_name.to_sym)
+                    end
+
+                    if reflection
+                      relation = item.send(relation_name)
+                      relation.try(:name) || relation.to_s
+                    else
+                      item.send(accessor)
+                    end
+                  end
+          current_arbre_element.add_child value
+        end
 
-    class Column
-      attr :name, :title, :accessor
-      def initialize(accessor, title = nil)
-        @name = accessor.kind_of?(Symbol) ? accessor.to_s.underscore : title.titleize.gsub(/\s+/,'').underscore
-        @accessor = accessor
-        @title = title || @name.titleize
-      end
-    end
+        def display_columns
+          specified_columns? ? @columns : @columns.slice(1..MAX_COLS_TO_SHOW_IDX)
+        end
 
-    def specified_columns?
-      !!specified_columns
-    end
+        def columns_hidden?
+          !specified_columns? && columns.size > MAX_COLS_TO_SHOW_IDX+1
+        end
 
-    def specified_columns
-      config[:columns]
-    end
+        class Column
+          attr :name, :title, :accessor
+          def initialize(accessor, title = nil)
+            @name = accessor.kind_of?(Symbol) ? accessor.to_s.underscore : title.titleize.gsub(/\s+/,'').underscore
+            @accessor = accessor
+            @title = title || @name.titleize
+          end
+        end
 
-    def hidden_columns_header_indicator
-      th(class: 'more-columns-indicator') {
-        "..."
-      }
-    end
+        def specified_columns?
+          !!specified_columns
+        end
 
-    def hidden_column_cell
-      td(class: 'more-columns-indicator')
-    end
+        def specified_columns
+          config[:columns]
+        end
 
-    private
-      def _initialize_columns
-        @columns =
-          if specified_columns.kind_of?(Array)
-            specified_columns.map { |name| Column.new(name) }
+        def hidden_columns_header_indicator
+          th(class: 'more-columns-indicator') {
+            "..."
+          }
+        end
 
-          elsif specified_columns.kind_of?(Hash)
-            specified_columns.map { |title, accessor| Column.new(accessor, title) }
+        def hidden_column_cell
+          td(class: 'more-columns-indicator')
+        end
 
-          else
-            resource_attributes.map { |column| Column.new(column.name.to_sym) }
+        private
+          def _initialize_columns
+            @columns =
+              if specified_columns.kind_of?(Array)
+                specified_columns.map { |name| Column.new(name) }
+
+              elsif specified_columns.kind_of?(Hash)
+                specified_columns.map { |title, accessor| Column.new(accessor, title) }
+
+              else
+                resource_attributes.map { |column| Column.new(column.name.to_sym) }
+              end
           end
-      end
 
+      end
+    end
   end
 end