express_admin 1.7.26 → 1.7.27

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 997e0b7b334817dc76efd76805c325b81c93f5e2
-  data.tar.gz: ed78a8471ebbad6147f00c27dfaa535aa23ca577
+  metadata.gz: d1a10bf410c0e2d08756531f963dd722c22b328f
+  data.tar.gz: 15b6feeef65c8452edf48d4d9b60386556b40ebc
 SHA512:
-  metadata.gz: 62c247411891b79fc02576251dac34a8824e14e2c096ee183d16253fde0eb8198a596cb860b1cd2b3cc231a2b39a26262e955803960ac03ae0df59bc7cbe05d0
-  data.tar.gz: 58363ee6be8f1035361032868b8dab0134fb50a705ec5966d7cbc29a98c0326020cf264979e28da5f75275d1646e96aed4bf99a3d3f61be11f6078bcf83bb084
+  metadata.gz: e7d81d053ca6c36ef11dd11396fc2c2309c192278377a1f57a838d788d0fa9bcff49ad216743ca944e9be22459c24f5dc8ada0ace2f6e280d667daa72117c83a
+  data.tar.gz: 4c67126e638192e99a320e6bd153d0286c8952dd8e1a6289e4993c6f72efd8c2b17ecb2bc7259a8deda51c620ba185aec44d9aff823ce7fce1ee503429ffac41

data/app/assets/stylesheets/express_admin/components/_image.sass

@@ -0,0 +1,4 @@
+.image-thumbnail
+  height: 5em
+  border: 2px solid #CCC
+  box-shadow: 1px 2px 1px -1px rgba(0, 0, 0, 0.18)

data/app/assets/stylesheets/express_admin/components/_label.sass

@@ -0,0 +1,8 @@
+.label
+  text-transform: capitalize
+
+.label-rounded
+  border-radius: 3px
+
+.label-strong
+  font-weight: 700

data/app/assets/stylesheets/express_admin/components/_smart_table.sass

@@ -1,4 +1,6 @@
 .smart-table
-  
+  margin:
+    bottom: 1rem
+
   .smart-table-button
     margin: 0

data/app/assets/stylesheets/express_admin/screen.sass

@@ -23,6 +23,8 @@
 @import 'components/v_box'
 @import 'components/h_box'
 @import 'components/smart_table'
+@import 'components/label'
+@import 'components/image'
 
 @import 'shared/media_object'
 @import 'shared/breadcrumbs'

data/app/assets/stylesheets/express_admin/shared/_forms.sass

@@ -3,7 +3,7 @@
     bottom: 1rem
 
   textarea
-    resize: none
+    min-height: 6rem
 
   select[multiple]
     height: 6rem

data/app/components/express_admin/definition_list.rb

@@ -3,10 +3,7 @@ module ExpressAdmin
     module Presenters
       class DefinitionList < ExpressTemplates::Components::Configurable
         include ExpressTemplates::Components::Capabilities::Resourceful
-
-        COLUMN_REGEX_LIST = {
-          in_words: /(\w+)_in_words/
-        }
+        include ExpressAdmin::Components::Presenters::Helper
 
         tag :dl
 
@@ -36,16 +33,8 @@ module ExpressAdmin
         def definitions_from_hash(hash)
           processed = hash.map do |k,v|
             value =
-              if attrib = v.to_s.match(COLUMN_REGEX_LIST[:in_words]).try(:[], 1)
-                if resource.send(attrib)
-                  if resource.send(attrib) < DateTime.now
-                    "#{helpers.time_ago_in_words(resource.send(attrib))} ago"
-                  else
-                    "in #{helpers.time_ago_in_words(resource.send(attrib))}"
-                  end
-                else
-                  'never'
-                end
+              if words?(v)
+                make_in_words(resource, v)
               elsif v.kind_of? Symbol
                 resource.send(v)
               elsif v.respond_to?(:call)

data/app/components/express_admin/error_message.rb

