express_admin 1.2.1 → 1.3.0

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

@@ -3,91 +3,114 @@ require 'test_helper'
 module ExpressAdmin
 
   class SmartFormTest < ActiveSupport::TestCase
-    def compiled_widget_form(*args)
-      ExpressAdmin::SmartForm.new(:widget, *args).compile
+
+    def resource_assigns
+      {resource: Widget.new, collection: Widget.all}
+    end
+    def helpers
+      view = mock_action_view(resource_assigns)
+      class << view
+        def widget_path(widget_id)
+          "/widgets/#{widget_id.to_param}"
+        end
+        alias resource_path widget_path
+        def widgets_path
+          "/widgets"
+        end
+        alias collection_path widgets_path
+        def admin_widgets_path
+          "/admin/widgets"
+        end
+      end
+      view
+    end
+
+
+    def widget_form(*args)
+      arbre {
+        smart_form(:widgets, *args)
+      }
     end
 
     test "renders a form correct id" do
-      assert_match '<form id=\"widget\"', compiled_widget_form
+      assert_match '<form id="widget"', widget_form
     end
 
     test "uses inherited_resources path helpers to set correct action" do
-      action_attrib = 'action=\"{{@widget.try(:persisted?) ? widget_path(@widget) : widgets_path}}\"'
-      assert_match action_attrib, compiled_widget_form
+      action_attrib = 'action="/widgets"'
+      assert_match action_attrib, widget_form
     end
 
     test "action path can be overridden" do
-      custom_action = '{{something_custom}}'
-      action_attrib = 'action=\"'+custom_action+'\"'
-      assert_match action_attrib, compiled_widget_form(action: custom_action)
+      custom_action = '/something_custom'
+      assert_match /action="#{custom_action}"/, widget_form(action: custom_action)
     end
 
     test "category field is a select" do
-      assert_match 'select_tag("widget[category_id]"', compiled_widget_form
+      assert_match /<select.*name="widget\[category_id\]".*class="select2"/, widget_form
     end
 
     test "string field column2 is an input" do
-      assert_match 'text_field(:widget, :column2)', compiled_widget_form
+      assert_match /<input.*type="text".*name="widget\[column2\]"/, widget_form
     end
 
     test "text field column3 is a text_area" do
-      assert_match 'text_area(:widget, :column3)', compiled_widget_form
+      assert_match /<textarea.*rows="10".*name="widget\[column3\]"/, widget_form
     end
 
     test "datetime field column4 is a datetime_field" do
-      assert_match 'datetime_field(:widget, :column4)', compiled_widget_form
+      assert_match /<input.*type="datetime".*name="widget\[column4\]"/, widget_form
     end
 
-    test "boolean field column4 is a checkbox" do
-      assert_match 'check_box(:widget, :column5, {}, "1", "0")', compiled_widget_form
+    test "boolean field column5 is a checkbox" do
+      assert_match /<input.*type="checkbox".*name="widget\[column5\]"/, widget_form
     end
 
-    test "integer column is a number_field" do
-      assert_match 'number_field(:widget, :column7)', compiled_widget_form
+    test "integer column7 is a number_field" do
+      assert_match /<input.*type="number".*name="widget\[column7\]"/, widget_form
     end
 
     test "timestamps are not editable" do
-      assert_match 'Created At: {{@widget.try(:created_at)}}', compiled_widget_form
-      assert_match 'Updated At: {{@widget.try(:updated_at)}}', compiled_widget_form
+      assert_match /Created At:.*\n/, widget_form
+      assert_match /Updated At:.*\n/, widget_form
     end
 
     test "fields have labels" do
