sprockets 3.0.0.beta.9 → 3.0.0.beta.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: da01c3bbf8752fe3705b073775d7067b1a984239
-  data.tar.gz: 934f3ea753eba823e957005907d594771d053ec2
+  metadata.gz: 62bc83e5dba29c526fc06ee79618cac3013f5ab1
+  data.tar.gz: 8d5716e9158a481ac8893badaddba2562b2d5e2d
 SHA512:
-  metadata.gz: 86023eba8d65c22262182f2602b8c22a6347a634bf894cc969d4d5e7bf94a75198ea4034a3cad71f80c4bfb4ea46cf7bcdf2cad5f1dcdc1877589c9b1a967589
-  data.tar.gz: af13b0c540e0e78f0fa36a567aa2aa98f50680f20468c9d3d8433563f0d16c21d19279e3cac3b6369d532104cecb667a48cf9c6d150061cea41c86bfccb35465
+  metadata.gz: 4e31bcaac28fe9d231373471e49c91edf25bc27775ebc80f14949258be4dea66ddf9f48340b5e44613d195ade34b96c74898fd482224fe91a0204d69cea5312a
+  data.tar.gz: 48002bb898333ca896ec592603ef32ece5a1528d8dbc45d12618e5f80cd2cc905f758795f7d1305a6e44086fcf47f4ecdb422ca78404b70b2a454cbfd7df0473

data/lib/sprockets.rb

@@ -1,32 +1,11 @@
 require 'sprockets/version'
 require 'sprockets/autoload'
+require 'sprockets/cache'
+require 'sprockets/environment'
+require 'sprockets/errors'
+require 'sprockets/manifest'
 
 module Sprockets
-  # Environment
-  autoload :Asset,                   'sprockets/asset'
-  autoload :Base,                    'sprockets/base'
-  autoload :CachedEnvironment,       'sprockets/cached_environment'
-  autoload :Environment,             'sprockets/environment'
-  autoload :Manifest,                'sprockets/manifest'
-
-  # Processing
-  autoload :Bundle,                  'sprockets/bundle'
-  autoload :Context,                 'sprockets/context'
-  autoload :DirectiveProcessor,      'sprockets/directive_processor'
-  autoload :FileReader,              'sprockets/file_reader'
-
-  # Internal utilities
-  autoload :ArgumentError,           'sprockets/errors'
-  autoload :Cache,                   'sprockets/cache'
-  autoload :ContentTypeMismatch,     'sprockets/errors'
-  autoload :DigestUtils,             'sprockets/digest_utils'
-  autoload :EncodingUtils,           'sprockets/encoding_utils'
-  autoload :Error,                   'sprockets/errors'
-  autoload :FileNotFound,            'sprockets/errors'
-  autoload :HTTPUtils,               'sprockets/http_utils'
-  autoload :PathUtils,               'sprockets/path_utils'
-  autoload :Utils,                   'sprockets/utils'
-
   require 'sprockets/processor_utils'
   extend ProcessorUtils
 

data/lib/sprockets/bower.rb

@@ -19,9 +19,8 @@ module Sprockets
       # bower.json can only be nested one level deep
       if !logical_path.index('/')
         dirname = File.join(load_path, logical_path)
-        stat    = self.stat(dirname)
 
-        if stat && stat.directory?
+        if directory?(dirname)
           filenames = POSSIBLE_BOWER_JSONS.map { |basename| File.join(dirname, basename) }
           filename  = filenames.detect { |fn| self.file?(fn) }
 

data/lib/sprockets/context.rb

@@ -108,7 +108,11 @@ module Sprockets
     # the dependency file with invalidate the cache of the
     # source file.
     def depend_on(path)
-      resolve(path, compat: false)
+      if environment.absolute_path?(path) && environment.directory?(path)
+        @dependencies << environment.build_file_digest_uri(path)
+      else
+        resolve(path, compat: false)
+      end
       nil
     end
 

data/lib/sprockets/manifest.rb

@@ -240,6 +240,7 @@ module Sprockets
     # Persist manfiest back to FS
     def save
       if @rename_filename
+        logger.info "Renaming #{@filename} to #{@rename_filename}"
         FileUtils.mv(@filename, @rename_filename)
         @filename = @rename_filename
         @rename_filename = nil

data/lib/sprockets/path_utils.rb

@@ -8,7 +8,7 @@ module Sprockets
   module PathUtils
     extend self
 
-    # Internal: Like `File.stat`.
+    # Public: Like `File.stat`.
     #
     # path - String file or directory path
     #
@@ -21,7 +21,7 @@ module Sprockets
       end
     end
 
-    # Internal: Like `File.file?`.
+    # Public: Like `File.file?`.
     #
     # path - String file path.
     #
@@ -34,7 +34,20 @@ module Sprockets
       end
     end
 
-    # Internal: A version of `Dir.entries` that filters out `.` files and `~`
+    # Public: Like `File.directory?`.
+    #
+    # path - String file path.
+    #
+    # Returns true path exists and is a directory.
+    def directory?(path)
+      if stat = self.stat(path)
+        stat.directory?
+      else
+        false
+      end
+    end
+
+    # Public: A version of `Dir.entries` that filters out `.` files and `~`
     # swap files.
     #
     # path - String directory path
@@ -48,7 +61,7 @@ module Sprockets
       end
     end
 
-    # Internal: Check if path is absolute or relative.
+    # Public: Check if path is absolute or relative.
     #
     # path - String path.
     #
@@ -73,7 +86,7 @@ module Sprockets
       SEPARATOR_PATTERN = "#{Regexp.quote(File::SEPARATOR)}"
     end
 
-    # Internal: Check if path is explicitly relative.
+    # Public: Check if path is explicitly relative.
     # Starts with "./" or "../".
     #
     # path - String path.
@@ -178,7 +191,7 @@ module Sprockets
       nil
     end
 
-    # Internal: Stat all the files under a directory.
+    # Public: Stat all the files under a directory.
     #
     # dir - A String directory
     #
@@ -196,7 +209,7 @@ module Sprockets
       nil
     end
 
-    # Internal: Recursive stat all the files under a directory.
+    # Public: Recursive stat all the files under a directory.
     #
     # dir - A String directory
     #
@@ -215,7 +228,7 @@ module Sprockets
       nil
     end
 
-    # Internal: Recursive stat all the files under a directory in alphabetical
+    # Public: Recursive stat all the files under a directory in alphabetical
     # order.
     #
     # dir - A String directory
@@ -237,7 +250,7 @@ module Sprockets
       nil
     end
 
-    # Internal: Write to a file atomically. Useful for situations where you
+    # Public: Write to a file atomically. Useful for situations where you
     # don't want other processes or threads to see half-written files.
     #
     #   Utils.atomic_write('important.file') do |file|

data/lib/sprockets/processing.rb

@@ -1,4 +1,5 @@
 require 'sprockets/engines'
+require 'sprockets/file_reader'
 require 'sprockets/legacy_proc_processor'
 require 'sprockets/legacy_tilt_processor'
 require 'sprockets/mime'

data/lib/sprockets/version.rb

@@ -1,3 +1,3 @@
 module Sprockets
-  VERSION = "3.0.0.beta.9"
+  VERSION = "3.0.0.beta.10"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sprockets
 version: !ruby/object:Gem::Version
-  version: 3.0.0.beta.9
+  version: 3.0.0.beta.10
 platform: ruby
 authors:
 - Sam Stephenson
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-03-22 00:00:00.000000000 Z
+date: 2015-03-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rack