sprockets-rails 2.3.3 → 3.0.0

data/lib/sprockets/railtie.rb

@@ -2,9 +2,13 @@ require 'rails'
 require 'rails/railtie'
 require 'action_controller/railtie'
 require 'active_support/core_ext/module/remove_method'
+require 'active_support/core_ext/numeric/bytes'
 require 'sprockets'
+require 'sprockets/rails/context'
 require 'sprockets/rails/helper'
+require 'sprockets/rails/route_wrapper'
 require 'sprockets/rails/version'
+require 'set'
 
 module Rails
   class Application
@@ -19,37 +23,32 @@ module Rails
     remove_possible_method :assets=
 
     # Returns Sprockets::Environment for app config.
-    def assets
-      @assets ||= Sprockets::Environment.new(root.to_s) do |env|
-        env.version = ::Rails.env
+    attr_accessor :assets
 
-        path = "#{config.root}/tmp/cache/assets/#{::Rails.env}"
-        env.cache = Sprockets::Cache::FileStore.new(path)
+    # Returns Sprockets::Manifest for app config.
+    attr_accessor :assets_manifest
 
-        env.context_class.class_eval do
-          include ::Sprockets::Rails::Helper
-        end
-      end
+    # Called from asset helpers to alert you if you reference an asset URL that
+    # isn't precompiled and hence won't be available in production.
+    def asset_precompiled?(logical_path)
+      precompiled_assets.include? logical_path
     end
-    attr_writer :assets
 
-    # Returns Sprockets::Manifest for app config.
-    attr_accessor :assets_manifest
+    # Lazy-load the precompile list so we don't cause asset compilation at app
+    # boot time, but ensure we cache the list so we don't recompute it for each
+    # request or test case.
+    def precompiled_assets
+      @precompiled_assets ||= assets_manifest.find(config.assets.precompile).map(&:logical_path).to_set
+    end
   end
 
   class Engine < Railtie
     # Skip defining append_assets_path on Rails <= 4.2
     unless initializers.find { |init| init.name == :append_assets_path }
       initializer :append_assets_path, :group => :all do |app|
-        if paths["app/assets"].respond_to?(:existent_directories)
-          app.config.assets.paths.unshift(*paths["vendor/assets"].existent_directories)
-          app.config.assets.paths.unshift(*paths["lib/assets"].existent_directories)
-          app.config.assets.paths.unshift(*paths["app/assets"].existent_directories)
-        else
-          app.config.assets.paths.unshift(*paths["vendor/assets"].paths.select { |d| File.directory?(d) })
-          app.config.assets.paths.unshift(*paths["lib/assets"].paths.select { |d| File.directory?(d) })
-          app.config.assets.paths.unshift(*paths["app/assets"].paths.select { |d| File.directory?(d) })
-        end
+        app.config.assets.paths.unshift(*paths["vendor/assets"].existent_directories)
+        app.config.assets.paths.unshift(*paths["lib/assets"].existent_directories)
+        app.config.assets.paths.unshift(*paths["app/assets"].existent_directories)
       end
     end
   end
@@ -57,8 +56,11 @@ end
 
 module Sprockets
   class Railtie < ::Rails::Railtie
-    LOOSE_APP_ASSETS = lambda do |filename, path|
-      path =~ /app\/assets/ && !%w(.js .css).include?(File.extname(filename))
+    include Sprockets::Rails::Utils
+
+    LOOSE_APP_ASSETS = lambda do |logical_path, filename|
+        filename.start_with?(::Rails.root.join("app/assets").to_s) &&
+        !%w(.js .css).include?(File.extname(logical_path))
     end
 
     class OrderedOptions < ActiveSupport::OrderedOptions
@@ -68,92 +70,139 @@ module Sprockets
     end
 
     config.assets = OrderedOptions.new