@@ -0,0 +1,29 @@
+module ExpressAdmin
+  class ErrorMessage < ExpressTemplates::Components::Configurable
+
+    has_option :display, 'Display the error message, by default it is hidden', type: :boolean, default: false
+    has_option :title, 'Title of the error message component', type: :string
+    has_option :messages, 'List of error messages', type: :array
+    has_option :status, type: :string
+
+    contains -> {
+      if config[:display]
+        div(class: "card #{config[:status]}") {
+          div(class: 'card-divider') {
+            strong {
+              text_node config[:title]
+            }
+          }
+
+          div(class: 'card-section') {
+            ul {
+              config[:messages].each do |message|
+                li { text_node message }
+              end
+            }
+          }
+        }
+      end
+    }
+  end
+end

data/app/components/express_admin/helpers/presenters_helper.rb

@@ -0,0 +1,68 @@
+module ExpressAdmin
+  module Components
+    module Presenters
+      module Helper
+        COLUMN_REGEX_LIST = {
+          link: /(\w+)_link$/,
+          checkmark: /(\w+)_checkmark/,
+          in_words: /(\w+)_in_words/
+        }
+
+        def link(accessor)
+          accessor_match(accessor, COLUMN_REGEX_LIST[:link])
+        end
+
+        def checkmark(accessor)
+          accessor_match(accessor, COLUMN_REGEX_LIST[:checkmark])
+        end
+
+        def words(accessor)
+          accessor_match(accessor, COLUMN_REGEX_LIST[:in_words])
+        end
+
+        def accessor_match(accessor, regex)
+          accessor.to_s.match(regex).try(:[], 1)
+        end
+
+        def link?(accessor)
+          link(accessor).present?
+        end
+
+        def checkmark?(accessor)
+          checkmark(accessor).present?
+        end
+
+        def words?(accessor)
+          words(accessor).present?
+        end
+
+        def make_link(item, accessor)
+          # TODO: only works with non-namespaced routes
+          attrib = link(accessor)
+          if item.send(attrib).present?
+            helpers.link_to item.send(attrib), resource_path(item)
+          end
+        end
+
+        def make_checkmark(item, accessor)
+          attrib = checkmark(accessor)
+          "<i class='ion-checkmark-round'></i>".html_safe if item.send(attrib)
+        end
+
+        def make_in_words(item, accessor)
+          attrib = words(accessor)
+          if item.send(attrib)
+            if item.send(attrib) < DateTime.now
+              "#{helpers.time_ago_in_words(item.send(attrib))} ago"
+            else
+              "in #{helpers.time_ago_in_words(item.send(attrib))}"
+            end
+          else
+            'never'
+          end
+        end
+
+      end
+    end
+  end
+end

data/app/components/express_admin/smart_table.rb

@@ -3,21 +3,18 @@ module ExpressAdmin
     module Presenters
       class SmartTable < ExpressTemplates::Components::Configurable
         include ExpressTemplates::Components::Capabilities::Resourceful
+        include ExpressAdmin::Components::Presenters::Helper
 
         tag :div
 
         MAX_COLS_TO_SHOW_IDX = 5
         MAX_ROWS_TO_SHOW_IDX = 10
-        COLUMN_REGEX_LIST = {
-          link: /(\w+)_link$/,
-          checkmark: /(\w+)_checkmark/,
-          in_words: /(\w+)_in_words/
-        }
 
         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 :show_search, 'Show search form of smart table, it is true by default', type: :boolean, default: true
         has_option :search_action, 'The search form action containing the resource path or url.'
         has_option :row_class, 'Add a class to each table row'
 
