express_admin 1.4.4 → 1.4.5

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

@@ -99,7 +99,13 @@ module ExpressTemplates
             else
               definition[:type] || []
             end
-          valid_type_names.map(&:to_s).map(&:classify).map(&:constantize)
+          valid_type_names.map do |type_name|
+            if type_name.eql?(:boolean)
+              type_name
+            else
+              type_name.to_s.classify.constantize
+            end
+          end
         end
 
         def _is_valid?(value, definition)
@@ -108,6 +114,9 @@ module ExpressTemplates
             true
           elsif valid_types.include?(value.class)
             true
+          elsif valid_types.include?(:boolean) &&
+                [1, 0, true, false].include?(value)
+            true
           else
             false
           end

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

@@ -8,6 +8,8 @@ module ExpressTemplates
         before_build -> {
           set_attribute(:id, "#{resource_name}_#{field_name}_wrapper")
           add_class(config[:wrapper_class])
+          add_class('error') if resource.respond_to?(:errors) &&
+                                resource.errors.include?(field_name.to_sym)
         }
 
         has_option :wrapper_class, 'Override the class of the wrapping div of a form component', default: 'field-wrapper'

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

@@ -45,7 +45,7 @@ module ExpressTemplates
 
       contains -> (&customize_block) {
         @customize_block = customize_block
-        list_items(eval(config[:id].to_s))
+        list_items(send(config[:id]))
       }
 
       before_build -> {

data/vendor/gems/express_templates/lib/express_templates/template/handler.rb

@@ -1,3 +1,5 @@
+require 'ripper'
+
 module ExpressTemplates
   module Template
     class Handler
@@ -6,10 +8,24 @@ module ExpressTemplates
       end
 
       def call(template)
+        # call ripper stuff method
+
+        warn_contains_logic("(#{ExpressTemplates.compile(template)}).html_safe")  # pass the source code
         # returns a string to be eval'd
         "(#{ExpressTemplates.compile(template)}).html_safe"
       end
 
+      def warn_contains_logic(compiled_template)
+        keywords = %w(if until unless case for do loop while)                                                                 # array of conditional keywords
+        tokens = []
+        if Ripper.lex(compiled_template).select do |element|                                                                  # since it outputs an array [[line, col], type, token]
+          element[1]==:on_kw                                                                                                  # type must match ':on_kw' type (type is keyword)
+        end.each { |match| tokens.push(match) if keywords.include? match[2] }                                                 # check if token is in given /keyword/ array, then push to new array match
+          tokens.each do |first|
+            warn "PAGE TEMPLATE INCLUDES #{first[2]} STATEMENT AT LINE #{first[0][0]}: #{first}\n#{compiled_template}"        # warn on first occurence of conditional logic
+          end
+        end
+      end
     end
   end
-end
+end

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

@@ -1,3 +1,3 @@
 module ExpressTemplates
-  VERSION = "0.9.2"
+  VERSION = "0.9.4"
 end

data/vendor/gems/express_templates/test/components/forms/basic_fields_test.rb

@@ -1,4 +1,5 @@
 require 'test_helper'
+require 'active_model'
 
 class BasicFieldsTest < ActiveSupport::TestCase
 
@@ -89,4 +90,61 @@ class BasicFieldsTest < ActiveSupport::TestCase
     assert_match /<input class="hidden form-field" value="ninja" type="hidden" name="foo\[bar\]" id="foo_bar"/, html
   end
 
+  def resource_with_errors
+    mock_resource = resource
+    class << mock_resource
+      def errors
+        errors = ActiveModel::Errors.new(self)
+        errors.add(:name, "Can't be Foo")
+        errors
+      end
+    end
+    mock_resource
+  end
+
+  def has_error_class
+    /div[^>]*class="[^"]*error[^"]*"/
+  end
+
+  def has_error_class_on(field, html)
+    md = html.match(/(<div[^>]*id="[^"]*#{field}_wrapper[^"]*"[^>]*>)/)
+    assert md, "field has no wrapper"
+    return !!md[1].match(has_error_class)
+  end
+
+  test "adds error class if there are errors on a field with no input attributes" do
+    html_with_error = arbre(resource: resource_with_errors) {
+      express_form(:foo) {
+       text :name
+       text :body
+      }
+    }
+    assert resource_with_errors.errors.any?
+    assert assigns[:resource].errors.any?
+    assert has_error_class_on(:name, html_with_error), "name field has no error when expected"
+    refute has_error_class_on(:body, html_with_error), "body field has error class when it should not"
+  end
+
+    test "adds error class if there are errors on a field with no class set" do
+    html_with_error = arbre(resource: resource_with_errors) {
+      express_form(:foo) {
+       text :name, value: 'ninja'
+      }
+    }
+    assert resource_with_errors.errors.any?
+    assert assigns[:resource].errors.any?
+    assert_match has_error_class, html_with_error
+  end
+
+    test "adds error to class if there are errors on a field with existing class" do
+    html_with_error = arbre(resource: resource_with_errors) {
+      express_form(:foo) {
+       text :name, value: 'ninja', class: 'slug'
+      }
+    }
+    assert resource_with_errors.errors.any?
+    assert assigns[:resource].errors.any?
+    assert_match has_error_class, html_with_error
+  end
+
 end

data/vendor/gems/express_templates/test/components/forms/submit_test.rb

@@ -7,6 +7,10 @@ class Stuff
 end
 
 class SubmitTest < ActiveSupport::TestCase
+
+  def assigns
+    {resource: nil}
+  end
   test "submit takes string param for value" do
     fragment = -> (ctx) {
       submit value: "Save it!"

data/vendor/gems/express_templates/test/components/tree_for_test.rb

@@ -2,11 +2,6 @@ require 'test_helper'
 require 'ostruct'
 
 class TreeForTest < ActiveSupport::TestCase
-  class Context
-    def initialize(roles)
-      @roles = roles
-    end
-  end
 
   class Role
     attr :name, :children
@@ -17,7 +12,7 @@ class TreeForTest < ActiveSupport::TestCase
   end
 
   def roles
-    [Role.new('SuperAdmin', children:
+    @roles ||= [Role.new('SuperAdmin', children:
           [Role.new('Admin', children:
             [Role.new('Publisher', children:
               [Role.new('Author')]),

data/vendor/gems/express_templates/test/core_extensions/proc_test.rb

@@ -68,7 +68,7 @@ class ProcTest < ActiveSupport::TestCase
     assert_equal 'foo', Proc.from_source(src).call
   end
 
-  test ".source_body captures full body when parens around parameters not provided" do
+  test "#source_body captures full body when parens around parameters not provided" do
     block = return_block { something(:one, "two") }
     assert_equal 'something(:one, "two")', block.source_body
     block = return_block -> { something :one, "two" }
@@ -78,4 +78,13 @@ class ProcTest < ActiveSupport::TestCase
     # assert_equal 'something :one, "two"', block.source_body
   end
 
+  def return_proc_value(*args, options)
+    options.values.first.values.first
+  end
+
+  test "#source works when a proc is inside a hash literal" do
+    block = return_proc_value(:one, two: {a: -> {'proc_inside'}})
+    assert_equal "-> {'proc_inside'}", block.source
+  end
+
 end