webshot 0.0.2 → 0.0.3

data/README.md

@@ -21,13 +21,26 @@ Or install it yourself as:
 
     # Setup Capybara
     Webshot.capybara_setup!
-
     webshot = Webshot::Screenshot.new
+
+    # Capture Google's home page
     webshot.capture "http://www.google.com/", "google.png"
 
-    # Customize output (MiniMagick settings)
+    # Customize thumbnail
     webshot.capture "http://www.google.com/", "google.png", width: 100, height: 90, quality: 85
 
+    # Customize thumbnail generation (MiniMagick)
+    # see: https://github.com/minimagick/minimagick
+    webshot.capture("http://www.google.com/", "google.png") do |magick|
+      magick.combine_options do |c|
+        c.thumbnail "100x"
+        c.background "white"
+        c.extent "100x90"
+        c.gravity "north"
+        c.quality 85
+      end
+    end
+
 ## Contributing
 
 1. Fork it

data/lib/webshot/screenshot.rb

@@ -22,21 +22,30 @@ module Webshot
       gravity = opts.fetch(:gravity, "north")
       quality = opts.fetch(:quality, 85)
 
+      # Reset session before visiting url
+      Capybara.reset_sessions!
+
       # Open page
       visit url
 
+      # Check response code
       if page.driver.status_code == 200
-        # Save screenshot
+        # Save screenshot to file
         page.driver.save_screenshot(path, :full => true)
 
         # Resize screenshot
         thumb = MiniMagick::Image.open(path)
-        thumb.combine_options do |c|
-          c.thumbnail "#{width}x"
-          c.background "white"
-          c.extent "#{width}x#{height}"
-          c.gravity gravity
-          c.quality quality
+        if block_given?
+          # Customize MiniMagick options
+          yield thumb
+        else
+          thumb.combine_options do |c|
+            c.thumbnail "#{width}x"
+            c.background "white"
+            c.extent "#{width}x#{height}"
+            c.gravity gravity
+            c.quality quality
+          end
         end
 
         # Save thumbnail

data/lib/webshot/version.rb

@@ -1,3 +1,3 @@
 module Webshot
-  VERSION = "0.0.2"
+  VERSION = "0.0.3"
 end

data/test/webshot_test.rb

@@ -11,7 +11,7 @@ class WebshotTest < Test::Unit::TestCase
 
   def test_http
     assert_nothing_raised do
-      %w(www.google.com www.yahoo.com).each do |name|
+      %w(www.yahoo.com).each do |name|
         output = thumb(name)
         File.delete output if File.exists? output
         @webshot.capture "http://#{name}/", output
@@ -31,14 +31,31 @@ class WebshotTest < Test::Unit::TestCase
     end
   end
 
-  def test_
-    %w(888.888.888.888).each do |name|
+  def test_invalid_url
+    %w(nxdomain).each do |name|
       assert_raise Webshot::WebshotError do
         @webshot.capture "http://#{name}/", thumb(name)
       end
     end
   end
 
+  def test_mini_magick
+    assert_nothing_raised do
+      %w(www.yahoo.com).each do |name|
+        output = thumb(name)
+        File.delete output if File.exists? output
+
+        # Customize MiniMagick options
+        @webshot.capture("http://#{name}/", output) do |thumb|
+          thumb.combine_options do |c|
+            c.thumbnail "100x90"
+          end
+        end
+        assert File.exists? output
+      end
+    end
+  end
+
   protected
 
   def thumb(name)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: webshot
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-04-30 00:00:00.000000000 Z
+date: 2013-05-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler