sprockets-image_compressor 0.1.1 → 0.1.2

data/CHANGELOG.md

@@ -1,7 +1,12 @@
+0.1.2 (01/26/2012)
+-------------------------
+
+* Bugfix: Works on Rails 3.1 and 3.2 on Ruby 1.9
+
 0.1.1 (12/26/2011)
 -------------------------
 
-* Bugfix: make sure we're using binary encoding when dealing with the image files
+* Bugfix: Make sure we're using binary encoding when dealing with the image files
 * Bugfix: Add basic sprockets integration tests
 
 0.1.0 (09/21/2011)

data/README.md

@@ -14,9 +14,9 @@ The gem ships with a Railtie which will automatically register the compressor pr
 
 ## TODO
 
-* Detect missing pngcrush or jpegoptim installations
+* Detect missing pngcrush or jpegoptim installations (vendor?)
 * Provide configuration hooks
-* Tests
+* Test Railtie
 
 ## License
 

data/lib/sprockets/image_compressor/integration.rb

@@ -2,6 +2,8 @@ module Sprockets
   module ImageCompressor
     class Integration
       def self.setup env
+        monkey_patch_older_sprockets!
+
         env.register_mime_type 'image/png', '.png'
         env.register_postprocessor 'image/png', :png_compressor do |context, data|
           PngCompressor.new.compress data
@@ -12,6 +14,115 @@ module Sprockets
           JpgCompressor.new.compress data
         end
       end
+
+      # Rails locks down Sprockets to an older version, which will cause the image compressor to barf on ruby 1.9.
+      # Monkey patch in binary fixes from Sprockets 2.2.0.
+      def self.monkey_patch_older_sprockets!
+        return unless Sprockets::VERSION =~ /2\.[01]\.\d/ # Sprockets version >= 2.0.0 and < 2.2.0
+        return unless "".respond_to?(:valid_encoding?) # is ruby 1.9?
+
+        Sprockets::BundledAsset.class_eval do
+          def build_dependency_context_and_body
+            start_time = Time.now.to_f
+
+            context = blank_context
+
+            # Read original data once and pass it along to `Context`
+            mime_type = environment.mime_types(pathname.extname)
+            encoding = environment.encoding_for_mime_type(mime_type)
+            if encoding && "".respond_to?(:valid_encoding?)
+              data = Sprockets::Utils.read_unicode(pathname, encoding)
+            else
+              data = Sprockets::Utils.read_unicode(pathname)
+            end
+
+            # Prime digest cache with data, since we happen to have it
+            environment.file_digest(pathname, data)
+
+            # Runs all processors on `Context`
+            body = context.evaluate(pathname, :data => data)
+
+            @dependency_context, @body = context, body
+
+            elapsed_time = ((Time.now.to_f - start_time) * 1000).to_i
+            logger.info "Compiled #{logical_path}  (#{elapsed_time}ms)  (pid #{Process.pid})"
+
+            return context, body
+          end
+        end
+
+        Sprockets::Context.class_eval do
+          def evaluate(path, options = {})
+            pathname   = resolve(path)
+            attributes = environment.attributes_for(pathname)
+            processors = options[:processors] || attributes.processors
+
+            if options[:data]
+              result = options[:data]
+            else
+              mime_type = environment.mime_types(pathname.extname)
+              encoding = environment.encoding_for_mime_type(mime_type)
+              if encoding && "".respond_to?(:valid_encoding?)
+                result = Sprockets::Utils.read_unicode(pathname, encoding)
+              else
+                result = Sprockets::Utils.read_unicode(pathname)
+              end
+            end
+
+            processors.each do |processor|
+              begin
+                template = processor.new(pathname.to_s) { result }
+                result = template.render(self, {})
+              rescue Exception => e
+                annotate_exception! e
+                raise
+              end
+            end
+
+            result
+          end
+        end
+
+        Sprockets::Mime.module_eval do
+          # Mime types that should be opened with BINARY encoding.
+          def binary_mime_types
+            @binary_mime_types ||= [ %r{^(image|audio|video)/} ]
+          end
+
+          # 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 = "BINARY" if binary_mime_types.any? { |matcher| matcher === type }
+            encoding ||= default_external_encoding if respond_to?(:default_external_encoding)
+            encoding
+          end
+        end
+
+        Sprockets::Utils.module_eval do
+          def self.utf8_bom_pattern
+            @ut8_bom_pattern ||= Regexp.new("\\A\uFEFF".encode('utf-8'))
+          end
+
+          def self.read_unicode(pathname, external_encoding = Encoding.default_external)
+            pathname.open("r:#{external_encoding}") do |f|
+              f.read.tap do |data|
+                # Eager validate the file's encoding. In most cases we
+                # expect it to be UTF-8 unless `default_external` is set to
+                # something else. An error is usually raised if the file is
+                # saved as UTF-16 when we expected UTF-8.
+                if !data.valid_encoding?
+                  raise EncodingError, "#{pathname} has a invalid " +
+                  "#{data.encoding} byte sequence"
+
+                  # If the file is UTF-8 and theres a BOM, strip it for safe concatenation.
+                elsif data.encoding.name == "UTF-8" && data =~ utf8_bom_pattern
+                  data.sub!(utf8_bom_pattern, "")
+                end
+              end
+            end
+          end
+        end
+      end
     end
   end
 end

