express_admin 1.3.2 → 1.4.0

data/app/components/express_admin/{addon_sidebar_component.rb → module_sidebar.rb}

@@ -1,20 +1,23 @@
 module ExpressAdmin
   # renders a sidebar partial if one is available
   # otherwise uses menu.yml
-  class AddonSidebarComponent < ExpressTemplates::Components::Base
+  class ModuleSidebar < ExpressTemplates::Components::Base
+    tag :section
 
-    emits -> {
+    contains -> {
+      ul(class: 'menu-items') {
+        li(class: 'title') { current_menu_name }
+        menu_list(helpers.current_menu.items)
+      }
+    }
+
+    def build(*args, &block)
       begin
         render("shared/#{helpers.current_module_path_name}/sidebar")
       rescue Exception => e
-        section(class: 'module-sidebar') {
-          ul(class: 'menu-items') {
-            li(class: 'title') { current_menu_name }
-            menu_list(helpers.current_menu.items)
-          }
-        }
+        super(*args, &block)
       end
-    }
+    end
 
     def menu_list(list)
       list.each do |item|
@@ -27,6 +30,5 @@ module ExpressAdmin
         link_to item.title.html_safe, helpers.instance_eval(item.path)
       }
     end
-
   end
 end

data/app/components/express_admin/page_header.rb

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

data/app/components/express_admin/smart_form.rb

@@ -1,18 +1,29 @@
 require 'rails/generators/generated_attribute'
 
 module ExpressAdmin
-  class SmartForm < ExpressTemplates::Components::Configurable
-    include ExpressTemplates::Components::Capabilities::Resourceful
-
-    emits -> {
-      express_form(form_args) {
-        hidden(:id)
-        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
+  class SmartForm < ExpressTemplates::Components::Forms::ExpressForm
+    TIMESTAMPS = %w(updated_at created_at)
+
+    has_option :virtual_attributes, 'Override the list of virtual attributes of the resource to be displayed'
+    has_option :exclude, 'Attributes not to be included in the form'
+    has_option :only, 'Respects the order the attributes are listed in'
+    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 {
@@ -20,11 +31,10 @@ module ExpressAdmin
             }
           }
         end
-        submit(class: 'button')
-      }
+      end
+      submit(class: 'button')
     }
 
-    TIMESTAMPS = ['updated_at', 'created_at']
 
     def form_field_for(attrib)
       field_type_substitutions = {'text_area'       => 'textarea',
@@ -33,7 +43,7 @@ module ExpressAdmin
       field_type = attrib.field_type.to_s.sub(/_field$/,'')
       if relation = attrib.name.match(/(\w+)_id$/).try(:[], 1)
           # TODO: should allow select2 override
-          select(attrib.name, options: config["#{relation}_collection".to_sym], select2: true)
+          select(attrib.name.to_sym, options: config["#{relation}_collection".to_sym], select2: true)
       else
         if field_type == 'text_area'
           textarea attrib.name.to_sym, rows: 10
@@ -45,19 +55,6 @@ module ExpressAdmin
 
     protected
 
-      def form_args
-        {           id: resource_name,
-                action: form_action,
-         resource_name: resource_name,
-        resource_class: config[:resource_class],
-             namespace: namespace}
-      end
-
-      # 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
@@ -85,6 +82,10 @@ module ExpressAdmin
         resource_attributes.select {|attrib| TIMESTAMPS.include?(attrib.name) }
       end
 
+      def show_timestamps?
+        !!config[:show_timestamps]
+      end
+
       def non_timestamp_attributes
         resource_attributes.reject {|attrib| TIMESTAMPS.include?(attrib.name) }
       end

data/app/components/express_admin/smart_table.rb

@@ -2,44 +2,61 @@ module ExpressAdmin
   class SmartTable < ExpressTemplates::Components::Configurable
     include ExpressTemplates::Components::Capabilities::Resourceful
 
+    tag :table
+
     MAX_COLS_TO_SHOW_IDX = 5
 
     attr :columns
 
-    emits -> {
-      table(id: config[:id], class: 'table striped') {
-        thead {
-          tr {
+    has_option :scrollable, 'Set to true if the table should be scrollable'
+    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]
+
+    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?
+        }
+      }
+      tbody {
+        collection.each do |item|
+          tr(id: row_id(item), class: row_class(item)) {
             display_columns.each do |column|
-              th(class: column.name) {
-                column.title
+              td(class: column.name) {
+                cell_value(item, column.accessor)
               }
             end
-            actions_header if should_show_actions?
-            hidden_columns_header_indicator if columns_hidden?
+            actions_column(item) if should_show_actions?
+            hidden_column_cell if columns_hidden?
           }
-        }
-        tbody {
-          collection.each do |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 ; nil
-        }
+        end ; nil
       }
 
-      scroll_table if !!config[:scroll_table]
+      scroll_table if !!config[:scrollable]
+    }
+
+    before_build -> {
+      add_class 'table striped'
     }
 
     def scroll_table
       script {
-        %Q($('\##{my[:id]}').scrollTableBody())
+        %Q($('\##{config[:id]}').scrollTableBody())
       }
     end
 
@@ -48,7 +65,7 @@ module ExpressAdmin
     end
 
     def should_show_actions?
-      config[:actions].nil? || !!config[:actions]
+      !!config[:show_actions]
     end
 
     def resource_path(item)
@@ -81,10 +98,6 @@ module ExpressAdmin
       end
     end
 
-    def is_permanent?
-      config[:permanent].nil? || (config[:permanent].present? && config[:permanent])
-    end
-
     def row_id(item)
       "#{collection_member_name}:#{item.to_param}"
     end
@@ -92,7 +105,7 @@ module ExpressAdmin
     def cell_value(item, accessor)
       if accessor.respond_to?(:call)
         value = begin
-            eval "(#{accessor.source}).call(item).to_s"
+            accessor.call(item).html_safe
           rescue
             'Error: '+$!.to_s
           end

data/app/components/express_admin/widget_box.rb

@@ -1,14 +1,19 @@
 module ExpressAdmin
   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
-        }
+
+    has_option :title, 'The title to be displayed.'
+
+    contains -> (&block) {
+      header(class: 'title') { box_title }
+      div(class: 'widget-body') {
+        block.call(self) if block
       }
     }
 
