express_admin 1.4.4 → 1.4.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c377f1f67e51a26bd13b6ae7985fe770a5432b83
-  data.tar.gz: 355f5b80413105604d2fef666aca329deca12aae
+  metadata.gz: a4e4c3c080c9d417ad96cec7a4f482d681998e89
+  data.tar.gz: 39e8700c94d154d98d25930090d3794c81d16aa0
 SHA512:
-  metadata.gz: 5c286cd8d67e72cec5aafdd22ed52dd24b0c7dc6b70885333c62a0dacb0096ff412808231e61966f40d118177f819103666e0e7df3f6adbda117eb727033af7a
-  data.tar.gz: 791bfa6e3fad339ad7d33a5ac0060ee03f2be2eb05dee37012d1a228118cfd59c77f5cf515afcada43d772e3b247695cc2148e54bb1e8c6ea41bc66ee24ded75
+  metadata.gz: 64e004b1571753b064868e753d29035a198b079316b12745ac77d1ce2856a0030562a70fe8a34805bfdcb6eec65c1e3fbc650a13333d3dd57646c2569dbc9265
+  data.tar.gz: 886a1812ab705290b6cf3a97a242495371b46e56e8b3b6fdd1e7a8469d84e957137b33f0d2963bd6c39e127ee13571131c554d8e48bb46c05c19b167ea6a2021

data/README.md

@@ -1,6 +1,8 @@
 express_admin
 =============
 
