sprockets-helpers 0.6.1 → 0.7.0

data/Appraisals

@@ -17,3 +17,11 @@ end
 appraise 'sprockets-2.4' do
   gem 'sprockets', '~> 2.4.0'
 end
+
+appraise 'sprockets-2.5' do
+  gem 'sprockets', '~> 2.5.0'
+end
+
+appraise 'sprockets-2.6' do
+  gem 'sprockets', '~> 2.6.0'
+end

data/gemfiles/sprockets-2.5.gemfile

@@ -0,0 +1,7 @@
+# This file was generated by Appraisal
+
+source "http://rubygems.org"
+
+gem "sprockets", "~> 2.5.0"
+
+gemspec :path=>"../"

data/gemfiles/sprockets-2.6.gemfile

@@ -0,0 +1,7 @@
+# This file was generated by Appraisal
+
+source "http://rubygems.org"
+
+gem "sprockets", "~> 2.6.0"
+
+gemspec :path=>"../"

data/lib/sprockets/helpers.rb

@@ -11,24 +11,24 @@ module Sprockets
     class << self
       # Link to assets from a dedicated server.
       attr_accessor :asset_host
-      
+
       # When true, the asset paths will return digest paths.
       attr_accessor :digest
-      
+
       # Set the Sprockets environment to search for assets.
       # This defaults to the context's #environment method.
       attr_accessor :environment
-      
+
       # The manifest file used for lookup
       attr_accessor :manifest
-      
+
       # The base URL the Sprocket environment is mapped to.
       # This defaults to '/assets'.
       def prefix
         @prefix ||= '/assets'
       end
       attr_writer :prefix
-      
+
       # Customize the protocol when using asset hosts.
       # If the value is :relative, A relative protocol ('//')
       # will be used.
@@ -36,7 +36,7 @@ module Sprockets
         @protocol ||= 'http://'
       end
       attr_writer :protocol
-      
+
       # The path to the public directory, where the assets
       # not managed by Sprockets will be located.
       # Defaults to './public'
@@ -44,13 +44,15 @@ module Sprockets
         @public_path ||= './public'
       end
       attr_writer :public_path
-      
+
       # Convience method for configuring Sprockets::Helpers.
       def configure
         yield self
       end
     end
-    
+  end
+
+  class Context
     # Returns the path to an asset either in the Sprockets environment
     # or the public directory. External URIs are untouched.
     #
@@ -79,35 +81,43 @@ module Sprockets
     #   asset_path '/dir/xmlhr.js', :dir => 'javascripts' # => '/dir/xmlhr.js'
     #   asset_path 'http://www.example.com/js/xmlhr'      # => 'http://www.example.com/js/xmlhr'
     #   asset_path 'http://www.example.com/js/xmlhr.js'   # => 'http://www.example.com/js/xmlhr.js'
-    # 
+    #
     def asset_path(source, options = {})
       uri = URI.parse(source)
-      
+
       # Return fast if the URI is absolute
       return source if uri.absolute?
-      
+
+      # When debugging return paths without digests, asset_hosts, etc.
+      if options[:debug]
+        options[:manifest]   = false
+        options[:digest]     = false
+        options[:asset_host] = false
+      end
+
       # Append extension if necessary
       source_ext = File.extname(source)
       if options[:ext] && source_ext != ".#{options[:ext]}"
         uri.path << ".#{options[:ext]}"
       end
-      
+
       # If a manifest is present, try to grab the path from the manifest first
-      if Helpers.manifest && Helpers.manifest.assets[uri.path]
-        return ManifestPath.new(uri, Helpers.manifest.assets[uri.path], options).to_s
+      # Don't try looking in manifest in the first place if we're not looking for digest version
+      if options[:manifest] != false && Helpers.manifest && Helpers.manifest.assets[uri.path]
+        return Helpers::ManifestPath.new(uri, Helpers.manifest.assets[uri.path], options).to_s
       end
-      
+
       # If the source points to an asset in the Sprockets
       # environment use AssetPath to generate the full path.
       assets_environment.resolve(uri.path) do |path|
