express_admin 1.3.0 → 1.3.1

data/app/components/express_admin/h_box.rb

@@ -0,0 +1,11 @@
+require File.join(File.dirname(__FILE__), 'layout_component')
+module ExpressAdmin
+  class HBox < LayoutComponent
+
+    emits -> (contents) {
+      div(container_div_attributes) {
+        contents.call(self) if contents
+      }
+    }
+  end
+end

data/app/components/express_admin/icon.rb

@@ -0,0 +1,7 @@
+module ExpressAdmin
+  class Icon < ExpressTemplates::Components::Configurable
+    emits -> {
+      i(class: "icon ion-#{config[:id]}")
+    }
+  end
+end

data/app/components/express_admin/icon_link.rb

@@ -0,0 +1,34 @@
+module ExpressAdmin
+  class IconLink < ExpressTemplates::Components::Configurable
+
+    emits -> {
+      if config[:right]
+        a(anchor_args) {
+          text_node config[:text]
+          icon(config[:icon_name].to_sym)
+        }
+      else
+        a(anchor_args) {
+          icon(config[:icon_name].to_sym)
+          text_node config[:text]
+        }
+      end
+    }
+
+    def anchor_args
+      args = {class: class_list, 
+              href:  config[:href]}
+      args[:id] = config[:id] if config[:id]
+      args[:target] = config[:target] if config[:target]
+      args['data-delete'] = config[:delete] if config[:delete]
+      args['data-confirm'] = config[:confirm] if config[:confirm]
+      args[:title] = config[:title] if config[:title]
+      args
+    end
+
+    def icon_options
+      [:icon_name, :text, :right]
+    end
+
+  end
+end

data/app/components/express_admin/layout_component.rb

@@ -1,7 +1,44 @@
 module ExpressAdmin
   class LayoutComponent < ExpressTemplates::Components::Configurable
+
     def dom_id
       config.try(:[], :id)
     end
+
+    def component_options
+      [:id, :class, :style] + supported_style_options
+    end
+
+    def component_classes
+      add_class config[:id].to_s
+      add_class config[:class]
+      class_names
+    end
+
+    def supported_style_options
+      [:height, :width]
+    end
+
+    def provided_style_attributes
+      config.select {|k,v| supported_style_options.include?(k) }
+    end
+
+    def style_attributes
+      attribs = config[:style] || {}
+      attribs.merge(provided_style_attributes).map do |k, v|
+        "#{k}: #{v}"
+      end.join('; ')
+    end
+
+    def pass_along_attributes
+      config.reject {|k,v| component_options.include?(k) }
+    end
+
+    def container_div_attributes
+      pass_along_attributes
+        .merge(id: dom_id, class: component_classes)
+        .merge(style: style_attributes)
+    end
+
   end
 end

data/app/components/express_admin/pane.rb

