sprockets 2.4.6 → 2.5.0

data/README.md

@@ -361,6 +361,12 @@ submit a pull request.
 
 ## Version History ##
 
+**2.5.0** (September 4, 2012)
+
+* Fixed Ruby 2.0 RegExp warning
+* Provide stubbed implementation of context *_path helpers
+* Add SassCompressor
+
 **2.4.5** (July 10, 2012)
 
 * Tweaked some logger levels

data/lib/sprockets.rb

@@ -20,6 +20,8 @@ module Sprockets
   autoload :JstProcessor,            "sprockets/jst_processor"
   autoload :Processor,               "sprockets/processor"
   autoload :SassCacheStore,          "sprockets/sass_cache_store"
+  autoload :SassCompressor,          "sprockets/sass_compressor"
+  autoload :SassFunctions,           "sprockets/sass_functions"
   autoload :SassImporter,            "sprockets/sass_importer"
   autoload :SassTemplate,            "sprockets/sass_template"
   autoload :ScssTemplate,            "sprockets/scss_template"

data/lib/sprockets/context.rb

@@ -221,6 +221,56 @@ module Sprockets
       "data:#{asset.content_type};base64,#{Rack::Utils.escape(base64)}"
     end
 
+    # Expands logical path to full url to asset.
+    #
+    # NOTE: This helper is currently not implemented and should be
+    # customized by the application. Though, in the future, some
+    # basics implemention may be provided with different methods that
+    # are required to be overridden.
+    def asset_path(path, options = {})
+      message = <<-EOS
+Custom asset_path helper is not implemented
+
+Extend your environment context with a custom method.
+
+    environment.context_class.class_eval do
+      def asset_path(path, options = {})
+      end
+    end
+      EOS
+      raise NotImplementedError, message
+    end
+
+    # Expand logical image asset path.
+    def image_path(path)
+      asset_path(path, :type => :image)
+    end
+
+    # Expand logical video asset path.
+    def video_path(path)
+      asset_path(path, :type => :video)
+    end
+
+    # Expand logical audio asset path.
+    def audio_path(path)
+      asset_path(path, :type => :audio)
+    end
+
+    # Expand logical font asset path.
+    def font_path(path)
+      asset_path(path, :type => :font)
+    end
+
+    # Expand logical javascript asset path.
+    def javascript_path(path)
+      asset_path(path, :type => :javascript)
+    end
+
+    # Expand logical stylesheet asset path.
+    def stylesheet_path(path)
+      asset_path(path, :type => :stylesheet)
+    end
+
     private
       # Annotates exception backtrace with the original template that
       # the exception was raised in.

data/lib/sprockets/directive_processor.rb

@@ -65,7 +65,7 @@ module Sprockets
     #     //= require "foo"
     #
     DIRECTIVE_PATTERN = /
-      ^ [\W]* = \s* (\w+.*?) (\*\/)? $
+      ^ \W* = \s* (\w+.*?) (\*\/)? $
     /x
 
     attr_reader :pathname

data/lib/sprockets/errors.rb

@@ -7,6 +7,7 @@ module Sprockets
   class EncodingError           < Error; end
   class FileNotFound            < Error; end
   class FileOutsidePaths        < Error; end
+  class NotImplementedError     < Error; end
   class UnserializeError        < Error; end
 
   module EngineError

data/lib/sprockets/sass_compressor.rb

@@ -0,0 +1,18 @@
+require 'sass'
+
+module Sprockets
+  class SassCompressor
+    def self.compress(css)
+      new.compress(css)
+    end
+
+    def compress(css)
+      Sass::Engine.new(css, {
+        :syntax => :scss,
+        :cache => false,
+        :read_cache => false,
+        :style => :compressed
+      }).render
+    end
+  end
+end

data/lib/sprockets/sass_functions.rb