-        return AssetPath.new(uri, assets_environment[path], options).to_s
+        return Helpers::AssetPath.new(uri, assets_environment[path], options).to_s
       end
-      
+
       # Use FilePath for normal files on the file system
-      FilePath.new(uri, options).to_s
+      return Helpers::FilePath.new(uri, options).to_s
     end
     alias_method :path_to_asset, :asset_path
-    
+
     # Computes the path to a audio asset either in the Sprockets environment
     # or the public directory. External URIs are untouched.
     #
@@ -131,7 +141,7 @@ module Sprockets
       asset_path source, { :dir => 'audios' }.merge(options)
     end
     alias_method :path_to_audio, :audio_path
-    
+
     # Computes the path to a font asset either in the Sprockets environment
     # or the public directory. External URIs are untouched.
     #
@@ -155,7 +165,7 @@ module Sprockets
       asset_path source, { :dir => 'fonts' }.merge(options)
     end
     alias_method :path_to_font, :font_path
-    
+
     # Computes the path to an image asset either in the Sprockets environment
     # or the public directory. External URIs are untouched.
     #
@@ -179,7 +189,7 @@ module Sprockets
       asset_path source, { :dir => 'images' }.merge(options)
     end
     alias_method :path_to_image, :image_path
-    
+
     # Computes the path to a javascript asset either in the Sprockets
     # environment or the public directory. If the +source+ filename has no extension,
     # <tt>.js</tt> will be appended. External URIs are untouched.
@@ -204,7 +214,7 @@ module Sprockets
       asset_path source, { :dir => 'javascripts', :ext => 'js' }.merge(options)
     end
     alias_method :path_to_javascript, :javascript_path
-    
+
     # Computes the path to a stylesheet asset either in the Sprockets
     # environment or the public directory. If the +source+ filename has no extension,
     # <tt>.css</tt> will be appended. External URIs are untouched.
@@ -229,7 +239,7 @@ module Sprockets
       asset_path source, { :dir => 'stylesheets', :ext => 'css' }.merge(options)
     end
     alias_method :path_to_stylesheet, :stylesheet_path
-    
+
     # Computes the path to a video asset either in the Sprockets environment
     # or the public directory. External URIs are untouched.
     #
@@ -253,9 +263,9 @@ module Sprockets
       asset_path source, { :dir => 'videos' }.merge(options)
     end
     alias_method :path_to_video, :video_path
-    
+
     protected
-    
+
     # Returns the Sprockets environment #asset_path uses to search for
     # assets. This can be overridden for more control, if necessary.
     # Defaults to Sprockets::Helpers.environment or the envrionment
@@ -264,8 +274,4 @@ module Sprockets
       Helpers.environment || environment
     end
   end
-  
-  class Context
-    include Helpers
-  end
 end

data/lib/sprockets/helpers/base_path.rb

@@ -3,40 +3,40 @@ require 'zlib'
 
 module Sprockets
   module Helpers
-    # 
+    #
     class BasePath
       # The parsed URI from which to generate the full path to the asset.
       attr_reader :uri
-      
+
       # The various options used when generating the path.
       attr_reader :options
-      
+
       #
       def initialize(uri, options = {})
         @uri     = uri
         @options = options
       end
-      
+
       # Returns the full path to the asset, complete with
       # timestamp.
       def to_s
         rewrite_path
         rewrite_query
         rewrite_host
-        
+
         uri.to_s
       end
-      
+
       protected
-      
+
       # Hook for rewriting the base path.
       def rewrite_path # :nodoc:
       end
-      
+
       # Hook for rewriting the query string.
       def rewrite_query # :nodoc:
       end
-      
+
       # Hook for rewriting the host.
       def rewrite_host # :nodoc:
         if host = compute_asset_host
@@ -44,36 +44,40 @@ module Sprockets
           uri.scheme = compute_scheme
         end
       end
