imgkit 1.6.0 → 1.6.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b6db8c1811095b219f1f7a4fabf5c8cd17f1185e
-  data.tar.gz: 934d7ca922cf72789af64fb78c13e82721c8f8ed
+  metadata.gz: 4a5ed8f0be7c4decfabdf2d979460cb8697f2b05
+  data.tar.gz: 7e1b079b97fc5f9f71c3d1e62d242aa1ab3177db
 SHA512:
-  metadata.gz: 85fd2c927e505b17de2dd6d5f965fdf02e27d6a330a14fa2504e9518f46c5dbb7d5b595140557eb1da587bce7263d13d6b2a2a7a1d9d6f783d13053d2b303e46
-  data.tar.gz: 7eb58a359bbbe0ed8e7e8833f025f9a51a5d4b2bad9082ad12237dc75a64982e1757739fef9e675fb24a2b0af73c10323ed2f2236d9bee50cf2d5105e74ff786
+  metadata.gz: 941f53f2c3fb7391999e54c81fcf036f6f1e94929f056a5d1979d8372865134fa120305ccbd2563c0b689bae8d2a826717933480e3405f4c36da40ac9d8f4f37
+  data.tar.gz: 0a407a93a60d9007edda86266bc373614cde9a614419c41d9cee98983ab1f688bf005c6bd8dbdf7b6859cdc7456e0d6b8abf94bf013478f14d203708ed3e7f32

data/Gemfile.lock

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

data/bin/imgkit

@@ -9,7 +9,7 @@ require 'imgkit/version'
 GOOGLE_CODE_URL = ENV['GOOGLE_CODE_URL'] || "http://code.google.com/p/wkhtmltopdf/downloads/list?can=1"
 
 def detect_architecture
-  case arch = Config::CONFIG['arch']
+  case arch = RbConfig::CONFIG['arch']
   when /x86_64-linux/i
     'amd64'
   when /linux/i
@@ -33,7 +33,7 @@ def cleanup(install_to)
 end
 
 def download_wkhtmltoimage(arch)
-  if ENV['BZIP'] 
+  if ENV['BZIP']
     download = "wkhtmltoimage-0.10.0_beta4-static-#{arch}.tar.bz2"
     url = "http://wkhtmltopdf.googlecode.com/files/wkhtmltoimage-0.10.0_beta4-static-#{arch}.tar.bz2"
   else
@@ -43,7 +43,7 @@ def download_wkhtmltoimage(arch)
     url = "http://wkhtmltopdf.googlecode.com/files/#{download}"
   end
   puts "Downloading #{download} from #{url}"
-  
+
   `curl #{url} > #{download}`
   download
 end
@@ -77,9 +77,9 @@ OptionParser.new do |parser|
     @command = Proc.new do
       architecture = ENV['ARCHITECTURE'] || detect_architecture
       install_to = ENV['TO'] ? ENV['TO']+'/wkhtmltoimage' : IMGKit.configuration.wkhtmltoimage
-      
+
       Dir.chdir '/tmp'
-      
+
       cleanup(install_to)
       download = download_wkhtmltoimage(architecture)
       install(download, architecture, install_to)

data/lib/imgkit/imgkit.rb

@@ -45,7 +45,7 @@ class IMGKit
     raise NoExecutableError.new unless File.exists?(IMGKit.configuration.wkhtmltoimage)
   end
 
-  def command
+  def command(output_file = nil)
     args = [executable]
     args += normalize_options(@options).to_a.flatten.compact
 
@@ -55,7 +55,12 @@ class IMGKit
       args << @source.to_s
     end
 
-    args << '-' # Read IMG from stdout
+    if output_file
+      args << output_file.to_s
+    else
+      args << '-' # Read IMG from stdout
+    end
+
     args
   end
 
@@ -101,23 +106,22 @@ class IMGKit
     end
   end
 
-  def to_img(format = nil)
+  def to_img(format = nil, path = nil)
     append_stylesheets
     append_javascripts
     set_format(format)
 
     opts = @source.html? ? {:stdin_data => @source.to_s} : {}
-    result, stderr = capture3(*(command + [opts]))
+    result, stderr = capture3(*(command(path) + [opts]))
     result.force_encoding("ASCII-8BIT") if result.respond_to? :force_encoding
-
-    raise CommandFailedError.new(command.join(' '), stderr) if result.size == 0
+    raise CommandFailedError.new(command.join(' '), stderr) if path.nil? and result.size == 0
     result
   end
 
   def to_file(path)
     format = File.extname(path).gsub(/^\./,'').to_sym
-    set_format(format)
-    File.open(path,'w:ASCII-8BIT') {|file| file << self.to_img}
+    self.to_img(format, path)
+    File.new(path)
   end
 
   def method_missing(name, *args, &block)

data/lib/imgkit/version.rb

@@ -1,3 +1,3 @@
 class IMGKit
-  VERSION = "1.6.0"
+  VERSION = "1.6.1"
 end

data/spec/imgkit_spec.rb

@@ -282,12 +282,11 @@ describe IMGKit do
       File.delete(@file_path) if File.exist?(@file_path)
     end
 
-    it "should create a file with the result of :to_img  as content" do
+    it "should create a binary file" do
       imgkit = IMGKit.new('html', :quality => 50)
-      imgkit.expects(:to_img).returns('CONTENT')
       file = imgkit.to_file(@file_path)
       file.should be_instance_of(File)
-      File.read(file.path).should == 'CONTENT'
+      File.exists?(file.path).should be_true
     end
 
     IMGKit::KNOWN_FORMATS.each do |format|

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: imgkit
 version: !ruby/object:Gem::Version
-  version: 1.6.0
+  version: 1.6.1
 platform: ruby
 authors:
 - csquared
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-12-17 00:00:00.000000000 Z
+date: 2015-05-21 00:00:00.000000000 Z
 dependencies: []
 description: Uses wkhtmltoimage to create Images using HTML
 email: christopher.continanza@gmail.com
@@ -17,11 +17,11 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
-- ".document"
-- ".gitignore"
-- ".rspec"
-- ".rvmrc"
-- ".travis.yml"
+- .document
+- .gitignore
+- .rspec
+- .rvmrc
+- .travis.yml
 - Gemfile
 - Gemfile.lock
 - LICENSE
@@ -65,17 +65,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: imgkit
-rubygems_version: 2.2.2
+rubygems_version: 2.0.14
 signing_key: 
 specification_version: 4
 summary: HTML+CSS -> JPG