-    config.assets._blocks    = []
-    config.assets.paths      = []
-    config.assets.prefix     = "/assets"
-    config.assets.manifest   = nil
-    config.assets.precompile = [LOOSE_APP_ASSETS, /(?:\/|\\|\A)application\.(css|js)$/]
-    config.assets.version    = ""
-    config.assets.debug      = false
-    config.assets.compile    = true
-    config.assets.digest     = false
+    config.assets._blocks     = []
+    config.assets.paths       = []
+    config.assets.prefix      = "/assets"
+    config.assets.manifest    = nil
+    if using_sprockets4?
+      config.assets.precompile  = %w( manifest.js )
+    else
+      config.assets.precompile  = [LOOSE_APP_ASSETS, /(?:\/|\\|\A)application\.(css|js)$/]
+    end
+    config.assets.version     = ""
+    config.assets.debug       = false
+    config.assets.compile     = true
+    config.assets.digest      = true
+    config.assets.cache_limit = 50.megabytes
+
+    config.assets.configure do |env|
+      config.assets.paths.each { |path| env.append_path(path) }
+    end
+
+    config.assets.configure do |env|
+      env.context_class.send :include, ::Sprockets::Rails::Context
+      env.context_class.assets_prefix = config.assets.prefix
+      env.context_class.digest_assets = config.assets.digest
+      env.context_class.config        = config.action_controller
+    end
+
+    config.assets.configure do |env|
+      env.cache = Sprockets::Cache::FileStore.new(
+        "#{env.root}/tmp/cache",
+        config.assets.cache_limit,
+        env.logger
+      )
+    end
+
+    Sprockets.register_dependency_resolver 'rails-env' do
+      ::Rails.env
+    end
+    config.assets.configure do |env|
+      env.depend_on 'environment-version'
+    end
+
+    config.assets.configure do |env|
+      env.version = config.assets.version
+    end
 
     rake_tasks do |app|
       require 'sprockets/rails/task'
       Sprockets::Rails::Task.new(app)
     end
 
-    config.after_initialize do |app|
-      config = app.config
-
-      # Configuration options that should invalidate
-      # the Sprockets cache when changed.
-      app.assets.version = [
-        app.assets.version,
-        config.assets.version,
-        config.action_controller.relative_url_root,
-        (config.action_controller.asset_host unless config.action_controller.asset_host.respond_to?(:call)),
-        Sprockets::Rails::VERSION
-      ].compact.join('-')
-
-      # Copy config.assets.paths to Sprockets
-      config.assets.paths.each do |path|
-        app.assets.append_path path
+    def build_environment(app, initialized = nil)
+      initialized = app.initialized? if initialized.nil?
+      unless initialized
+        ::Rails.logger.warn "Application uninitialized: Try calling YourApp::Application.initialize!"
       end
 
+      env = Sprockets::Environment.new(app.root.to_s)
+
+      config = app.config
+
       # Run app.assets.configure blocks
       config.assets._blocks.each do |block|
-        block.call app.assets
+        block.call(env)
       end
 
       # Set compressors after the configure blocks since they can
       # define new compressors and we only accept existent compressors.
-      app.assets.js_compressor  = config.assets.js_compressor
-      app.assets.css_compressor = config.assets.css_compressor
+      env.js_compressor  = config.assets.js_compressor
+      env.css_compressor = config.assets.css_compressor
 
       # No more configuration changes at this point.
       # With cache classes on, Sprockets won't check the FS when files
       # change. Preferable in production when the FS only changes on
       # deploys when the app restarts.
       if config.cache_classes
-        app.assets = app.assets.index
+        env = env.cached
       end
 
-      manifest_assets_path = File.join(config.paths['public'].first, config.assets.prefix)
+      env
+    end
+
+    def self.build_manifest(app)
+      config = app.config
+      path = File.join(config.paths['public'].first, config.assets.prefix)
+      Sprockets::Manifest.new(app.assets, path, config.assets.manifest)
+    end
+
+    config.after_initialize do |app|
+      config = app.config
+
       if config.assets.compile
-        app.assets_manifest = Sprockets::Manifest.new(app.assets, manifest_assets_path, config.assets.manifest)
-      else
-        app.assets_manifest = Sprockets::Manifest.new(manifest_assets_path, config.assets.manifest)
+        app.assets = self.build_environment(app, true)
+        app.routes.prepend do
+          mount app.assets => config.assets.prefix
+        end
+      end
+
+      app.assets_manifest = build_manifest(app)
+
+      if config.assets.resolve_with.nil?
+        config.assets.resolve_with = []
+        config.assets.resolve_with << :manifest if config.assets.digest && !config.assets.debug
+        config.assets.resolve_with << :environment if config.assets.compile
+      end
+
+      ActionDispatch::Routing::RouteWrapper.class_eval do
+        class_attribute :assets_prefix
+
+        if defined?(prepend) && ::Rails.version >= '4'
+          prepend Sprockets::Rails::RouteWrapper
+        else
+          include Sprockets::Rails::RouteWrapper
+        end
+
+        self.assets_prefix = config.assets.prefix
       end
 
       ActiveSupport.on_load(:action_view) do
         include Sprockets::Rails::Helper
 
         # Copy relevant config to AV context
