sprockets-rails 2.3.3 → 3.0.0.beta1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ce070066edd25fc773120801099deaa44cbab0a8
-  data.tar.gz: 0ae39779bf56111b665205168d7b4daebd47ea94
+  metadata.gz: a7e8197def5c64d991abb7e4c18f4d8a4f0cc6ae
+  data.tar.gz: 5f50d295b072faf5d82391d0758b9582be53b3cc
 SHA512:
-  metadata.gz: 4032a379c2a1d87b5d28e2be7119c628aaf36814fc0d34c717068fc91b59b69af7ed979107f0c47d37aad0c42e485ade12b688cd8ea562ca2bfbdceb5daa75c4
-  data.tar.gz: b32fc1c142d819cf55b734fda999b7a55f88d1ce7a164f6417ff6839f3acb15fe00a38004b6507dc867e50ffabcb186ca4e73e80f53be6b5f61068c2a2e3987c
+  metadata.gz: 1ec86dc53e523a016d690cb201fe53e7b13d3c37144025059efbbedb311bd54b2c234ae4d159e9b76f600888b772038e0524f2288705ec83b08ede2896f665fa
+  data.tar.gz: ce22650daae7b6bfd3ecf93498c08bb064b4c01cb6b770a83acff558e654baf202af8cb8721242f73255a9d7a312eebed669f19d818ff5370e906a75be8bed14

data/LICENSE

