express_templates 0.11.4 → 0.11.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9974ff2ee9b43a2995de75414d2b03b7923d589d
-  data.tar.gz: 62bdff14270e90b4b3ce41a5a208f1645cf8fa84
+  metadata.gz: 837a8240902bdcc3580f426982c97c7059db1fab
+  data.tar.gz: c45b6746eeff2ce8f1a202c408f8673126f41f0b
 SHA512:
-  metadata.gz: 50e19ae0db48d7831f1ba311ffdacb6fb458e744064c6ebb907334f0558971fdce62550f3e455b5505f5a5ab09237e5fa328499bcc3b87b23f32dd154665212d
-  data.tar.gz: 05c26ab0186720edde5d339dff39b9511cb2b594106836629f02791c2d7033efee61cfc825510522ce79b65607054d6d5f22e7cf3085d78cac0a7c7d02ea79d4
+  metadata.gz: 1d2a7fc15d2c72e934b55fbc3bb38ad788321d72307a526d247018d1017a6436bedb12a28ac5995990930a3e3cf37f4d5f3b7226f7d69c58b4357a12fd1b860c
+  data.tar.gz: af25e8b9959674d6dba0ae9b3ac524ff03a437a98c1eb22a22138160c44746f0946e5f4b242a1e6d990f558d2c9628cedbab3ac70aa0106bb9a4f02b3076084e

data/lib/arbre/patches.rb

@@ -31,6 +31,7 @@ module Arbre
       def on_component_error(tag, exception)
         tag.content = "Error rendering #{tag.class} component: #{exception.message}"
         ::Rails.logger.error exception
+        ::Rails.logger.error exception.backtrace.slice(0..20).join("\n")
       end
     end
 

data/lib/express_templates/components/base.rb

@@ -121,7 +121,6 @@ module ExpressTemplates
           self.class.name.demodulize.underscore.dasherize
         end
 
-
       private
         def _run_before_build_hooks
           before_build_hooks.each do |hook|

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

@@ -6,7 +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_argument :id, "The name of the collection. A resourceful component will look for the resource based on the ID.", 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.', type: [:string, :proc]
             has_option :resource_class, 'Overrides namespaced resource_class for using resources from a different module or namespace.'
@@ -29,7 +29,15 @@ module ExpressTemplates
 
         def resource_class
           resource_class = config[:resource_class] || _namespaced_resource_class
-          resource_class.constantize
+          if Object.const_defined?(resource_class)
+            resource_class.constantize
+          else
+            message = [
+              "Could not find the class `#{resource_class}`.",
+              "You may need to define the option `:resource_class`.",
+            ].join(" ")
+            fail ArgumentError, message
+          end
         end
 
         private
@@ -206,7 +214,11 @@ module ExpressTemplates
         end
 
         def resource
-          self.send(resource_name)
+          begin
+            self.send(resource_name)
+          rescue NoMethodError
+            nil
+          end
         end
       end
     end

data/lib/express_templates/components/forms/basic_fields.rb

@@ -36,10 +36,16 @@ RUBY
       end
 
       class Textarea < FormComponent
+        has_option :value, 'The initial textarea value'
+
         contains {
           label_tag(label_name, label_text)
           text_area_tag field_name_attribute, field_value, field_helper_options
         }
+
+        def field_value
+          config[:value] || super
+        end
       end
 
       class Hidden < FormComponent

data/lib/express_templates/components/forms/express_form.rb

@@ -6,7 +6,7 @@ module ExpressTemplates
 
         tag :form
 
-        has_option :method, 'The form method', default: 'POST', attribute: true #, options: ['PUT', 'POST', 'GET', 'DELETE']
+        has_option :method, 'The form method' #, options: ['PUT', 'POST', 'GET', 'DELETE']
         has_option :action, 'The form action containing the resource path or url.'
         has_option :on_success, 'Pass a form value indicating where to go on a successful submission.'
         has_option :on_failure, 'Pass a form value indicating where to go on a failed submission.'