-        self.debug_assets  = config.assets.debug
-        self.digest_assets = config.assets.digest
-        self.assets_prefix = config.assets.prefix
-
-        # Copy over to Sprockets as well
-        context = app.assets.context_class
-        context.assets_prefix = config.assets.prefix
-        context.digest_assets = config.assets.digest
-        context.config        = config.action_controller
+        self.debug_assets      = config.assets.debug
+        self.digest_assets     = config.assets.digest
+        self.assets_prefix     = config.assets.prefix
+        self.assets_precompile = config.assets.precompile
 
-        self.assets_environment = app.assets if config.assets.compile
+        self.assets_environment = app.assets
         self.assets_manifest = app.assets_manifest
-      end
 
-      Sprockets::Rails::Helper.precompile         ||= app.config.assets.precompile
-      Sprockets::Rails::Helper.assets             ||= app.assets
-      Sprockets::Rails::Helper.raise_runtime_errors = app.config.assets.raise_runtime_errors
+        self.resolve_assets_with = config.assets.resolve_with
 
-      if config.assets.compile
-        if app.routes.respond_to?(:prepend)
-          app.routes.prepend do
-            mount app.assets => config.assets.prefix
-          end
-        end
+        # Expose the app precompiled asset check to the view
+        self.precompiled_asset_checker = -> logical_path { app.asset_precompiled? logical_path }
       end
     end
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sprockets-rails
 version: !ruby/object:Gem::Version
-  version: 2.3.3
+  version: 3.0.0
 platform: ruby
 authors:
 - Joshua Peek
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-09-08 00:00:00.000000000 Z
+date: 2015-12-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sprockets
@@ -16,62 +16,56 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '2.8'
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: '4.0'
+        version: 3.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '2.8'
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: '4.0'
+        version: 3.0.0
 - !ruby/object:Gem::Dependency
   name: actionpack
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '4.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '4.0'
 - !ruby/object:Gem::Dependency
   name: activesupport
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '4.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '4.0'
 - !ruby/object:Gem::Dependency
   name: railties
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '4.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '4.0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -120,13 +114,13 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- LICENSE
 - README.md
 - lib/sprockets/rails.rb
+- lib/sprockets/rails/context.rb
 - lib/sprockets/rails/helper.rb
-- lib/sprockets/rails/legacy_asset_tag_helper.rb
-- lib/sprockets/rails/legacy_asset_url_helper.rb
+- lib/sprockets/rails/route_wrapper.rb
 - lib/sprockets/rails/task.rb
+- lib/sprockets/rails/utils.rb
 - lib/sprockets/rails/version.rb
 - lib/sprockets/railtie.rb
 homepage: https://github.com/rails/sprockets-rails
@@ -141,7 +135,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.9.3
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
@@ -149,9 +143,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.7
+rubygems_version: 2.4.5.1
 signing_key: 
 specification_version: 4
 summary: Sprockets Rails integration
 test_files: []
-has_rdoc: 

data/LICENSE

@@ -1,20 +0,0 @@
-Copyright (c) 2014 Joshua Peek
-
-Permission is hereby granted, free of charge, to any person obtaining
-a copy of this software and associated documentation files (the
-"Software"), to deal in the Software without restriction, including
-without limitation the rights to use, copy, modify, merge, publish,
-distribute, sublicense, and/or sell copies of the Software, and to
-permit persons to whom the Software is furnished to do so, subject to
-the following conditions:
-
-The above copyright notice and this permission notice shall be
-included in all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

data/lib/sprockets/rails/legacy_asset_tag_helper.rb

@@ -1,32 +0,0 @@
-require 'sprockets'
-
-module Sprockets
-  module Rails
-    # Backports of AssetTagHelper methods for Rails 2.x and 3.x.
-    module LegacyAssetTagHelper
-      include ActionView::Helpers::TagHelper
-
-      def javascript_include_tag(*sources)
-        options = sources.extract_options!.stringify_keys
-        sources.uniq.map { |source|
-          tag_options = {
-            "src" => path_to_javascript(source)
-          }.merge(options)
-          content_tag(:script, "", tag_options)
-        }.join("\n").html_safe
-      end
-
-      def stylesheet_link_tag(*sources)
-        options = sources.extract_options!.stringify_keys
-        sources.uniq.map { |source|
-          tag_options = {
-            "rel" => "stylesheet",
-            "media" => "screen",
-            "href" => path_to_stylesheet(source)
-          }.merge(options)
-          tag(:link, tag_options)
-        }.join("\n").html_safe
-      end
-    end
-  end
-end

