sprockets 3.0.0.beta.4 → 3.0.0.beta.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: bfc75742a9bbe41f39e393933281cc8210d2e2f2
-  data.tar.gz: ceaf8d045782996a37e7e00f48084bf8fbbd7355
+  metadata.gz: 6a6bee17ca558f25cc69850e82405f479f3d3af3
+  data.tar.gz: b513251bb8582e5fc2d30ccf3b0a65336e14edd9
 SHA512:
-  metadata.gz: c59092430bb9da574a2fcbb28b1e2d3ef69dfcfc38103e6e95da4de969e8ce6526d24e2900041bd76d9327453f385386e8225684ea8ade1fa20d740cbdf44897
-  data.tar.gz: 95594832c3a2911d30d3e467271d66fc1f367472b4617e4b5137ed70e2c30aa6124cadf6a4a06bced8f00874a9a5481d2a21a7e45813d5f652e77b7772424946
+  metadata.gz: 2b16c9ea238f143f8b9e0881c74748446ae160179db5895195d00075e72eb7982630270ab8e1609ed93d05a86259d48b21c29723d9c9e90749b6010fa6599b89
+  data.tar.gz: 02c9e685bb2b994590402d7761b5476dc6c67afb49563ea04b6493c5b89a16d17069176ab4c3d7900367b41176ee059d2f653416d002dc4b7393c64ce9622794

data/lib/sprockets/cache/file_store.rb

@@ -1,6 +1,7 @@
 require 'digest/md5'
 require 'fileutils'
 require 'logger'
+require 'zlib'
 
 module Sprockets
   class Cache
@@ -52,7 +53,13 @@ module Sprockets
 
         value = safe_open(path) do |f|
           begin
-            Marshal.load(f)
+            raw = f.read
+            if raw =~ /\A\x04\x08/
+              marshaled = raw
+            else
+              marshaled = Zlib::Inflate.new(Zlib::MAX_WBITS).inflate(raw)
+            end
+            Marshal.load(marshaled)
           rescue Exception => e
             @logger.error do
               "#{self.class}[#{path}] could not be unmarshaled: " +
@@ -85,9 +92,26 @@ module Sprockets
         # Check if cache exists before writing
         exists = File.exist?(path)
 
+        # Serialize value
+        marshaled = Marshal.dump(value)
+
+        # Compress if larger than 4KB
+        if marshaled.bytesize > 4 * 1024
+          deflater = Zlib::Deflate.new(
+            Zlib::BEST_COMPRESSION,
+            Zlib::MAX_WBITS,
+            Zlib::MAX_MEM_LEVEL,
+            Zlib::DEFAULT_STRATEGY
+          )
+          deflater << marshaled
+          raw = deflater.finish
+        else
+          raw = marshaled
+        end
+
         # Write data
         PathUtils.atomic_write(path) do |f|
-          Marshal.dump(value, f)
+          f.write(raw)
           @size += f.size unless exists
         end
 

data/lib/sprockets/context.rb

@@ -21,6 +21,9 @@ module Sprockets
   class Context
     attr_reader :environment, :filename, :pathname
 
+    # Deprecated
+    attr_accessor :__LINE__
+
     def initialize(input)
       @environment  = input[:environment]
       @metadata     = input[:metadata]
@@ -67,6 +70,7 @@ module Sprockets
     attr_reader :content_type
 
     # Internal
+    # TODO: Cleanup relative resolver logic shared between directive processor.
     def _resolve(method, path, options = {})
       options[:content_type] = self.content_type if options[:content_type] == :self
       options[:accept] = options.delete(:content_type)

data/lib/sprockets/directive_processor.rb

@@ -337,6 +337,71 @@ module Sprockets
         end
       end
 
