jammit 0.5.1 → 0.5.3

data/jammit.gemspec

@@ -1,7 +1,7 @@
 Gem::Specification.new do |s|
   s.name      = 'jammit'
-  s.version   = '0.5.1'         # Keep version in sync with jammit.rb
-  s.date      = '2010-7-15'
+  s.version   = '0.5.3'         # Keep version in sync with jammit.rb
+  s.date      = '2010-9-15'
 
   s.homepage    = "http://documentcloud.github.com/jammit/"
   s.summary     = "Industrial Strength Asset Packaging for Rails"

data/lib/jammit.rb

@@ -4,7 +4,7 @@ $LOAD_PATH.push File.expand_path(File.dirname(__FILE__))
 # to all of the configuration options.
 module Jammit
 
-  VERSION               = "0.5.1"
+  VERSION               = "0.5.3"
 
   ROOT                  = File.expand_path(File.dirname(__FILE__) + '/..')
 
@@ -168,9 +168,7 @@ module Jammit
 
   def self.warn(message)
     message = "Jammit Warning: #{message}"
-    @logger ||= (defined?(Rails) && Rails.logger ? Rails.logger :
-                 defined?(RAILS_DEFAULT_LOGGER) ? RAILS_DEFAULT_LOGGER : nil)
-    @logger ? @logger.warn(message) : STDERR.puts(message)
+    $stderr.puts message
   end
 
   # Clone of active_support's symbolize_keys, so that we don't have to depend

data/lib/jammit/compressor.rb

@@ -16,7 +16,8 @@ module Jammit
       '.tif'  => 'image/tiff',
       '.tiff' => 'image/tiff',
       '.ttf'  => 'font/truetype',
-      '.otf'  => 'font/opentype'
+      '.otf'  => 'font/opentype',
+      '.woff' => 'font/woff'
     }
 
     # Font extensions for which we allow embedding:
@@ -96,7 +97,8 @@ module Jammit
       paths       = paths.grep(Jammit.template_extension_matcher).sort
       base_path   = find_base_path(paths)
       compiled    = paths.map do |path|
-        contents  = File.read(path).gsub(/\n/, '').gsub("'", '\\\\\'')
+        contents  = File.open(path, 'r:binary') {|f| f.read }
+        contents  = contents.gsub(/\n/, '').gsub("'", '\\\\\'')
         name      = template_name(path, base_path)
         "#{namespace}['#{name}'] = #{Jammit.template_function}('#{contents}');"
       end
@@ -135,7 +137,8 @@ module Jammit
     # at it.
     def concatenate_and_tag_assets(paths, variant=nil)
       stylesheets = [paths].flatten.map do |css_path|
-        File.read(css_path).gsub(EMBED_DETECTOR) do |url|
+        contents = File.open(css_path, 'r:binary') {|f| f.read }
+        contents.gsub(EMBED_DETECTOR) do |url|
           ipath, cpath = Pathname.new($1), Pathname.new(File.expand_path(css_path))
           is_url = URI.parse($1).absolute?
           is_url ? url : "url(#{construct_asset_path(ipath, cpath, variant)})"
@@ -224,7 +227,9 @@ module Jammit
 
     # Return the Base64-encoded contents of an asset on a single line.
     def encoded_contents(asset_path)
-      @asset_contents[asset_path] ||= Base64.encode64(File.read(asset_path)).gsub(/\n/, '')
+      return @asset_contents[asset_path] if @asset_contents[asset_path]
+      data = File.open(asset_path, 'rb') {|f| f.read }
+      @asset_contents[asset_path] = Base64.encode64(data).gsub(/\n/, '')
     end
 
     # Grab the mime-type of an asset, by filename.

data/rails/routes.rb

@@ -1,7 +1,7 @@
 if defined?(Rails::Application)
   # Rails3 routes
-  Rails::Application.routes.draw do |map|
+  Rails.application.routes.draw do
     match "/#{Jammit.package_path}/:package.:extension",
       :to => 'jammit#package', :as => :jammit
   end
-end
+end

metadata

@@ -1,12 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: jammit
 version: !ruby/object:Gem::Version 
+  hash: 13
   prerelease: false
   segments: 
   - 0
   - 5
-  - 1
-  version: 0.5.1
+  - 3
+  version: 0.5.3
 platform: ruby
 authors: 
 - Jeremy Ashkenas
@@ -14,16 +15,18 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-07-15 00:00:00 -04:00
+date: 2010-09-15 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: yui-compressor
   prerelease: false
   requirement: &id001 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 57
         segments: 
         - 0
         - 9
@@ -35,9 +38,11 @@ dependencies:
   name: closure-compiler
   prerelease: false
   requirement: &id002 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 27
         segments: 
         - 0
         - 1
@@ -85,23 +90,27 @@ rdoc_options:
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
       segments: 
       - 0
       version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
       segments: 
       - 0
       version: "0"
 requirements: []
 
 rubyforge_project: jammit
-rubygems_version: 1.3.6
+rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
 summary: Industrial Strength Asset Packaging for Rails