turbo-sprockets-rails3 0.3.10 → 0.3.11

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    OTc3YmY4YjI3NjViN2M5NzEzY2E1OTk3MDU1ODY4NDFlNzdmNmEzOA==
+    MzQ3MTExMTMzYjYyMDhmMmQ3ZGQ4N2U3OGI3NjMwN2ZlMjNmMDIwZg==
   data.tar.gz: !binary |-
-    Y2ZhOGNkMDAxZTViMTY2NTM3N2FiZjgyODBjMGRkYWM5MmMxNDljYQ==
-!binary "U0hBNTEy":
+    ODBhNjRiZTkwNDBjYzA4NDk0OTIyYTE1YjI5OTVjMjc2YzE3MjZiOQ==
+SHA512:
   metadata.gz: !binary |-
-    NGE3MjdjMmQ2NTg3YTVkNzBmOGMzNDFlOTcyZTY4ZTVhODE4YjBkNjI5MDdh
-    MTVmZDc3OTBmMmI2NDY5YzVjNTM1NTAyYzBiYWVmMzIxNTc5ZDBlYTQzYmJm
-    MjU5ZGRjNTQyYmNmMDU4NzY1NmRjNTVkZThlYzk4M2RkMGY4MTk=
+    ZWE0ZTljMTdmZGRjZGU1MGY4Y2FjYTZiY2UyYWQ0ZTViZWY2ZTFiMWViNjll
+    MjE5ZmUyODViYWIxY2Y4NGMzMjcxOGUzNTRiODI1NWI5NTgxNWY0NjcxNjI4
+    ZmMyNWQ3ODk4OTA0YzE0NzM3NDliMTU2MWRlMDMwZGJmYzA4MTc=
   data.tar.gz: !binary |-
-    ZWE2ZDEwMTcyYTI4Y2NhNjE3MmJiMTBlZDY2MDBmZTFlOWJkYjk0ZDI4YWUz
-    YzM1M2U0YmViOTNiMDlmOTAxODVkODFkYzUyYmQxOTlhYzhjOWQzMmEzY2E3
-    NTczNDQ1YjRmYTI2ZGE0ODAyODk5MTNhMGU1MTU5MGQ2OTE1YmM=
+    ZjBmOTMwNWNhNzI4NjI0YjdiM2Y3Nzk4ODViOTRjMmM5YmViMzA5NWVhNmZi
+    NTkwMmViYmEyOGEyM2QzNGVjN2I5ZmZkNzM1OTEwNzg1OWMwODhlYjJiZGVh
+    NTI1YzliZGY0OTUyNTFhNzhlZGM2NjVhNDM4ZmM2MWUxNmI3NTU=

data/lib/sprockets/asset_with_dependencies.rb

@@ -78,28 +78,32 @@ module Sprockets
 
     private
       def build_required_assets(environment, context, asset_options = {})
+        @required_assets = resolve_dependencies(environment, context._required_paths + [pathname.to_s], asset_options) -
+          resolve_dependencies(environment, context._stubbed_assets.to_a, asset_options)
+      end
+
+      def resolve_dependencies(environment, paths, asset_options)
         asset_options[:bundle] = false
-        @required_assets = []
-        required_assets_cache = {}
+        assets = []
+        cache = {}
 
-        (context._required_paths + [pathname.to_s]).each do |path|
+        paths.each do |path|
           if path == self.pathname.to_s
-            unless required_assets_cache[self]
-              required_assets_cache[self] = true
-              @required_assets << self
+            unless cache[self]
+              cache[self] = true
+              assets << self
             end
           elsif asset = environment.find_asset(path, asset_options)
             asset.required_assets.each do |asset_dependency|
-              unless required_assets_cache[asset_dependency]
-                required_assets_cache[asset_dependency] = true
-                @required_assets << asset_dependency
+              unless cache[asset_dependency]
+                cache[asset_dependency] = true
+                assets << asset_dependency
               end
             end
           end
         end
 
-        required_assets_cache.clear
-        required_assets_cache = nil
+        assets
       end
 
       def build_dependency_paths(environment, context, asset_options = {})

data/lib/sprockets/unprocessed_asset.rb

@@ -6,10 +6,11 @@ module Sprockets
       @environment = environment
       context = environment.context_class.new(environment, logical_path, pathname)
       attributes = environment.attributes_for(pathname)
+      preprocessors = environment.preprocessors(content_type)
 
-      # Remove all engine processors except ERB to return unprocessed source file
+      # Remove all postprocessors and engines except ERB to return unprocessed source file
       allowed_engines = [Tilt::ERBTemplate]
-      processors = attributes.processors - (attributes.engines - allowed_engines)
+      processors = preprocessors + (allowed_engines & attributes.engines)
 
       @source = context.evaluate(pathname, :processors => processors)
 
@@ -20,7 +21,7 @@ module Sprockets
         allowed_engines << Sass::Rails::ScssTemplate if defined?(Sass::Rails::ScssTemplate)
         allowed_engines << Sass::Rails::SassTemplate if defined?(Sass::Rails::SassTemplate)
         allowed_engines << Less::Rails::LessTemplate if defined?(Less::Rails::LessTemplate)
-        processors = attributes.processors - (attributes.engines - allowed_engines)
+        processors = preprocessors + (allowed_engines & attributes.engines)
         @source = context.evaluate(pathname, :processors => processors)
       end
 

data/lib/turbo-sprockets/version.rb

@@ -1,3 +1,3 @@
 module TurboSprockets
-  VERSION = "0.3.10"
+  VERSION = "0.3.11"
 end

data/test/assets_test.rb

@@ -39,6 +39,18 @@ module ApplicationTests
       assert !File.exists?(filename), "#{filename} does exist"
     end
 
+    test "assets support stub" do
+      app_file "app/assets/javascripts/application.js", "//= require jquery\n//= require foo\n//= stub frameworks"
+      app_file "app/assets/javascripts/jquery.js", "jQuery = 1;"
+      app_file "app/assets/javascripts/frameworks.js", "//= require jquery"
+      app_file "app/assets/javascripts/foo.js", "foo = 1;"
+
+      require "#{app_path}/config/environment"
+
+      get "/assets/application.js"
+      assert_equal "foo = 1;", last_response.body.strip
+    end
+
     test "assets routes have higher priority" do
       app_file "app/assets/javascripts/demo.js.erb", "a = <%= image_path('rails.png').inspect %>;"
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: turbo-sprockets-rails3
 version: !ruby/object:Gem::Version
-  version: 0.3.10
+  version: 0.3.11
 platform: ruby
 authors:
 - Nathan Broadbent
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-09-12 00:00:00.000000000 Z
+date: 2013-12-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sprockets
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 2.0.0
+        version: 2.2.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 2.0.0
+        version: 2.2.0
 - !ruby/object:Gem::Dependency
   name: railties
   requirement: !ruby/object:Gem::Requirement
@@ -108,7 +108,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.5
+rubygems_version: 2.1.11
 signing_key: 
 specification_version: 4
 summary: Supercharge your Rails 3 asset pipeline