+      # `link_directory` links all the files inside a single
+      # directory. It's similar to `path/*` since it does not follow
+      # nested directories.
+      #
+      #     //= link_directory "./fonts"
+      #
+      def process_link_directory_directive(path = ".")
+        if @environment.relative_path?(path)
+          root = expand_relative_path(path)
+
+          unless (stats = @environment.stat(root)) && stats.directory?
+            raise ArgumentError, "link_directory argument must be a directory"
+          end
+
+          @dependency_paths << root
+
+          @environment.stat_directory(root).each do |subpath, stat|
+            if subpath == @filename
+              next
+            elsif stat.directory?
+              next
+            elsif uri = @environment.locate(subpath)
+              asset = @environment.load(uri)
+              @dependency_paths.merge(asset.metadata[:dependency_paths])
+              @links << asset.uri
+            end
+          end
+        else
+          # The path must be relative and start with a `./`.
+          raise ArgumentError, "link_directory argument must be a relative path"
+        end
+      end
+
+      # `link_tree` links all the nested files in a directory.
+      # Its glob equivalent is `path/**/*`.
+      #
+      #     //= link_tree "./images"
+      #
+      def process_link_tree_directive(path = ".")
+        if @environment.relative_path?(path)
+          root = expand_relative_path(path)
+
+          unless (stats = @environment.stat(root)) && stats.directory?
+            raise ArgumentError, "link_tree argument must be a directory"
+          end
+
+          @dependency_paths << root
+
+          @environment.stat_sorted_tree(root).each do |subpath, stat|
+            if subpath == @filename
+              next
+            elsif stat.directory?
+              @dependency_paths << subpath
+            elsif uri = @environment.locate(subpath)
+              asset = @environment.load(uri)
+              @dependency_paths.merge(asset.metadata[:dependency_paths])
+              @links << asset.uri
+            end
+          end
+        else
+          # The path must be relative and start with a `./`.
+          raise ArgumentError, "link_tree argument must be a relative path"
+        end
+      end
+
     private
       def expand_relative_path(path)
         File.expand_path(path, @dirname)
@@ -350,6 +415,7 @@ module Sprockets
         _resolve(:resolve, path, options)
       end
 
+      # TODO: Cleanup relative resolver logic shared between context.
       def _resolve(method, path, options = {})
         if @environment.absolute_path?(path)
           raise FileOutsidePaths, "can't require absolute file: #{path}"

data/lib/sprockets/legacy.rb

@@ -53,6 +53,14 @@ module Sprockets
       nil
     end
 
+    def cache_get(key)
+      cache._get(key)
+    end
+
+    def cache_set(key, value)
+      cache._set(key, value)
+    end
+
     private
       # Deprecated: Seriously.
       def matches_filter(filters, logical_path, filename)

data/lib/sprockets/loader.rb

@@ -144,7 +144,6 @@ module Sprockets
           )
         else
           asset[:metadata] = {
-            encoding: Encoding::BINARY,
             digest: file_digest(asset[:filename]),
             length: self.stat(asset[:filename]).size
           }

data/lib/sprockets/sass_cache_store.rb

@@ -0,0 +1,2 @@
+# Deprecated: Require sprockets/sass_template instead
+require 'sprockets/sass_template'

data/lib/sprockets/sass_functions.rb

@@ -0,0 +1,2 @@
+# Deprecated: Require sprockets/sass_template instead
+require 'sprockets/sass_template'

data/lib/sprockets/sass_importer.rb

@@ -0,0 +1,2 @@
+# Deprecated: Require sprockets/sass_template instead
+require 'sprockets/sass_template'

data/lib/sprockets/version.rb

@@ -1,3 +1,3 @@
 module Sprockets
-  VERSION = "3.0.0.beta.4"
+  VERSION = "3.0.0.beta.5"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sprockets
 version: !ruby/object:Gem::Version
-  version: 3.0.0.beta.4
+  version: 3.0.0.beta.5
 platform: ruby
 authors:
 - Sam Stephenson
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-11-24 00:00:00.000000000 Z
+date: 2014-11-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rack
@@ -260,7 +260,10 @@ files:
 - lib/sprockets/paths.rb
 - lib/sprockets/processing.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_template.rb
 - lib/sprockets/server.rb
 - lib/sprockets/transformers.rb