tension 0.9.14 → 0.9.15

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a75cab3b3ef65c9590305e2ae0743398a5326968
-  data.tar.gz: 9ff656abe44e288d6ee0e8ea2a8c3bfbcf0725f6
+  metadata.gz: 4eaa058ee2622eb39b664cc7ba46ec0764421d94
+  data.tar.gz: 552a3bff4bbae5383b983151b881729bab24acaf
 SHA512:
-  metadata.gz: 94bfedf19b85e67862a66b352e9cc2b439a357d3389a031993ba6236b0e213f7f7d97d3089f441c6a826d31a2f849a78ca88b418942cee37115b2afaeddad31a
-  data.tar.gz: fc08ff6e486a0c43564c7ee934617bde46a33cc58d99926dfcbd77622052737e799cc9838cab327d39391a1eff0d38a6d49f8f1e9834041ce0c68087959cce81
+  metadata.gz: a711ab02daf23f6f578a2a006864ebf422668317e5f09d11b63104403bdf587041ec4779985efcd4fe6714b0f4e1e0ab1a363dcf8e05b010a3822106a11c270d
+  data.tar.gz: 03efbcd1cdd7f00fc53c8da818c2ff9a0942a348463414b361a5d56d61d23836eb0ca0d5f902131e84e3fae589b58e44bbaef4cb3da8bf16a5073bd863638c0d

data/lib/tension/environment.rb

@@ -8,8 +8,9 @@ module Tension
     attr_reader :assets
 
     def initialize(assets_path)
-      @manifest = Sprockets::Manifest.new(assets_path)
-      process_assets!
+      if assets_cached?
+        cache_assets_from_manifest!(Sprockets::Manifest.new(assets_path))
+      end
     end
 
     # Loads a Context for the specified controller path.
@@ -17,7 +18,18 @@ module Tension
     def find_context(key)
       fetch( Tension::Utils.controller_path(key) )
     end
-    alias_method :[], :find_context
+
+    # Returns a Sprockets::Asset for the given logical path. Will load assets
+    # cached from a manifest if available, but in development falls back to
+    # the Sprockets::Index as assets may be under development.
+    #
+    def find_asset(logical_path)
+      if assets_cached?
+        assets[logical_path]
+      else
+        Rails.application.assets.find_asset(logical_path)
+      end
+    end
 
     # A Hash mapping controller paths to Contexts.
     #
@@ -51,9 +63,13 @@ module Tension
       end
     end
 
-    def process_assets!
+    def assets_cached?
+      ! Rails.env.development? && ! Rails.application.config.assets.compile
+    end
+
+    def cache_assets_from_manifest!(manifest)
       @assets = Hash.new
-      @manifest.files.each do |full_path, info|
+      manifest.files.each do |full_path, info|
         next unless full_path.match(/\.css|\.js\z/)
 
         info = info.merge(full_path: full_path).with_indifferent_access

data/lib/tension/utils.rb

@@ -42,14 +42,14 @@ module Tension
       #     type: Tension::CSS
       #
       def find_asset(options)
-        Tension.environment.assets[ logical_asset_path(options) ]
+        Tension.environment.find_asset( logical_asset_path(options) )
       end
 
       # Returns the application-wide Sprockets Asset for the given type.
       #   ARGS: type: Tension::JS or Tension::CSS
       #
       def global_asset(type)
-        Tension.environment.assets[ "application.#{type}" ]
+        Tension.environment.find_asset( "application.#{type}" )
       end
 
       private

data/lib/tension/version.rb

@@ -1,3 +1,3 @@
 module Tension
-  VERSION = "0.9.14".freeze
+  VERSION = "0.9.15".freeze
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: tension
 version: !ruby/object:Gem::Version
-  version: 0.9.14
+  version: 0.9.15
 platform: ruby
 authors:
 - Piers Mainwaring
@@ -67,3 +67,4 @@ signing_key:
 specification_version: 4
 summary: Tighten up Rails's asset pipeline for CSS & JS.
 test_files: []
+has_rdoc: