tension 0.9.10 → 0.9.11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6039624381a0d73836dfa4caced220027b665dc2
-  data.tar.gz: f0b3aa15739e27340cf7e60fcb361332807d5d1c
+  metadata.gz: d79990890e3efdb3e301b8a25d1aea118d536167
+  data.tar.gz: 41117c436948f6aef93d09652fdb3a1c503dfc08
 SHA512:
-  metadata.gz: 1297e086e71c4e771ea6f01bfef803bfbd9e0173678dc1c949223c2930a2c62ab0d028ee65188e479d02c0fee43b7ba23b82ee407c0e422f391b2f8e9b447588
-  data.tar.gz: 2cdca84e54a796751a41f74ab2dc14ca8f14bcec8d1337c1a5264cc52dd65787b1f9ea225fb99e746fd827de6730c9010c884029ee1234ed3fef81edc9ab328e
+  metadata.gz: d42c14d2bc9d8bb9d787b4a05d5fd94bdcfe35e48f25d09a8cf92eadf68427af0b5f38583bb4566064cd2b24fc32917a6e64d284dc49a72bd167aa49dc639c36
+  data.tar.gz: 691cb93f49e58aefe0c54fa892dac95b2ca7d6a2b9c57cd9fd394fd4b7fe2afde6a566480a6b963a84176f88feddd5f163db269d4d57e9f677e3f46c5ab464ed

data/lib/tension/controller.rb

@@ -12,21 +12,21 @@ module Tension
     # Returns the Context for the current controller.
     #
     def asset_context
-      find_asset_context( request.symbolized_path_parameters[:controller] )
+      find_asset_context( request.path_parameters['controller'] )
     end
 
     # Returns the Sprockets Asset for the current action's JavaScript
     # to be written into the template.
     #
     def action_javascript
-      asset_context.js( request.symbolized_path_parameters[:action] )
+      asset_context.js( request.path_parameters['action'] )
     end
 
     # Returns the Sprockets Asset for the current action's stylesheet
     # to be written into the template.
     #
     def action_stylesheet
-      asset_context.css( request.symbolized_path_parameters[:action] )      
+      asset_context.css( request.path_parameters['action'] )
     end
 
     # Proxy to Tension::Environment.find.

data/lib/tension/helper.rb

@@ -24,19 +24,14 @@ module Tension
     private
 
     def asset_for(type, *args)
-      controller = request.symbolized_path_parameters[:controller]
-      action     = request.symbolized_path_parameters[:action]
+      return nil if asset_context.nil?
 
-      asset = Tension::Environment.find( controller ).send( action, type )
-
-      include_method = case type.to_s
-      when "js"
-        :javascript_include_tag
-      when "css"
-        :stylesheet_link_tag
+      case type.to_sym
+      when :js
+        javascript_include_tag( action_javascript.logical_path, *args )
+      when :css
+        stylesheet_link_tag( action_stylesheet.logical_path, *args )
       end
-
-      send( include_method, asset.logical_path, *args )
     end
   end
 

data/lib/tension/version.rb

@@ -1,3 +1,3 @@
 module Tension
-  VERSION = "0.9.10".freeze
+  VERSION = "0.9.11".freeze
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: tension
 version: !ruby/object:Gem::Version
-  version: 0.9.10
+  version: 0.9.11
 platform: ruby
 authors:
 - Piers Mainwaring