express_templates 0.9.3 → 0.9.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9e93820b0563b5a327dea57ec300ff2878641cb3
-  data.tar.gz: 5a5f7d0954ca6be289f8e0ba6de35e7b01c04988
+  metadata.gz: 05a81ab8ff1f7f2e94240689d4d87cbea72a4381
+  data.tar.gz: caffe066d6c10c2d0d90730f747a72a73d7008fc
 SHA512:
-  metadata.gz: 03b9541ab3544bbbb721f1efd2b92adafdd1c68bb33626702b9623ebcb0e314cb21ecdd7fa205aa991b70a9c731c9583bb7d267c07f2989204cf4b2e494c58b6
-  data.tar.gz: 3e262ad21e99a696376ba705a33103c1bf375cd83e8bb8643b3052b41e44722df3a8c23e1e1341dd0eb343ef6284e83163c82420688c3e64a8dce8e0393b7136
+  metadata.gz: fc9dfd7ad73fd876fd18d51d16e2524a7b9d344ee52ddd9ec713b5378ed802e68e5a29b0d773eba563c3d6b78667072979be676e17e6945dedfbe32195fef3a5
+  data.tar.gz: b10321d22b52c7a26fbba4105ed363638fd7f4915cc5ed957b2ee2c53926e04fdefc69c1b9ac55256f2513e234d374f0a6e3297b83306290e84bc09b15687aa3

data/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/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/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/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/lib/express_templates/version.rb

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

data/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/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/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/test/handler_test.rb

@@ -121,4 +121,28 @@ class HandlerTest < ActiveSupport::TestCase
     assert_equal "<li>\n#{A_LINK}#{A_LINK}</li>\n", render
   end
 
+  test "raises warning if template has conditional logic" do
+    temp = "dd(class: 'date') {
+          if blog_post.publish_at
+            blog_post.publish_at
+          else
+            link_to('Edit', '#'')
+          end
+        }"
+    keywords = %w(if unless until case for do loop while)
+    tokens = []
+
+    if Ripper.lex(temp).select do |element|
+      element[1]==:on_kw
+    end.each { |match| tokens.push(match) if keywords.include? match[2] }
+      tokens.each do |first|
+       out, @err = capture_io do
+          warn 'foo'
+        end
+      end
+    end
+
+    assert_equal @err, "foo\n"
+  end
+
 end

data/test/test_helper.rb

@@ -44,16 +44,16 @@ end
 
 module ActiveSupport
   class TestCase
-    def arbre(&block)
-      Arbre::Context.new assigns, helpers, &block
+    def arbre(additional_assigns = {}, &block)
+      Arbre::Context.new assigns.merge(additional_assigns), helpers, &block
     end
     def assigns
-      {}
+      @arbre_assigns ||={}
     end
     def helpers
-      mock_action_view(assigns)
+      mock_action_view
     end
-    def mock_action_view(assigns = {})
+    def mock_action_view
       controller = ActionView::TestCase::TestController.new
       ActionView::Base.send :include, ActionView::Helpers
       ActionView::Base.send :include, ActionView::Helpers::UrlHelper

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: express_templates
 version: !ruby/object:Gem::Version
-  version: 0.9.3
+  version: 0.9.4
 platform: ruby
 authors:
 - Steven Talcott Smith
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-07-28 00:00:00.000000000 Z
+date: 2015-08-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport