imgkit 1.3.8 → 1.3.9

data/.gitignore

@@ -3,3 +3,4 @@ pkg/*
 .bundle
 test.sh
 .rvmrc
+vendor

data/Gemfile

@@ -1,4 +1,4 @@
-source :rubygems
+source 'https://rubygems.org'
 
 gemspec
 

data/Gemfile.lock

@@ -1,10 +1,10 @@
 PATH
   remote: .
   specs:
-    imgkit (1.3.8)
+    imgkit (1.3.9)
 
 GEM
-  remote: http://rubygems.org/
+  remote: https://rubygems.org/
   specs:
     archive-tar-minitar (0.5.2)
     columnize (0.3.4)

data/README.md

@@ -1,4 +1,3 @@
-
 # IMGKit
 
 Create JPGs using plain old HTML+CSS. Uses [wkhtmltoimage](http://github.com/antialize/wkhtmltopdf) on the backend which renders HTML using Webkit.
@@ -57,16 +56,48 @@ Heavily based on [PDFKit](http://github.com/jdpace/pdfkit/).
 
 ## Configuration
 
-If you're on Windows or you installed wkhtmltoimage by hand to a location other than /usr/local/bin you will need to tell IMGKit where the binary is. You can configure IMGKit like so:
+### `wkhtmltoimage` binary location
+
+If you're on Windows or you installed `wkhtmltoimage` by hand to a location other than `/usr/local/bin` you will need to tell IMGKit where the binary is. You can configure IMGKit like so:
 
     # config/initializers/imgkit.rb
     IMGKit.configure do |config|
       config.wkhtmltoimage = '/path/to/wkhtmltoimage'
+    end
+
+### Default image format
+
+May be set to one of [`IMGKit::KNOWN_FORMATS = [:jpg, :jpeg, :png, :tiff, :tif]`](https://github.com/csquared/IMGKit/blob/d3755e2c23ba605da2f41e17f3edc99f3037d1c7/lib/imgkit/imgkit.rb#L2)
+
+      config.default_format = :png
+
+### Prefix for `<meta>` tag options (see **Usage**) :
+
+May be changed from its default (`imgkit-`):
+
+      config.meta_tag_prefix = 'imgkit-option'
+
+### Additional default options
+
+Any flag accepted by `wkhtmltoimage` may be set thus:
+
       config.default_options = {
         :quality => 60
       }
-      config.default_format = :png
-    end
+
+For a flag which takes no parameters, use `true` for the value:
+
+        'no-images' => true
+
+For flags with multiple parameters, use an array:
+
+        :cookie => ['my_session', '123BADBEEF456']
+
+### Overriding options
+
+When initializing an `IMGKit` options may be may be set for the life time of the `IMGKit` object:
+
+    IMGKit.new('http://example.com/form', :post => ['my_field', 'my_unique_value'])
 
 ## Heroku
 
@@ -216,6 +247,23 @@ Contributed by @ticktricktrack
   (if you want to have your own version, that is fine but bump version in a commit by itself I can ignore when I pull)
 * Send me a pull request. Bonus points for topic branches.
 
+## Testing
+
+Make sure the tests pass in the following ruby versions:
+
+  - 1.8.7-p370
+  - 1.9.2-p290
+  - 1.9.3-p194
+
+You can simply
+
+    $ rbenv-install <version>
+    $ rbenv shell <version>
+    $ bundle
+    $ bundle exec rake
+
+For each version
+
 ## Copyright
 
 Copyright (c) 2010 <a href="mailto:christopher.continanza@gmail.com">Chris Continanza</a>

data/lib/imgkit/configuration.rb

@@ -4,9 +4,10 @@ class IMGKit
 
     def initialize
       @meta_tag_prefix = 'imgkit-'
-      @wkhtmltoimage   = '/usr/local/bin/wkhtmltoimage'
       @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
   end
 

data/lib/imgkit/version.rb

@@ -1,3 +1,3 @@
 class IMGKit
-  VERSION = "1.3.8"
+  VERSION = "1.3.9"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: imgkit
 version: !ruby/object:Gem::Version
-  version: 1.3.8
+  version: 1.3.9
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-02-21 00:00:00.000000000 Z
+date: 2013-02-22 00:00:00.000000000 Z
 dependencies: []
 description: Uses wkhtmltoimage to create Images using HTML
 email: christopher.continanza@gmail.com
@@ -61,7 +61,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 1349900022860754797
+      hash: -4155335714113497947
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -70,7 +70,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 1349900022860754797
+      hash: -4155335714113497947
 requirements: []
 rubyforge_project: imgkit
 rubygems_version: 1.8.23