+    before_build -> {
+      set_attribute(:id, "#{config[:id].to_s.dasherize}-box")
+    }
+
     protected
 
       def resource_name

data/app/views/layouts/express_admin/admin.html.et

@@ -13,10 +13,10 @@ html {
       render('shared/express_admin/navigation_bar')
       div(class: 'main-page') {
         div(class: 'page-sidebar') {
-          addon_sidebar_component
+          module_sidebar
         }
         div(class: 'page-body') {
-          page_header_component
+          page_header
           current_arbre_element.add_child yield
         }
       }

data/app/views/shared/express_admin/_navigation_bar.html.et

@@ -6,12 +6,12 @@ nav(class: 'top-bar') {
           image_tag 'express_admin/appexpress_logo_dark.png', class: 'nav-logo'
         }
       }
-      mega_menu_component
+      mega_menu
       li {
-        icon_link(icon_name: 'android-open', text: 'View Site', href: '/', target: '_blank')
+        icon_link("android-open", text: 'View Site', href: '/', target: '_blank')
       }
       render(partial: 'shared/nav_bar_actions')
-      li { flash_message_component } unless helpers.flash.empty?
+      li { flash_messages } unless helpers.flash.empty?
     }
   }
   div(class: 'secondary-menu') {

data/lib/express_admin/version.rb

@@ -1,3 +1,3 @@
 module ExpressAdmin
-  VERSION = "1.3.2"
+  VERSION = "1.4.0"
 end

data/test/dummy/test/components/smart_form_test.rb

@@ -7,6 +7,7 @@ module ExpressAdmin
     def resource_assigns
       {resource: Widget.new, collection: Widget.all}
     end
+
     def helpers
       view = mock_action_view(resource_assigns)
       class << view
@@ -25,15 +26,14 @@ module ExpressAdmin
       view
     end
 
-
     def widget_form(*args)
       arbre {
-        smart_form(:widgets, *args)
+        smart_form(:widget, *args)
       }
     end
 
     test "renders a form correct id" do
-      assert_match '<form id="widget"', widget_form
+      assert_match /form.*id="widget"/, widget_form
     end
 
     test "uses inherited_resources path helpers to set correct action" do
@@ -71,8 +71,9 @@ module ExpressAdmin
     end
 
     test "timestamps are not editable" do
-      assert_match /Created At:.*\n/, widget_form
-      assert_match /Updated At:.*\n/, widget_form
+      form_with_timestamps = widget_form(show_timestamps: true)
+      assert_match /Created At:.*\n/, form_with_timestamps
+      assert_match /Updated At:.*\n/, form_with_timestamps
     end
 
     test "fields have labels" do

data/vendor/gems/express_templates/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    express_templates (0.7.0)
+    express_templates (0.7.1)
       activesupport (~> 4.2)
       arbre
       parslet (~> 1.6)

data/vendor/gems/express_templates/express_templates.gemspec

@@ -15,7 +15,7 @@ Gem::Specification.new do |s|
   s.license     = "MIT"
 
   s.files = Dir["{app,config,db,lib}/**/*", "LICENSE", "Rakefile", "README.md"]
-  s.test_files = Dir["test/**/*"]
+  s.test_files = Dir["test/**/*"] - Dir["test/log/*", "test/tmp/*", "test/dummy/tmp/**/*", "test/dummy/log/*"]
 
   s.add_dependency "activesupport", "~> 4.2" # strictly speaking we only depend on active support
   s.add_dependency "parslet", "~> 1.6"

data/vendor/gems/express_templates/lib/express_templates/compiler.rb

@@ -1,16 +1,7 @@
-require 'ostruct'
 module ExpressTemplates
   module Compiler
     def compile(template_or_src=nil, &block)
 
-      if block
-        begin
-          block.source
-        rescue
-          raise "block must have source - did you do compile(&:label) ?"
-        end
-      end
-
       template, src = _normalize(template_or_src)
 
       %Q[Arbre::Context.new(assigns.merge(template_virtual_path: @virtual_path), self) { #{src || block.source_body} }.to_s]

data/vendor/gems/express_templates/lib/express_templates/components.rb

@@ -5,6 +5,5 @@ end
 
 require 'express_templates/components/base'
 require 'express_templates/components/configurable'
-require 'express_templates/components/form_rails_support'
 require 'express_templates/components/tree_for'
 require 'express_templates/components/forms'

data/vendor/gems/express_templates/lib/express_templates/components/base.rb

@@ -21,12 +21,46 @@ module ExpressTemplates
         # puts "added #{method_name} -> #{klass.name}"
       end
 
-      def self.emits(proc = nil, &block)
-        define_method(:build, &(proc || block))
+      def initialize(*)
+        super
+        _default_attributes.each do |name, value|
+          set_attribute(name, value)
+        end
+        add_class _default_classes
       end
 
-      def build(*args, block)
-        raise "#build method must be overridden"
+      def self.contains(proc = nil, &block)
+        define_method(:_build_body, &(proc || block))
+      end
+
+      # Override the tag_name method for other than <div>
+      def self.tag(tag)
+        define_method(:tag_name) { tag }
+      end
+
+      # Provide default attributes for the enclosing tag
+      # of the component
+      def self.has_attributes(attribs)
+        self._default_classes = attribs.delete(:class)
+        _default_attributes.merge!(attribs)
+      end
+
+      def self.before_build(proc_or_symbol = nil, &block)
+        if proc_or_symbol.kind_of?(Symbol)
+          define_method(:_before_build) do
+            self.send(proc_or_symbol)
+          end
+        else
+          define_method(:_before_build, &(proc_or_symbol || block))
+        end
+      end
+
+      def build(*args, &block)
+        _extract_class!(args)
+        _before_build if respond_to?(:_before_build)
+        super(*args) {
+          _build_body(&block) if respond_to?(:_build_body)
+        }
       end
 
       def resource
@@ -37,13 +71,31 @@ module ExpressTemplates
         builder_method_and_class subclass.to_s.demodulize.underscore, subclass
       end
 
-      def indent_level
-        parent_indent_level = parent.try(:indent_level) || 0
-      end
+      protected
+        def default_class_name
+          self.class.name.demodulize.underscore.dasherize
+        end
 
-      def to_s
-        children.to_s
-      end
+
+      private
+        def _extract_class!(args)
+          add_class args.last.delete(:class) if args.last.try(:kind_of?, Hash)
+        end
+        def _default_attributes
+          self.class._default_attributes
+        end
+        def self._default_attributes
+          @default_attributes ||= {}
+        end
+        def _default_classes
+          self.class._default_classes
+        end
+        def self._default_classes
+          @default_classes ||= ''
+        end
+        def self._default_classes=(classes)
+          @default_classes = classes
+        end
 
     end
   end