-      
+
       # Pick an asset host for this source. Returns +nil+ if no host is set,
       # the host if no wildcard is set, the host interpolated with the
       # numbers 0-3 if it contains <tt>%d</tt> (the number is the source hash mod 4),
       # or the value returned from invoking call on an object responding to call
       # (proc or otherwise).
       def compute_asset_host # :nodoc:
+        return nil if options[:asset_host] == false
+
         if host = options[:asset_host] || Helpers.asset_host
           if host.respond_to?(:call)
             host.call(uri.to_s)
           elsif host =~ /%d/
             host % (Zlib.crc32(uri.to_s) % 4)
+          elsif host.empty?
+            nil
           else
             host
           end
         end
       end
-      
+
       # Pick a scheme for the protocol if we are using
       # an asset host.
       def compute_scheme # :nodoc:
         protocol = options[:protocol] || Helpers.protocol
-        
+
         if protocol.nil? || protocol == :relative
           nil
         else
           protocol.to_s.sub %r{://\z}, ''
         end
       end
-      
+
       # Prepends the given path. If the path is absolute
       # An attempt to merge the URIs is made.
       #
@@ -81,16 +85,16 @@ module Sprockets
       def prepend_path(value) # :nodoc:
         prefix_uri = URI.parse(value)
         uri.path   = File.join prefix_uri.path, uri.path
-        
+
         if prefix_uri.absolute?
           @uri = prefix_uri.merge(uri)
         end
       end
-      
+
       # Append the given query string to the URI
       # instead of clobbering it.
       def append_query(value) # :nodoc:
-        if uri.query.nil? || uri.query.empty? 
+        if uri.query.nil? || uri.query.empty?
           uri.query = value
         else
           uri.query << ('&' + value)

data/lib/sprockets/helpers/version.rb

@@ -1,5 +1,5 @@
 module Sprockets
   module Helpers
-    VERSION = '0.6.1'
+    VERSION = '0.7.0'
   end
 end

data/spec/spec_helper.rb

@@ -9,7 +9,7 @@ Dir["#{File.dirname(__FILE__)}/support/**/*.rb"].each { |f| require f }
 
 RSpec.configure do |config|
   config.include Construct::Helpers
-  
+
   # Returns a Sprockets environment. Automatically
   # appends the 'assets' path if available.
   def env
@@ -17,7 +17,7 @@ RSpec.configure do |config|
       env.append_path 'assets' if File.directory?('assets')
     end
   end
-  
+
   # Returns a fresh context, that can be used to test helpers.
   def context(logical_path = 'application.js', pathname = nil)
     pathname ||= Pathname.new(File.join('assets', logical_path)).expand_path

data/spec/sprockets-helpers_spec.rb

@@ -5,7 +5,7 @@ describe Sprockets::Helpers do
     it 'sets global configuration' do
       within_construct do |c|
         c.file 'assets/main.css'
-        
+
         context.asset_path('main.css').should == '/assets/main.css'
         Sprockets::Helpers.configure do |config|
           config.digest = true
@@ -17,12 +17,12 @@ describe Sprockets::Helpers do
       end
     end
   end
-  
+
   describe '.digest' do
     it 'globally configures digest paths' do
       within_construct do |c|
         c.file 'assets/main.js'
-        
+
         context.asset_path('main', :ext => 'js').should == '/assets/main.js'
         Sprockets::Helpers.digest = true
         context.asset_path('main', :ext => 'js').should =~ %r(/assets/main-[0-9a-f]+.js)
@@ -30,12 +30,12 @@ describe Sprockets::Helpers do
       end
     end
   end
-  
+
   describe '.environment' do
     it 'sets a custom assets environment' do
       within_construct do |c|
         c.file 'themes/main.css'
-        
+
         custom_env = Sprockets::Environment.new
         custom_env.append_path 'themes'
         Sprockets::Helpers.environment = custom_env
@@ -44,27 +44,27 @@ describe Sprockets::Helpers do
       end
     end
   end
-  
+
   describe '.asset_host' do
     context 'that is a string' do
       it 'prepends the asset_host' do
         within_construct do |c|
           c.file 'assets/main.js'
           c.file 'public/logo.jpg'
-          
+
           Sprockets::Helpers.asset_host = 'assets.example.com'
           context.asset_path('main.js').should == 'http://assets.example.com/assets/main.js'
           context.asset_path('logo.jpg').should =~ %r(http://assets.example.com/logo.jpg\?\d+)
           Sprockets::Helpers.asset_host = nil
         end
       end
-      
+
       context 'with a wildcard' do
         it 'cycles asset_host between 0-3' do
           within_construct do |c|
             c.file 'assets/main.css'
             c.file 'public/logo.jpg'
-            
+
             Sprockets::Helpers.asset_host = 'assets%d.example.com'
             context.asset_path('main.css').should =~ %r(http://assets[0-3].example.com/assets/main.css)
             context.asset_path('logo.jpg').should =~ %r(http://assets[0-3].example.com/logo.jpg\?\d+)
@@ -73,13 +73,13 @@ describe Sprockets::Helpers do
         end
       end
     end
-    
+
     context 'that is a proc' do
       it 'prepends the returned asset_host' do
         within_construct do |c|
           c.file 'assets/main.js'
           c.file 'public/logo.jpg'
-          
+
           Sprockets::Helpers.asset_host = Proc.new { |source| File.basename(source, File.extname(source)) + '.assets.example.com' }
           context.asset_path('main.js').should == 'http://main.assets.example.com/assets/main.js'
           context.asset_path('logo.jpg').should =~ %r(http://logo.assets.example.com/logo.jpg\?\d+)
@@ -88,12 +88,12 @@ describe Sprockets::Helpers do
       end
     end
   end
-  
+
   describe '.prefix' do
     it 'sets a custom assets prefix' do
       within_construct do |c|
         c.file 'assets/logo.jpg'
-        
+
         context.asset_path('logo.jpg').should == '/assets/logo.jpg'
         Sprockets::Helpers.prefix = '/images'
         context.asset_path('logo.jpg').should == '/images/logo.jpg'
@@ -101,13 +101,13 @@ describe Sprockets::Helpers do
       end
     end
   end
-  
+
   describe '.protocol' do
     it 'sets the protocol to use with asset_hosts' do
       within_construct do |c|
         c.file 'assets/main.js'
         c.file 'public/logo.jpg'
-        
+
         Sprockets::Helpers.asset_host = 'assets.example.com'
         Sprockets::Helpers.protocol   = 'https'
         context.asset_path('main.js').should == 'https://assets.example.com/assets/main.js'
@@ -116,13 +116,13 @@ describe Sprockets::Helpers do
         Sprockets::Helpers.protocol   = nil
       end
     end
-    
+
     context 'that is :relative' do
       it 'sets a relative protocol' do
         within_construct do |c|
           c.file 'assets/main.js'
           c.file 'public/logo.jpg'
-          
+
           Sprockets::Helpers.asset_host = 'assets.example.com'
           Sprockets::Helpers.protocol   = :relative
           context.asset_path('main.js').should == '//assets.example.com/assets/main.js'
@@ -133,12 +133,12 @@ describe Sprockets::Helpers do
       end
     end
   end
-  
+
   describe '.public_path' do
     it 'sets a custom location for the public path' do
       within_construct do |c|
         c.file 'output/main.js'
-        
+
         context.asset_path('main.js').should == '/main.js'
         Sprockets::Helpers.public_path = './output'
         context.asset_path('main.js').should =~ %r(/main.js\?\d+)
@@ -158,32 +158,32 @@ describe Sprockets::Helpers do
           '//ajax.googleapis.com/ajax/libs/jquery/1.6.4/jquery.min.js'
       end
     end
-    
+
     context 'with regular files' do
       it 'returns absolute paths' do
         context.asset_path('/path/to/file.js').should == '/path/to/file.js'
         context.asset_path('/path/to/file.jpg').should == '/path/to/file.jpg'
         context.asset_path('/path/to/file.eot?#iefix').should == '/path/to/file.eot?#iefix'
       end
-      
+
       it 'appends the extension for javascripts and stylesheets' do
         context.asset_path('/path/to/file', :ext => 'js').should == '/path/to/file.js'
         context.asset_path('/path/to/file', :ext => 'css').should == '/path/to/file.css'
       end
-      
+
       it 'prepends a base dir' do
         context.asset_path('main', :dir => 'stylesheets', :ext => 'css').should == '/stylesheets/main.css'
         context.asset_path('main', :dir => 'javascripts', :ext => 'js').should == '/javascripts/main.js'
         context.asset_path('logo.jpg', :dir => 'images').should == '/images/logo.jpg'
       end
-      
+
       it 'appends a timestamp if the file exists in the output path' do
         within_construct do |c|
           c.file 'public/main.js'
           c.file 'public/favicon.ico'
           c.file 'public/font.eot'
           c.file 'public/font.svg'
-          
+
           context.asset_path('main', :ext => 'js').should =~ %r(/main.js\?\d+)
           context.asset_path('/favicon.ico').should =~ %r(/favicon.ico\?\d+)
           context.asset_path('font.eot?#iefix').should =~ %r(/font.eot\?\d+#iefix)
@@ -191,110 +191,155 @@ describe Sprockets::Helpers do
         end
       end
     end
-    
+
     context 'with assets' do
       it 'returns URLs to the assets' do
         within_construct do |c|
           c.file 'assets/logo.jpg'
           c.file 'assets/main.js'
           c.file 'assets/main.css'
-          
+
           context.asset_path('main', :ext => 'css').should == '/assets/main.css'
           context.asset_path('main', :ext => 'js').should == '/assets/main.js'
           context.asset_path('logo.jpg').should == '/assets/logo.jpg'
         end
       end
-      
+
       it 'prepends the assets prefix' do
         within_construct do |c|
           c.file 'assets/logo.jpg'
-          
+
           context.asset_path('logo.jpg').should == '/assets/logo.jpg'
           context.asset_path('logo.jpg', :prefix => '/images').should == '/images/logo.jpg'
         end
       end
-      
+
       it 'uses the digest path if configured' do
         within_construct do |c|
           c.file 'assets/main.js'
           c.file 'assets/font.eot'
           c.file 'assets/font.svg'
-          
+
           context.asset_path('main', :ext => 'js').should == '/assets/main.js'
           context.asset_path('main', :ext => 'js', :digest => true).should =~ %r(/assets/main-[0-9a-f]+.js)
           context.asset_path('font.eot?#iefix', :digest => true).should =~ %r(/assets/font-[0-9a-f]+.eot\?#iefix)
           context.asset_path('font.svg#FontName', :digest => true).should =~ %r(/assets/font-[0-9a-f]+.svg#FontName)
         end
       end
-      
+
       it 'returns a body parameter' do
         within_construct do |c|
           c.file 'assets/main.js'
           c.file 'assets/font.eot'
           c.file 'assets/font.svg'
-          
+
           context.asset_path('main', :ext => 'js', :body => true).should == '/assets/main.js?body=1'
           context.asset_path('font.eot?#iefix', :body => true).should == '/assets/font.eot?body=1#iefix'
           context.asset_path('font.svg#FontName', :body => true).should == '/assets/font.svg?body=1#FontName'
         end
       end
     end
-    
+
+    context 'when debuging' do
+      it 'does not use the digest path' do
+        within_construct do |c|
+          c.file 'assets/main.js'
+
+          Sprockets::Helpers.digest = true
+          context.asset_path('main.js', :debug => true).should == '/assets/main.js'
+          Sprockets::Helpers.digest = nil
+        end
+      end
+
+      it 'does not prepend the asset host' do
+        within_construct do |c|
+          c.file 'assets/main.js'
+
+          Sprockets::Helpers.asset_host = 'assets.example.com'
+          context.asset_path('main.js', :debug => true).should == '/assets/main.js'
+          Sprockets::Helpers.asset_host = nil
+        end
+      end
+    end
+
     if defined?(::Sprockets::Manifest)
       context 'with a manifest' do
         it 'reads path from a manifest file' do
           within_construct do |c|
             asset_file    = c.file 'assets/application.js'
             manifest_file = c.join 'manifest.json'
-            
+
             manifest = Sprockets::Manifest.new(env, manifest_file)
             manifest.compile 'application.js'
-            
+
             Sprockets::Helpers.configure do |config|
               config.digest   = true
               config.prefix   = '/assets'
               config.manifest = Sprockets::Manifest.new(env, manifest_file)
             end
-            
+
             asset_file.delete
             context.asset_path('application.js').should =~ %r(/assets/application-[0-9a-f]+.js)
-            
+
             Sprockets::Helpers.digest = nil
             Sprockets::Helpers.prefix = nil
           end
         end
+
+        context 'when debuging' do
+          it 'does not read the path from the manifest file' do
+            within_construct do |c|
+              asset_file    = c.file 'assets/application.js'
+              manifest_file = c.join 'manifest.json'
+
+              manifest = Sprockets::Manifest.new(env, manifest_file)
+              manifest.compile 'application.js'
+
+              Sprockets::Helpers.configure do |config|
+                config.digest   = true
+                config.prefix   = '/assets'
+                config.manifest = Sprockets::Manifest.new(env, manifest_file)
+              end
+
+              context.asset_path('application.js', :debug => true).should == '/assets/application.js'
+
+              Sprockets::Helpers.digest = nil
+              Sprockets::Helpers.prefix = nil
+            end
+          end
+        end
       end
     end
   end
-  
+
   describe '#javascript_path' do
     context 'with regular files' do
       it 'appends the js extension' do
         context.javascript_path('/path/to/file').should == '/path/to/file.js'
         context.javascript_path('/path/to/file.min').should == '/path/to/file.min.js'
       end
-      
+
       it 'prepends the javascripts dir' do
         context.javascript_path('main').should == '/javascripts/main.js'
         context.javascript_path('main.min').should == '/javascripts/main.min.js'
       end
     end
   end
-  
+
   describe '#stylesheet_path' do
     context 'with regular files' do
       it 'appends the css extension' do
         context.stylesheet_path('/path/to/file').should == '/path/to/file.css'
         context.stylesheet_path('/path/to/file.min').should == '/path/to/file.min.css'
       end
-      
+
       it 'prepends the stylesheets dir' do
         context.stylesheet_path('main').should == '/stylesheets/main.css'
         context.stylesheet_path('main.min').should == '/stylesheets/main.min.css'
       end
     end
   end
-  
+
   describe '#image_path' do
     context 'with regular files' do
       it 'prepends the images dir' do
@@ -302,7 +347,7 @@ describe Sprockets::Helpers do
       end
     end
   end
-  
+
   describe '#font_path' do
     context 'with regular files' do
       it 'prepends the fonts dir' do
@@ -310,7 +355,7 @@ describe Sprockets::Helpers do
       end
     end
   end
-  
+
   describe '#video_path' do
     context 'with regular files' do
       it 'prepends the videos dir' do
@@ -318,7 +363,7 @@ describe Sprockets::Helpers do
       end
     end
   end
-  
+
   describe '#audio_path' do
     context 'with regular files' do
       it 'prepends the audios dir' do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sprockets-helpers
 version: !ruby/object:Gem::Version
-  version: 0.6.1
+  version: 0.7.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-07-11 00:00:00.000000000 Z
+date: 2012-09-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sprockets
@@ -109,6 +109,8 @@ files:
 - gemfiles/sprockets-2.2.gemfile
 - gemfiles/sprockets-2.3.gemfile
 - gemfiles/sprockets-2.4.gemfile
+- gemfiles/sprockets-2.5.gemfile
+- gemfiles/sprockets-2.6.gemfile
 - lib/sprockets-helpers.rb
 - lib/sprockets/helpers.rb
 - lib/sprockets/helpers/asset_path.rb
@@ -133,7 +135,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -275350641
+      hash: 193858515
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -142,7 +144,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -275350641
+      hash: 193858515
 requirements: []
 rubyforge_project: sprockets-helpers
 rubygems_version: 1.8.23