express_templates 0.11.17 → 0.11.18

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2657456072d4ef3e2bdefa7a90aeb4d0661513c3
-  data.tar.gz: e4061750733bb15e0bbfe68cf379d2ac102fc742
+  metadata.gz: 890df022013fa147cf7e3ebc99ca0e193248b3a5
+  data.tar.gz: 1f12843eb4d1cb79628a6b93ff5c0e535a4aed3e
 SHA512:
-  metadata.gz: 8c012d5ab9d10634ed9904c0d0ea6015a68df9c96769b54080268036b0f39d1d0e4b99d79fe3cff7cb6815e43c173281b7c287bf7eb105f28b71d21ed42ecfee
-  data.tar.gz: 8839b0c6effbafb74e1cedc7624f51daa05e8ce81f062523baf1954a9a31565942ca8232af617a90668328d37c18142db57b1579cdc178f5701a21d0013b7634
+  metadata.gz: 12c5c6aabac29e5c94e7a8e37404f6689d7b09b731e8ce93c1e0fa9c4dce2fe841e87b7ede3f85489ce825580406a0e9275f6ad7b45ccb6fe9f5f283b2c2b303
+  data.tar.gz: 9fa7499b429c0253d83029343239bfcb25f85932285533d115b1770d22059987c9a83f294a36add75c0f31022fd408eab3bdef1769e2661e2625724b3ae28b5c

data/lib/arbre/patches.rb

@@ -19,11 +19,11 @@ module Arbre
         tag.parent = current_arbre_element
 
         with_current_arbre_element tag do
-          begin
+          # begin
             tag.build(*args, &block)
-          rescue Exception => e
-            on_component_error(tag, e)
-          end
+          # rescue Exception => e
+          #   on_component_error(tag, e)
+          # end
         end
 
         tag

data/lib/express_templates/compiler.rb

@@ -2,14 +2,13 @@ module ExpressTemplates
   module Compiler
     def compile(template_or_src=nil, &block)
       template, src = _normalize(template_or_src)
-      %Q{
-        assigns.merge!(template_virtual_path: @virtual_path)
-        if defined?(local_assigns)
-          Arbre::Context.new(assigns.merge(local_assigns), self) { #{src || block.source_body} }.to_s
-        else
-          Arbre::Context.new(assigns, self) { #{src || block.source_body} }.to_s
-        end
-      }
+
+        # local_assigns = {} if !defined?(local_assigns)
+        # merged_assigns = assigns.merge(template_virtual_path: @virtual_path)
+        #                         .merge(local_assigns)
+      # The following must be one-line otherwise we lose accurate
+      # line reporting on the stack.
+      %Q{Arbre::Context.new(assigns.merge(template_virtual_path: @virtual_path).merge(defined?(local_assigns) ? local_assigns : {}), self) { #{src || block.source_body} }.to_s}
     end
 
     private

data/lib/express_templates/components.rb

@@ -6,6 +6,7 @@ end
 # Abbreviation for your component class definitions
 ET = ExpressTemplates
 
+require 'express_templates/components/capabilities/iteration'
 require 'express_templates/components/registry'
 require 'express_templates/components/base'
 require 'express_templates/components/configurable'

data/lib/express_templates/components/all.rb

@@ -2,26 +2,21 @@ module ExpressTemplates
   module Components
     module Presenters
       class All < Container
+        include Capabilities::Iteration
 
-        has_argument :id, "Name of the collection", as: :collection_name, type: :symbol
+        has_argument :id, "Name of the collection", type: :symbol
+
+        def start_tag; ''; end
+        def end_tag; ''; end
 
         contains -> (&block) {
           prepended
-          collection.each do |item|
-            assigns[member_name.to_sym] = item
+          for_all(config[:id]) {
             block.call(self) if block
-          end
+          }
           appended
         }
 
-        def member_name
-          config[:collection_name].to_s.singularize.to_sym
-        end
-
-        def collection
-          self.send(config[:collection_name])
-        end
-
       end
     end
   end

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

@@ -0,0 +1,50 @@
+module ExpressTemplates
+  module Components
+    module Capabilities
+
+      # Provides iteration to components that iterate over a collection.
+
+      module Iteration
+
+        def self.included(base)
+          base.class_eval do
+
+            # Iterates over the collection calling the block provided to emit markup.
+            #
+            # The collection (symbol) must be available as a method on the component
+            # or as a local (assigns) value in the rendering context.
+            #
+            # The collection name is singularized and a local value is set
+            # for each item in the collection.
+
+            def for_all(collection_name, &block)
+              @collection_name = collection_name
+              raise "#{collection_name} is not a collection" unless self.send(collection_name).respond_to?(:each)
+              self.send(collection_name).each do |item|
+                old_value = assigns[singular_item_name]
+                assigns[singular_item_name] = item
+                block.call
+                assigns[singular_item_name] = old_value
+              end
+            end
+
+            protected
+
+              def collection_name
+                @collection_name
+              end
+
+              def singular_item_name
+                collection_name.to_s.singularize.to_sym
+              end
+
+              def item
+                assigns[singular_item_name]
+              end
+
+          end
+        end
+      end
+    end
+  end
+end

data/lib/express_templates/version.rb

@@ -1,3 +1,3 @@
 module ExpressTemplates
-  VERSION = "0.11.17"
+  VERSION = "0.11.18"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: express_templates
 version: !ruby/object:Gem::Version
-  version: 0.11.17
+  version: 0.11.18
 platform: ruby
 authors:
 - Steven Talcott Smith
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-04-07 00:00:00.000000000 Z
+date: 2017-04-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: arbre
@@ -73,6 +73,7 @@ files:
 - lib/express_templates/components/base.rb
 - lib/express_templates/components/capabilities/configurable.rb
 - lib/express_templates/components/capabilities/hideable.rb
+- lib/express_templates/components/capabilities/iteration.rb
 - lib/express_templates/components/capabilities/resourceful.rb
 - lib/express_templates/components/capabilities/suppressable.rb
 - lib/express_templates/components/configurable.rb