-      #%Q({{label_tag(\"widget_category_id\", \"Category\")}})
-      matches = compiled_widget_form.scan /label_tag\(\\"\w+\\", \"\w+\"\)/
+      matches = widget_form.scan /<label.*>/
       assert 7, matches.length
 
-      assert_match '%Q({{label_tag("widget_category_id", "Category")}})', compiled_widget_form
+      assert_match '<label for="widget_category_id">Category</label>', widget_form
     end
 
     test "fields are wrapped in a div" do
-      assert_match '<div class=\"field-wrapper\">', compiled_widget_form
+      assert_match '<div class="field-wrapper">', widget_form
     end
 
     test 'path prefix is provided' do
-      action_attrib = 'action=\"{{@widget.try(:persisted?) ? admin_widget_path(@widget) : admin_widgets_path}}\"'
-      assert_match action_attrib, compiled_widget_form(path_prefix: 'admin')
+      action_attrib = 'action="/admin/widgets"'
+      assert_match action_attrib, widget_form(path_prefix: 'admin')
     end
 
-    test "options_from_collection_for_select used for the related collection" do
-      assert_match 'options_from_collection_for_select(Category.all.select(:id, :name).order(:name)',
-                    compiled_widget_form
+    test "options for select come from the related collection" do
+      assert_match /<option.*>Toys<\/option>/, widget_form
+      assert_match /<option.*>Tools<\/option>/, widget_form
     end
 
-    test "options_from_collection_for_select use when a namespace is specified" do
-      assert_match 'options_from_collection_for_select(ExampleEngine::Category.all.select(:id, :name).order(:name)',
-                    compiled_widget_form(namespace: "example_engine")
+    test "options for select work when a namespace is specified" do
+      assert_match /<option.*>Toys<\/option>/, widget_form(namespace: "example_engine")
+      assert_match /<option.*>Tools<\/option>/, widget_form(namespace: "example_engine")
     end
 
-    test "collection_select with collection_ids is used for has_many_through associations" do
-      assert_match /collection_select.*tag_ids.*multiple: true/, compiled_widget_form
+    test "multiple select is used for has_many_through associations" do
+      assert_match /select.*multiple="multiple".*name="widget\[tag_ids\]\[\]"/, widget_form
     end
 
     test "excluded fields are excluded" do
-      refute_match 'column3', compiled_widget_form(exclude: [:column3])
+      refute_match 'column3', widget_form(exclude: [:column3])
     end
 
     test "virtual attributes may be included" do
-      assert_match 'password', compiled_widget_form(virtual: [:password])
+      assert_match 'password', widget_form(virtual: [:password])
     end
   end
 end

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

@@ -4,10 +4,25 @@ module Components
 
   class SmartTableTest < ActiveSupport::TestCase
 
-    fixtures :widgets
-
+    fixtures :widgets, :categories
+
+    def resource_assigns
+      {resource: Widget.new, collection: Widget.all}
+    end
+    def helpers
+      view = mock_action_view(resource_assigns)
+      class << view
+        def widget_path(widget_id)
+          "/widgets/#{widget_id.to_param}"
+        end
+        alias resource_path widget_path
+      end
+      view
+    end
     def compiled_widget_table(*args)
-      ExpressAdmin::SmartTable.new(:widgets, *args).compile
+      arbre {
+        smart_table(:widgets, *args)
+      }
     end
 
     test "should have hidden columns" do
@@ -15,12 +30,13 @@ module Components
       assert_no_match 'column7', compiled_widget_table
     end
 
-    test "iterates over collection setting local var correctly" do
-      assert_match '(@widgets.each_with_index.map do |widget, widget_index|', compiled_widget_table
+    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 within a substitution" do
-      assert_match /\{\{[^\{\}]*widget.column2[^\{\}]*\}\}/, compiled_widget_table
+    test "renders cell contents" do
+      assert_match '<td class="column2">Hammer</td>', compiled_widget_table
     end
 
     # this behavior could change after we implement support for decorators
@@ -31,7 +47,8 @@ module Components
     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 'widget.category.try(:name) || widget.category.to_s', compiled_widget_table
+      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
@@ -46,11 +63,11 @@ module Components
 
     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
+      assert_match /<th class="column3">Column3 is the Best/, compiled
     end
 
-    def widget_table_with_proc_column
-      return -> {
+    def compiled_widget_table_with_proc_column
+      arbre {
          smart_table(:widgets, columns: {
            "This column will error" => -> (widget) { doesnt_work },
            "This column will be fine" => -> (widget) { widget.column2.upcase },
@@ -58,51 +75,34 @@ module Components
       }
     end
 
-    def compiled_widget_table_with_proc_column
-      ExpressTemplates.compile(&widget_table_with_proc_column)
-    end
-
-
-    test "table cell values may be specified as procs" do
-      assert_match '-> (widget) { doesnt_work }', compiled_widget_table_with_proc_column
-    end
-
-    class DummyView
-      def initialize
-        @widgets = Widget.all
-      end
-      def widget_path(*args) ; "does not matter" ; end
-      def link_to(*args) ; widget_path(*args) ; end
-    end
-
     test "table cell has 'Error' if a value specified as a proc throws an exception" do
-      assert_match 'Error', DummyView.new.instance_eval(compiled_widget_table_with_proc_column)
+      assert_match 'Error', compiled_widget_table_with_proc_column
     end
 
     test "table cell contains result of proc.call if no exception is raised" do
-      assert_match 'LEGO', DummyView.new.instance_eval(compiled_widget_table_with_proc_column)
+      assert_match 'LEGO', compiled_widget_table_with_proc_column
     end
 
     test "table cell class is valid when proc is used" do
-      assert_match 'class=\"this_column_will_error\"', compiled_widget_table_with_proc_column
+      assert_match 'class="this_column_will_error"', compiled_widget_table_with_proc_column
     end
 
     test "attribute accessor appended with _link generates a link" do
-      fragment = -> {
+      fragment = arbre {
           smart_table(:widgets, columns: {
               'A link column' => :column3_link
             })
         }
-      assert_match 'link_to widget.column3, widget_path(widget.id)', ExpressTemplates.compile(&fragment)
+      assert_match /column3.*href="\/widgets\/(\d+)/, fragment
     end
 
     test "timestamp accessor appeneded with _in_words generates code that uses time_ago_in_words" do
-      fragment = -> {
+      fragment = arbre {
           smart_table(:widgets, columns: {
               'Created' => :created_at_in_words
             })
         }
-      assert_match "\(widget.created_at \? time_ago_in_words\(widget.created_at\)\+' ago' : 'never'\)", ExpressTemplates.compile(&fragment)
+      assert_match /class="created_at.*less than a minute ago/, fragment
     end
 
   end

data/test/dummy/tmp/cache/assets/test/sprockets/v3.0/4OPIkynisipUm8vKo57HUhBMWFSHBno_IH6OdpK29IA.cache

@@ -0,0 +1 @@
+I"

file:///Users/steve/Projects/appexpress/appexpress-io2/vendor/gems/express_site/vendor/gems/express_admin/test/dummy/app/assets/javascripts/demo.js?type=application/javascript&pipeline=self&id=dd456b9bf2c00ff3390f8a427657ca58f7ca18178971575c058e25d3e4688ca1:ET

data/test/dummy/tmp/cache/assets/test/sprockets/v3.0/9QvwPXfTSVmgQX6tdK9GuCn0--MZ8Z8eJJbHpUEq1p8.cache

@@ -0,0 +1 @@
+I"
�file:///Users/steve/Projects/appexpress/appexpress-io2/vendor/gems/express_site/vendor/gems/express_admin/test/dummy/app/assets/stylesheets/application.css?type=text/css&id=38bc076e35fb96e70bed4aa4a965d1264ece561d2e9929768e77073124f85493:ET

data/test/dummy/tmp/cache/assets/test/sprockets/v3.0/GJGMlSyTg1AvPCV_6PaLOTVEKbHeVKY1jhCoaKuRlxM.cache

@@ -0,0 +1 @@
+I"
�file:///Users/steve/Projects/appexpress/appexpress-io2/vendor/gems/express_site/vendor/gems/express_admin/test/dummy/app/assets/stylesheets/application.css?type=text/css&pipeline=self&id=2ab8b9bedfbaa3206a5049828222e419849530855b290a7d3a73ce17666ceae8:ET

data/test/dummy/tmp/cache/assets/test/sprockets/v3.0/IBLgVNsKBbJxN8NQnh6zTc3bC_OG-8BhtA3xCNDV6ks.cache

@@ -0,0 +1 @@
+I"
�file:///Users/steve/Projects/appexpress/appexpress-io2/vendor/gems/express_site/vendor/gems/express_admin/test/dummy/app/assets/javascripts/application.js?type=application/javascript&id=772903df259a1ef79dc73c8765d2fdcc5c93b7087bcf05f12aab804d3e80042c:ET

data/test/dummy/tmp/cache/assets/test/sprockets/v3.0/V1aP9G-CVtOLR5PTnHleid8WC9TSfFAT1DzAygp_5CQ.cache

@@ -0,0 +1 @@
+I"
file:///Users/steve/Projects/appexpress/appexpress-io2/vendor/gems/express_site/vendor/gems/express_admin/test/dummy/app/assets/javascripts/application.js?type=application/javascript&pipeline=self&id=16055f28135a48516774deca69704a58124ce122a415d2213d2a541207d3f42d:ET

data/test/dummy/tmp/cache/assets/test/sprockets/v3.0/tzX-HHF4F70o-aSB9Z_duoPxFGDv3auYnrpko9SYafU.cache

@@ -0,0 +1 @@
+I"
�file:///Users/steve/Projects/appexpress/appexpress-io2/vendor/gems/express_site/vendor/gems/express_admin/test/dummy/app/assets/stylesheets/demo.css.scss?type=text/css&pipeline=self&id=38c2a2a9551d19522ed73c7495a6d97a9421df70758c93c4e4b848aa4905348f:ET

data/test/fixtures/categories.yml

@@ -0,0 +1,8 @@
+# Read about fixtures at
+# http://api.rubyonrails.org/classes/ActiveRecord/Fixtures.html
+
+toys:
+  name: Toys
+
+tools:
+  name: Tools

data/test/test_helper.rb

@@ -10,6 +10,7 @@ require "minitest/rails"
 require "minitest/rails/capybara"
 require 'minitest/rg'
 
+require 'pry'
 
 # Filter out Minitest backtrace while allowing backtrace from other libraries
 # to be shown.
@@ -36,3 +37,36 @@ module ExampleEngine
     has_many :widgets, class_name: 'ExampleEngine::Widget'
   end
 end
+module AdditionalHelpers
+
+  def protect_against_forgery?
+    true
+  end
+
+  def form_authenticity_token
+    "AUTH_TOKEN"
+  end
+
+end
+
+module ActiveSupport
+  class TestCase
+    def arbre(assigns = {}, &block)
+      Arbre::Context.new assigns, helpers, &block
+    end
+    def mock_action_view(assigns = {})
+      controller = ActionView::TestCase::TestController.new
+      ActionView::Base.send :include, ActionView::Helpers
+      ActionView::Base.send :include, ActionView::Helpers::UrlHelper
+      ActionView::Base.send :include, AdditionalHelpers
+      view = ActionView::Base.new(ActionController::Base.view_paths, assigns, controller)
+      eigenklass = class << view
+        self
+      end
+      assigns.each do |helper_name,value|
+        eigenklass.send(:define_method, helper_name) { value }
+      end
+      view
+    end
+  end
+end

data/vendor/gems/express_templates/CHANGELOG.md

@@ -0,0 +1,12 @@
+# ExpressTemplates Changelog
+
+## Version 0.6.0
+
+* Switched out the Expander and related classes to use arbre gem instead
+* This is mostly backward compatible but introduces some breaking changes:
+  - dom ids must be specified with an id: key instead of as first parameter
+  - some capabilities have been removed as they are no longer necessary
+  - must use normal ruby control-flow in template fragements instead of for_each, unless_block, etc.
+  - wrapping must be accomplished using methods and blocks instead of wrap_with
+  - css class names must be specified as class: parameters instead of using .class_name methods
+

data/vendor/gems/express_templates/Gemfile.lock

@@ -1,8 +1,9 @@
 PATH
   remote: .
   specs:
-    express_templates (0.5.0)
+    express_templates (0.7.0)
       activesupport (~> 4.2)
+      arbre
       parslet (~> 1.6)
 
 GEM
@@ -44,6 +45,8 @@ GEM
       thread_safe (~> 0.3, >= 0.3.4)
       tzinfo (~> 1.1)
     ansi (1.5.0)
+    arbre (1.0.3)
+      activesupport (>= 3.0.0)
     arel (6.0.0)
     better_errors (2.1.1)
       coderay (>= 1.0.0)

data/vendor/gems/express_templates/README.md

@@ -2,6 +2,10 @@
 
 Provides a DSL for HTML templates using a declarative style of Ruby as an alternative to Erb or HAML.
 
+Although originally we implemented our own DSL and used a code generation approach,
+this gem now uses [ActiveAdmin's arbre](https://github.com/activeadmin/arbre).  Arbre is widely
+used as part of ActiveAdmin, has a long history and many contributors and is conceptually much simpler.
+
 ## Usage
 
 Add this to your gemfile:
@@ -26,7 +30,7 @@ html(lang: "en") {
     csrf_meta_tags
   }
   body {
-    yield
+    current_arbre_element.add_child yield
     javascript_include_tag "application"
   }
 }
@@ -36,35 +40,18 @@ Everything should work as you would expect.
 
 Set your editor syntax for .et files to Ruby.
 
-You will now have also be able to utilize components which are found with documentation and examples in <tt>ExpressTemplates::Components<tt>.
-
-## History
-
-To understand ExpressTemplates, you must first understand the standard tools of ERB and Haml which have been with us for quite some time.
-
-![Haml/Erb Diagram](https://raw.githubusercontent.com/aelogica/express_templates/master/diagrams/diagram_haml_erb.png "Haml/Erb Diagram")
-
-Both of these provide a language for embedding other languages.  Erb embeds Ruby between <% %> style tags.  This is similar to the way we worked with PHP and for those who can remember "embedded Perl" in 1990s.  Erb places no constraints on either the text into which the Ruby is embedded, nor on the Ruby which may be placed within the delimiters which comprise Erb's simple grammar.
-
-Haml introduced a number of innovations or improvements upon Erb.  Through Haml's use of significant whitespace and indentation, it ensures well-formed markup.  This noticably slows template compilation, however, due to caching it generally goes unnoticed.  Haml added better support for mixing grammars in a single file as is common practice with Javascript.  Haml introduced abbreviated methods for specifying CSS classes and HTML entity attribute values with the result of generally cleaning up view code.
+You can now utilize components which are found with documentation and examples in <tt>ExpressTemplates::Components<tt>.
 
-Both Haml and Erb compile down to Ruby code which must be eval()'d in a View Context as per the interface required by Rails' ActionView.
+Components are the real strength of both arbre and express_templates.
 
-## Expansion
+express_templates now *is* arbre + some components + some conventions.  ExpressTemplates::Components::Base provides a little syntactic sugar in the form of the emits class method.
 
-ExpressTemplates introduces an earlier step in this process, "expansion", which may be likened to a kind of macro system.  This is introduced to facilitate reusable view components in the form of normal object-oriented Ruby classes.
+In terms of conventions, we use brace blocks { } to indicate html structure and do/end blocks to indicate control flow.
 
-![Diagram depciting Haml/Erb](https://raw.githubusercontent.com/aelogica/express_templates/master/diagrams/diagram_express_templates.png "Diagram depciting Haml/Erb")
+Control flow should only be used in Components.  This is currently not enforced but it will be in the future.
 
-## Constraints - Important!
+The purpose of express_templates is to provide a foundation for a library of reusable UX components which we can enhance for drag-and-drop style UX construction and template editing.
 
-ExpressTemplates imposes some constraints.  The most important constraint is that your view templates must be declarative in style.  They should not contain conditional logic.  Declarative code is easier to read and reason about.  It also requires fewer tests since declarative code is build on presumably well-tested primitives.
-
-With ExpressTemplates, one *must not* place conditional logic or iterators anywhere in template code.  All logic *must* be encapsulated in components.  Strange things will happen if you try to put logic in the template or a template fragment.  In the future I may issue warnings or disallow it by examinging the output of Ruby's tokenizer.
-
-If you have been around long enough to see a few Rails codebases grow out of control, and you have had to manage or watch the efforts of less-experienced developers closely, you know that one of the major causes of trouble and wasted effort is copy-and-paste code and logic errors in the view.  Another common problem is the "blank slate" issue wherein every view must be constructed new with little chance for higher-level reuse of code.  Diligent use of partials and helpers can do much to DRY up view code but deciding where to put them or how to share them between projects can be difficult.  Rarely is view logic tested except in integration.
-
-ExpressTemplates only enforces what is already considered a best practice by many, while introducing new possilibities for well-ordered UX libraries similar to what developers working with commercial frameworks for desktop operating systems or mobile devices enjoy.
 
 ## Block Structure
 
@@ -90,8 +77,6 @@ Let us suppose that an @three variable exists in the view context with the value
 </ul>
 ```
 
-yield and local variables which we may expect to be available in a ViewContext are also wrapped for evaluation later.
-
 ## Components
 
 Given the constraint that logic must not go in the template, where does one put it?  The answer is we make a component!
@@ -108,27 +93,23 @@ We can make a simple component like so:
 
 ```ruby
 class ListComponent < ExpressTemplates::Components::Base
-  emits inner: -> {
-                    li {
-                      item
-                    }
-                  },
-        outer: -> {
-                    ul {
-                      _yield
-                    }
-                  }
-
-  for_each -> { @list }, emit: :inner
-
-  wrap_with :outer
+  emits -> {
+    ul {
+      # assumes view provides list
+      list.each do |item|
+        li {
+          item
+        }
+      end
+    }
+  }
 end
 ```
 
 This would be used in a view template just as if it were a tag, like so:
 
 ```ruby
-div.active {
+div(class: "active") {
   list_component
 }
 ```