sprockets-redirect 0.1.0 → 0.2.0

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: 05665c3e2fd0b0271a7ee7cdeefae5f5e0d06f47
+  data.tar.gz: eb0e49c4fa65361437f8909aac5eb1aa1a2a2978
+SHA512:
+  metadata.gz: 5eb94d40046f8d64ac573c254f69a6c1b79e9b72bf134c486f33c7f43aad8d683c2e0e2bbc9589e2ea28da0de05130f84b66907324307ac1bbabc6b9d2f85f30
+  data.tar.gz: f9e317cf8c54c037bdd54dab20067e6c9c0317b85d038911d9f5f91b60c63a894d55f664d296ec4ccb09c9dc08e1187394dbbe444fb1f63abe6e636ab5c1348b

data/README.md

@@ -1,4 +1,4 @@
-Sprockets::Redirect [![Build Status](https://secure.travis-ci.org/thoughtbot/paperclip.png?branch=master)](http://travis-ci.org/thoughtbot/paperclip)
+Sprockets::Redirect [![Build Status](https://secure.travis-ci.org/sikachu/sprockets-redirect.png?branch=master)](http://travis-ci.org/sikachu/sprockets-redirect)
 ===================
 
 A Rack middleware for [Rails](https://github.com/rails/rails) >= 3.1.0 with asset pipeline and asset digest enabled. This middleware is used to redirect any request to static asset without a digest to the version with digest in its filename by reading the `manifest.yml` file generated after you run `rake assets:precompile`
@@ -75,6 +75,8 @@ Contributing
 
 If you found any bug or would like to request a feature, please use Github's [issue tracker](https://github.com/sikachu/sprockets-redirect/issues) to report them. [Pull requests](https://github.com/sikachu/sprockets-redirect/pulls) are always welcomed if you also want to help me fix it. Please make sure to include a test to make sure that I don't break it in the future.
 
+Also, you should run `rake test_all` to run the test against multiple versions of Ruby. We're currently testing against Rails 3.1, 3.2 and 4.0
+
 
 License
 -------

data/lib/sprockets-redirect.rb

@@ -2,10 +2,10 @@ require 'sprockets/redirect'
 
 module Sprockets
   class RedirectRailtie < ::Rails::Railtie
-    initializer "my_railtie.configure_rails_initialization" do |app|
-      if ::Rails.configuration.assets.enabled && !::Rails.configuration.assets.compile && ::Rails.configuration.assets.digest
-        app.middleware.insert_before Rack::Lock, Sprockets::Redirect, :digests => ::Rails.configuration.assets.digests,
-                                                                      :prefix  => ::Rails.configuration.assets.prefix
+    initializer "insert_sprockets_redirect_middleware" do |app|
+      if !::Rails.configuration.assets.compile && ::Rails.configuration.assets.digest
+        app.middleware.insert 0, Sprockets::Redirect, ::Rails.application.assets,
+          :prefix => ::Rails.configuration.assets.prefix
       end
     end
   end

data/lib/sprockets/redirect.rb

@@ -24,11 +24,6 @@ module Sprockets
   # E-Mail which refers to static assets in the asset pipeline, which might be
   # impossible and impractical for you to use an URL with a digest in it.
   class Redirect
-
-    # Set a path to manifest file, which will be used for lookup
-    class_attribute :manifest
-    self.manifest = nil
-
     # Set this to false to disable middleware's redirection
     class_attribute :enabled
     self.enabled = true
@@ -37,38 +32,52 @@ module Sprockets
     class_attribute :redirect_status
     self.redirect_status = 302
 
-    def initialize(app, options = {})
+    def initialize(app, sprockets_environment, options = {})
       @app = app
-      @digests = options[:digests] || []
       @prefix = options[:prefix] || "/assets"
-      if manifest = options[:manifest] || self.class.manifest
-        @digests = YAML.load_file manifest
-      end
+      @environment = sprockets_environment
     end
 
     def call(env)
-      if self.class.enabled && !@digests.empty? && asset_match?(env)
+      @request = Rack::Request.new(env)
+
+      if should_redirect?
         redirect_to_digest_version(env)
       else
         @app.call(env)
       end
     end
 
-    protected
+    private
+
+    def should_redirect?
+      self.class.enabled && asset_path_matched?
+    end
 
     # This will returns true if a requested path is matched in the digests hash
-    def asset_match?(env)
-      @request = Rack::Request.new(env)
-      @request.path.match(/^#{@prefix}/) && @digests.has_key?(@request.path.sub(/^#{@prefix}\//, ""))
+    def asset_path_matched?
+      @request.path.start_with?(@prefix) && asset_exists?
+    end
+
+    def asset_exists?
+      @environment[logical_path]
+    end
+
+    def logical_path
+      @request.path.sub(/^#{@prefix}\//, "")
+    end
+
+    def digest_path
+      @environment[logical_path].digest_path
     end
 
     # Sends a redirect header back to browser
     def redirect_to_digest_version(env)
       url = URI(@request.url)
-      filename = @digests[@request.path.sub("#{@prefix}/", "")]
-      url.path = "#{@prefix}/#{filename}"
+      url.path = "#{@prefix}/#{digest_path}"
+
       headers = { 'Location'      => url.to_s,
-                  'Content-Type'  => Rack::Mime.mime_type(::File.extname(filename)),
+                  'Content-Type'  => Rack::Mime.mime_type(::File.extname(digest_path)),
                   'Pragma'        => 'no-cache',
                   'Cache-Control' => 'no-cache; max-age=0' }
       [self.class.redirect_status, headers, [redirect_message(url.to_s)]]

metadata

@@ -1,52 +1,131 @@
 --- !ruby/object:Gem::Specification
 name: sprockets-redirect
 version: !ruby/object:Gem::Version
-  version: 0.1.0
-  prerelease: 
+  version: 0.2.0
 platform: ruby
 authors:
 - Prem Sichanugrist
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-09-15 00:00:00.000000000Z
+date: 2014-01-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rack
-  requirement: &70163961784520 !ruby/object:Gem::Requirement
-    none: false
+  requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70163961784520
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: activesupport
-  requirement: &70163961783480 !ruby/object:Gem::Requirement
-    none: false
+  requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: 3.1.0
   type: :runtime
   prerelease: false
-  version_requirements: *70163961783480
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: 3.1.0
+- !ruby/object:Gem::Dependency
+  name: appraisal
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: 1.0.0.beta2
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: 1.0.0.beta2
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &70163961774060 !ruby/object:Gem::Requirement
-    none: false
+  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: mocha
+  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: rake
+  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: rack-test
+  requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70163961774060
-description: ! "    Rack middleware which will look up your `public/assets/manifest.yml`
-  and\n    redirect a request with no digest in the file name to the version with\n
-  \   digest in the file name.\n"
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: rails
+  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'
+description: |2
+      Rack middleware which will look up your `public/assets/manifest.yml` and
+      redirect a request with no digest in the file name to the version with
+      digest in the file name.
 email: s@sikac.hu
 executables: []
 extensions: []
@@ -59,26 +138,25 @@ files:
 - README.md
 homepage: https://github.com/sikachu/sprockets-redirect
 licenses: []
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.10
+rubygems_version: 2.0.14
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Redirect assets with no digest request to a filename with digest version.
 test_files: []