data/lib/sprockets/rails/legacy_asset_url_helper.rb

@@ -1,133 +0,0 @@
-require 'sprockets'
-
-module Sprockets
-  module Rails
-    # Backports of AssetUrlHelper methods for Rails 2.x and 3.x.
-    module LegacyAssetUrlHelper
-      URI_REGEXP = %r{^[-a-z]+://|^(?:cid|data):|^//}
-
-      def asset_path(source, options = {})
-        source = source.to_s
-        return "" unless source.present?
-        return source if source =~ URI_REGEXP
-
-        tail, source = source[/([\?#].+)$/], source.sub(/([\?#].+)$/, '')
-
-        if extname = compute_asset_extname(source, options)
-          source = "#{source}#{extname}"
-        end
-
-        if source[0] != ?/
-          source = compute_asset_path(source, options)
-        end
-
-        relative_url_root = defined?(config.relative_url_root) && config.relative_url_root
-        if relative_url_root
-          source = "#{relative_url_root}#{source}" unless source.starts_with?("#{relative_url_root}/")
-        end
-
-        if host = compute_asset_host(source, options)
-          source = "#{host}#{source}"
-        end
-
-        "#{source}#{tail}"
-      end
-      alias_method :path_to_asset, :asset_path
-
-      def asset_url(source, options = {})
-        path_to_asset(source, options.merge(:protocol => :request))
-      end
-
-      ASSET_EXTENSIONS = {
-        :javascript => '.js',
-        :stylesheet => '.css'
-      }
-
-      def compute_asset_extname(source, options = {})
-        return if options[:extname] == false
-        extname = options[:extname] || ASSET_EXTENSIONS[options[:type]]
-        extname if extname && File.extname(source) != extname
-      end
-
-      ASSET_PUBLIC_DIRECTORIES = {
-        :audio      => '/audios',
-        :font       => '/fonts',
-        :image      => '/images',
-        :javascript => '/javascripts',
-        :stylesheet => '/stylesheets',
-        :video      => '/videos'
-      }
-
-      def compute_asset_path(source, options = {})
-        dir = ASSET_PUBLIC_DIRECTORIES[options[:type]] || ""
-        File.join(dir, source)
-      end
-
-      def compute_asset_host(source = "", options = {})
-        request = self.request if respond_to?(:request)
-
-        if defined? config
-          host = config.asset_host
-        elsif defined? ActionController::Base.asset_host
-          host = ActionController::Base.asset_host
-        end
-
-        host ||= request.base_url if request && options[:protocol] == :request
-        return unless host
-
-        if host.respond_to?(:call)
-          arity = host.respond_to?(:arity) ? host.arity : host.method(:call).arity
-          args = [source]
-          args << request if request && (arity > 1 || arity < 0)
-          host = host.call(*args)
-        elsif host =~ /%d/
-          host = host % (Zlib.crc32(source) % 4)
-        end
-
-        if host =~ URI_REGEXP
-          host
-        else
-          protocol = options[:protocol] || (request ? :request : :relative)
-          case protocol
-          when :relative
-            "//#{host}"
-          when :request
-            "#{request.protocol}#{host}"
-          else
-            "#{protocol}://#{host}"
-          end
-        end
-      end
-
-      def javascript_path(source, options = {})
-        path_to_asset(source, {:type => :javascript}.merge(options))
-      end
-      alias_method :path_to_javascript, :javascript_path
-
-      def stylesheet_path(source, options = {})
-        path_to_asset(source, {:type => :stylesheet}.merge(options))
-      end
-      alias_method :path_to_stylesheet, :stylesheet_path
-
-      def image_path(source, options = {})
-        path_to_asset(source, {:type => :image}.merge(options))
-      end
-      alias_method :path_to_image, :image_path
-
-      def video_path(source, options = {})
-        path_to_asset(source, {:type => :video}.merge(options))
-      end
-      alias_method :path_to_video, :video_path
-
-      def audio_path(source, options = {})
-        path_to_asset(source, {:type => :audio}.merge(options))
-      end
-      alias_method :path_to_audio, :audio_path
-
-      def font_path(source, options = {})
-        path_to_asset(source, {:type => :font}.merge(options))
-      end
-      alias_method :path_to_font, :font_path
-    end
-  end
-end