sprockets-image_compressor 0.2.4 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 81df94dce44c7b5dc9574c4f67e129411a19715d
-  data.tar.gz: dcbd97c1609a7b2330b44b68f18c085b545892a0
+  metadata.gz: aaed8e8733ed00024e60e873586d05562665938a
+  data.tar.gz: 14514d263b2cd8a2564e7549ddd623b74420786c
 SHA512:
-  metadata.gz: 0200cb52f50b03b36692dbb1e2577ef6b900720dbd993bdc0f462dfaf588c921b0a8f71a7f6fad8798d537fe6d76c024600d966351c43618c3ae4b02d2c5a693
-  data.tar.gz: 6c04631bccf6435785a8f317e00a5d76b4321ebfa9615af0be50fa74534ecd96b22bfc18b9ee5537ee17f7ee249945553281f25d3e00f519922293c7c2d9385e
+  metadata.gz: 71368ede2c27681e320663b1360c92cfce187697fbccaf508e0483d77b41e7d66dc1b6095f7e354448c5c67692daf8f4b58661f87403ac9c0f642fd8afa913c8
+  data.tar.gz: a8c5ab038f88e5ff1cf1a1166e0af62cad7d5ca46a2fec786ee2faef0992c43c2b29c8d2a905989de31e4d3826705e860d0e5a75c91befca17bbe6bf4a7843cb

data/CHANGELOG.md

@@ -1,3 +1,11 @@
+0.3.0 (09/17/2014)
+-------------------------
+* Feature: Windows support! Thanks, @JakeTheSnake3p0!
+
+0.2.4 (05/18/2014)
+-------------------------
+* Bugfix: jpgs weren't being opened in binary mode. Thanks, @JakeTheSnake3p0!
+
 0.2.3 (04/10/2014)
 -------------------------
 * Bugfix: Return original file and warn if compression fails. Thanks, @tomchentw!

data/README.md

