tension 0.9.8 → 0.9.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: cc906aa325cb6c6e63d2fbcdb44a1e2be3a18e0a
-  data.tar.gz: fa098e09cf55ac5c4152583859cf1d38343d96ad
+  metadata.gz: 6039624381a0d73836dfa4caced220027b665dc2
+  data.tar.gz: f0b3aa15739e27340cf7e60fcb361332807d5d1c
 SHA512:
-  metadata.gz: 049abb4b1527302a0aa56c4e3b6fe83835485e31335f3ea1bbc093a4cfb1f2d1a4bcce739d5f133832477ce3f74d281f8b3cd82911a6c4b87319a402b70a0f3c
-  data.tar.gz: e122f1f04e4f63ab065537f4f5df25c4004203d242eaba6d7b26b767c887fa2177b12b0dc4ff1dbc1154e69538bf55abe7b1c3f91043afad28e3ca1064c1e20b
+  metadata.gz: 1297e086e71c4e771ea6f01bfef803bfbd9e0173678dc1c949223c2930a2c62ab0d028ee65188e479d02c0fee43b7ba23b82ee407c0e422f391b2f8e9b447588
+  data.tar.gz: 2cdca84e54a796751a41f74ab2dc14ca8f14bcec8d1337c1a5264cc52dd65787b1f9ea225fb99e746fd827de6730c9010c884029ee1234ed3fef81edc9ab328e

data/lib/tension/environment.rb

@@ -34,8 +34,8 @@ module Tension
       # precompilation.
       #
       def precompilation_needed?(path)
-        if context = find(path)
-          context.has_action?( Tension::Utils.action_name(path) )
+        if cxt = find(path)
+          Tension::Utils.shared_asset?(path) || cxt.has_action?( Tension::Utils.action_name(path) )
         end
       end
 
@@ -43,7 +43,7 @@ module Tension
       private
 
       def fetch(path)
-        contexts[path] || store(path)
+        contexts[path] || store(path) unless path.nil?
       end
 
       def store(path)

data/lib/tension/utils.rb

@@ -3,6 +3,7 @@ module Tension
     class << self
 
       SHARED_SUFFIX   = "_common".freeze
+      SHARED_REGEX    = /#{SHARED_SUFFIX}\..*\z/.freeze
       EXTENSION_REGEX = /(#{SHARED_SUFFIX})?\..*\z/.freeze
 
       # Matches strings like "blog/comments".
@@ -29,6 +30,13 @@ module Tension
         strip_file_extension( path.split("/").last ) if asset_path?(path)
       end
 
+      # Determines whether an asset path is shared amongst all actions
+      # for its controller.
+      #
+      def shared_asset?(path)
+        !!path.match(SHARED_SUFFIX)
+      end
+
       # Attempts to load an Asset from the Sprockets index. Uses the given
       # Hash argument to build an asset path.
       #   ARGS: options: a Hash containing e.g.
@@ -76,8 +84,8 @@ module Tension
       def controller_for_asset_path(path)
         parts = path.split("/")
 
-        if parts.last.match(SHARED_SUFFIX)
-          strip_file_extension( parts.last )
+        if shared_asset?(parts.last)
+          parts.push(strip_file_extension( parts.pop ))
         else
           parts.pop
         end

data/lib/tension/version.rb

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

metadata

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