@@ -47,13 +44,18 @@ module ExpressAdmin
         has_option :pagination, 'Add pagination to the bottom of the table', type: :string, default: 'bottom'
 
         contains -> {
+
           pagination if config[:pagination] == 'top'
-          express_form(config[:id], method: :get, action: config[:search_action]) {
-            span(class: 'inline-label') {
-              input type: 'text', name: 'search_string', placeholder: 'Type here...', value: helpers.params[:search_string]
-              submit class: 'button search', value: 'Search'
+
+          if config[:show_search]
+            express_form(config[:id], method: :get, action: config[:search_action]) {
+              span(class: 'inline-label') {
+                input type: 'text', name: 'search_string', placeholder: 'Type here...', value: helpers.params[:search_string]
+                submit class: 'button search', value: 'Search'
+              }
             }
-          }
+          end
+
           table(class: table_classes) {
             thead {
               tr {
@@ -182,41 +184,31 @@ module ExpressAdmin
         end
 
         def cell_value(item, accessor)
-          value = if accessor.respond_to?(:call)
-                    begin
-                      accessor.call(item).to_s.html_safe
-                    rescue
-                      'Error: '+$!.to_s
-                    end
-                  elsif attrib = accessor.to_s.match(COLUMN_REGEX_LIST[:link]).try(:[], 1)
-                    # TODO: only works with non-namespaced routes
-                    if item.send(attrib).present?
-                      helpers.link_to item.send(attrib), resource_path(item)
-                    end
-                  elsif attrib = accessor.to_s.match(COLUMN_REGEX_LIST[:checkmark]).try(:[], 1)
-                    "<i class='ion-checkmark-round'></i>".html_safe if item.send(attrib)
-                  elsif attrib = accessor.to_s.match(COLUMN_REGEX_LIST[:in_words]).try(:[], 1)
-                    if item.send(attrib)
-                      if item.send(attrib) < DateTime.now
-                        "#{helpers.time_ago_in_words(item.send(attrib))} ago"
-                      else
-                        "in #{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
+          value =
+            if accessor.respond_to?(:call)
+              begin
+                accessor.call(item).to_s.html_safe
+              rescue
+                'Error: '+$!.to_s
+              end
+            elsif link?(accessor)
+              make_link(item, accessor)
+            elsif checkmark?(accessor)
+              make_checkmark(item, accessor)
+            elsif words?(accessor)
+              make_in_words(item, accessor)
+            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
 
@@ -229,6 +221,7 @@ module ExpressAdmin
         end
 
         class Column
+          include ExpressAdmin::Components::Presenters::Helper
           attr :name, :title, :accessor, :table_column
           def initialize(accessor, title = nil)
             @name = accessor.kind_of?(Symbol) ? accessor.to_s.underscore : title.titleize.gsub(/\s+/,'').underscore
@@ -240,14 +233,10 @@ module ExpressAdmin
           def table_column
             if accessor.kind_of?(Symbol)
               COLUMN_REGEX_LIST.map do |key, value|
-                accessor_match(COLUMN_REGEX_LIST[key])
+                accessor_match(accessor, COLUMN_REGEX_LIST[key])
               end.compact.first
             end
           end
-
-          def accessor_match(regex)
-            accessor.to_s.match(regex).try(:[], 1)
-          end
         end
 
         def specified_columns?

data/lib/express_admin/engine.rb

@@ -15,8 +15,11 @@ require 'responders'
 require 'tinymce-rails'
 require 'textacular'
 
-require File.join(File.dirname(__FILE__), '..', '..', 'app', 'components', 'express_admin', 'definition_list')
+# helpers for the components
+helpers = Dir.glob(File.join(File.dirname(__FILE__), '..', '..', 'app', 'components', 'express_admin', 'helpers', '*.rb'))
+helpers.each {|helper| require helper }
 
+require File.join(File.dirname(__FILE__), '..', '..', 'app', 'components', 'express_admin', 'definition_list')
 # should be a way to add this folder to rails' autoload paths
 components = Dir.glob(File.join(File.dirname(__FILE__), '..', '..', 'app', 'components', '**', '*.rb'))
 components.sort!

data/lib/express_admin/version.rb

@@ -1,3 +1,3 @@
 module ExpressAdmin
-  VERSION = "1.7.26"
+  VERSION = "1.7.27"
 end

data/test/dummy/test/components/error_message_test.rb

@@ -0,0 +1,24 @@
+require 'test_helper'
+
+
+module Components
+  class ErrorMessageTest < ActiveSupport::TestCase
+    def render_error_message
+      arbre {
+        error_message(
+          display: true,
+          title: 'Sample Title',
+          messages: ["An error message", "Another error message"],
+          status: 'alert'
+        )
+      }
+    end
+
+    test "render error message" do
+      assert_match '<strong>Sample Title</strong>', render_error_message
+      assert_match '<div class="card alert">', render_error_message
+      assert_match '<li>An error message</li>', render_error_message
+      assert_match '<li>Another error message</li>', render_error_message
+    end
+  end
+end

data/test/dummy/test/components/smart_table_test.rb

@@ -109,6 +109,16 @@ module Components
       assert_match /class="created_at.*less than a minute ago/, fragment
     end
 
+    test 'set show_search to false to hide the search form' do
+      fragment = arbre(widget: Widget.first, widgets: Widget.all){
+        smart_table(:widgets, show_search: false, columns: {
+            'Created' => :created_at_in_words
+        })
+      }
+
+      assert_no_match '<input type="submit" name="commit" value="Search" class="button search">', fragment
+    end
+
     test 'assign column to be sortable which generates a header link' do
       fragment = arbre(widget: Widget.first, widgets: Widget.all){
         smart_table(:widgets,

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: express_admin
 version: !ruby/object:Gem::Version
-  version: 1.7.26
+  version: 1.7.27
 platform: ruby
 authors:
 - Steven Talcott Smith
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-12-14 00:00:00.000000000 Z
+date: 2016-01-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: express_templates
@@ -400,6 +400,8 @@ files:
 - app/assets/stylesheets/express_admin/components/_definition.sass
 - app/assets/stylesheets/express_admin/components/_empty_state.sass
 - app/assets/stylesheets/express_admin/components/_h_box.sass
+- app/assets/stylesheets/express_admin/components/_image.sass
+- app/assets/stylesheets/express_admin/components/_label.sass
 - app/assets/stylesheets/express_admin/components/_main_menu.sass
 - app/assets/stylesheets/express_admin/components/_module_sidebar.sass
 - app/assets/stylesheets/express_admin/components/_oauth_sign_in_links.sass
@@ -441,8 +443,10 @@ files:
 - app/components/express_admin/country_select.rb
 - app/components/express_admin/definition_list.rb
 - app/components/express_admin/definition_table.rb
+- app/components/express_admin/error_message.rb
 - app/components/express_admin/file_upload.rb
 - app/components/express_admin/flash_messages.rb
+- app/components/express_admin/helpers/presenters_helper.rb
 - app/components/express_admin/icon.rb
 - app/components/express_admin/icon_link.rb
 - app/components/express_admin/layout_component.rb
@@ -477,7 +481,6 @@ files:
 - config/initializers/gravatar_image_tag.rb
 - config/initializers/kaminari.rb
 - config/initializers/postgresql_trigram.rb
-- config/initializers/request_store_current_user.rb
 - config/initializers/tinymce-rails.rb
 - config/tinymce.yml
 - db/migrate/20150928044202_install_trigram.rb
@@ -576,6 +579,7 @@ files:
 - test/dummy/test/components/country_select_test.rb
 - test/dummy/test/components/definition_list_test.rb
 - test/dummy/test/components/definition_table_test.rb
+- test/dummy/test/components/error_message_test.rb
 - test/dummy/test/components/flash_messages_test.rb
 - test/dummy/test/components/icon_link_test.rb
 - test/dummy/test/components/icon_test.rb
@@ -643,7 +647,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.8
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: ExpressAdmin provides an admin menu framework based on Foundation.
@@ -717,6 +721,7 @@ test_files:
 - test/dummy/test/components/country_select_test.rb
 - test/dummy/test/components/definition_list_test.rb
 - test/dummy/test/components/definition_table_test.rb
+- test/dummy/test/components/error_message_test.rb
 - test/dummy/test/components/flash_messages_test.rb
 - test/dummy/test/components/icon_link_test.rb
 - test/dummy/test/components/icon_test.rb

data/config/initializers/request_store_current_user.rb

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