@@ -37,9 +37,10 @@ See [#15](https://github.com/botandrose/sprockets-image_compressor/issues/15) fo
 ## Credits
 
 * @nhogle for help with compiling and packaging the jpegoptim and pngcrush binaries
+* @JakeTheSnake3p0 for Windows support
 * @florentmorin for compatibility with sprockets-rails
 * @dkubb for compatibility with Rails 4
 
 ## License
 
-(MIT License) - Copyright (c) 2012 Micah Geisel
+(MIT License) - Copyright (c) 2014 Micah Geisel

data/lib/sprockets/image_compressor.rb

@@ -1,4 +1,5 @@
 require "sprockets/image_compressor/version"
+require "sprockets/image_compressor/binary_finder"
 require "sprockets/image_compressor/png_compressor"
 require "sprockets/image_compressor/jpg_compressor"
 require "sprockets/image_compressor/integration"

data/lib/sprockets/image_compressor/base.rb

@@ -2,32 +2,14 @@ require "tempfile"
 
 module Sprockets
   module ImageCompressor
+
     GEM_ROOT = File.expand_path File.join(File.dirname(__FILE__), "../../../")
 
     class Base
       def binary_path
-        @binary_path ||= begin
-          try_system_binary or try_vendored_binaries or raise """
-            Can't find an installed version of #{@name}, and none of the vendored binaries seem to work.
-            Please install #{@name}, or open an issue on the project page at https://github.com/botandrose/sprockets-image_compressor
-          """
-        end
-      end
-
-      private
-
-      def try_system_binary
-        system_binary = `which #{@name}`.chomp
-        system_binary if system_binary.length > 0
-      end
-
-      def try_vendored_binaries
-        # use the first vendored binary that doesn't shit the bed when we ask for its version
-        vendored_binaries = Dir["#{GEM_ROOT}/bin/#{@name}.*"].sort
-        vendored_binaries.find do |path|
-          system("#{path} -version 2> /dev/null > /dev/null")
-        end
+        @binary_path ||= BinaryFinder.new(@name).path
       end
     end
+
   end
 end

data/lib/sprockets/image_compressor/binary_finder.rb

@@ -0,0 +1,49 @@
+module Sprockets
+  module ImageCompressor
+    class BinaryFinder
+      def initialize binary_name
+        @binary_name = binary_name
+      end
+
+      attr_reader :binary_name
+
+      def path
+        try_system_binary or try_vendored_binaries or raise NotFound
+      end
+
+      class NotFound < StandardError
+        def message
+          """
+            Can't find an installed version of #{binary_name}, and none of the vendored binaries seem to work.
+            Please install #{binary_name}, or open an issue on the project page at https://github.com/botandrose/sprockets-image_compressor
+          """
+        end
+      end
+
+      private
+
+      def try_system_binary
+        which(binary_name)
+      end
+
+      def try_vendored_binaries
+        # use the first vendored binary that doesn't shit the bed when we ask for its version
+        vendored_binaries = Dir["#{GEM_ROOT}/bin/#{ binary_name }.*"].sort
+        vendored_binaries.find do |path|
+          system("#{ path } -version 2> /dev/null > /dev/null")
+        end
+      end
+
+      def which cmd
+        exts = ENV["PATHEXT"] ? ENV["PATHEXT"].split(";") : [""]
+        ENV["PATH"].split(File::PATH_SEPARATOR).each do |path|
+          exts.each do |ext|
+            exe = File.join(path, "#{cmd}#{ext}")
+            return exe if File.executable?(exe) && !File.directory?(exe)
+          end
+        end
+        nil
+      end
+    end
+  end
+end

data/lib/sprockets/image_compressor/version.rb

@@ -1,5 +1,5 @@
 module Sprockets
   module Imagecompressor
-    VERSION = "0.2.4"
+    VERSION = "0.3.0"
   end
 end

data/spec/binary_finder_spec.rb

@@ -0,0 +1,33 @@
+require "sprockets/image_compressor"
+
+describe Sprockets::ImageCompressor::BinaryFinder do
+  subject { Sprockets::ImageCompressor::BinaryFinder.new(binary) }
+  let(:binary) { "example_binary_name" } 
+  let(:path)   { "/some/path/to/binary" }
+
+  describe "#path" do
+    context "when binary is installed locally " do
+      before { subject.stub try_system_binary: path }
+
+      it "prefers the system's binary" do
+        subject.path.should == path
+      end
+    end
+
+    context "when local binary is missing, but one of the vendored binaries works" do
+      before { subject.stub try_system_binary: nil, try_vendored_binaries: path }
+
+      it "falls back to the vendored binary" do
+        subject.path.should == path
+      end
+    end
+
+    context "when local binary is missing and none of the vendored binaries work" do
+      before { subject.stub try_system_binary: nil, try_vendored_binaries: nil }
+
+      it "raises an exception" do
+        expect { subject.path }.to raise_exception
+      end
+    end
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sprockets-image_compressor
 version: !ruby/object:Gem::Version
-  version: 0.2.4
+  version: 0.3.0
 platform: ruby
 authors:
 - Micah Geisel
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-05-19 00:00:00.000000000 Z
+date: 2014-09-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sprockets
@@ -104,13 +104,13 @@ files:
 - lib/sprockets-image_compressor.rb
 - lib/sprockets/image_compressor.rb
 - lib/sprockets/image_compressor/base.rb
+- lib/sprockets/image_compressor/binary_finder.rb
 - lib/sprockets/image_compressor/integration.rb
 - lib/sprockets/image_compressor/jpg_compressor.rb
 - lib/sprockets/image_compressor/png_compressor.rb
 - lib/sprockets/image_compressor/railtie.rb
 - lib/sprockets/image_compressor/version.rb
-- spec/compressors/jpg_compressor_spec.rb
-- spec/compressors/png_compressor_spec.rb
+- spec/binary_finder_spec.rb
 - spec/fixtures/largejpg.jpg
 - spec/fixtures/largepng.png
 - spec/fixtures/smalljpg.jpg

data/spec/compressors/jpg_compressor_spec.rb

@@ -1,40 +0,0 @@
-require "sprockets/image_compressor"
-
-describe Sprockets::ImageCompressor::JpgCompressor do
-  let(:compressor) { Sprockets::ImageCompressor::JpgCompressor.new }
-  let(:gem_root) { Sprockets::ImageCompressor::GEM_ROOT }
-
-  describe "#binary_path" do
-    context "when jpegoptim is installed" do
-      before do
-        compressor.should_receive(:`).with("which jpegoptim").and_return("/path/to/jpegoptim\n")
-      end
-
-      it "prefers the system's binary" do
-        compressor.binary_path.should == "/path/to/jpegoptim"
-      end
-    end
-
-    context "when jpegoptim is missing and we're on a supported system" do
-      before do
-        compressor.should_receive(:`).with("which jpegoptim").and_return("")
-        compressor.should_receive(:system).and_return(true)
-      end
-
-      it "falls back to a vendored binary" do
-        compressor.binary_path.should include("#{gem_root}/bin/jpegoptim")
-      end
-    end
-
-    context "when jpegoptim is missing and we're on an unsupported system" do
-      before do
-        compressor.should_receive(:`).with("which jpegoptim").and_return("")
-        compressor.should_receive(:system).twice.and_return(false)
-      end
-
-      it "raises hell" do
-        lambda { compressor.binary_path }.should raise_exception
-      end
-    end
-  end
-end

data/spec/compressors/png_compressor_spec.rb

@@ -1,47 +0,0 @@
-require "sprockets/image_compressor"
-
-describe Sprockets::ImageCompressor::PngCompressor do
-  let(:compressor) { Sprockets::ImageCompressor::PngCompressor.new }
-  let(:gem_root) { Sprockets::ImageCompressor::GEM_ROOT }
-
-  describe "#binary_path" do
-    context "when pngcrush is installed" do
-      before do
-        compressor.should_receive(:`).with("which pngcrush").and_return("/path/to/pngcrush\n")
-      end
-
-      it "prefers the system's binary" do
-        compressor.binary_path.should == "/path/to/pngcrush"
-      end
-    end
-
-    context "when pngcrush is missing and we're on a supported system" do
-      before do
-        compressor.should_receive(:`).with("which pngcrush").and_return("")
-        compressor.should_receive(:system).and_return(true)
-      end
-
-      it "falls back to a vendored binary" do
-        compressor.binary_path.should include("#{gem_root}/bin/pngcrush")
-      end
-    end
-
-    context "when pngcrush is missing and we're an unsupported system" do
-      before do
-        compressor.should_receive(:`).with("which pngcrush").and_return("")
-        compressor.should_receive(:system).twice.and_return(false)
-      end
-
-      it "raises hell" do
-        lambda { compressor.binary_path }.should raise_exception
-      end
-    end
-  end
-
-  describe "#compress" do
-    it "returns uncompressable content as-is with a warning" do
-      compressor.should_receive(:warn)
-      compressor.compress("asdf").should == "asdf"
-    end
-  end
-end