@@ -4,7 +4,7 @@ module ExpressAdmin
   class Pane < LayoutComponent
 
     emits -> (block) {
-      div(id: dom_id, class: pane_classes) {
+      div(container_div_attributes) {
         heading if title || status
         block.call(self) if block
       }
@@ -31,9 +31,9 @@ module ExpressAdmin
       config[:status] || nil
     end
 
-    def pane_classes
-      add_class config[:id].to_s
-      class_names
+    def component_options
+      super +
+        [:title, :status]
     end
 
   end

data/app/components/express_admin/smart_form.rb

@@ -32,7 +32,8 @@ module ExpressAdmin
                                   'check_box'       => 'checkbox'}
       field_type = attrib.field_type.to_s.sub(/_field$/,'')
       if relation = attrib.name.match(/(\w+)_id$/).try(:[], 1)
-          select(attrib.name, config["#{relation}_collection".to_sym], select2: true)
+          # TODO: should allow select2 override
+          select(attrib.name, options: config["#{relation}_collection".to_sym], select2: true)
       else
         if field_type == 'text_area'
           textarea attrib.name.to_sym, rows: 10

data/app/components/express_admin/smart_table.rb

@@ -20,7 +20,7 @@ module ExpressAdmin
           }
         }
         tbody {
-          helpers.collection.each do |item|
+          collection.each do |item|
             tr(id: row_id(item), class: row_class(item)) {
               display_columns.each do |column|
                 td(class: column.name) {
@@ -55,9 +55,21 @@ module ExpressAdmin
       helpers.send(resource_path_helper, 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 actions_column(item)
       td {
-        link_to 'Delete', resource_path(item), method: :delete, data: {confirm: 'Are you sure?'}, class: 'button small secondary'
+        if should_show_delete?(item)
+          link_to 'Delete', resource_path(item), method: :delete, data: {confirm: 'Are you sure?'}, class: 'button small secondary'
+        end
       }
     end
 
@@ -80,13 +92,13 @@ module ExpressAdmin
     def cell_value(item, accessor)
       if accessor.respond_to?(:call)
         value = begin
-            helpers.instance_eval "(#{accessor.source}).call(item).to_s"
+            eval "(#{accessor.source}).call(item).to_s"
           rescue
             'Error: '+$!.to_s
           end
       elsif attrib = accessor.to_s.match(/(\w+)_link$/).try(:[], 1)
         # TODO: only works with non-namespaced routes
-        value = helpers.link_to item.send(attrib), helpers.resource_path(item)
+        value = helpers.link_to item.send(attrib), resource_path(item)
       elsif attrib = accessor.to_s.match(/(\w+)_in_words/).try(:[], 1)
         value = item.send(attrib) ? (helpers.time_ago_in_words(item.send(attrib))+' ago') : 'never'
       else

data/app/components/express_admin/v_box.rb

@@ -0,0 +1,10 @@
+module ExpressAdmin
+  class VBox < LayoutComponent
+
+    emits -> (contents) {
+      div(container_div_attributes) {
+        contents.call(self) if contents
+      }
+    }
+  end
+end

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

@@ -2,7 +2,7 @@
 html {
   head {
     title { title_content }
-    meta(name: "description", content: "#{description_meta_content}")
+    meta(name: "description", content: "#{helpers.description_meta_content}")
     meta(name: "viewport", content: "width=device-width, initial-scale=1.0")
     admin_javascript_and_css_includes
     yield(:page_css)

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

@@ -7,8 +7,11 @@ nav(class: 'top-bar') {
         }
       }
       mega_menu_component
-      li { link_to 'View Site', '/', target: '_blank' }
-      li { flash_message_component }
+      li {
+        icon_link(icon_name: 'android-open', text: 'View Site', href: '/', target: '_blank')
+      }
+      render(partial: 'shared/nav_bar_actions')
+      li { flash_message_component } unless helpers.flash.empty?
     }
   }
   div(class: 'secondary-menu') {
@@ -16,7 +19,7 @@ nav(class: 'top-bar') {
       li {
         a {
           current_user_gravatar
-            span {'Profile' }
+          span {'Profile' }
         }
         sign_in_or_sign_out
       }

data/config/initializers/request_store_current_user.rb

@@ -0,0 +1,9 @@
+class ApplicationController < ActionController::Base
+
+  if defined? Devise
+    before_filter do
+      RequestStore[:current_user] = current_user
+    end
+  end
+
+end

data/lib/express_admin/routes.rb

@@ -0,0 +1,17 @@
+module ExpressAdmin
+  class Routes
+    def self.register(&block)
+      registered_route_blocks << block
+    end
+
+    def self.registered_route_blocks
+      @blocks ||= []
+    end
+
+    def self.draw(application_routes)
+      registered_route_blocks.each do |route_block|
+        application_routes.instance_eval(&route_block)
+      end
+    end
+  end
+end

data/lib/express_admin/version.rb

@@ -1,3 +1,3 @@
 module ExpressAdmin
-  VERSION = "1.3.0"
+  VERSION = "1.3.1"
 end

data/lib/express_admin.rb

@@ -1,5 +1,6 @@
 require File.join(File.dirname(__FILE__), "core_extensions/string_promptify")
 require "express_admin/engine"
+require "express_admin/routes"
 
 module ExpressAdmin
 end

data/lib/generators/express_admin/install/install_generator.rb

@@ -21,7 +21,7 @@ module ExpressAdmin
 
       def create_admin_controller
         template 'controllers/admin_controller.rb.erb',
-          File.join('app/controllers', @project_name, 'admin', 'admin_controller.rb')
+          File.join('app/controllers', @project_name, 'admin_controller.rb')
       end
 
       def create_admin_layout

data/lib/generators/express_admin/install/templates/controllers/admin_controller.rb.erb

@@ -1,34 +1,32 @@
 require_dependency "application_controller"
 
 module <%= project_class %>
-  module Admin
-    class AdminController < ApplicationController
-      inherit_resources  # Use inherited_resources
+  class AdminController < ApplicationController
+    inherit_resources  # Use inherited_resources
 
-      helper ::ExpressAdmin::AdminHelper
-      before_filter :authenticate_user! if defined?(Devise)
-      layout "<%= project_name %>/admin"
+    helper ::ExpressAdmin::AdminHelper
+    before_filter :authenticate_user! if defined?(Devise)
+    layout "<%= project_name %>/admin"
 
-      before_filter :load_collection, only: [:show]
-      before_filter :build_new_resource, only: [:index]
+    before_filter :load_collection, only: [:show]
+    before_filter :build_new_resource, only: [:index]
 
-      def show
-        show! do |format|
-          format.html { render :index }
-        end
+    def show
+      show! do |format|
+        format.html { render :index }
       end
+    end
 
-      private
+    private
 
-        def load_collection
-          collection # from InheritedResources
-        end
+      def load_collection
+        collection # from InheritedResources
+      end
 
-        def build_new_resource
-          @resource_params = {}
-          build_resource
-        end
+      def build_new_resource
+        @resource_params = {}
+        build_resource
+      end
 
-    end
   end
 end

data/lib/generators/express_admin/scaffold/scaffold_generator.rb

@@ -20,7 +20,7 @@ module ExpressAdmin
       end
 
       def generate_controller
-        controller_file_path = File.join(["app/controllers", project_name, admin_controller_path, "#{controller_file_name}_controller.rb"].compact)
+        controller_file_path = File.join(["app/controllers", project_name, "#{controller_file_name}_controller.rb"].compact)
         template "controller/controller.rb", controller_file_path
       end
 
@@ -30,23 +30,9 @@ module ExpressAdmin
           inject_into_file 'config/routes.rb', "        resources :#{controller_file_name}\n",
             after: "scope '#{project_path}' do\n"
         else
-          # this whole thing needs reworking for admin controllers
-          # in applications
-          if module_name # <-- should be namespaced?
-            admin_route = <<-EOD
-  namespace :admin do
-    scope '#{module_name}' do
-      resources :#{controller_file_name}, except: [:edit]
-    end
-  end
-EOD
-          else
-            admin_route = <<-EOD
-  namespace :admin do
-    resources :#{controller_file_name}, except: [:edit]
-  end
+          admin_route = <<-EOD
+  resources :#{controller_file_name}, except: [:edit]
 EOD
-          end
           inject_into_file 'config/routes.rb', admin_route,
             after: "#{namespaced?}::Engine.routes.draw do\n"
         end
@@ -54,7 +40,7 @@ EOD
 
       def add_menu_item
         path = if namespaced?
-          "#{namespaced?.to_s.underscore}.#{project_name}_admin_#{controller_file_name}_path"
+          "#{controller_file_name}_path"
         else
           "admin_#{controller_file_name}_path"
         end
@@ -95,17 +81,6 @@ menu_entry = %Q(
           controller_class_path.last if controller_class_path.size.eql?(2)
         end
 
-        def admin_controller_path
-          # place the generated controller into an Admin module
-          acp = controller_class_path.dup
-          if acp.empty?
-            acp.push 'admin'
-          else
-            acp.insert(1,'admin').compact.slice(1..-1)
-          end
-          File.join acp
-        end
-
         def model_class_name
           class_path_parts = class_name.split("::")
           class_path_parts.unshift namespace.to_s if namespaced?
@@ -113,7 +88,7 @@ menu_entry = %Q(
         end
 
         def admin_view_path
-          path_parts = ["app/views", project_name, admin_controller_path, controller_file_name]
+          path_parts = ["app/views", project_name, controller_file_name]
           File.join path_parts.compact
         end
 

data/lib/generators/express_admin/scaffold/templates/controller/controller.rb

@@ -1,14 +1,12 @@
 <% module_namespacing do -%>
-module Admin
-  class <%= controller_class_name %>Controller < AdminController
+class <%= controller_class_name %>Controller < AdminController
 
-    defaults resource_class: <%= model_class_name %>
+  defaults resource_class: <%= model_class_name %>
 
-    private
+  private
 
-      def <%= singular_table_name %>_params
-        params.require(:<%= singular_table_name %>).permit!
-      end
-  end
+    def <%= singular_table_name %>_params
+      params.require(:<%= singular_table_name %>).permit!
+    end
 end
 <% end -%>

data/lib/generators/express_admin/scaffold/templates/index.html.et.erb

@@ -1,10 +1,8 @@
-row {
-  main_region {
-    smart_table(:<%= plural_table_name %>, show_on_click: true)
-  }
-  sidebar_region {
-    widget_box(:<%= singular_table_name %>) {
-      smart_form(:<%= singular_table_name %>)
-    }
+main_region {
+  smart_table(:<%= plural_table_name %>)
+}
+sidebar_region {
+  widget_box(:<%= singular_table_name %>) {
+    smart_form(:<%= singular_table_name %>)
   }
 }