sprockets 3.0.0.beta.6 → 3.0.0.beta.7

data/lib/sprockets/uglifier_compressor.rb

@@ -16,10 +16,23 @@ module Sprockets
   class UglifierCompressor
     VERSION = '1'
 
-    def self.call(*args)
-      new.call(*args)
+    # Public: Return singleton instance with default options.
+    #
+    # Returns UglifierCompressor object.
+    def self.instance
+      @instance ||= new
     end
 
+    def self.call(input)
+      instance.call(input)
+    end
+
+    def self.cache_key
+      instance.cache_key
+    end
+
+    attr_reader :cache_key
+
     def initialize(options = {})
       # Feature detect Uglifier 2.0 option support
       if Uglifier::DEFAULTS[:copyright]
@@ -33,11 +46,11 @@ module Sprockets
       @uglifier = ::Uglifier.new(options)
 
       @cache_key = [
-        'UglifierCompressor',
+        self.class.name,
         ::Uglifier::VERSION,
         VERSION,
         options
-      ]
+      ].freeze
     end
 
     def call(input)

data/lib/sprockets/uri_utils.rb

@@ -0,0 +1,190 @@
+require 'uri'
+
+module Sprockets
+  # Internal: Asset URI related parsing utilities. Mixed into Environment.
+  #
+  # An Asset URI identifies the compiled Asset result. It shares the file:
+  # scheme and requires an absolute path.
+  #
+  # Other query parameters
+  #
+  # type - String output content type. Otherwise assumed from file extension.
+  #        This maybe different than the extension if the asset is transformed
+  #        from one content type to another. For an example .coffee -> .js.
+  #
+  # id - Unique fingerprint of the entire asset and all its metadata. Assets
+  #      will only have the same id if they serialize to an identical value.
+  #
+  # skip_bundle - Boolean if bundle processors should be skipped.
+  #
+  # encoding - A content encoding such as "gzip" or "deflate". NOT a charset
+  #            like "utf-8".
+  #
+  module URIUtils
+    extend self
+
+    # Internal: Parse URI into component parts.
+    #
+    # uri - String uri
+    #
+    # Returns Array of components.
+    def split_uri(uri)
+      URI.split(uri)
+    end
+
+    # Internal: Join URI component parts into String.
+    #
+    # Returns String.
+    def join_uri(scheme, userinfo, host, port, registry, path, opaque, query, fragment)
+      URI::Generic.new(scheme, userinfo, host, port, registry, path, opaque, query, fragment).to_s
+    end
+
+    # Internal: Parse file: URI into component parts.
+    #
+    # uri - String uri
+    #
+    # Returns [scheme, host, path, query].
+    def split_file_uri(uri)
+      scheme, _, host, _, _, path, _, query, _ = URI.split(uri)
+
+      path = URI::Generic::DEFAULT_PARSER.unescape(path)
+      path.force_encoding(Encoding::UTF_8)
+
+      # Hack for parsing Windows "file:///C:/Users/IEUser" paths
+      path = path.gsub(/^\/([a-zA-Z]:)/, '\1')
+
+      [scheme, host, path, query]
+    end
+
+    # Internal: Join file: URI component parts into String.
+    #
+    # Returns String.
+    def join_file_uri(scheme, host, path, query)
+      str = "#{scheme}://"
+      str << host if host
+      path = "/#{path}" unless path.start_with?("/")
+      str << URI::Generic::DEFAULT_PARSER.escape(path)
+      str << "?#{query}" if query
+      str
+    end
+
+    # Internal: Check if String is a valid Asset URI.
+    #
+    # str - Possible String asset URI.
+    #
+    # Returns true or false.
+    def valid_asset_uri?(str)
+      # Quick prefix check before attempting a full parse
+      str.start_with?("file://") && parse_asset_uri(str) ? true : false
+    rescue URI::InvalidURIError
+      false
+    end
+
+    # Internal: Parse Asset URI.
+    #
+    # Examples
+    #
+    #   parse("file:///tmp/js/application.coffee?type=application/javascript")
+    #   # => "/tmp/js/application.coffee", {type: "application/javascript"}
+    #
+    # uri - String asset URI
+    #
+    # Returns String path and Hash of symbolized parameters.
+    def parse_asset_uri(uri)
+      scheme, _, path, query = split_file_uri(uri)
+
+      unless scheme == 'file'
+        raise URI::InvalidURIError, "expected file:// scheme: #{uri}"
+      end
+
+      return path, parse_uri_query_params(query)
+    end
+
+    # Internal: Build Asset URI.
+    #
+    # Examples
+    #
+    #   build("/tmp/js/application.coffee", type: "application/javascript")
+    #   # => "file:///tmp/js/application.coffee?type=application/javascript"
+    #
+    # path   - String file path
+    # params - Hash of optional parameters
+    #
+    # Returns String URI.
+    def build_asset_uri(path, params = {})
+      join_file_uri("file", nil, path, encode_uri_query_params(params))
+    end
+
+    # Internal: Parse file-digest dependency URI.
+    #
+    # Examples
+    #
+    #   parse("file-digest:/tmp/js/application.js")
+    #   # => "/tmp/js/application.js"
+    #
+    # uri - String file-digest URI
+    #
+    # Returns String path.
+    def parse_file_digest_uri(uri)
+      scheme, _, path, _ = split_file_uri(uri)
+
+      unless scheme == 'file-digest'
+        raise URI::InvalidURIError, "expected file-digest scheme: #{uri}"
+      end
+
+      path
+    end
+
+    # Internal: Build file-digest dependency URI.
+    #
+    # Examples
+    #
+    #   build("/tmp/js/application.js")
+    #   # => "file-digest:/tmp/js/application.js"
+    #
+    # path - String file path
+    #
+    # Returns String URI.
+    def build_file_digest_uri(path)
+      join_file_uri("file-digest", nil, path, nil)
+    end
+
+    # Internal: Serialize hash of params into query string.
+    #
+    # params - Hash of params to serialize
+    #
+    # Returns String query or nil if empty.
+    def encode_uri_query_params(params)
+      query = []
+
+      params.each do |key, value|
+        case value
+        when Integer
+          query << "#{key}=#{value}"
+        when String
+          query << "#{key}=#{URI::Generic::DEFAULT_PARSER.escape(value)}"
+        when TrueClass
+          query << "#{key}"
+        when FalseClass, NilClass
+        else
+          raise TypeError, "unexpected type: #{value.class}"
+        end
+      end
+
+      "#{query.join('&')}" if query.any?
+    end
+
+    # Internal: Parse query string into hash of params
+    #
+    # query - String query string
+    #
+    # Return Hash of params.
+    def parse_uri_query_params(query)
+      query.to_s.split('&').reduce({}) do |h, p|
+        k, v = p.split('=', 2)
+        v = URI::Generic::DEFAULT_PARSER.unescape(v) if v
+        h.merge(k.to_sym => v || true)
+      end
+    end
+  end
+end

