sprockets 2.0.0 → 2.0.1

data/README.md

@@ -110,6 +110,10 @@ way to do this is with the `map` method in `config.ru`:
       environment.append_path 'app/assets/stylesheets'
       run environment
     end
+    
+    map '/' do
+      run YourRackApp
+    end
 
 ### Accessing Assets Programmatically ###
 

data/lib/sprockets/asset_attributes.rb

@@ -49,6 +49,8 @@ module Sprockets
         path = engine_extensions.inject(path) { |p, ext| p.sub(ext, '') }
         path = "#{path}#{engine_format_extension}" unless format_extension
         path
+      else
+        raise FileOutsidePaths, "#{pathname} isn't in paths: #{environment.paths.join(', ')}"
       end
     end
 
@@ -130,8 +132,7 @@ module Sprockets
       if old_digest = path_fingerprint
         pathname.sub(old_digest, digest).to_s
       else
-        basename = "#{pathname.basename(extensions.join)}-#{digest}#{extensions.join}"
-        pathname.dirname.to_s == '.' ? basename : pathname.dirname.join(basename).to_s
+        pathname.to_s.sub(/\.(\w+)$/) { |ext| "-#{digest}#{ext}" }
       end
     end
 

data/lib/sprockets/base.rb

@@ -110,11 +110,34 @@ module Sprockets
       find_asset(*args)
     end
 
+    def each_entry(root, &block)
+      return to_enum(__method__, root) unless block_given?
+      root = Pathname.new(root) unless root.is_a?(Pathname)
+
+      paths = []
+      entries(root).sort.each do |filename|
+        path = root.join(filename)
+        paths << path
+
+        if stat(path).directory?
+          each_entry(path) do |subpath|
+            paths << subpath
+          end
+        end
+      end
+
+      paths.sort_by(&:to_s).each(&block)
+
+      nil
+    end
+
     def each_file
       return to_enum(__method__) unless block_given?
-      paths.each do |base_path|
-        Dir["#{base_path}/**/*"].each do |filename|
-          yield filename unless File.directory?(filename)
+      paths.each do |root|
+        each_entry(root) do |path|
+          if !stat(path).directory?
+            yield path
+          end
         end
       end
       nil

data/lib/sprockets/directive_processor.rb

@@ -258,17 +258,18 @@ module Sprockets
         if relative?(path)
           root = pathname.dirname.join(path).expand_path
 
-          unless root.directory?
+          unless (stats = stat(root)) && stats.directory?
             raise ArgumentError, "require_tree argument must be a directory"
           end
 
           context.depend_on(root)
 
-          Dir["#{root}/*"].sort.each do |filename|
-            if filename == self.file
+          entries(root).each do |pathname|
+            pathname = root.join(pathname)
+            if pathname.to_s == self.file
               next
-            elsif context.asset_requirable?(filename)
-              context.require_asset(filename)
+            elsif context.asset_requirable?(pathname)
+              context.require_asset(pathname)
             end
           end
         else
@@ -286,19 +287,19 @@ module Sprockets
         if relative?(path)
           root = pathname.dirname.join(path).expand_path
 
-          unless root.directory?
+          unless (stats = stat(root)) && stats.directory?
             raise ArgumentError, "require_tree argument must be a directory"
           end
 
           context.depend_on(root)
 
-          Dir["#{root}/**/*"].sort.each do |filename|
-            if filename == self.file
+          each_entry(root) do |pathname|
+            if pathname.to_s == self.file
               next
-            elsif File.directory?(filename)
-              context.depend_on(filename)
-            elsif context.asset_requirable?(filename)
-              context.require_asset(filename)
+            elsif stat(pathname).directory?
+              context.depend_on(pathname)
+            elsif context.asset_requirable?(pathname)
+              context.require_asset(pathname)
             end
           end
         else
@@ -359,8 +360,8 @@ module Sprockets
       # compat mode is on.
       def constants
         if compat?
-          path = File.join(context.root_path, "constants.yml")
-          File.exist?(path) ? YAML.load_file(path) : {}
+          pathname = Pathname.new(context.root_path).join("constants.yml")
+          stat(pathname) ? YAML.load_file(pathname) : {}
         else
           {}
         end
@@ -376,5 +377,17 @@ module Sprockets
       def relative?(path)
         path =~ /^\.($|\.?\/)/
       end
+
+      def stat(path)
+        context.environment.stat(path)
+      end
+
+      def entries(path)
+        context.environment.entries(path)
+      end
+
+      def each_entry(root, &block)
+        context.environment.each_entry(root, &block)
+      end
   end
 end

