sprockets-helpers 0.8.0 → 0.9.1

data/lib/sprockets/helpers.rb

@@ -2,7 +2,6 @@ require 'sprockets'
 require 'sprockets/helpers/version'
 require 'sprockets/helpers/base_path'
 require 'sprockets/helpers/asset_path'
-require 'sprockets/helpers/expanded_asset_paths'
 require 'sprockets/helpers/file_path'
 require 'sprockets/helpers/manifest_path'
 require 'uri'
@@ -49,6 +48,20 @@ module Sprockets
       end
       attr_writer :public_path
 
+      # The default options for each asset path method. This is where you
+      # can change your default directories for the fallback directory.
+      def default_path_options
+        @default_path_options ||= {
+          :audio_path => { :dir => 'audios' },
+          :font_path => { :dir => 'fonts' },
+          :image_path => { :dir => 'images' },
+          :javascript_path => { :dir => 'javascripts', :ext => 'js' },
+          :stylesheet_path => { :dir => 'stylesheets', :ext => 'css' },
+          :video_path => { :dir => 'videos' }
+        }
+      end
+      attr_writer :default_path_options
+
       # Convience method for configuring Sprockets::Helpers.
       def configure
         yield self
@@ -99,50 +112,33 @@ module Sprockets
     #
     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[: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
-      # 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.
-      # With expand, return array of paths of assets required by asset.
-      assets_environment.resolve(uri.path) do |path|
-        asset = assets_environment[path]
-        if options[:expand]
-          return Helpers::ExpandedAssetPaths.new(uri, asset, options).to_a
-        else
-          return Helpers::AssetPath.new(uri, asset, options).to_s
-        end
+      path = find_asset_path(uri, options)
+      if options[:expand] && path.respond_to?(:to_a)
+        path.to_a
+      else
+        path.to_s
       end
-
-      # Use FilePath for normal files on the file system
-      return Helpers::FilePath.new(uri, options).to_s
     end
     alias_method :path_to_asset, :asset_path
 
     def asset_tag(source, options = {}, &block)
       raise ::ArgumentError, 'block missing' unless block
-      path = asset_path source, { :expand => Helpers.expand }.merge(options)
-      if options[:expand] && path.kind_of?(Array)
+      options = { :expand => Helpers.expand }.merge(options)
+      path = asset_path source, options
+      if options[:expand] && path.respond_to?(:map)
         return path.map(&block).join()
       else
         yield path
@@ -150,13 +146,15 @@ module Sprockets
     end
 
     def javascript_tag(source, options = {})
-      asset_tag(source, { :ext => 'js' }.merge(options)) do |path|
+      options = Helpers.default_path_options[:javascript_path].merge(options)
+      asset_tag(source, options) do |path|
         %Q(<script src="#{path}"></script>)
       end
     end
 
     def stylesheet_tag(source, options = {})
-      asset_tag(source, { :ext => 'css' }.merge(options)) do |path|
+      options = Helpers.default_path_options[:stylesheet_path].merge(options)
+      asset_tag(source, options) do |path|
         %Q(<link rel="stylesheet" href="#{path}">)
       end
     end
@@ -181,7 +179,7 @@ module Sprockets
     #   audio_path 'http://www.example.com/img/audio.mp3' # => 'http://www.example.com/img/audio.mp3'
     #
     def audio_path(source, options = {})
-      asset_path source, { :dir => 'audios' }.merge(options)
+      asset_path source, Helpers.default_path_options[:audio_path].merge(options)
     end
     alias_method :path_to_audio, :audio_path
 
@@ -205,7 +203,7 @@ module Sprockets
     #   font_path 'http://www.example.com/img/font.ttf' # => 'http://www.example.com/img/font.ttf'
     #
     def font_path(source, options = {})
-      asset_path source, { :dir => 'fonts' }.merge(options)
+      asset_path source, Helpers.default_path_options[:font_path].merge(options)
     end
     alias_method :path_to_font, :font_path
 
@@ -229,7 +227,7 @@ module Sprockets
     #   image_path 'http://www.example.com/img/edit.png' # => 'http://www.example.com/img/edit.png'
     #
     def image_path(source, options = {})
-      asset_path source, { :dir => 'images' }.merge(options)
+      asset_path source, Helpers.default_path_options[:image_path].merge(options)
     end
     alias_method :path_to_image, :image_path
 
@@ -254,7 +252,7 @@ module Sprockets
     #   javascript_path 'http://www.example.com/js/xmlhr.js' # => 'http://www.example.com/js/xmlhr.js'
     #
     def javascript_path(source, options = {})
-      asset_path source, { :dir => 'javascripts', :ext => 'js' }.merge(options)
+      asset_path source, Helpers.default_path_options[:javascript_path].merge(options)
     end
     alias_method :path_to_javascript, :javascript_path
 
@@ -279,7 +277,7 @@ module Sprockets
     #   stylesheet_path 'http://www.example.com/css/style.css'   # => 'http://www.example.com/css/style.css'
     #
     def stylesheet_path(source, options = {})
-      asset_path source, { :dir => 'stylesheets', :ext => 'css' }.merge(options)
+      asset_path source, Helpers.default_path_options[:stylesheet_path].merge(options)
     end
     alias_method :path_to_stylesheet, :stylesheet_path
 
@@ -303,7 +301,7 @@ module Sprockets
     #   video_path 'http://www.example.com/img/video.mp4' # => 'http://www.example.com/img/video.mp4'
     #
     def video_path(source, options = {})
-      asset_path source, { :dir => 'videos' }.merge(options)
+      asset_path source, Helpers.default_path_options[:video_path].merge(options)
     end
     alias_method :path_to_video, :video_path
 
@@ -316,6 +314,19 @@ module Sprockets
     def assets_environment
       Helpers.environment || environment
     end
+
+    def find_asset_path(uri, options = {})
+      if Helpers.manifest && options[:manifest] != false
+        manifest_path = Helpers.manifest.assets[uri.path]
+        return Helpers::ManifestPath.new(uri, manifest_path, options) if manifest_path
+      end
+
+      assets_environment.resolve(uri.path) do |path|
+        return Helpers::AssetPath.new(uri, assets_environment[path], options)
+      end
+
+      return Helpers::FilePath.new(uri, options)
+    end
   end
 
   class Context

data/lib/sprockets/helpers/asset_path.rb

@@ -4,18 +4,25 @@ module Sprockets
     # that exists in Sprockets environment.
     class AssetPath < BasePath
       def initialize(uri, asset, options = {})
-        @uri     = uri
+        @uri = uri
+        @asset = asset
         @options = {
-          :body   => false,
+          :body => false,
           :digest => Helpers.digest,
           :prefix => Helpers.prefix
         }.merge options
-        
+
         @uri.path = @options[:digest] ? asset.digest_path : asset.logical_path
       end
-      
+
+      def to_a
+        @asset.to_a.map do |dependency|
+          AssetPath.new(@uri.clone, dependency, @options.merge(:body => true)).to_s
+        end
+      end
+
       protected
-      
+
       def rewrite_path
         prefix = if options[:prefix].respond_to? :call
           warn 'DEPRECATION WARNING: Using a Proc for Sprockets::Helpers.prefix is deprecated and will be removed in 1.0. Please use Sprockets::Helpers.asset_host instead.'
@@ -23,10 +30,10 @@ module Sprockets
         else
           options[:prefix].to_s
         end
-        
+
         prepend_path(prefix)
       end
-      
+
       def rewrite_query
         append_query('body=1') if options[:body]
       end

data/lib/sprockets/helpers/base_path.rb

@@ -13,7 +13,7 @@ module Sprockets
 
       #
       def initialize(uri, options = {})
-        @uri     = uri
+        @uri = uri
         @options = options
       end
 
@@ -40,7 +40,7 @@ module Sprockets
       # Hook for rewriting the host.
       def rewrite_host # :nodoc:
         if host = compute_asset_host
-          uri.host   = host
+          uri.host = host
           uri.scheme = compute_scheme
         end
       end

data/lib/sprockets/helpers/manifest_path.rb

@@ -4,12 +4,12 @@ module Sprockets
     # prepends the prefix.
     class ManifestPath < AssetPath
       def initialize(uri, path, options = {})
-        @uri     = uri
+        @uri = uri
         @options = {
-          :body   => false,
+          :body => false,
           :prefix => Helpers.prefix
         }.merge options
-        
+
         @uri.path = path.to_s
       end
     end

data/lib/sprockets/helpers/version.rb

@@ -1,5 +1,5 @@
 module Sprockets
   module Helpers
-    VERSION = '0.8.0'
+    VERSION = '0.9.1'
   end
 end

data/spec/sprockets-helpers_spec.rb

@@ -379,7 +379,7 @@ describe Sprockets::Helpers do
     end
 
     it 'raises when called without block' do
-      expect { context.asset_tag('main.js') }.to raise_error(ArgumentError, "block missing")
+      expect { context.asset_tag('main.js') }.to raise_error(ArgumentError, 'block missing')
     end
 
     it 'expands when configured' do
@@ -419,11 +419,15 @@ describe Sprockets::Helpers do
 
   describe '#javascript_tag' do
     it 'generates script tag' do
-      context.javascript_tag('main.js').should == '<script src="/main.js"></script>'
+      context.javascript_tag('/main.js').should == '<script src="/main.js"></script>'
     end
 
     it 'appends extension' do
-      context.javascript_tag('main').should == '<script src="/main.js"></script>'
+      context.javascript_tag('/main').should == '<script src="/main.js"></script>'
+    end
+
+    it 'prepends the javascript dir' do
+      context.javascript_tag('main').should == '<script src="/javascripts/main.js"></script>'
     end
 
     describe 'when expanding' do
@@ -441,11 +445,15 @@ describe Sprockets::Helpers do
 
   describe '#stylesheet_tag' do
     it 'generates stylesheet tag' do
-      context.stylesheet_tag('main.css').should == '<link rel="stylesheet" href="/main.css">'
+      context.stylesheet_tag('/main.css').should == '<link rel="stylesheet" href="/main.css">'
     end
 
-    it 'generates stylesheet tag' do
-      context.stylesheet_tag('main').should == '<link rel="stylesheet" href="/main.css">'
+    it 'appends extension' do
+      context.stylesheet_tag('/main').should == '<link rel="stylesheet" href="/main.css">'
+    end
+
+    it 'prepends the stylesheets dir' do
+      context.stylesheet_tag('main').should == '<link rel="stylesheet" href="/stylesheets/main.css">'
     end
 
     describe 'when expanding' do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sprockets-helpers
 version: !ruby/object:Gem::Version
-  version: 0.8.0
+  version: 0.9.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-01-16 00:00:00.000000000 Z
+date: 2013-03-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sprockets
-  requirement: &70280862449120 !ruby/object:Gem::Requirement
+  requirement: &70117526611900 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,10 +21,10 @@ dependencies:
         version: '2.0'
   type: :runtime
   prerelease: false
-  version_requirements: *70280862449120
+  version_requirements: *70117526611900
 - !ruby/object:Gem::Dependency
   name: appraisal
-  requirement: &70280862448600 !ruby/object:Gem::Requirement
+  requirement: &70117526611360 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -32,10 +32,10 @@ dependencies:
         version: '0.4'
   type: :development
   prerelease: false
-  version_requirements: *70280862448600
+  version_requirements: *70117526611360
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70280862448100 !ruby/object:Gem::Requirement
+  requirement: &70117526610900 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -43,10 +43,10 @@ dependencies:
         version: '2.6'
   type: :development
   prerelease: false
-  version_requirements: *70280862448100
+  version_requirements: *70117526610900
 - !ruby/object:Gem::Dependency
   name: test-construct
-  requirement: &70280862447080 !ruby/object:Gem::Requirement
+  requirement: &70117526610340 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -54,10 +54,10 @@ dependencies:
         version: '1.2'
   type: :development
   prerelease: false
-  version_requirements: *70280862447080
+  version_requirements: *70117526610340
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &70280862446380 !ruby/object:Gem::Requirement
+  requirement: &70117526609960 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,7 +65,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70280862446380
+  version_requirements: *70117526609960
 description: Asset path helpers for Sprockets 2.x applications
 email:
 - me@petebrowne.com
@@ -90,7 +90,6 @@ files:
 - lib/sprockets/helpers.rb
 - lib/sprockets/helpers/asset_path.rb
 - lib/sprockets/helpers/base_path.rb
-- lib/sprockets/helpers/expanded_asset_paths.rb
 - lib/sprockets/helpers/file_path.rb
 - lib/sprockets/helpers/manifest_path.rb
 - lib/sprockets/helpers/version.rb
@@ -111,7 +110,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -4303612460519246856
+      hash: 2044833446584008479
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -120,7 +119,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -4303612460519246856
+      hash: 2044833446584008479
 requirements: []
 rubyforge_project: sprockets-helpers
 rubygems_version: 1.8.11

data/lib/sprockets/helpers/expanded_asset_paths.rb

@@ -1,17 +0,0 @@
-module Sprockets
-  module Helpers
-    class ExpandedAssetPaths
-      def initialize(uri, asset, options = {})
-        @uri = uri
-        @asset = asset
-        @options = { :body => true }.merge options
-      end
-
-      def to_a
-        @asset.to_a.map do |dependency|
-          AssetPath.new(@uri.clone, dependency, @options).to_s
-        end
-      end
-    end
-  end
-end