express_templates 0.11.3 → 0.11.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 822db99a91968f200eab1966f514a27df56439ec
-  data.tar.gz: edaec4289ef7d6c4c5f3814ab893adab767e8e65
+  metadata.gz: 9974ff2ee9b43a2995de75414d2b03b7923d589d
+  data.tar.gz: 62bdff14270e90b4b3ce41a5a208f1645cf8fa84
 SHA512:
-  metadata.gz: 5d622c294ccb1d1bb0f04ce998e6217d5e3d29daa37f5c25930ab1337efe9f440b05224922098f3ff50df31dd513f68aec930f3a6c18dfe6a3eb820e70c218c9
-  data.tar.gz: 965081b173f8546fabe7b38ff7b579ca9f1b0fd0f48833437ccf5278c2cfdf89f2002a19c6da1cebee76275d7096da5dec25bf1725589759030479e254b6956f
+  metadata.gz: 50e19ae0db48d7831f1ba311ffdacb6fb458e744064c6ebb907334f0558971fdce62550f3e455b5505f5a5ab09237e5fa328499bcc3b87b23f32dd154665212d
+  data.tar.gz: 05c26ab0186720edde5d339dff39b9511cb2b594106836629f02791c2d7033efee61cfc825510522ce79b65607054d6d5f22e7cf3085d78cac0a7c7d02ea79d4

data/lib/arbre/patches.rb

@@ -18,11 +18,20 @@ module Arbre
         tag.parent = current_arbre_element
 
         with_current_arbre_element tag do
-          tag.build(*args, &block)
+          begin
+            tag.build(*args, &block)
+          rescue Exception => e
+            on_component_error(tag, e)
+          end
         end
 
         tag
       end
+
+      def on_component_error(tag, exception)
+        tag.content = "Error rendering #{tag.class} component: #{exception.message}"
+        ::Rails.logger.error exception
+      end
     end
 
     def possible_route_proxy(name)
@@ -73,4 +82,4 @@ module Arbre
 
   end
 
-end
+end

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

@@ -179,6 +179,7 @@ module ExpressTemplates
             end
           else
             if helpers.respond_to?(:resource_path) &&
+               object.nil? &&
                helpers.resource.to_param.present? # skip on nil resource
               helpers.resource_path
             else

data/lib/express_templates/template/handler.rb

@@ -12,7 +12,7 @@ module ExpressTemplates
 
         # returns a string to be eval'd
         source = "(#{ExpressTemplates.compile(template)}).html_safe"
-        warn_contains_logic(source)  # pass the source code
+        warn_contains_logic(source) if ENV['NO_TEMPLATE_WARN'].nil? # pass the source code
         source
       end
 

data/lib/express_templates/version.rb

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

data/test/components/configurable_test.rb

@@ -66,9 +66,7 @@ class ConfigurableTest < ActiveSupport::TestCase
   end
 
   test "required options are required" do
-    assert_raises(RuntimeError) do
-      render { config_with_required_options }
-    end
+    assert_match "Error rendering ConfigurableTest::ConfigWithRequiredOptions component", render { config_with_required_options }
     assert render { config_with_required_options(title: 'foo') }
   end
 

data/test/components/forms/radio_test.rb

@@ -19,10 +19,8 @@ class RadioTest < ActiveSupport::TestCase
   end
 
   test "radio requires a parent component" do
-    assert_raises(RuntimeError) {
-      html = arbre {
-        radio :preferred_email_format, options: ['HTML', 'Text']
-      }
+    assert_match "Error rendering ExpressTemplates::Components::Forms::Radio", arbre {
+      radio :preferred_email_format, options: ['HTML', 'Text']
     }
   end
 
@@ -59,12 +57,10 @@ class RadioTest < ActiveSupport::TestCase
     assert_match 'input class="radio" type="radio" value="1" name="person[subscribed]" id="person_subscribed_1" />Yes', compiled
   end
 
-  test "radio throws error if given improper options" do
-    assert_raises(RuntimeError) {
-      html = arbre {
-        express_form(:person) {
-          radio :subscribed, "Garbage options"
-        }
+  test "radio displays error if given improper options" do
+    assert_match "Error rendering ExpressTemplates::Components::Forms::Radio component: No association collection for: person.subscribed", arbre {
+      express_form(:person) {
+        radio :subscribed, "Garbage options"
       }
     }
   end

data/test/components/forms/select_test.rb

@@ -16,10 +16,8 @@ class SelectTest < ActiveSupport::TestCase
 
 
   test "select requires a parent component" do
-    assert_raises(RuntimeError) {
-      html = arbre {
-        select :gender, options: ['Male', 'Female'], selected: 'Male'
-      }
+    assert_match "Error rendering ExpressTemplates::Components::Forms::Select component: FormComponent must have a parent form", arbre {
+      select :gender, options: ['Male', 'Female'], selected: 'Male'
     }
   end
 
@@ -126,4 +124,4 @@ class SelectTest < ActiveSupport::TestCase
   end
 
 
-end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: express_templates
 version: !ruby/object:Gem::Version
-  version: 0.11.3
+  version: 0.11.4
 platform: ruby
 authors:
 - Steven Talcott Smith
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-09-11 00:00:00.000000000 Z
+date: 2015-10-07 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.5
+rubygems_version: 2.4.7
 signing_key: 
 specification_version: 4
 summary: Write HTML templates in declarative Ruby.  Create reusable view components.