@@ -15,7 +15,7 @@ module ExpressTemplates
         prepends -> {
           div(style: 'display:none') {
             add_child helpers.utf8_enforcer_tag
-            add_child helpers.send(:method_tag, resource.persisted? ? :put : :post)
+            add_child helpers.send(:method_tag, method_tag) if method_tag
             add_child helpers.send(:token_tag)
             hidden_field_tag :on_success, config[:on_success] if config[:on_success]
             hidden_field_tag :on_failure, config[:on_failure] if config[:on_failure]
@@ -24,6 +24,7 @@ module ExpressTemplates
 
         before_build -> {
           set_attribute(:id, form_id)
+          set_attribute(:method, form_method)
           set_attribute(:action, form_action)
           set_attribute(:enctype, form_enctype) if form_enctype
           add_class(config[:id])
@@ -41,6 +42,35 @@ module ExpressTemplates
           config[:enctype]
         end
 
+        private
+
+        def form_method
+          case config[:method]
+          when :put, :delete, :post, :patch
+            'POST'
+          when :get
+            'GET'
+          when nil
+            'POST'
+          end
+        end
+
+        def method_tag
+          case config[:method]
+          when :get, :post
+            nil
+          when :put, :patch
+            :patch
+          when :delete
+            :delete
+          else
+            determine_method_tag
+          end
+        end
+
+        def determine_method_tag
+          :patch if resource.try(:persisted?)
+        end
       end
     end
   end

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

@@ -75,7 +75,7 @@ module ExpressTemplates
 
         def options_from_belongs_to
           if belongs_to_association.polymorphic?
-            helpers.options_for_select([[]]) # we can't really handle polymorhic yet
+            raise 'No options for Polymorphic association'
           else
             helpers.options_from_collection_for_select(related_collection, :id, option_name_method, resource.send(field_name))
           end

data/lib/express_templates/version.rb

@@ -1,3 +1,3 @@
 module ExpressTemplates
-  VERSION = "0.11.4"
+  VERSION = "0.11.5"
 end

data/test/components/capabilities/resourceful_test.rb

@@ -59,5 +59,19 @@ module ExpressTemplates
       assert_equal FooBar, AdminModule::SmartThing.new('somethings/index', resource_class: 'FooBar').resource_class
       assert_equal Something, AdminModule::SmartThing.new('somethings/index', id: :something).resource_class
     end
+
+    test "#resource_class raises a helpful error message when the class does not exist" do
+      expected_error_message = [
+        "Could not find the class `FooBar`.",
+        "You may need to define the option `:resource_class`.",
+      ].join(" ")
+
+      smart_thing = AdminModule::SmartThing.
+        new('somethings/index', resource_class: 'NonExistentBar')
+
+      assert_raises(ArgumentError, expected_error_message) do
+        smart_thing.resource_class
+      end
+    end
   end
 end

data/test/components/forms/basic_fields_test.rb

@@ -74,10 +74,22 @@ class BasicFieldsTest < ActiveSupport::TestCase
         textarea :bar, rows: 5, class: 'tinymce form-field'
       }
     }
+
     assert_match label_html, html
     assert_match /<textarea name="foo\[bar\]" id="foo_bar" rows="5" class="tinymce form-field"><\/textarea>/, html.gsub("\n", '')
   end
 
+  test 'textare has default value' do
+    html = arbre {
+      express_form(:foo) {
+        textarea :bar, value: "This is a default value", rows: 3
+      }
+    }
+
+    assert_match label_html, html
+    assert_match /<textarea name="foo\[bar\]" id="foo_bar" rows="3">This is a default value<\/textarea>/, html.gsub("\n", '')
+  end
+
   test "hidden uses rails hidden_tag helper" do
     html = arbre {
       express_form(:foo) {

data/test/components/forms/express_form_test.rb

@@ -1,9 +1,5 @@
 require 'test_helper'
 
-  class Foo
-    def self.columns ; [] ; end
-  end
-
 class ExpressFormTest < ActiveSupport::TestCase
 
   def simplest_form
@@ -22,6 +18,14 @@ class ExpressFormTest < ActiveSupport::TestCase
     end
   end
 
+  def form_with_method(method)
+    arbre(foo: resource) {
+      express_form(:foo, method: method) {
+        submit value: 'Save it!'
+      }
+    }
+  end
+
   test "simplest form renders" do
     assert simplest_form
   end
@@ -41,7 +45,6 @@ class ExpressFormTest < ActiveSupport::TestCase
   test "simplest form contains rails form helpers" do
     compiled_src = simplest_form
     assert_match "input name=\"utf8\" type=\"hidden\"", compiled_src
-    assert_match "input type=\"hidden\" name=\"_method\"", compiled_src
     assert_match "name=\"authenticity_token\" value=\"AUTH_TOKEN\"", compiled_src
     assert_match /<form.*authenticity_token.*\/form>/, compiled_src.gsub("\n",'')
   end
@@ -51,12 +54,56 @@ class ExpressFormTest < ActiveSupport::TestCase
   end
 
   test "simplest_form uses form_action for the action" do
-    form_open_tag = simplest_form.match(/<form[^>]*>/)[0]
-    assert_match 'action="/foos"', form_open_tag
+    assert_includes form_open_tag_attrs(simplest_form), 'action="/foos"'
   end
 
   test "express_form default method is POST" do
-    assert_match 'method="POST"', simplest_form
+    assert_includes form_open_tag_attrs(simplest_form), 'method="POST"'
+  end
+
+  test "express_form generates correct markup when method :get is passed in" do
+    get_form = form_with_method(:get)
+
+    assert_includes form_open_tag_attrs(get_form), 'method="GET"'
+    refute_match hidden_method_tag, get_form
+  end
+
+  test "express_form generates correct markup when method :post is passed in" do
+    post_form = form_with_method(:post)
+
+    assert_includes form_open_tag_attrs(post_form), 'method="POST"'
+    refute_match hidden_method_tag, post_form
+  end
+
+  test "express_form generates correct markup when method :put is passed in" do
+    put_form = form_with_method(:put)
+
+    assert_includes form_open_tag_attrs(put_form), 'method="POST"'
+    assert_match hidden_method_tag('value="patch"'), put_form
+  end
+
+  test "express_form generates correct markup when method :patch is passed in" do
+    patch_form = form_with_method(:patch)
+
+    assert_includes form_open_tag_attrs(patch_form), 'method="POST"'
+    assert_match hidden_method_tag('value="patch"'), patch_form
+  end
+
+  test "express_form generates correct markup when method :delete is passed in" do
+    delete_form = form_with_method(:delete)
+
+    assert_includes form_open_tag_attrs(delete_form), 'method="POST"'
+    assert_match hidden_method_tag('value="delete"'), delete_form
+  end
+
+  private
+
+  def form_open_tag_attrs(form)
+     form.match(/<form[^>]*>/)[0]
+  end
+
+  def hidden_method_tag(attrs="")
+    /<input type="hidden" name="_method" #{attrs}[^>]*>/
   end
 
 end

data/test/test_helper.rb

@@ -40,10 +40,24 @@ module AdditionalHelpers
 
 end
 
-
+# For express form and basic fields test
+class Foo
+  def self.columns ; [] ; end
+end
 
 module ActiveSupport
   class TestCase
+
+    class Context
+      def assigns
+        {}
+      end
+    end
+
+    def render(&block)
+      ExpressTemplates.render(Context.new, &block)
+    end
+
     def arbre(additional_assigns = {}, &block)
       Arbre::Context.new assigns.merge(additional_assigns), helpers, &block
     end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: express_templates
 version: !ruby/object:Gem::Version
-  version: 0.11.4
+  version: 0.11.5
 platform: ruby
 authors:
 - Steven Talcott Smith
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-10-07 00:00:00.000000000 Z
+date: 2015-11-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -280,7 +280,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.7
+rubygems_version: 2.4.8
 signing_key: 
 specification_version: 4
 summary: Write HTML templates in declarative Ruby.  Create reusable view components.