express_templates 0.9.5 → 0.9.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 018beee9648be7172909cb241812b004795dbe49
-  data.tar.gz: 47e8b5946af001b551ee6e5897de40857409748f
+  metadata.gz: f68c1b1c1fd84e707116c27f274c05fa564e4e7c
+  data.tar.gz: e0dd446cbcd244d728aff72f143ba9747b0732ae
 SHA512:
-  metadata.gz: 74dcb721d16f6281b1f5b8824ac1314a7cfccbf0fe427cf360a611f9b629688723a9df6caf405a9f60ef38e858928e10b192ba25e8e9bf16dbc40448c1cee11f
-  data.tar.gz: 49eb76041d82f329fab1a67232b8e55870b395c62b863d40d3d781c6bbf07fbc8c253555ff1a855e5299ab273acaec59345d7df8ece71c9bcb8b69df254ccf7c
+  metadata.gz: f408c30156803c94feb534e8bf427aedb1fbb753c465ee06655e08563cd13cba140aaf1640890a65ac65e58d96ff2e29400fc2ceb548301e4ae50b6fbb8b2162
+  data.tar.gz: 66b9fcb9283ef89056c99950e4d9691cc0a62aa351f28d323cadc34e6a09d46e796d618eeec9f060b6685f515cc7b71ad64e99d77dd01e4601ab19961a4941be

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

@@ -132,7 +132,11 @@ module ExpressTemplates
               config[:collection_path]
             end
           else
-            helpers.instance_eval collection_path_helper
+            if helpers.respond_to?(:collection_path)
+              helpers.collection_path
+            else
+              helpers.instance_eval collection_path_helper
+            end
           end
         end
 
@@ -178,11 +182,15 @@ module ExpressTemplates
               config[:resource_path]
             end
           else
-            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}')")
+            if helpers.respond_to?(:resource_path)
+              helpers.resource_path
             else
-              helpers.instance_eval("#{resource_path_helper}(#{ivar_or_resource ? '@' : ''}#{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
         end

data/lib/express_templates/version.rb

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

metadata

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