data/lib/sprockets/utils.rb

@@ -1,10 +1,71 @@
 require 'set'
 
 module Sprockets
-  # `Utils`, we didn't know where else to put it!
+  # Internal: Utils, we didn't know where else to put it! Functions may
+  # eventually be shuffled into more specific drawers.
   module Utils
     extend self
 
+    # Internal: Check if object can safely be .dup'd.
+    #
+    # Similar to ActiveSupport #duplicable? check.
+    #
+    # obj - Any Object
+    #
+    # Returns false if .dup would raise a TypeError, otherwise true.
+    def duplicable?(obj)
+      case obj
+      when NilClass, FalseClass, TrueClass, Symbol, Numeric
+        false
+      else
+        true
+      end
+    end
+
+    # Internal: Duplicate and store key/value on new frozen hash.
+    #
+    # Seperated for recursive calls, always use hash_reassoc(hash, *keys).
+    #
+    # hash - Hash
+    # key  - Object key
+    #
+    # Returns Hash.
+    def hash_reassoc1(hash, key)
+      hash = hash.dup if hash.frozen?
+      old_value = hash[key]
+      old_value = old_value.dup if duplicable?(old_value)
+      new_value = yield old_value
+      new_value.freeze if duplicable?(new_value)
+      hash.store(key, new_value)
+      hash.freeze
+    end
+
+    # Internal: Duplicate and store key/value on new frozen hash.
+    #
+    # Similar to Hash#store for nested frozen hashes.
+    #
+    # hash  - Hash
+    # key   - Object keys. Use multiple keys for nested hashes.
+    # block - Receives current value at key.
+    #
+    # Examples
+    #
+    #     config = {paths: ["/bin", "/sbin"]}.freeze
+    #     new_config = hash_reassoc(config, :paths) do |paths|
+    #       paths << "/usr/local/bin"
+    #     end
+    #
+    # Returns duplicated frozen Hash.
+    def hash_reassoc(hash, *keys, &block)
+      if keys.size == 1
+        hash_reassoc1(hash, keys[0], &block)
+      else
+        hash_reassoc1(hash, keys[0]) do |value|
+          hash_reassoc(value, *keys[1..-1], &block)
+        end
+      end
+    end
+
     # Internal: Check if string has a trailing semicolon.
     #
     # str - String
@@ -126,12 +187,32 @@ module Sprockets
       nodes
     end
 