+[![Circle CI](https://circleci.com/gh/aelogica/express_admin/tree/master.svg?style=svg&circle-token=a0d588b30ed9e468b3471462ea7fd6ad3fd89916)](https://circleci.com/gh/aelogica/express_admin/tree/master)
+
 ExpressAdmin is a common admin layout based on [Foundation](http://foundation.zurb.com). It also provides tools for creating modules for [AppExpress](http://www.appexpress.io).
 
 ![screenshot](https://cloud.githubusercontent.com/assets/5047/6912152/2b06b1d4-d79e-11e4-9765-1a0b095a3c83.png)

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

@@ -1,4 +1,4 @@
-form
+.smart-form, .express-form
   margin:
     bottom: 1rem
 
@@ -8,6 +8,19 @@ form
   select[multiple]
     height: 6rem
 
+  .error
+    border: none
+    input, select, textarea, .select2-container
+      border: 1px solid $red
+
+  .help
+    font:
+      size: 0.9em
+    padding: 1em 0
+    margin:
+      bottom: 0
+      top: 0.5em
+
 .help
   color: $gray
   font:
@@ -17,4 +30,4 @@ form
   background: #fff
   border: 1px solid #ddd
   margin: 100px 0
-  padding: 40px 20px 0 20px
+  padding: 40px 20px 0 20px

data/app/components/express_admin/definition_list.rb

@@ -21,19 +21,22 @@ module ExpressAdmin
 
     def definitions
       if config[:list].kind_of?(Array)
-        definitions_from_array(@args.first)
+        definitions_from_array(config[:list])
       elsif config[:list].kind_of?(Hash)
-        definitions_from_hash(@args.first)
+        definitions_from_hash(config[:list])
       end
     end
 
     def definitions_from_hash(hash)
       processed = hash.map do |k,v|
-        if v.kind_of? Symbol
-          [promptify(k), resource.send(v)]
+        value = if v.kind_of? Symbol
+          resource.send(v)
+        elsif v.respond_to?(:call)
+          v.call(resource).html_safe
         else
-          [promptify(k), helpers.instance_eval("(#{v.source}).call(resource).to_s").html_safe]
+          v
         end
+        [promptify(k), value]
       end
       Hash[processed]
     end

data/app/components/express_admin/smart_form.rb

@@ -4,7 +4,7 @@ module ExpressAdmin
   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 :virtual, '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'
@@ -41,6 +41,7 @@ module ExpressAdmin
                                   'datetime_select' => 'datetime',
                                   'check_box'       => 'checkbox'}
       field_type = attrib.field_type.to_s.sub(/_field$/,'')
+      field_type = "password" if attrib.name.match(/password/)
       if relation = attrib.name.match(/(\w+)_id$/).try(:[], 1)
           # TODO: should allow select2 override
           select(attrib.name.to_sym, options: config["#{relation}_collection".to_sym], select2: true)

data/app/components/express_admin/smart_table.rb

@@ -8,7 +8,7 @@ module ExpressAdmin
 
     attr :columns
 
-    has_option :scrollable, 'Set to true if the table should be scrollable'
+    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 :row_class, 'Add a class to each table row'
 
@@ -51,6 +51,7 @@ module ExpressAdmin
     }
 
     before_build -> {
+      _initialize_columns
       add_class 'table striped'
     }
 
@@ -130,7 +131,7 @@ module ExpressAdmin
     end
 
     def display_columns
-      specified_columns? ? columns : columns.slice(1..MAX_COLS_TO_SHOW_IDX)
+      specified_columns? ? @columns : @columns.slice(1..MAX_COLS_TO_SHOW_IDX)
     end
 
     def columns_hidden?
@@ -146,10 +147,6 @@ module ExpressAdmin
       end
     end
 
-    def columns
-      @columns ||= _initialize_columns
-    end
-
     def specified_columns?
       !!specified_columns
     end

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

@@ -9,7 +9,7 @@ html(lang: 'en') {
     csrf_meta_tags
   }
   body {
-    flash_message_component
+    flash_messages
     yield
   }
 }

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

@@ -1 +1 @@
-flash_message_component
+flash_messages

data/config/initializers/tinymce-rails.rb

@@ -0,0 +1 @@
+Rails.application.config.tinymce.config_path = '../tinymce.yml'

data/config/tinymce.yml

@@ -3,14 +3,16 @@ default:
   theme: 'modern'
   height: 400
   toolbar:
-    - bold italic underline strikethrough | link unlink | bullist numlist | table | nonbreaking hr | formatselect | blockquote | alignleft aligncenter alignright alignjustify | outdent indent | image media | forecolor charmap | sp
+    - bold italic underline strikethrough | link unlink | bullist numlist
+    - table | nonbreaking hr | formatselect | blockquote | alignleft aligncenter alignright alignjustify
+    - outdent indent | image media | forecolor charmap | spellchecker removeformat | pastetext searchreplace | undo redo | code | fullscreen
   relative_urls: false
   remove_script_host: false
   convert_urls: true
+  resize: false
   plugins:
     - advlist
     - anchor
-    - anchor
     - autolink
     - charmap
     - code

data/lib/express_admin/version.rb

@@ -1,3 +1,3 @@
 module ExpressAdmin
-  VERSION = "1.4.4"
+  VERSION = "1.4.5"
 end

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

@@ -0,0 +1,71 @@
+require 'test_helper'
+
+module ExpressAdmin
+
+  class DefinitionListTest < ActiveSupport::TestCase
+
+    def assigns
+    	{list_types: list_types}
+    end
+
+    def helpers
+      mock_action_view(assigns)
+    end
+
+    def list_types
+    	@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
+    end
+
+    test "accepts array as input" do
+    	assert deflist(list_types[:array])
+    end
+
+    test "accepts hash as input" do
+      assert deflist(list_types[:hash])
+    end
+
+    test "uses keys as labels and values as definitions" do
+      assert_match /<dt>Term1/, deflist(list_types[:hash])
+    end
+
+    DEFLIST_MARKUP_ARR = <<-HTML
+<dl class="definition-list" id="deflist">
+  <dt>Field1:</dt>
+  <dd>{{resource.field1}}</dd>
+  <dt>Field2:</dt>
+  <dd>{{resource.field2}}</dd>
+</dl>
+HTML
+
+    DEFLIST_MARKUP_HASH = <<-HTML
+<dl class="definition-list" id="deflist">
+  <dt>Term1:</dt>
+  <dd>def1</dd>
+  <dt>Term2:</dt>
+  <dd>def2</dd>
+  <dt>Term3:</dt>
+  <dd>def3</dd>
+</dl>
+HTML
+
+    test "definition_list renders correct markup with hash input" do
+      assert_equal DEFLIST_MARKUP_HASH, deflist(list_types[:hash])
+    end
+
+    test "definition_list renders correct markup with array input" do
+      assert_equal DEFLIST_MARKUP_ARR, deflist(list_types[:array])
+    end 
+
+  end
+
+end

data/test/dummy/test/components/definition_table_test.rb

@@ -0,0 +1,72 @@
+require 'test_helper'
+
+module ExpressAdmin
+
+  class DefinitionTableTest < ActiveSupport::TestCase
+
+    def assigns
+      {list_types: list_types}
+    end
+
+    def helpers
+      mock_action_view(assigns)
+    end
+
+    def list_types
+      @list_types ||= OpenStruct.new(
+        array: ["field1", "field2"],
+        hash: {term1: "def1",
+               term2: "def2",
+               term3: "def3"})
+    end 
+
+    def deftable(*args)
+      arbre {
+        definition_table(:deftable, *args)
+      }.to_s
+    end
+
+    DEFTABLE_MARKUP = <<-HTML
+<table class="definition-table" id="deftable">
+  <tbody>
+    <tr>
+      <th align="right">Term1:</th>
+      <td>def1</td>
+    </tr>
+    <tr>
+      <th align="right">Term2:</th>
+      <td>def2</td>
+    </tr>
+    <tr>
+      <th align="right">Term3:</th>
+      <td>def3</td>
+    </tr>
+  </tbody>
+</table>
+HTML
+
+    DEFTABLE_MARKUP_ARR = <<-HTML
+<table class="definition-table" id="deftable">
+  <tbody>
+    <tr>
+      <th align="right">Field1:</th>
+      <td>{{resource.field1}}</td>
+    </tr>
+    <tr>
+      <th align="right">Field2:</th>
+      <td>{{resource.field2}}</td>
+    </tr>
+  </tbody>
+</table>
+HTML
+
+    test "definition_table renders correct markup with hash input" do
+      assert_equal DEFTABLE_MARKUP, deftable(list_types[:hash])
+    end
+
+    test "definition_table renders correct markup with array input" do
+      assert_equal DEFTABLE_MARKUP_ARR, deftable(list_types[:array])
+    end
+
+  end
+end

data/test/dummy/test/components/flash_messages_test.rb

@@ -0,0 +1,35 @@
+require 'test_helper'
+
+module Components
+
+  class FlashMessagesTest < ActiveSupport::TestCase
+
+    def assigns
+      { flash: flash }
+    end
+
+    def flash
+      {notice: "Message"}
+    end
+
+    def helpers
+      view = mock_action_view(assigns)
+    end
+
+    def flashmsg
+      arbre {
+        flash_messages
+      }
+    end
+
+    test "renders" do
+      assert flashmsg
+    end
+
+    test "shows correct flash message" do
+      assert_match /<span>Message<\/span>/, flashmsg
+    end
+
+  end
+
+end

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

@@ -0,0 +1,77 @@
+require 'test_helper'
+
+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
+      mock_action_view(assigns)
+    end
+
+  	def rendered_icon_link(*args)
+  		arbre {
+  		 icon_link(:beer, *args)	
+  		}.to_s
+  	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 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 "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 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
+
+		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
+
+  end
+end

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

@@ -0,0 +1,31 @@
+require 'test_helper'
+
+module Components
+
+  class IconTest < ActiveSupport::TestCase
+
+    def assigns
+      {}
+    end
+
+    def helpers
+      mock_action_view(assigns)
+    end
+
+    def rendered_icon(*args)
+      arbre {
+        icon(*args)
+      }
+    end
+
+    test "accepts string as input for icon name as id" do
+      assert_match /i class="icon ion-beer"/, rendered_icon("beer")
+    end
+
+    test "accepts symbol as input for icon name as id" do
+      assert_match /i class="icon ion-beer"/, rendered_icon(:beer)
+    end    
+
+  end
+
+end

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

@@ -0,0 +1,45 @@
+require 'test_helper'
+
+module ExpressAdmin
+
+  class MegaMenuTest < ActiveSupport::TestCase
+
+    class MenuItem
+      attr_accessor :title, :path
+
+      def initialize(title, path)
+        @title = title
+        @path = path
+      end
+    end
+
+    def rendered_mega_menu
+      arbre {
+        mega_menu
+      }
+    end
+
+    def helpers
+      OpenStruct.new(
+        admin_menus: [MenuItem.new('Big Menu', 'my_path'), MenuItem.new('Foo', 'another_path')],
+        my_path: 'evaled_path',
+        another_path: 'some_path'
+      )
+    end
+
+    test "renders" do
+      assert rendered_mega_menu
+    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 
+
+    test "replaces whitespace in menu title to underscore for icon class" do
+      assert_match /icon-express_big_menu/, rendered_mega_menu
+      assert_match /icon-express_foo/, rendered_mega_menu
+    end
+  end
+end
+

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

@@ -0,0 +1,56 @@
+require 'test_helper'
+
+module Components
+
+  class ModuleSidebarTest < ActiveSupport::TestCase
+   
+    class MenuItem
+      attr_accessor :title, :path, :items
+
+      def initialize(title, path, items)
+        @title = title
+        @path = path
+        @items = items
+      end
+    end
+
+    def rendered_module_sidebar
+      arbre {
+        module_sidebar
+      }
+    end
+
+    def assigns
+      { current_menu: current_menu, 
+        current_menu_name: current_menu_name,
+        foo_path: 'foo',
+        bar_path: 'bar',
+        baz_path: 'baz'
+      }
+    end
+
+    def current_menu
+      MenuItem.new('Big Menu', 'menu_path', [
+                      MenuItem.new('Foo', 'foo_path',[]),
+                      MenuItem.new('Bar', 'bar_path', []),
+                      MenuItem.new('Baz', 'baz_path', [])])
+    end
+
+    def current_menu_name
+      current_menu.title
+    end
+
+    def helpers
+      mock_action_view(assigns)
+    end
+
+    test "renders the correct current menu name as sidebar title" do
+      assert_match /class="title">Big Menu/, rendered_module_sidebar
+    end
+
+    test "evals the correct path" do
+      assert_equal "foo", helpers.instance_eval(current_menu.items.first.path)
+    end
+
+  end
+end

data/test/dummy/test/components/widget_box_test.rb

@@ -0,0 +1,30 @@
+require 'test_helper'
+
+module ExpressAdmin
+
+  class WidgetBoxTest < ActiveSupport::TestCase
+
+    def helpers
+      mock_action_view(assigns)
+    end
+
+    def assigns
+      {resource: Widget.first}
+    end
+
+    def rendered_widget_box(*args)
+      arbre {
+        widget_box(:test, *args)
+      }
+    end
+
+    test "renders correct widget box title" do
+      assert_match /<header class="title">Edit Test/, rendered_widget_box
+    end
+
+    test "renders correct widget box title with param" do
+      assert_match /<header class="title">Widget Box/, rendered_widget_box(title: "Widget Box")
+    end
+
+  end
+end

data/vendor/gems/express_templates/Gemfile.lock

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

data/vendor/gems/express_templates/README.md

@@ -40,7 +40,7 @@ Everything should work as you would expect.
 
 Set your editor syntax for .et files to Ruby.
 
-You can now utilize components which are found with documentation and examples in <tt>ExpressTemplates::Components<tt>.
+You can now utilize components which are found with documentation and examples in <tt>ExpressTemplates::Components</tt>.
 
 Components are the real strength of both arbre and express_templates.
 

data/vendor/gems/express_templates/lib/core_extensions/proc.rb

@@ -29,7 +29,8 @@ class Proc
       tokens =  Ripper.lex File.read(file)
       tokens_on_line = tokens.select {|pos, lbl, str| pos[0].eql?(line_no) }
       starting_token = tokens_on_line.detect do |pos, lbl, str|
-          TOKEN_PAIRS.keys.include? [lbl, str]
+          TOKEN_PAIRS.keys.include?([lbl, str]) &&
+          _actually_starting_a_proc?(tokens, [pos, lbl, str])
       end
       starting_token_type = [starting_token[1], starting_token[2]]
       ending_token_type = TOKEN_PAIRS[starting_token_type]
@@ -54,6 +55,17 @@ class Proc
     end
   end
 
+  def _actually_starting_a_proc?(tokens, tok)
+    return true if tokens.index(tok).eql?(0)
+    look_back = tokens.slice(0..tokens.index(tok)-1)
+    look_back.pop if look_back.last.try(:[], 1).eql? :on_sp
+    if [:on_tlambeg, :on_tlambda].include?(tok[1])
+      true
+    else
+      ![:on_comma, :on_lparen, :on_label].include?(look_back.last.try(:[], 1))
+    end
+  end
+
   # Examines the source of a proc to extract the body by
   # removing the outermost block delimiters and any surrounding.
   # whitespace.

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

@@ -6,6 +6,7 @@ module ExpressTemplates
 
         def self.included(base)
           base.class_eval do
+            has_argument :id, "The name of the collection", type: :symbol, optional: false
             has_option :collection, 'Provide an explicit collection as a resource.'
             has_option :collection_path, 'Provide an explicit path for the collection resource.'
             has_option :resource_class, 'Overrides namespaced resource_class for using resources from a different module or namespace.'