express_templates 0.9.1 → 0.9.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1109260a4e3712f661862ccaf73d360615b0e82d
-  data.tar.gz: d8c7f19fc269deb4c10271d1a94a0b017177780f
+  metadata.gz: 9e93820b0563b5a327dea57ec300ff2878641cb3
+  data.tar.gz: 5a5f7d0954ca6be289f8e0ba6de35e7b01c04988
 SHA512:
-  metadata.gz: 0fc7364a8cb7b63065305d51836f2a3a09c00aea1859494a52187382a4b934d475baec312fb04b9277bab6d2decff77bdb99c4ec4c99e57e7468735ff26b92c8
-  data.tar.gz: c0e5c279e140b09026eff54e8b69cee86b3296fd94fab7520d66d590857d4de4a9a9f4b4aa31b93344ce9d162b91a64b4754fbafd40e71a92cff0aef1efaec2c
+  metadata.gz: 03b9541ab3544bbbb721f1efd2b92adafdd1c68bb33626702b9623ebcb0e314cb21ecdd7fa205aa991b70a9c731c9583bb7d267c07f2989204cf4b2e494c58b6
+  data.tar.gz: 3e262ad21e99a696376ba705a33103c1bf375cd83e8bb8643b3052b41e44722df3a8c23e1e1341dd0eb343ef6284e83163c82420688c3e64a8dce8e0393b7136

data/lib/core_extensions/proc.rb

@@ -29,7 +29,8 @@ class Proc
       tokens =  Ripper.lex File.read(file)
       tokens_on_line = tokens.select {|pos, lbl, str| pos[0].eql?(line_no) }
       starting_token = tokens_on_line.detect do |pos, lbl, str|
-          TOKEN_PAIRS.keys.include? [lbl, str]
+          TOKEN_PAIRS.keys.include?([lbl, str]) &&
+          _actually_starting_a_proc?(tokens, [pos, lbl, str])
       end
       starting_token_type = [starting_token[1], starting_token[2]]
       ending_token_type = TOKEN_PAIRS[starting_token_type]
@@ -54,6 +55,17 @@ class Proc
     end
   end
 
+  def _actually_starting_a_proc?(tokens, tok)
+    return true if tokens.index(tok).eql?(0)
+    look_back = tokens.slice(0..tokens.index(tok)-1)
+    look_back.pop if look_back.last.try(:[], 1).eql? :on_sp
+    if [:on_tlambeg, :on_tlambda].include?(tok[1])
+      true
+    else
+      ![:on_comma, :on_lparen, :on_label].include?(look_back.last.try(:[], 1))
+    end
+  end
+
   # Examines the source of a proc to extract the body by
   # removing the outermost block delimiters and any surrounding.
   # whitespace.

data/lib/express_templates/components/base.rb

@@ -12,6 +12,9 @@ module ExpressTemplates
     #
     class Base < Arbre::Component
 
+      class_attribute :before_build_hooks
+      self.before_build_hooks = []
+
       def self.builder_method_and_class(method_name, klass)
         Arbre::Element::BuilderMethods.class_eval <<-EOF, __FILE__, __LINE__
           def #{method_name}(*args, &block)
@@ -45,19 +48,21 @@ module ExpressTemplates
         _default_attributes.merge!(attribs)
       end
 
-      def self.before_build(proc_or_symbol = nil, &block)
-        if proc_or_symbol.kind_of?(Symbol)
-          define_method(:_before_build) do
-            self.send(proc_or_symbol)
-          end
+      def self.before_build(proc_or_symbol = nil, exclusive: false, &block)
+        hook = (proc_or_symbol || block)
+        unless hook.kind_of?(Symbol) or hook.respond_to?(:call)
+          raise "before_build requires symbol (method_name), proc or block"
+        end
+        if exclusive
+          self.before_build_hooks = [hook]
         else
-          define_method(:_before_build, &(proc_or_symbol || block))
+          self.before_build_hooks += [hook]
         end
       end
 
       def build(*args, &block)
         _extract_class!(args)
-        _before_build if respond_to?(:_before_build)
+        _run_before_build_hooks
         super(*args) {
           _build_body(&block) if respond_to?(:_build_body)
         }
@@ -68,7 +73,15 @@ module ExpressTemplates
       end
 
       def self.inherited(subclass)
-        builder_method_and_class subclass.to_s.demodulize.underscore, subclass
+        builder_method_and_class subclass.builder_method_name, subclass
+      end
+
+      def self.builder_method_name
+        to_s.demodulize.underscore
+      end
+
+      def builder_method_name
+        self.class.builder_method_name
       end
 
       def self.descendants
@@ -82,6 +95,15 @@ module ExpressTemplates
 
 
       private
+        def _run_before_build_hooks
+          before_build_hooks.each do |hook|
+            if hook.kind_of?(Symbol)
+              self.send(hook)
+            else
+              instance_exec &hook
+            end
+          end
+        end
         def _extract_class!(args)
           add_class args.last.delete(:class) if args.last.try(:kind_of?, Hash)
         end

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

@@ -6,6 +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_option :collection, 'Provide an explicit collection as a resource.'
             has_option :collection_path, 'Provide an explicit path for the collection resource.'
             has_option :resource_class, 'Overrides namespaced resource_class for using resources from a different module or namespace.'

data/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/lib/express_templates/components/forms/submit.rb

@@ -11,16 +11,15 @@ module ExpressTemplates
           submit_tag(value, input_attributes)
         }
 
-        before_build -> {
-          # if we are not part of a form, we don't get a default id
-          begin
-            super()
-          rescue
-            add_class(config[:wrapper_class])
-            remove_class('submit')
-          end
+        before_build(exclusive: true) {
+          add_class(config[:wrapper_class])
+          remove_class('submit')
         }
 
+        def resource_name
+          parent_form ? super : nil
+        end
+
         def value
           config[:value]
         end

data/lib/express_templates/version.rb

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

data/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

metadata

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