-    def benchmark_start
-      Time.now.to_f
-    end
+    # Internal: Post-order Depth-First search algorithm that gathers all paths
+    # along the way.
+    #
+    # TODO: Rename function.
+    #
+    # path   - Initial Array node path
+    # block  -
+    #   node - Current node to get children of
+    #
+    # Returns an Array of node Arrays.
+    def dfs_paths(path)
+      paths = []
+      stack, seen = [path], Set.new
+
+      while path = stack.pop
+        if !seen.include?(path.last)
+          seen.add(path.last)
+          paths << path if path.size > 1
+
+          Array(yield path.last).reverse_each do |node|
+            stack.push(path + [node])
+          end
+        end
+      end
 
-    def benchmark_end(start_time)
-      ((Time.now.to_f - start_time) * 1000).to_i
+      paths
     end
   end
 end

data/lib/sprockets/version.rb

@@ -1,3 +1,3 @@
 module Sprockets
-  VERSION = "3.0.0.beta.6"
+  VERSION = "3.0.0.beta.7"
 end

data/lib/sprockets/yui_compressor.rb

@@ -16,18 +16,31 @@ module Sprockets
   class YUICompressor
     VERSION = '1'
 
-    def self.call(*args)
-      new.call(*args)
+    # Public: Return singleton instance with default options.
+    #
+    # Returns YUICompressor object.
+    def self.instance
+      @instance ||= new
     end
 
+    def self.call(input)
+      instance.call(input)
+    end
+
+    def self.cache_key
+      instance.cache_key
+    end
+
+    attr_reader :cache_key
+
     def initialize(options = {})
       @options = options
       @cache_key = [
-        'YUICompressor',
+        self.class.name,
         ::YUI::Compressor::VERSION,
         VERSION,
         options
-      ]
+      ].freeze
     end
 
     def call(input)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sprockets
 version: !ruby/object:Gem::Version
-  version: 3.0.0.beta.6
+  version: 3.0.0.beta.7
 platform: ruby
 authors:
 - Sam Stephenson
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-12-03 00:00:00.000000000 Z
+date: 2015-02-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rack
@@ -223,7 +223,7 @@ files:
 - lib/rake/sprocketstask.rb
 - lib/sprockets.rb
 - lib/sprockets/asset.rb
-- lib/sprockets/asset_uri.rb
+- lib/sprockets/autoload_processor.rb
 - lib/sprockets/base.rb
 - lib/sprockets/bower.rb
 - lib/sprockets/bundle.rb
@@ -233,41 +233,50 @@ files:
 - lib/sprockets/cache/null_store.rb
 - lib/sprockets/cached_environment.rb
 - lib/sprockets/closure_compressor.rb
+- lib/sprockets/coffee_script_processor.rb
 - lib/sprockets/coffee_script_template.rb
 - lib/sprockets/compressing.rb
 - lib/sprockets/configuration.rb
 - lib/sprockets/context.rb
+- lib/sprockets/dependencies.rb
 - lib/sprockets/digest_utils.rb
 - lib/sprockets/directive_processor.rb
+- lib/sprockets/eco_processor.rb
 - lib/sprockets/eco_template.rb
+- lib/sprockets/ejs_processor.rb
 - lib/sprockets/ejs_template.rb
 - lib/sprockets/encoding_utils.rb
 - lib/sprockets/engines.rb
 - lib/sprockets/environment.rb
+- lib/sprockets/erb_processor.rb
 - lib/sprockets/erb_template.rb
 - lib/sprockets/errors.rb
+- lib/sprockets/file_reader.rb
 - lib/sprockets/http_utils.rb
 - lib/sprockets/jst_processor.rb
-- lib/sprockets/lazy_processor.rb
 - lib/sprockets/legacy.rb
 - lib/sprockets/legacy_proc_processor.rb
 - lib/sprockets/legacy_tilt_processor.rb
 - lib/sprockets/loader.rb
 - lib/sprockets/manifest.rb
 - lib/sprockets/mime.rb
+- lib/sprockets/path_dependency_utils.rb
 - lib/sprockets/path_digest_utils.rb
 - lib/sprockets/path_utils.rb
 - lib/sprockets/paths.rb
 - lib/sprockets/processing.rb
+- lib/sprockets/processor_utils.rb
 - lib/sprockets/resolve.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_processor.rb
 - lib/sprockets/sass_template.rb
 - lib/sprockets/server.rb
 - lib/sprockets/transformers.rb
 - lib/sprockets/uglifier_compressor.rb
+- lib/sprockets/uri_utils.rb
 - lib/sprockets/utils.rb
 - lib/sprockets/version.rb
 - lib/sprockets/yui_compressor.rb
@@ -291,7 +300,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: 1.3.1
 requirements: []
 rubyforge_project: sprockets
-rubygems_version: 2.2.2
+rubygems_version: 2.4.5
 signing_key: 
 specification_version: 4
 summary: Rack-based asset packaging system