@@ -1,4 +1,4 @@
-Copyright (c) 2014 Joshua Peek
+Copyright (c) 2012-2014 Joshua Peek
 
 Permission is hereby granted, free of charge, to any person obtaining
 a copy of this software and associated documentation files (the

data/README.md

@@ -89,7 +89,9 @@ Defines the full path to be used for the asset precompiler's manifest file. Defa
 
 **`config.assets.digest`**
 
-Link to undigest asset filenames. This option will eventually go away. Unless when `compile` is disabled.
+When enabled, fingerprints will be added to asset filenames.
+If `config.assets.raise_runtime_errors` is also enabled, requests for assets
+will raise an error unless they contain fingerprints.
 
 **`config.assets.debug`**
 
@@ -105,7 +107,7 @@ Invokes block with environment when the environment is initialized. Allows direc
 
 ``` ruby
 config.assets.configure do |env|
-  env.js_compressor  = :uglify # or :closure, :yui
+  env.js_compressor  = :uglifier # or :closure, :yui
   env.css_compressor = :sass   # or :yui
 
   require 'my_processor'
@@ -132,7 +134,7 @@ The following plugins provide some extras for the Sprockets Asset Pipeline.
 
 * Only compiles digest filenames. Static non-digest assets should simply live in public/.
 * Unmanaged asset paths and urls fallback to linking to public/. This should make it easier to work with both compiled assets and simple static assets. As a side effect, there will never be any "asset not precompiled errors" when linking to missing assets. They will just link to a public file which may or may not exist.
-* JS and CSS compressors must be explicitly set. Magic detection has been removed to avoid loading compressors in environments where you want to avoid loading any of the asset libraries. Assign `config.assets.js_compressor = :uglify` or `config.assets.css_compressor = :sass` for the standard compressors.
+* JS and CSS compressors must be explicitly set. Magic detection has been removed to avoid loading compressors in environments where you want to avoid loading any of the asset libraries. Assign `config.assets.js_compressor = :uglifier` or `config.assets.css_compressor = :sass` for the standard compressors.
 * The manifest file is now in a JSON format. Since it lives in public/ by default, the initial filename is also randomized to obfuscate public access to the resource.
 * `config.assets.manifest` (if used) must now include the manifest filename, e.g. `Rails.root.join('config/manifest.json')`. It cannot be a directory.
 * Two cleanup tasks. `rake assets:clean` is now a safe cleanup that only removes older assets that are no longer used. While `rake assets:clobber` nukes the entire `public/assets` directory and clears your filesystem cache. The clean task allows for rolling deploys that may still be linking to an old asset while the new assets are being built.
@@ -149,22 +151,22 @@ $ bundle install
 $ bundle exec rake test
 ```
 
-[![Build Status](https://secure.travis-ci.org/rails/sprockets-rails.png)](http://travis-ci.org/rails/sprockets-rails)
+[![Build Status](https://travis-ci.org/rails/sprockets-rails.svg?branch=master)](https://travis-ci.org/rails/sprockets-rails)
 
 
 ## Releases
 
-sprockets-rails 2.x will primarily target sprockets 2.x with future compatibility for 3.x. Consider upgrading to sprockets-rails 3.x to take full advantage of 3.x features.
+sprockets-rails 2.x will primarily target sprockets 2.x. And future versions will target the corresponding sprockets release line.
 
 The minor and patch version will be updated according to [semver](http://semver.org/).
 
 * Any new APIs or config options that don't break compatibility will be in a minor release
-* Any time the sprockets dependency is bumped, there will be a new minor release
+* Any time the sprockets depedency is bumped, there will be a new minor release
 * Simple bug fixes will be patch releases
 
 
 ## License
 
-Copyright © 2014 Joshua Peek.
+Copyright © 2012 Joshua Peek.
 
 Released under the MIT license. See `LICENSE` for details.

data/lib/sprockets/rails/environment.rb

@@ -0,0 +1,39 @@
+require 'sprockets'
+require 'sprockets/rails/helper'
+
+module Sprockets
+  module Rails
+    class Environment < Sprockets::Environment
+      class NoDigestError < StandardError
+        def initialize(asset)
+          msg = "Assets should not be requested directly without their digests: " <<
+                "Use the helpers in ActionView::Helpers to request #{asset}"
+          super(msg)
+        end
+      end
+
+      def call(env)
+        if Sprockets::Rails::Helper.raise_runtime_errors && context_class.digest_assets
+          path = unescape(env['PATH_INFO'].to_s.sub(/^\//, ''))
+
+          if fingerprint = path_fingerprint(path)
+            path = path.sub("-#{fingerprint}", '')
+          else
+            raise NoDigestError.new(path)
+          end
+
+          asset = find_asset(path)
+          if asset && asset.digest != fingerprint
+            asset_path = File.join(context_class.assets_prefix || "/", asset.digest_path)
+            asset_path += '?' + env['QUERY_STRING'] if env['QUERY_STRING']
+            [302, {"Location" => asset_path}, []]
+          else
+            super(env)
+          end
+        else
+          super(env)
+        end
+      end
+    end
+  end
+end

data/lib/sprockets/rails/helper.rb

@@ -38,15 +38,8 @@ module Sprockets
         end
       end
 
-      if defined? ActionView::Helpers::AssetUrlHelper
-        include ActionView::Helpers::AssetUrlHelper
-        include ActionView::Helpers::AssetTagHelper
-      else
-        require 'sprockets/rails/legacy_asset_tag_helper'
-        require 'sprockets/rails/legacy_asset_url_helper'
-        include LegacyAssetTagHelper
-        include LegacyAssetUrlHelper
-      end
+      include ActionView::Helpers::AssetUrlHelper
+      include ActionView::Helpers::AssetTagHelper
 
       VIEW_ACCESSORS = [:assets_environment, :assets_manifest,
                         :assets_prefix, :digest_assets, :debug_assets]

data/lib/sprockets/rails/version.rb

@@ -1,5 +1,5 @@
 module Sprockets
   module Rails
-    VERSION = "2.3.3"
+    VERSION = "3.0.0.beta1"
   end
 end

data/lib/sprockets/railtie.rb

@@ -3,6 +3,7 @@ require 'rails/railtie'
 require 'action_controller/railtie'
 require 'active_support/core_ext/module/remove_method'
 require 'sprockets'
+require 'sprockets/rails/environment'
 require 'sprockets/rails/helper'
 require 'sprockets/rails/version'
 
@@ -18,9 +19,9 @@ module Rails
     remove_possible_method :assets
     remove_possible_method :assets=
 
-    # Returns Sprockets::Environment for app config.
+    # Returns Sprockets::Rails::Environment for app config.
     def assets
-      @assets ||= Sprockets::Environment.new(root.to_s) do |env|
+      @assets ||= Sprockets::Rails::Environment.new(root.to_s) do |env|
         env.version = ::Rails.env
 
         path = "#{config.root}/tmp/cache/assets/#{::Rails.env}"
@@ -32,26 +33,6 @@ module Rails
       end
     end
     attr_writer :assets
-
-    # Returns Sprockets::Manifest for app config.
-    attr_accessor :assets_manifest
-  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
-      end
-    end
   end
 end
 
@@ -86,6 +67,8 @@ module Sprockets
     config.after_initialize do |app|
       config = app.config
 
+      manifest_assets_path = File.join(config.paths['public'].first, config.assets.prefix)
+
       # Configuration options that should invalidate
       # the Sprockets cache when changed.
       app.assets.version = [
@@ -101,31 +84,6 @@ module Sprockets
         app.assets.append_path path
       end
 
-      # Run app.assets.configure blocks
-      config.assets._blocks.each do |block|
-        block.call app.assets
-      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
-
-      # 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
-      end
-
-      manifest_assets_path = File.join(config.paths['public'].first, config.assets.prefix)
-      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)
-      end
-
       ActiveSupport.on_load(:action_view) do
         include Sprockets::Rails::Helper
 
@@ -140,19 +98,38 @@ module Sprockets
         context.digest_assets = config.assets.digest
         context.config        = config.action_controller
 
-        self.assets_environment = app.assets if config.assets.compile
-        self.assets_manifest = app.assets_manifest
+        if config.assets.compile
+          self.assets_environment = app.assets
+          self.assets_manifest    = Sprockets::Manifest.new(app.assets, manifest_assets_path, config.assets.manifest)
+        else
+          self.assets_manifest = Sprockets::Manifest.new(manifest_assets_path, config.assets.manifest)
+        end
+      end
+
+      app.assets.js_compressor  = config.assets.js_compressor
+      app.assets.css_compressor = config.assets.css_compressor
+
+      # Run app.assets.configure blocks
+      config.assets._blocks.each do |block|
+        block.call app.assets
+      end
+
+      # 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
       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
 
       if config.assets.compile
-        if app.routes.respond_to?(:prepend)
-          app.routes.prepend do
-            mount app.assets => config.assets.prefix
-          end
+        app.routes.prepend do
+          mount app.assets => config.assets.prefix
         end
       end
     end

metadata

@@ -1,77 +1,57 @@
 --- !ruby/object:Gem::Specification
 name: sprockets-rails
 version: !ruby/object:Gem::Version
-  version: 2.3.3
+  version: 3.0.0.beta1
 platform: ruby
 authors:
 - Joshua Peek
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-09-08 00:00:00.000000000 Z
+date: 2014-08-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sprockets
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '2.8'
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: '4.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'
 - !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'
-- !ruby/object:Gem::Dependency
-  name: railties
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '3.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
@@ -87,33 +67,19 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: sass
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: uglifier
+  name: railties
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '4.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '4.0'
 description: 
 email: josh@joshpeek.com
 executables: []
@@ -123,9 +89,8 @@ files:
 - LICENSE
 - README.md
 - lib/sprockets/rails.rb
+- lib/sprockets/rails/environment.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/task.rb
 - lib/sprockets/rails/version.rb
 - lib/sprockets/railtie.rb
@@ -144,12 +109,12 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.7
+rubygems_version: 2.3.0
 signing_key: 
 specification_version: 4
 summary: Sprockets Rails integration

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