express_admin 1.4.8 → 1.4.9

data/app/assets/javascripts/express_admin/admin.js.coffee

@@ -1,3 +1,37 @@
+class AceInput
+  constructor: (editor)->
+    @editor   = ace.edit(editor)
+    @editor.$blockScrolling = Infinity
+    @session  = @editor.getSession()
+    @renderer = @editor.renderer
+    @textarea = $("##{$(editor).data('target')}")
+    @setOptions()
+    @updateMode()
+    @updateTheme()
+    @bindTextarea()
+    @editor.setFontSize "16px"
+
+  setOptions: =>
+    @renderer.setShowPrintMargin false
+    @renderer.setHScrollBarAlwaysVisible false
+    @session.setUseWorker false
+    @session.setTabSize 2
+    @session.setUseSoftTabs true
+    @session.setFoldStyle "markbeginend"
+
+  updateMode: =>
+    mode = require("ace/mode/ruby").Mode
+    @session.setMode new mode()
+
+  updateTheme: =>
+    @editor.setTheme require("ace/theme/github")
+
+  bindTextarea: =>
+    ace = @
+    ace.session.setValue ace.textarea.val()
+    ace.session.on "change", ->
+      ace.textarea.val ace.session.getValue()
+
 $(document).ready ->
   $('.select2').select2()
   # Table Row as links
@@ -19,6 +53,8 @@ $(document).ready ->
     e.preventDefault()
     $('a.close-reveal-modal').trigger 'click'
     return
+  $('.ace-input').each (index)->
+    editor = new AceInput(this)
 
 String::repeat = (num) ->
   new Array(num + 1).join this

data/app/assets/javascripts/express_admin.js

@@ -1,6 +1,11 @@
 //= require jquery
 //= require jquery_ujs
+//= require jquery-ui/sortable
 //= require jquery.loadingdotdotdot
 //= require tinymce-jquery
 //= require select2
+//= require ace/ace
+//= require ace/worker-html
+//= require ace/mode-ruby
+//= require ace/theme-github
 //= require_tree .

data/app/components/express_admin/nav_bar_actions.rb

@@ -1,5 +1,7 @@
 module ExpressAdmin
   class NavBarActions < ExpressTemplates::Components::Base
+    tag :li
+
     contains -> {
       render(partial: 'shared/nav_bar_actions') rescue nil
     }

data/app/components/express_admin/smart_form.rb

@@ -48,7 +48,15 @@ module ExpressAdmin
           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
+          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

data/app/components/express_admin/smart_table.rb

@@ -12,14 +12,24 @@ module ExpressAdmin
     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)} }
+                           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]
+                         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 {
@@ -100,29 +110,29 @@ module ExpressAdmin
     end
 
     def cell_value(item, accessor)
-      if accessor.respond_to?(:call)
-        value = begin
-            accessor.call(item).html_safe
-          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), 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
-        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 = 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).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
+
+                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
 

data/lib/express_admin/engine.rb

@@ -1,7 +1,9 @@
 require 'express_admin/menu'
 require 'express_admin/version'
+require 'express_admin/standard_actions'
 require 'express_templates'
 require 'jquery-rails'
+require 'jquery-ui-rails'
 require 'select2-rails'
 require 'foundation_apps_styles'
 require 'bourbon'

data/lib/express_admin/standard_actions.rb

@@ -220,15 +220,15 @@ module ExpressAdmin
             # TODO: optimize
             parent_id = extract_path_info_from_routes["#{parent_name}_id".to_sym]
             current_parent = "current_#{parent_name}".to_sym
-            unless self.respond_to?(current_parent)
+            unless self.methods.include?(current_parent)
               if previous_parent.nil?
                 self.class_eval do
                   define_method(current_parent) do
                     parent_class = parent_module_name.constantize
-                    current_class_name = parent_name.capitalize
+                    current_class_name = parent_name.camelize
                     current_class = parent_class.const_defined?(current_class_name) ?
                       parent_class.const_get(current_class_name) :
-                      "::#{parent_name.capitalize}".constantize
+                      "::#{parent_name.camelize}".constantize
                     current_class.find(parent_id)
                   end
                 end