data/lib/sprockets/image_compressor/version.rb

@@ -1,5 +1,5 @@
 module Sprockets
   module Imagecompressor
-    VERSION = "0.1.1"
+    VERSION = "0.1.2"
   end
 end

data/spec/fixtures/test.css

@@ -0,0 +1,3 @@
+html {
+  body: red; // UTF8 ☃
+}

data/spec/integration/sprockets_integration_spec.rb

@@ -13,14 +13,21 @@ describe "sprockets integration" do
   end
 
   it "should compress pngs" do
-    get "/largepng.png"
-    last_response.should be_ok
-    last_response.headers["Content-Length"].should == "116773"
+    big_response = get "/largepng.png"
+    small_response = get "/smallpng.png"
+    big_response.headers["Content-Length"].should == small_response.headers["Content-Length"]
+    big_response.body.should == small_response.body
   end
 
   it "should compress jpgs" do
-    get "/largejpg.jpg"
-    last_response.should be_ok
-    last_response.headers["Content-Length"].should == "4000"
+    big_response = get "/largejpg.jpg"
+    small_response = get "/smalljpg.jpg"
+    big_response.headers["Content-Length"].should == small_response.headers["Content-Length"]
+    big_response.body.should == small_response.body
+  end
+
+  it "should still serve text assets" do
+    response = get "/test.css"
+    response.status.should == 200
   end
 end

metadata

@@ -1,89 +1,67 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: sprockets-image_compressor
-version: !ruby/object:Gem::Version 
-  hash: 25
+version: !ruby/object:Gem::Version
+  version: 0.1.2
   prerelease: 
-  segments: 
-  - 0
-  - 1
-  - 1
-  version: 0.1.1
 platform: ruby
-authors: 
+authors:
 - Micah Geisel
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2011-12-26 00:00:00 -08:00
-default_executable: 
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2012-01-27 00:00:00.000000000Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: sprockets
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  requirement: &80292680 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :runtime
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: ruby-debug
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  version_requirements: *80292680
+- !ruby/object:Gem::Dependency
+  name: ruby-debug
+  requirement: &80292420 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id002
-- !ruby/object:Gem::Dependency 
-  name: rspec
   prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  version_requirements: *80292420
+- !ruby/object:Gem::Dependency
+  name: rspec
+  requirement: &80292210 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id003
-- !ruby/object:Gem::Dependency 
-  name: rack-test
   prerelease: false
-  requirement: &id004 !ruby/object:Gem::Requirement 
+  version_requirements: *80292210
+- !ruby/object:Gem::Dependency
+  name: rack-test
+  requirement: &80291950 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id004
+  prerelease: false
+  version_requirements: *80291950
 description: Losslessly compress images in the Rails asset pipeline
-email: 
+email:
 - micah@botandrose.com
 executables: []
-
 extensions: []
-
 extra_rdoc_files: []
-
-files: 
+files:
 - .gitignore
 - CHANGELOG.md
 - Gemfile
@@ -100,41 +78,31 @@ files:
 - spec/fixtures/largepng.png
 - spec/fixtures/smalljpg.jpg
 - spec/fixtures/smallpng.png
+- spec/fixtures/test.css
 - spec/integration/sprockets_integration_spec.rb
 - sprockets-image_compressor.gemspec
-has_rdoc: true
-homepage: ""
+homepage: ''
 licenses: []
-
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+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 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: sprockets-image_compressor
-rubygems_version: 1.6.2
+rubygems_version: 1.8.10
 signing_key: 
 specification_version: 3
 summary: Losslessly compress images in the Rails asset pipeline
 test_files: []
-