@@ -0,0 +1,70 @@
+require 'sass'
+
+module Sprockets
+  module SassFunctions
+    def asset_path(path)
+      Sass::Script::String.new(sprockets_context.asset_path(path.value), :string)
+    end
+
+    def asset_url(path)
+      Sass::Script::String.new("url(" + sprockets_context.asset_path(path.value) + ")")
+    end
+
+    def image_path(path)
+      Sass::Script::String.new(sprockets_context.image_path(path.value), :string)
+    end
+
+    def image_url(path)
+      Sass::Script::String.new("url(" + sprockets_context.image_path(path.value) + ")")
+    end
+
+    def video_path(path)
+      Sass::Script::String.new(sprockets_context.video_path(path.value), :string)
+    end
+
+    def video_url(path)
+      Sass::Script::String.new("url(" + sprockets_context.video_path(path.value) + ")")
+    end
+
+    def audio_path(path)
+      Sass::Script::String.new(sprockets_context.audio_path(path.value), :string)
+    end
+
+    def audio_url(path)
+      Sass::Script::String.new("url(" + sprockets_context.audio_path(path.value) + ")")
+    end
+
+    def font_path(path)
+      Sass::Script::String.new(sprockets_context.font_path(path.value), :string)
+    end
+
+    def font_url(path)
+      Sass::Script::String.new("url(" + sprockets_context.font_path(path.value) + ")")
+    end
+
+    def javascript_path(path)
+      Sass::Script::String.new(sprockets_context.javascript_path(path.value), :string)
+    end
+
+    def javascript_url(path)
+      Sass::Script::String.new("url(" + sprockets_context.javascript_path(path.value) + ")")
+    end
+
+    def stylesheet_path(path)
+      Sass::Script::String.new(sprockets_context.stylesheet_path(path.value), :string)
+    end
+
+    def stylesheet_url(path)
+      Sass::Script::String.new("url(" + sprockets_context.stylesheet_path(path.value) + ")")
+    end
+
+    protected
+      def sprockets_context
+        options[:sprockets][:context]
+      end
+
+      def sprockets_environment
+        options[:sprockets][:environment]
+      end
+  end
+end

data/lib/sprockets/sass_template.rb

@@ -10,11 +10,20 @@ module Sprockets
     self.default_mime_type = 'text/css'
 
     def self.engine_initialized?
-      defined? ::Sass::Engine
+      defined?(::Sass::Engine) && defined?(::Sass::Script::Functions) &&
+        Sass::Script::Functions < Sprockets::SassFunctions
     end
 
     def initialize_engine
-      require_template_library 'sass'
+      # Double check constant to avoid tilt warning
+      unless defined? ::Sass
+        require_template_library 'sass'
+      end
+
+      # Install custom functions. It'd be great if this didn't need to
+      # be installed globally, but could be passed into Engine as an
+      # option.
+      Sass::Script::Functions.send :include, Sprockets::SassFunctions
     end
 
     def prepare

data/lib/sprockets/server.rb