@@ -266,13 +266,13 @@ module ExpressAdmin
             next unless engine_route
             path_for_engine = request.path.gsub(%r(^#{engine_route.path.spec.to_s}), "")
             begin
-              recognized_path = engine_instance.routes.recognize_path(path_for_engine, method: request.method)
+              recognized_path = engine_instance.routes.recognize_path(path_for_engine)
             rescue ActionController::RoutingError => e
             end
           end
           if recognized_path.nil?
             begin
-              recognized_path = Rails.application.routes.recognize_path(request.path, method: request.method)
+              recognized_path = Rails.application.routes.recognize_path(request.path)
             rescue ActionController::RoutingError => e
             end
           end

data/lib/express_admin/version.rb

@@ -1,3 +1,3 @@
 module ExpressAdmin
-  VERSION = "1.4.8"
+  VERSION = "1.4.9"
 end

data/test/dummy/test/components/definition_list_test.rb

@@ -5,7 +5,7 @@ module ExpressAdmin
   class DefinitionListTest < ActiveSupport::TestCase
 
     def assigns
-    	{list_types: list_types}
+      {list_types: list_types}
     end
 
     def helpers
@@ -13,21 +13,21 @@ module ExpressAdmin
     end
 
     def list_types
-    	@list_types ||= OpenStruct.new(
-    		array: ["field1", "field2"],
-    		hash: {term1: "def1",
-          		 term2: "def2",
-          		 term3: "def3"})
-    end	
+      @list_types ||= OpenStruct.new(
+        array: ["field1", "field2"],
+        hash: {term1: "def1",
+               term2: "def2",
+               term3: "def3"})
+    end
 
     def deflist(*args)
-    	arbre {
-    		definition_list(:deflist, *args)
-    	}.to_s
+      arbre {
+        definition_list(:deflist, *args)
+      }.to_s
     end
 
     test "accepts array as input" do
-    	assert deflist(list_types[:array])
+      assert deflist(list_types[:array])
     end
 
     test "accepts hash as input" do
@@ -64,8 +64,8 @@ HTML
 
     test "definition_list renders correct markup with array input" do
       assert_equal DEFLIST_MARKUP_ARR, deflist(list_types[:array])
-    end 
+    end
 
   end
 
-end
+end

data/test/dummy/test/components/icon_link_test.rb

@@ -4,74 +4,74 @@ module ExpressAdmin
 
   class IconLinkTest < ActiveSupport::TestCase
 
-  	def assigns
-  		{resource: resource}
-  	end
-
-  	def resource
-  		@resource ||= OpenStruct.new(
-  		text: 'Beer',
-  		title: 'beer icon',
-  		target: '_blank',
-  		right: true,
-  		delete: true,
-  		confirm: true,
-  		href: 'http://something.com'
-  		)
-  	end
-
-  	def helpers
+    def assigns
+      {resource: resource}
+    end
+
+    def resource
+      @resource ||= OpenStruct.new(
+      text: 'Beer',
+      title: 'beer icon',
+      target: '_blank',
+      right: true,
+      delete: true,
+      confirm: true,
+      href: 'http://something.com'
+      )
+    end
+
+    def helpers
       mock_action_view(assigns)
     end
 
-  	def rendered_icon_link(*args)
-  		arbre {
-  		 icon_link(:beer, *args)	
-  		}.to_s
-  	end
+    def rendered_icon_link(*args)
+      arbre {
+       icon_link(:beer, *args)
+      }.to_s
+    end
 
-		test "renders" do 
-			assert rendered_icon_link
-		end
+    test "renders" do
+      assert rendered_icon_link
+    end
 
-		test "icon link href default is set to #" do
-			assert_match /href="#"/, rendered_icon_link
-		end
+    test "icon link href default is set to #" do
+      assert_match /href="#"/, rendered_icon_link
+    end
 
-		test "icon-link target set to blank" do
-			# binding.pry
-			assert_match /target="_blank"/, rendered_icon_link(target: "#{resource[:target]}")
-		end
+    test "icon-link target set to blank" do
+      # binding.pry
+      assert_match /target="_blank"/, rendered_icon_link(target: "#{resource[:target]}")
+    end
 
-		test "delete attribute is true" do
-			assert_match /data-delete="true"/, rendered_icon_link(delete: resource[:delete])
-		end
+    test "delete attribute is true" do
+      assert_match /data-delete="true"/, rendered_icon_link(delete: resource[:delete])
+    end
 
-		test "confirm attribute is true" do
-			assert_match /data-confirm="true"/, rendered_icon_link(confirm: resource[:confirm])
-		end
+    test "confirm attribute is true" do
+      assert_match /data-confirm="true"/, rendered_icon_link(confirm: resource[:confirm])
+    end
 
-		test "icon link has title set" do
-			assert_match /title="beer icon"/, rendered_icon_link(title: "#{resource[:title]}")
-		end
+    test "icon link has title set" do
+      assert_match /title="beer icon"/, rendered_icon_link(title: "#{resource[:title]}")
+    end
 
-		test "icon link has accompanying text" do
-			assert_match /i>\nBeer<\/a>/, rendered_icon_link(text: "#{resource[:text]}")
-		end	
+    test "icon link has accompanying text" do
+      assert_match /i>\nBeer<\/a>/, rendered_icon_link(text: "#{resource[:text]}")
+    end
 
-		test "icon link has link set" do
-			assert_match /href="#{resource[:href]}"/, rendered_icon_link(href: "#{resource[:href]}")			
-		end
+    test "icon link has link set" do
+      assert_match /href="#{resource[:href]}"/, rendered_icon_link(href: "#{resource[:href]}")
+    end
 
-		MARKUP_RIGHT = <<-HTML
+    MARKUP_RIGHT = <<-HTML
 <a class="icon-link" href="#">
 Beer  <i class="icon ion-beer"></i>
 </a>
 HTML
 
-		test "if icon-link is set to right" do
-			assert_equal MARKUP_RIGHT, rendered_icon_link(text: "#{resource[:text]}", right: "#{resource[:right]}")
-		end
+    test "if icon-link is set to right" do
+      assert_equal MARKUP_RIGHT, rendered_icon_link(text: "#{resource[:text]}", right: "#{resource[:right]}")
+    end
 
   end
-end
+end

data/test/dummy/test/components/icon_test.rb

@@ -24,8 +24,8 @@ module Components
 
     test "accepts symbol as input for icon name as id" do
       assert_match /i class="icon ion-beer"/, rendered_icon(:beer)
-    end    
+    end
 
   end
 
-end
+end

data/test/dummy/test/components/mega_menu_test.rb

@@ -29,12 +29,12 @@ module ExpressAdmin
 
     test "renders" do
       assert rendered_mega_menu
-    end	
+    end
 
     test "links menu to eval'd path" do
       assert_match /href="evaled_path"/, rendered_mega_menu
       assert_match /href="some_path"/, rendered_mega_menu
-    end 
+    end
 
     test "replaces whitespace in menu title to underscore for icon class" do
       assert_match /icon-express_big_menu/, rendered_mega_menu

data/test/dummy/test/components/module_sidebar_test.rb

@@ -3,7 +3,7 @@ require 'test_helper'
 module Components
 
   class ModuleSidebarTest < ActiveSupport::TestCase
-   
+
     class MenuItem
       attr_accessor :title, :path, :items
 
@@ -21,7 +21,7 @@ module Components
     end
 
     def assigns
-      { current_menu: current_menu, 
+      { current_menu: current_menu,
         current_menu_name: current_menu_name,
         foo_path: 'foo',
         bar_path: 'bar',
@@ -53,4 +53,4 @@ module Components
     end
 
   end
-end
+end

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

@@ -1,7 +1,6 @@
 require 'test_helper'
 
 module Components
-
   class SmartTableTest < ActiveSupport::TestCase
 
     fixtures :widgets, :categories
@@ -24,17 +23,17 @@ module Components
       }
     end
 
-    test "should have hidden columns" do
+    test 'should have hidden columns' do
       assert_match 'more-columns-indicator', compiled_widget_table
       assert_no_match 'column7', compiled_widget_table
     end
 
-    test "iterates over collection setting table row id correctly" do
+    test 'iterates over collection setting table row id correctly' do
       assert_match 'widget:298486374', compiled_widget_table
       assert_match 'widget:980190962', compiled_widget_table
     end
 
-    test "renders cell contents" do
+    test 'renders cell contents' do
       assert_match '<td class="column2">Hammer</td>', compiled_widget_table
     end
 
@@ -43,24 +42,24 @@ module Components
     #   assert_match /\{\{\(widget.column3\).to_s.truncate\(27\)\}\}/, compiled_widget_table
     # end
 
-    test "table cell shows related item name or display name" do
+    test 'table cell shows related item name or display name' do
       # note this will move to a helper that will intelligently look
       # for decorated methods such as name or display_name
       assert_match '<td class="category_id">Toys</td>', compiled_widget_table
       assert_match '<td class="category_id">Tools</td>', compiled_widget_table
     end
 
-    test "table displays only columns specified if columns option provided" do
+    test 'table displays only columns specified if columns option provided' do
       compiled = compiled_widget_table(columns: [:column3, :column4])
       assert_match 'column3', compiled
-      assert_match 'column3', compiled
+      assert_match 'column4', compiled
       refute_match 'column2', compiled
       refute_match 'category_id', compiled
       refute_match 'column5', compiled
       refute_match 'column6', compiled
     end
 
-    test "table column titles may be customized" do
+    test 'table column titles may be customized' do
       compiled = compiled_widget_table(columns: {"Column3 is the Best" => :column3})
       assert_match /<th class="column3">Column3 is the Best/, compiled
     end
@@ -78,15 +77,15 @@ module Components
       assert_match 'Error', compiled_widget_table_with_proc_column
     end
 
-    test "table cell contains result of proc.call if no exception is raised" do
+    test 'table cell contains result of proc.call if no exception is raised' do
       assert_match 'LEGO', compiled_widget_table_with_proc_column
     end
 
-    test "table cell class is valid when proc is used" do
+    test 'table cell class is valid when proc is used' do
       assert_match 'class="this_column_will_error"', compiled_widget_table_with_proc_column
     end
 
-    test "attribute accessor appended with _link generates a link" do
+    test 'attribute accessor appended with _link generates a link' do
       fragment = arbre {
           smart_table(:widgets, columns: {
               'A link column' => :column3_link
@@ -95,7 +94,7 @@ module Components
       assert_match /column3.*href="\/widgets\/(\d+)/, fragment
     end
 
-    test "timestamp accessor appeneded with _in_words generates code that uses time_ago_in_words" do
+    test 'timestamp accessor appeneded with _in_words generates code that uses time_ago_in_words' do
       fragment = arbre {
           smart_table(:widgets, columns: {
               'Created' => :created_at_in_words

data/test/test_helper.rb

@@ -74,4 +74,4 @@ module ActiveSupport
       view
     end
   end
-end
+end

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

@@ -60,10 +60,14 @@ module ExpressTemplates
 
         def options_from_supplied_or_field_values
           if select_options_supplied?
-            helpers.options_for_select(
-                normalize_for_helper(use_supplied_options),
-                selected_value
-            )
+            supplied_options = use_supplied_options
+            if supplied_options.respond_to?(:map)
+              helpers.options_for_select(
+                  normalize_for_helper(supplied_options),
+                  selected_value)
+            else
+              supplied_options
+            end
           else
             generate_options_from_field_values
           end

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

@@ -42,16 +42,25 @@ module ExpressTemplates
       tag :ul
 
       has_attributes :class => 'tree'
+      has_option :root, "Root of the tree.  Defaults to collection with the same as the id.", type: :proc
 
       contains -> (&customize_block) {
         @customize_block = customize_block
-        list_items(send(config[:id]))
+        list_items(root_node)
       }
 
       before_build -> {
         add_class config[:id]
       }
 
+      def root_node
+        if config[:root] && config[:root].respond_to?(:call)
+          config[:root].call
+        else
+          send(config[:id])
+        end
+      end
+
       def list_items(nodes)
         nodes.each do |node|
           list_item(node)

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

@@ -1,3 +1,3 @@
 module ExpressTemplates
-  VERSION = "0.9.7"
+  VERSION = "0.9.8"
 end