express_templates 0.9.4 → 0.9.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 05a81ab8ff1f7f2e94240689d4d87cbea72a4381
-  data.tar.gz: caffe066d6c10c2d0d90730f747a72a73d7008fc
+  metadata.gz: 018beee9648be7172909cb241812b004795dbe49
+  data.tar.gz: 47e8b5946af001b551ee6e5897de40857409748f
 SHA512:
-  metadata.gz: fc9dfd7ad73fd876fd18d51d16e2524a7b9d344ee52ddd9ec713b5378ed802e68e5a29b0d773eba563c3d6b78667072979be676e17e6945dedfbe32195fef3a5
-  data.tar.gz: b10321d22b52c7a26fbba4105ed363638fd7f4915cc5ed957b2ee2c53926e04fdefc69c1b9ac55256f2513e234d374f0a6e3297b83306290e84bc09b15687aa3
+  metadata.gz: 74dcb721d16f6281b1f5b8824ac1314a7cfccbf0fe427cf360a611f9b629688723a9df6caf405a9f60ef38e858928e10b192ba25e8e9bf16dbc40448c1cee11f
+  data.tar.gz: 49eb76041d82f329fab1a67232b8e55870b395c62b863d40d3d781c6bbf07fbc8c253555ff1a855e5299ab273acaec59345d7df8ece71c9bcb8b69df254ccf7c

data/lib/arbre/patches.rb

@@ -25,6 +25,16 @@ module Arbre
       end
     end
 
+    def possible_route_proxy(name)
+      if helpers.controller.class.parent &&
+        helpers.respond_to?(namespace = helpers.controller.class.parent.to_s.underscore)
+        if (route_proxy = helpers.send(namespace)).respond_to?(name)
+          return route_proxy
+        end
+      end
+      return nil
+    end
+
     # Implements the method lookup chain. When you call a method that
     # doesn't exist, we:
     #
@@ -40,6 +50,8 @@ module Arbre
         assigns[name]
       elsif helpers.respond_to?(name)
         helper_method(name, *args, &block)
+      elsif route_proxy = possible_route_proxy(name)
+        route_proxy.send(name, *args, &block)
       else
         super
       end
@@ -52,6 +64,8 @@ module Arbre
     def helper_method(name, *args, &block)
       if name.match /_path$/
         helpers.send(name, *args, &block)
+      elsif (const_get([name, 'engine'].join('/').classify) rescue nil)
+        helpers.send(name, *args, &block)
       else
         current_arbre_element.add_child helpers.send(name, *args, &block)
       end

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

@@ -8,10 +8,13 @@ module ExpressTemplates
           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 :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.'
-            has_option :resource_path, 'Overides the resource path which is otherwise inferred from the class name.'
+            has_option :resource_path, 'Overides the resource path which is otherwise inferred from the class name.', type: [:string, :proc]
             has_option :path_prefix, 'Rarely used.  Override inferred path_prefix for path helpers.'
+            # note there is some duplication here.
+            # resource_path can be specified as a proc which can specify a namespace
+            # TODO: investigate which approach is better and deprecate if desirable
             has_option :namespace, 'Rarely used.  Overrides inferred namespace for resources.'
           end
         end
@@ -123,10 +126,21 @@ module ExpressTemplates
 
         def collection_path
           if config[:collection_path]
-            config[:collection_path]
+            if config[:collection_path].respond_to?(:call)
+              config[:collection_path].call()
+            else
+              config[:collection_path]
+            end
           else
-            #super
-            helpers.instance_eval "#{collection_name_with_prefix}_path"
+            helpers.instance_eval collection_path_helper
+          end
+        end
+
+        def collection_path_helper
+          if path_namespace
+            "#{path_namespace}.#{collection_name_with_prefix}_path"
+          else
+            "#{collection_name_with_prefix}_path"
           end
         end
 
@@ -139,15 +153,37 @@ module ExpressTemplates
         end
 
         def resource_path_helper
-          "#{resource_name_with_path_prefix}_path"
+          if path_namespace
+            "#{path_namespace}.#{resource_name_with_path_prefix}_path"
+          else
+            "#{resource_name_with_path_prefix}_path"
+          end
+        end
+
+        def path_namespace
+          resource_class_name = resource_class.to_s
+          resource_class_name.match(/::/) ?
+            resource_class_name.split("::").first.try(:underscore) : nil
         end
 