@@ -33,16 +33,16 @@ module Sprockets
       # Extract the path from everything after the leading slash
       path = unescape(env['PATH_INFO'].to_s.sub(/^\//, ''))
 
-      # Strip fingerprint
-      if fingerprint = path_fingerprint(path)
-        path = path.sub("-#{fingerprint}", '')
-      end
-
       # URLs containing a `".."` are rejected for security reasons.
       if forbidden_request?(path)
         return forbidden_response
       end
 
+      # Strip fingerprint
+      if fingerprint = path_fingerprint(path)
+        path = path.sub("-#{fingerprint}", '')
+      end
+
       # Look up the asset.
       asset = find_asset(path, :bundle => !body_only?(env))
 
@@ -90,7 +90,7 @@ module Sprockets
         #
         #     http://example.org/assets/../../../etc/passwd
         #
-        path.include?("..") || Pathname.new(path).absolute?
+        path.include?("..")
       end
 
       # Returns a 403 Forbidden response tuple
@@ -222,7 +222,7 @@ module Sprockets
       #     # => "0aa2105d29558f3eb790d411d7d8fb66"
       #
       def path_fingerprint(path)
-        path[/-([0-9a-f]{7,40})\.[^.]+\z/, 1]
+        path[/-([0-9a-f]{7,40})\.[^.]+$/, 1]
       end
 
       # URI.unescape is deprecated on 1.9. We need to use URI::Parser

data/lib/sprockets/version.rb

@@ -1,3 +1,3 @@
 module Sprockets
-  VERSION = "2.4.6"
+  VERSION = "2.5.0"
 end

metadata

@@ -1,7 +1,8 @@
 --- !ruby/object:Gem::Specification
 name: sprockets
 version: !ruby/object:Gem::Version
-  version: 2.4.6
+  version: 2.5.0
+  prerelease: 
 platform: ruby
 authors:
 - Sam Stephenson
@@ -9,194 +10,220 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-10-28 00:00:00.000000000 Z
+date: 2012-09-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: hike
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '1.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '1.2'
 - !ruby/object:Gem::Dependency
   name: multi_json
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '1.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '1.0'
 - !ruby/object:Gem::Dependency
   name: rack
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '1.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '1.0'
 - !ruby/object:Gem::Dependency
   name: tilt
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '1.1'
-    - - "!="
+    - - ! '!='
       - !ruby/object:Gem::Version
         version: 1.3.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '1.1'
-    - - "!="
+    - - ! '!='
       - !ruby/object:Gem::Version
         version: 1.3.0
 - !ruby/object:Gem::Dependency
   name: coffee-script
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '2.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '2.0'
 - !ruby/object:Gem::Dependency
   name: coffee-script-source
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: 1.2.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: 1.2.0
 - !ruby/object:Gem::Dependency
   name: eco
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '1.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '1.0'
 - !ruby/object:Gem::Dependency
   name: ejs
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '1.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '1.0'
 - !ruby/object:Gem::Dependency
   name: execjs
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '1.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '1.0'
 - !ruby/object:Gem::Dependency
   name: json
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rack-test
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: sass
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '3.1'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '3.1'
 description: Sprockets is a Rack-based asset packaging system that concatenates and
@@ -209,11 +236,9 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
-- LICENSE
 - README.md
-- bin/sprockets
+- LICENSE
 - lib/rake/sprocketstask.rb
-- lib/sprockets.rb
 - lib/sprockets/asset.rb
 - lib/sprockets/asset_attributes.rb
 - lib/sprockets/base.rb
@@ -238,6 +263,8 @@ files:
 - lib/sprockets/processor.rb
 - lib/sprockets/safety_colons.rb
 - lib/sprockets/sass_cache_store.rb
+- lib/sprockets/sass_compressor.rb
+- lib/sprockets/sass_functions.rb
 - lib/sprockets/sass_importer.rb
 - lib/sprockets/sass_template.rb
 - lib/sprockets/scss_template.rb
@@ -245,27 +272,30 @@ files:
 - lib/sprockets/static_asset.rb
 - lib/sprockets/utils.rb
 - lib/sprockets/version.rb
+- lib/sprockets.rb
+- bin/sprockets
 homepage: http://getsprockets.org/
 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: sprockets
-rubygems_version: 2.2.2
+rubygems_version: 1.8.24
 signing_key: 
-specification_version: 4
+specification_version: 3
 summary: Rack-based asset packaging system
 test_files: []

checksums.yaml

@@ -1,7 +0,0 @@
----
-SHA1:
-  metadata.gz: 1471328329eb1e6f3a8e218553de19ded2731956
-  data.tar.gz: 8bd2fc9eb30ab785ef04ed901a86ee3e9b416775
-SHA512:
-  metadata.gz: ade13ae863b06566bf143574ade26233e005dbf078ed400b6e7b5e0a3b370017b22f464c0e08da0416244c47e3044b1fb7e9705467620cf38e113424d432da1a
-  data.tar.gz: b50b7d1451f79a7d7446ac2ae428b36b6d006d1901e2ab86c0a489b642a30f217eed3a53dbc6f2414413fcad76b9bd427f22131bc853c68119d4a063608adaba