imgkit 1.3.10 → 1.4.0

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    imgkit (1.3.10)
+    imgkit (1.4.0)
 
 GEM
   remote: https://rubygems.org/

data/lib/imgkit/configuration.rb

@@ -1,13 +1,25 @@
 class IMGKit
   class Configuration
-    attr_accessor :meta_tag_prefix, :wkhtmltoimage, :default_options, :default_format
+    attr_writer :wkhtmltoimage
+    attr_accessor :meta_tag_prefix, :default_options, :default_format
 
     def initialize
       @meta_tag_prefix = 'imgkit-'
       @default_options = {:height => 1000}
       @default_format  = :jpg
-      @wkhtmltoimage ||= (defined?(Bundler::GemfileError) ? `bundle exec which wkhtmltoimage` : `which wkhtmltoimage`).chomp
-      @wkhtmltoimage = '/usr/local/bin/wkhtmltoimage' if @wkhtmltoimage.strip.empty?  # Fallback
+    end
+
+    def wkhtmltoimage
+      @wkhtmltoimage ||= begin
+        path = (using_bundler? ? `bundle exec which wkhtmltoimage` : `which wkhtmltoimage`).chomp
+        path = '/usr/local/bin/wkhtmltoimage' if path.strip.empty?  # Fallback
+        path
+      end
+    end
+
+    private
+    def using_bundler?
+      defined?(Bundler::GemfileError)
     end
   end
 

data/lib/imgkit/version.rb

@@ -1,3 +1,3 @@
 class IMGKit
-  VERSION = "1.3.10"
+  VERSION = "1.4.0"
 end

data/spec/configuration_spec.rb

@@ -0,0 +1,59 @@
+require "spec_helper"
+
+describe IMGKit::Configuration do
+  describe "#wkhtmltoimage" do
+    context "system version exists" do
+      let(:system_path) { "/path/to/wkhtmltoimage\n" }
+
+      before(:each) do
+        subject.stub :` => system_path
+      end
+
+      context "with Bundler" do
+        before(:each) do
+          subject.stub :using_bundler? => true
+        end
+
+        it "should return the result of `bundle exec which wkhtmltoimage` with whitespace stripped" do
+          subject.should_receive(:`).with("bundle exec which wkhtmltoimage")
+          subject.wkhtmltoimage.should == system_path.chomp
+        end
+      end
+
+      context "without Bundler" do
+        before(:each) do
+          subject.stub :using_bundler? => false
+        end
+
+        it "should return the result of `which wkhtmltoimage` with whitespace stripped" do
+          subject.should_receive(:`).with("which wkhtmltoimage")
+          subject.wkhtmltoimage.should == system_path.chomp
+        end
+      end
+    end
+
+    context "system version does not exist" do
+      before(:each) do
+        subject.stub :` => "\n"
+        subject.stub :using_bundler? => false
+      end
+
+      it "should return the fallback path" do
+        subject.wkhtmltoimage.should == "/usr/local/bin/wkhtmltoimage"
+      end
+    end
+
+    context "set explicitly" do
+      let(:explicit_path) { "/explicit/path/to/wkhtmltoimage" }
+
+      before(:each) do
+        subject.wkhtmltoimage = explicit_path
+      end
+
+      it "should not check the system version and return the explicit path" do
+        subject.should_not_receive(:`)
+        subject.wkhtmltoimage.should == explicit_path
+      end
+    end
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: imgkit
 version: !ruby/object:Gem::Version
-  version: 1.3.10
+  version: 1.4.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-10-29 00:00:00.000000000 Z
+date: 2014-02-14 00:00:00.000000000 Z
 dependencies: []
 description: Uses wkhtmltoimage to create Images using HTML
 email: christopher.continanza@gmail.com
@@ -35,6 +35,7 @@ files:
 - lib/imgkit/imgkit.rb
 - lib/imgkit/source.rb
 - lib/imgkit/version.rb
+- spec/configuration_spec.rb
 - spec/error_binary
 - spec/fixtures/example.css
 - spec/fixtures/example.html
@@ -61,7 +62,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -1737640145783329099
+      hash: -2785353123807079228
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -70,7 +71,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -1737640145783329099
+      hash: -2785353123807079228
 requirements: []
 rubyforge_project: imgkit
 rubygems_version: 1.8.23
@@ -78,6 +79,7 @@ signing_key:
 specification_version: 3
 summary: HTML+CSS -> JPG
 test_files:
+- spec/configuration_spec.rb
 - spec/error_binary
 - spec/fixtures/example.css
 - spec/fixtures/example.html