data/lib/sprockets/errors.rb

@@ -6,6 +6,7 @@ module Sprockets
   class ContentTypeMismatch     < Error; end
   class EncodingError           < Error; end
   class FileNotFound            < Error; end
+  class FileOutsidePaths        < Error; end
 
   module EngineError
     attr_accessor :sprockets_annotation

data/lib/sprockets/processing.rb

@@ -60,7 +60,7 @@ module Sprockets
     # argument is supplied, the processors registered under that
     # extension will be returned.
     #
-    # Postprocessors are ran after Postprocessors and Engine processors.
+    # Postprocessors are ran after Preprocessors and Engine processors.
     #
     # All `Processor`s must follow the `Tilt::Template` interface. It is
     # recommended to subclass `Tilt::Template`.

data/lib/sprockets/server.rb

@@ -1,5 +1,5 @@
-require 'rack/request'
 require 'time'
+require 'uri'
 
 module Sprockets
   # `Server` is a concern mixed into `Environment` and
@@ -36,7 +36,7 @@ module Sprockets
       env['rack.session.options'][:skip] = true
 
       # Extract the path from everything after the leading slash
-      path = env['PATH_INFO'].to_s.sub(/^\//, '')
+      path = unescape(env['PATH_INFO'].to_s.sub(/^\//, ''))
 
       # Look up the asset.
       asset = find_asset(path)
@@ -81,47 +81,6 @@ module Sprockets
       end
     end
 
-    # Deprecated: `path` is a url helper that looks up an asset given a
-    # `logical_path` and returns a path String. By default, the
-    # asset's digest fingerprint is spliced into the filename.
-    #
-    #     /assets/application-3676d55f84497cbeadfc614c1b1b62fc.js
-    #
-    # A third `prefix` argument can be pass along to be prepended to
-    # the string.
-    def path(logical_path, fingerprint = true, prefix = nil)
-      logger.warn "Sprockets::Environment#path is deprecated\n#{caller[0..2].join("\n")}"
-      if fingerprint && asset = find_asset(logical_path.to_s.sub(/^\//, ''))
-        url = asset.digest_path
-      else
-        url = logical_path
-      end
-
-      url = File.join(prefix, url) if prefix
-      url = "/#{url}" unless url =~ /^\//
-
-      url
-    end
-
-    # Deprecated: Similar to `path`, `url` returns a full url given a Rack `env`
-    # Hash and a `logical_path`.
-    def url(env, logical_path, fingerprint = true, prefix = nil)
-      logger.warn "Sprockets::Environment#url is deprecated\n#{caller[0..2].join("\n")}"
-      req = Rack::Request.new(env)
-
-      url = req.scheme + "://"
-      url << req.host
-
-      if req.scheme == "https" && req.port != 443 ||
-          req.scheme == "http" && req.port != 80
-        url << ":#{req.port}"
-      end
-
-      url << path(logical_path, fingerprint, prefix)
-
-      url
-    end
-
     private
       def forbidden_request?(env)
         # Prevent access to files elsewhere on the file system
@@ -264,6 +223,20 @@ module Sprockets
         end
       end
 
+      # URI.unescape is deprecated on 1.9. We need to use URI::Parser
+      # if its available.
+      if defined? URI::DEFAULT_PARSER
+        def unescape(str)
+          str = URI::DEFAULT_PARSER.unescape(str)
+          str.force_encoding(Encoding.default_internal) if Encoding.default_internal
+          str
+        end
+      else
+        def unescape(str)
+          URI.unescape(str)
+        end
+      end
+
       # Helper to quote the assets digest for use as an ETag.
       def etag(asset)
         %("#{asset.digest}")

data/lib/sprockets/version.rb

@@ -1,3 +1,3 @@
 module Sprockets
-  VERSION = "2.0.0"
+  VERSION = "2.0.1"
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: sprockets
 version: !ruby/object:Gem::Version 
-  hash: 15
+  hash: 13
   prerelease: 
   segments: 
   - 2
   - 0
-  - 0
-  version: 2.0.0
+  - 1
+  version: 2.0.1
 platform: ruby
 authors: 
 - Sam Stephenson
@@ -16,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-08-29 00:00:00 -05:00
+date: 2011-09-30 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -244,7 +244,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: sprockets
-rubygems_version: 1.5.2
+rubygems_version: 1.6.2
 signing_key: 
 specification_version: 3
 summary: Rack-based asset packaging system