sprockets 2.2.0.beta → 2.2.0

data/bin/sprockets

@@ -64,12 +64,17 @@ OptionParser.new do |opts|
   end
 end
 
-environment.append_path(".")
+if environment.paths.empty?
+  warn "No load paths given"
+  warn "Usage: sprockets -Ijavascripts/ filename"
+  exit 1
+end
 
 if manifest
   manifest.compile(filenames)
+elsif filenames.length == 1
+  puts environment.find_asset(filenames.first).to_s
 else
-  filenames.each do |filename|
-    puts environment.find_asset(filename).to_s
-  end
+  warn "Only one file can be compiled to stdout at a time"
+  exit 1
 end

data/lib/rake/sprocketstask.rb

@@ -49,6 +49,9 @@ module Rake
     #
     attr_accessor :assets
 
+    # Number of old assets to keep.
+    attr_accessor :keep
+
     # Logger to use during rake tasks. Defaults to using stderr.
     #
     #   t.logger = Logger.new($stdout)
@@ -77,7 +80,8 @@ module Rake
       @name         = name
       @environment  = lambda { Sprockets::Environment.new(Dir.pwd) }
       @logger       = Logger.new($stderr)
-      @logger.level = Logger::WARN
+      @logger.level = Logger::INFO
+      @keep         = 2
 
       yield self if block_given?
 
@@ -105,7 +109,7 @@ module Rake
       desc name == :assets ? "Clean old assets" : "Clean old #{name} assets"
       task "clean_#{name}" do
         with_logger do
-          manifest.clean
+          manifest.clean(keep)
         end
       end
 

data/lib/sprockets/context.rb

@@ -179,7 +179,9 @@ module Sprockets
         result = options[:data]
       else
         if environment.respond_to?(:default_external_encoding)
-          result = Sprockets::Utils.read_unicode(pathname, environment.default_external_encoding)
+          mime_type = environment.mime_types(pathname.extname)
+          encoding  = environment.encoding_for_mime_type(mime_type)
+          result    = Sprockets::Utils.read_unicode(pathname, encoding)
         else
           result = Sprockets::Utils.read_unicode(pathname)
         end

data/lib/sprockets/directive_processor.rb

@@ -260,7 +260,7 @@ module Sprockets
           root = pathname.dirname.join(path).expand_path
 
           unless (stats = stat(root)) && stats.directory?
-            raise ArgumentError, "require_tree argument must be a directory"
+            raise ArgumentError, "require_directory argument must be a directory"
           end
 
           context.depend_on(root)

data/lib/sprockets/mime.rb

@@ -30,6 +30,16 @@ module Sprockets
       ext = Sprockets::Utils.normalize_extension(ext)
       @mime_types[ext] = mime_type
     end
+
+    if defined? Encoding
+      # Returns the correct encoding for a given mime type, while falling
+      # back on the default external encoding, if it exists.
+      def encoding_for_mime_type(type)
+        encoding = Encoding::BINARY if type =~ %r{^(image|audio|video)/}
+        encoding ||= default_external_encoding if respond_to?(:default_external_encoding)
+        encoding
+      end
+    end
   end
 
   # Extend Sprockets module to provide global registry

data/lib/sprockets/version.rb

@@ -1,3 +1,3 @@
 module Sprockets
-  VERSION = "2.2.0.beta"
+  VERSION = "2.2.0"
 end

metadata

@@ -1,14 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: sprockets
 version: !ruby/object:Gem::Version 
-  hash: 31098225
-  prerelease: 6
+  hash: 7
+  prerelease: 
   segments: 
   - 2
   - 2
   - 0
-  - beta
-  version: 2.2.0.beta
+  version: 2.2.0
 platform: ruby
 authors: 
 - Sam Stephenson
@@ -17,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-12-16 00:00:00 -06:00
+date: 2012-01-10 00:00:00 -06:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -104,22 +103,23 @@ dependencies:
   type: :development
   version_requirements: *id005
 - !ruby/object:Gem::Dependency 
-  name: eco
+  name: coffee-script-source
   prerelease: false
   requirement: &id006 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 15
+        hash: 31
         segments: 
         - 1
+        - 2
         - 0
-        version: "1.0"
+        version: 1.2.0
   type: :development
   version_requirements: *id006
 - !ruby/object:Gem::Dependency 
-  name: ejs
+  name: eco
   prerelease: false
   requirement: &id007 !ruby/object:Gem::Requirement 
     none: false
@@ -134,7 +134,7 @@ dependencies:
   type: :development
   version_requirements: *id007
 - !ruby/object:Gem::Dependency 
-  name: execjs
+  name: ejs
   prerelease: false
   requirement: &id008 !ruby/object:Gem::Requirement 
     none: false
@@ -149,21 +149,22 @@ dependencies:
   type: :development
   version_requirements: *id008
 - !ruby/object:Gem::Dependency 
-  name: json
+  name: execjs
   prerelease: false
   requirement: &id009 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ">="
+    - - ~>
       - !ruby/object:Gem::Version 
-        hash: 3
+        hash: 15
         segments: 
+        - 1
         - 0
-        version: "0"
+        version: "1.0"
   type: :development
   version_requirements: *id009
 - !ruby/object:Gem::Dependency 
-  name: rack-test
+  name: json
   prerelease: false
   requirement: &id010 !ruby/object:Gem::Requirement 
     none: false
@@ -177,7 +178,7 @@ dependencies:
   type: :development
   version_requirements: *id010
 - !ruby/object:Gem::Dependency 
-  name: rake
+  name: rack-test
   prerelease: false
   requirement: &id011 !ruby/object:Gem::Requirement 
     none: false
@@ -190,6 +191,20 @@ dependencies:
         version: "0"
   type: :development
   version_requirements: *id011
+- !ruby/object:Gem::Dependency 
+  name: rake
+  prerelease: false
+  requirement: &id012 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  type: :development
+  version_requirements: *id012
 description: Sprockets is a Rack-based asset packaging system that concatenates and serves JavaScript, CoffeeScript, CSS, LESS, Sass, and SCSS.
 email: 
 - sstephenson@gmail.com
@@ -254,14 +269,12 @@ required_ruby_version: !ruby/object:Gem::Requirement
 required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
   requirements: 
-  - - ">"
+  - - ">="
     - !ruby/object:Gem::Version 
-      hash: 25
+      hash: 3
       segments: 
-      - 1
-      - 3
-      - 1
-      version: 1.3.1
+      - 0
+      version: "0"
 requirements: []
 
 rubyforge_project: sprockets