-        def resource_path(ivar=false)
+        # accepts boolean to indicate whether to use an ivar or not
+        # and also may accept a resource on which we call to_param
+        def resource_path(ivar_or_resource = nil)
           if config[:resource_path]
-            config[:resource_path]
+            if config[:resource_path].respond_to?(:call) &&
+              ivar_or_resource.respond_to?(:to_param) &&
+              ![true, false].include?(ivar_or_resource)
+              config[:resource_path].call(ivar_or_resource)
+            else
+              config[:resource_path]
+            end
           else
-            # super
-            helpers.instance_eval("#{resource_path_helper}(#{ivar ? '@' : ''}#{resource_name})")
+            if ivar_or_resource.respond_to?(:to_param) &&
+              ![true, false].include?(ivar_or_resource)
+              helpers.instance_eval("#{resource_path_helper}('#{ivar_or_resource.to_param}')")
+            else
+              helpers.instance_eval("#{resource_path_helper}(#{ivar_or_resource ? '@' : ''}#{resource_name})")
+            end
           end
         end
 

data/lib/express_templates/components/configurable.rb

@@ -47,10 +47,10 @@ module ExpressTemplates
         @config ||= {}
       end
 
-      def self.has_option(name, description, type: :text, required: nil, default: nil, attribute: nil)
+      def self.has_option(name, description, type: :string, required: nil, default: nil, attribute: nil, values: nil)
         raise "name must be a symbol" unless name.kind_of?(Symbol)
         option_definition = {description: description}
-        option_definition.merge!(type: type, required: required, default: default, attribute: attribute)
+        option_definition.merge!(type: type, required: required, default: default, attribute: attribute, values: values)
         self.supported_options =
           self.supported_options.merge(name => option_definition)
       end

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

@@ -28,7 +28,7 @@ module ExpressTemplates
         end
 
         def form_action
-          config[:action] || (resource.try(:persisted?) ? resource_path(ivar: true) : collection_path)
+          config[:action] || (resource.try(:persisted?) ? resource_path(true) : collection_path)
         end
 
       end

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

@@ -7,18 +7,22 @@ module ExpressTemplates
       module OptionSupport
 
         def has_many_through_association
-          reflection = resource_class.reflect_on_association(field_name.to_sym)
-          return reflection if reflection && reflection.macro.eql?(:has_many) && reflection.options.keys.include?(:through)
+          if resource_class.respond_to?(:reflect_on_association)
+            reflection = resource_class.reflect_on_association(field_name.to_sym)
+            return reflection if reflection && reflection.macro.eql?(:has_many) && reflection.options.keys.include?(:through)
+          end
         end
 
         # Reflect on any association and return it if the association type
         # is :belongs_to.  Returns false if the association is not :belongs_to.
         # Returns nil if there was a problem reflecting.
         def belongs_to_association
-          # assumes the belongs_to association uses <name>_id
-          reflection = resource_class.reflect_on_association(field_name.gsub(/_id$/, '').to_sym)
-          if reflection && reflection.macro.eql?(:belongs_to)
-            return reflection
+          if resource_class.respond_to?(:reflect_on_association)
+            # assumes the belongs_to association uses <name>_id
+            reflection = resource_class.reflect_on_association(field_name.gsub(/_id$/, '').to_sym)
+            if reflection && reflection.macro.eql?(:belongs_to)
+              return reflection
+            end
           end
         end
 

data/lib/express_templates/version.rb

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

data/test/components/configurable_test.rb

@@ -72,6 +72,19 @@ class ConfigurableTest < ActiveSupport::TestCase
     assert render { config_with_required_options(title: 'foo') }
   end
 
+  class ConfigWithOptionValues < ETCC
+    has_option :virtual, 'gets the virtual_attributes of a resource', values: -> (*) { resource_class.virtual_attributes }
+
+    def resource_class
+      OpenStruct.new(virtual_attributes: [:password, :password_confirmation])
+    end
+  end
+
+  test "values can be set for options" do
+    component = ConfigWithOptionValues.new
+    assert_equal [:password, :password_confirmation], component.instance_eval(&ConfigWithOptionValues.new.supported_options[:virtual][:values])
+  end
+
   class ConfigSubclass < ConfigWithRequiredOptions
     has_option :status, 'something'
   end

metadata

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