express_admin 1.2.1 → 1.3.0

data/app/components/express_admin/page_header_component.rb

@@ -3,29 +3,19 @@ module ExpressAdmin
     ETC = ExpressTemplates::Components
 
     class PageHeader < ExpressTemplates::Components::Base
-      include ETC::Capabilities::Conditionality
-
       emits -> {
-              h1 {
-                content_for(:page_header)
-              }
-            }
-
-      only_if -> { content_for?(:page_header) }
-
+        h1 {
+          content_for(:page_header) if content_for?(:page_header)
+        }
+      }
     end
 
     class PageHeaderLead < ExpressTemplates::Components::Base
-      include ETC::Capabilities::Conditionality
-
       emits -> {
-              p.lead {
-                content_for(:page_header_lead)
-              }
-            }
-
-      only_if -> { content_for?(:page_header_lead) }
-
+        p(class: 'lead') {
+          content_for(:page_header_lead) if content_for?(:page_header_lead)
+        }
+      }
     end
 
     emits -> {

data/app/components/express_admin/pane.rb

@@ -3,17 +3,19 @@ require File.join(File.dirname(__FILE__), 'layout_component')
 module ExpressAdmin
   class Pane < LayoutComponent
 
-    emits -> {
-      div(dom_id, class: classes) {
+    emits -> (block) {
+      div(id: dom_id, class: pane_classes) {
         heading if title || status
-        _yield
+        block.call(self) if block
       }
     }
 
     def heading
-      h2.title {
-        null_wrap { title }
-        span.status(status) if status
+      h4(class: 'title') {
+        current_arbre_element.add_child title
+        if status
+          span(class: 'status') { status }
+        end
       }
     end
 
@@ -22,15 +24,16 @@ module ExpressAdmin
     end
 
     def title
-      @config[:title] || ''
+      config[:title] || ''
     end
 
     def status
-      @config[:status] || nil
+      config[:status] || nil
     end
 
-    def classes
-      super << " #{@config[:id]}"
+    def pane_classes
+      add_class config[:id].to_s
+      class_names
     end
 
   end

data/app/components/express_admin/setting_form.rb

@@ -1,6 +1,5 @@
 module ExpressAdmin
-  class SettingForm < ExpressTemplates::Components::Container
-    include ExpressTemplates::Components::Capabilities::Configurable
+  class SettingForm < ExpressTemplates::Components::Configurable
 
     # .widget-box
     #   %h2.widget-header Blog
@@ -13,32 +12,36 @@ module ExpressAdmin
     #         = submit_tag 'Save', class: 'button tiny right radius ajax-submit'
 
 
-    helper(:save_button) { submit_tag 'Save', class: 'button tiny right radius ajax-submit' }
+    def save_button
+      submit_tag 'Save', class: 'button tiny right radius ajax-submit'
+    end
 
-    helper(:settings_path) { self.send("admin_#{current_module_path_name.gsub(/express_/, '')}_settings_path") }
+    def settings_path
+      helpers.instance_eval("admin_#{current_module_path_name.gsub(/express_/, '')}_settings_path")
+    end
 
-    helper(:settings) { |setting_type|
+    def settings(setting_type)
       current_module.settings.send("#{setting_type}_setting").map do |setting|
         edit_setting(setting)
       end.join()
-    }
-
-    emits -> {
-        widget_box(my[:id]) {
-          setting_selector = my[:id].to_s.gsub('_', '-')
-          form(href: ExpressAdmin::SettingForm.settings_path, id: "#{setting_selector}-setting-form", onSubmit: 'return false;', method: 'POST') {
-            form_rails_support(:patch)
-            hidden_field_tag :form_id, "#{setting_selector}-setting-form"
-            div._form_group {
-              _yield
-            }
-            settings(my[:id])
-            div._form_group._widget_buttons {
-              save_button
-            }
+    end
+
+    emits -> (block) {
+      widget_box(config[:id]) {
+        setting_selector = config[:id].to_s.gsub('_', '-')
+        form(href: ExpressAdmin::SettingForm.settings_path, id: "#{setting_selector}-setting-form", onSubmit: 'return false;', method: 'POST') {
+          form_rails_support(:patch)
+          hidden_field_tag :form_id, "#{setting_selector}-setting-form"
+          div(class: 'form-group') {
+            block.call(self) if block
+          }
+          settings(config[:id])
+          div(class: "form-group widget-buttons") {
+            save_button
           }
         }
       }
+    }
 
 
   end

data/app/components/express_admin/sidebar_region.rb

@@ -1,8 +1,10 @@
 module ExpressAdmin
-  class SidebarRegion < ExpressTemplates::Components::Container
-    emits -> {
-      div._sidebar_region {
-        _yield
+  class SidebarRegion < LayoutComponent
+    emits -> (block) {
+      add_class('sidebar-region')
+      add_class(config.try(:[], :class))
+      div(id: dom_id, class: class_names) {
+        block.call(self) if block
       }
     }
   end

data/app/components/express_admin/smart_form.rb

@@ -1,10 +1,8 @@
 require 'rails/generators/generated_attribute'
 
 module ExpressAdmin
-  class SmartForm < ExpressTemplates::Components::Base
-    include ExpressTemplates::Components::Capabilities::Configurable
+  class SmartForm < ExpressTemplates::Components::Configurable
     include ExpressTemplates::Components::Capabilities::Resourceful
-    include ExpressTemplates::Components::Forms::FormSupport
 
     emits -> {
       express_form(form_args) {
@@ -13,12 +11,12 @@ module ExpressAdmin
           form_field_for(attrib)
         end
         filter_by_name(has_many_through_associations).each do |assoc|
-          select_collection(assoc.name)
+          select_collection(assoc.name, nil, nil, class: 'select2')
         end
         filter_by_name(timestamp_attributes).each do |timestamp|
           div {
             label {
-              "#{timestamp.name.titleize}: {{@#{resource_name}.try(:#{timestamp.name})}}"
+              "#{timestamp.name.titleize}: #{resource.try(timestamp.name.to_sym)}"
             }
           }
         end
@@ -34,13 +32,13 @@ module ExpressAdmin
                                   'check_box'       => 'checkbox'}
       field_type = attrib.field_type.to_s.sub(/_field$/,'')
       if relation = attrib.name.match(/(\w+)_id$/).try(:[], 1)
-        if opts = @config["#{relation}_collection".to_sym]
-          select(attrib.name, opts)
+          select(attrib.name, config["#{relation}_collection".to_sym], select2: true)
+      else
+        if field_type == 'text_area'
+          textarea attrib.name.to_sym, rows: 10
         else
-          select(attrib.name)
+          self.send((field_type_substitutions[field_type] || field_type), attrib.name.to_sym)
         end
-      else
-        self.send((field_type_substitutions[field_type] || field_type), attrib.name.to_sym)
       end
     end
 
@@ -50,11 +48,16 @@ module ExpressAdmin
         {           id: resource_name,
                 action: form_action,
          resource_name: resource_name,
-        resource_class: @config[:resource_class],
+        resource_class: config[:resource_class],
              namespace: namespace}
       end
 
-      def attributes
+      # from express_form - perhaps move back to shared module
+      def form_action
+        config[:action] || (helpers.resource.try(:persisted?) ? resource_path(ivar: true) : collection_path)
+      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(":"))
@@ -66,23 +69,23 @@ module ExpressAdmin
       end
 
       def virtual_attributes
-        (@config[:virtual]||[]).map do |attrib_name|
+        (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 += config[:exclude] if config[:exclude]
         excl
       end
 
       def timestamp_attributes
-        attributes.select {|attrib| TIMESTAMPS.include?(attrib.name) }
+        resource_attributes.select {|attrib| TIMESTAMPS.include?(attrib.name) }
       end
 
       def non_timestamp_attributes
-        attributes.reject {|attrib| TIMESTAMPS.include?(attrib.name) }
+        resource_attributes.reject {|attrib| TIMESTAMPS.include?(attrib.name) }
       end
 
       def has_many_through_associations
@@ -92,9 +95,9 @@ module ExpressAdmin
       end
 
       def filter_by_name(attribs)
-        if @config[:only]
+        if config[:only]
           # if using :only, we respect the order
-          @config[:only].map do |only|
+          config[:only].map do |only|
             attribs.detect {|attrib| only.to_s.eql?(attrib.name)} || nil
           end.compact
         else

data/app/components/express_admin/smart_table.rb

@@ -1,6 +1,5 @@
 module ExpressAdmin
-  class SmartTable < ExpressTemplates::Components::Base
-    include ExpressTemplates::Components::Capabilities::Configurable
+  class SmartTable < ExpressTemplates::Components::Configurable
     include ExpressTemplates::Components::Capabilities::Resourceful
 
     MAX_COLS_TO_SHOW_IDX = 5
@@ -8,11 +7,11 @@ module ExpressAdmin
     attr :columns
 
     emits -> {
-      table(my[:id]).table.striped {
+      table(id: config[:id], class: 'table striped') {
         thead {
           tr {
             display_columns.each do |column|
-              th.send(column.name) {
+              th(class: column.name) {
                 column.title
               }
             end
@@ -21,21 +20,21 @@ module ExpressAdmin
           }
         }
         tbody {
-          for_each(collection, as: collection_member_name) {
-            tr(row_args) {
+          helpers.collection.each do |item|
+            tr(id: row_id(item), class: row_class(item)) {
               display_columns.each do |column|
-                td.send(column.name) {
-                  cell_value(column.accessor)
+                td(class: column.name) {
+                  cell_value(item, column.accessor)
                 }
               end
-              actions_column if should_show_actions?
+              actions_column(item) if should_show_actions?
               hidden_column_cell if columns_hidden?
             }
-          }
+          end ; nil
         }
       }
 
-      scroll_table if !!@config[:scroll_table]
+      scroll_table if !!config[:scroll_table]
     }
 
     def scroll_table
@@ -45,59 +44,64 @@ module ExpressAdmin
     end
 
     def actions_header
-      th.actions { 'Actions' }
+      th(class: 'actions') { 'Actions' }
     end
 
     def should_show_actions?
-      @config[:actions].nil? || !!@config[:actions]
+      config[:actions].nil? || !!config[:actions]
+    end
+
+    def resource_path(item)
+      helpers.send(resource_path_helper, item.to_param)
     end
 
-    def actions_column
+    def actions_column(item)
       td {
-        link_to 'Delete', "{{#{resource_path}}}", method: :delete, data: {confirm: 'Are you sure?'}, class: 'button small secondary'
+        link_to 'Delete', resource_path(item), method: :delete, data: {confirm: 'Are you sure?'}, class: 'button small secondary'
       }
     end
 
-    def row_class
-      @config[:row_class].try(:respond_to?, :call) ? 
-        "{{#{@config[:row_class].source}.call(#{collection_member_name})}}" : 
-        "{{#{collection_member_name}.eql?(@#{resource_name}) ? 'current' : ''}}"
+    def row_class(item)
+      if config[:row_class].try(:respond_to?, :call)
+        config[:row_class].call(item)
+      else
+        item.eql?(helpers.resource) ? 'current' : ''
+      end
     end
 
     def is_permanent?
-      @config[:permanent].nil? || (@config[:permanent].present? && @config[:permanent])
+      config[:permanent].nil? || (config[:permanent].present? && config[:permanent])
     end
 
-    def row_id
-      "#{collection_member_name}:{{#{collection_member_name}.id}}"
+    def row_id(item)
+      "#{collection_member_name}:#{item.to_param}"
     end
 
-    def row_args
-      {id: row_id, class: row_class}
-    end
-
-    def cell_value(accessor)
+    def cell_value(item, accessor)
       if accessor.respond_to?(:call)
-        value = "(begin #{accessor.source}.call(#{collection_member_name}).to_s rescue 'Error: '+$!.to_s ; end)"
+        value = begin
+            helpers.instance_eval "(#{accessor.source}).call(item).to_s"
+          rescue
+            'Error: '+$!.to_s
+          end
       elsif attrib = accessor.to_s.match(/(\w+)_link$/).try(:[], 1)
-        value = "(link_to #{collection_member_name}.#{attrib}, #{collection_member_name}_path(#{collection_member_name}.id))"
+        # TODO: only works with non-namespaced routes
+        value = helpers.link_to item.send(attrib), helpers.resource_path(item)
       elsif attrib = accessor.to_s.match(/(\w+)_in_words/).try(:[], 1)
-        value = "(#{collection_member_name}.#{attrib} ? time_ago_in_words(#{collection_member_name}.#{attrib})+' ago' : 'never')"
+        value = 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
 
         value = if reflection
-          relation = "#{collection_member_name}.#{relation_name}"
-          "#{relation}.try(:name) || #{relation}.to_s"
+          relation = item.send(relation_name)
+          relation.try(:name) || relation.to_s
         else
-          "#{collection_member_name}.#{accessor}"
+          item.send(accessor)
         end
       end
-      span {
-        "{{#{value}}}"
-      }
+      current_arbre_element.add_child value
     end
 
     def display_columns
@@ -126,17 +130,17 @@ module ExpressAdmin
     end
 
     def specified_columns
-      @config[:columns]
+      config[:columns]
     end
 
     def hidden_columns_header_indicator
-      th._more_columns_indicator {
+      th(class: 'more-columns-indicator') {
         "..."
       }
     end
 
     def hidden_column_cell
-      td._more_columns_indicator
+      td(class: 'more-columns-indicator')
     end
 
     private
@@ -149,7 +153,7 @@ module ExpressAdmin
             specified_columns.map { |title, accessor| Column.new(accessor, title) }
 
           else
-            attributes.map { |column| Column.new(column.name.to_sym) }
+            resource_attributes.map { |column| Column.new(column.name.to_sym) }
           end
       end
 

data/app/components/express_admin/widget_box.rb

@@ -1,10 +1,10 @@
 module ExpressAdmin
-  class WidgetBox < ExpressTemplates::Components::Column
-    emits -> {
-      div._widget_box(id: "#{my[:id].to_s.dasherize}-box") {
-        header.title(box_title)
-        div._widget_body {
-          _yield
+  class WidgetBox < ExpressTemplates::Components::Configurable
+    emits -> (block) {
+      div(class: 'widget-box', id: "#{config[:id].to_s.dasherize}-box") {
+        header(class: 'title') { box_title }
+        div(class: 'widget-body') {
+          block.call(self) if block
         }
       }
     }
@@ -12,11 +12,11 @@ module ExpressAdmin
     protected
 
       def resource_name
-        my[:id].to_s.titleize
+        config[:id].to_s.titleize
       end
 
       def box_title
-        "{{resource.persisted? ? 'Edit #{resource_name}' : 'New #{resource_name}'}}"
+        config[:title] || (helpers.resource.persisted? ? "Edit #{resource_name}" : "New #{resource_name}")
       end
   end
 end