photograph 0.0.1 → 0.0.2

data/lib/photograph/artist.rb

@@ -1,8 +1,8 @@
-require 'capybara-webkit'
+require 'capybara/poltergeist'
 require 'mini_magick'
 
 
-Capybara.default_wait_time = 5
+Capybara.default_wait_time = 15
 
 module Photograph
   class Artist
@@ -21,7 +21,7 @@ module Photograph
     }
 
     def self.browser
-      @browser ||= Capybara::Session.new :webkit
+      @browser ||= Capybara::Session.new :poltergeist
     end
 
     def browser
@@ -34,8 +34,15 @@ module Photograph
       @options = DefaultOptions.merge(options)
     end
 
-    def shoot!
+    def shoot! &block
       @image = capture
+
+      if block_given?
+        yield @image
+        clean!
+      else
+        @image
+      end
     end
 
     def capture

data/lib/photograph/service.rb

@@ -21,12 +21,10 @@ module Photograph
                           :wait => params["wait"].to_f,
                           :selector => params["selector"]
 
-      artist.shoot!
-
-      send_file artist.image.path,
-        :type => :png
-
-      artist.clean!
+      artist.shoot! do |image|
+        send_file image.path,
+          :type => :png
+      end
     end
   end
 end

data/lib/photograph/version.rb

@@ -1,3 +1,3 @@
 module Photograph
-  VERSION = "0.0.1"
+  VERSION = "0.0.2"
 end

data/photograph.gemspec

@@ -6,7 +6,7 @@ Gem::Specification.new do |gem|
   gem.email         = ["jh@chabran.fr"]
   gem.description   = %q{Webservice that screenshots any url}
   gem.summary       = %q{Webservice that screenshots any url}
-  gem.homepage      = "https://github.com/TactilizeTeam/photograph"
+  gem.homepage      = "https://github.com/jhchabran/photograph"
 
   gem.files         = `git ls-files`.split($\)
   gem.executables   = gem.files.grep(%r{^bin/}).map{ |f| File.basename(f) }
@@ -15,11 +15,12 @@ Gem::Specification.new do |gem|
   gem.require_paths = ["lib"]
   gem.version       = Photograph::VERSION
 
-  gem.add_dependency 'capybara-webkit'
+  gem.add_dependency 'poltergeist'
   gem.add_dependency 'mini_magick'
   gem.add_dependency 'sinatra'
   gem.add_dependency 'sinatra-contrib'
   gem.add_dependency 'thin'
 
   gem.add_development_dependency 'rspec', '~> 2.6'
+  gem.add_development_dependency 'rake'
 end

data/spec/photograph/artist_spec.rb

@@ -8,8 +8,14 @@ module Photograph
       Artist.new :url => URL
     end
 
+    it "should accept a block when shooting" do
+      Artist.new(:url => URL).shoot! do |image|
+        image.should respond_to(:path)
+      end
+    end
+
     it "should raise an error without an url" do
-      expect { Artist.new }.should raise_error(Artist::MissingUrlError)
+      expect { Artist.new }.to raise_error(Artist::MissingUrlError)
     end
 
     describe "Default size values" do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: photograph
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,10 +9,10 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-05-22 00:00:00.000000000 Z
+date: 2013-01-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: capybara-webkit
+  name: poltergeist
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
@@ -107,6 +107,22 @@ dependencies:
     - - ~>
       - !ruby/object:Gem::Version
         version: '2.6'
+- !ruby/object:Gem::Dependency
+  name: rake
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: Webservice that screenshots any url
 email:
 - jh@chabran.fr
@@ -131,7 +147,7 @@ files:
 - photograph.gemspec
 - spec/photograph/artist_spec.rb
 - spec/spec_helper.rb
-homepage: https://github.com/TactilizeTeam/photograph
+homepage: https://github.com/jhchabran/photograph
 licenses: []
 post_install_message: 
 rdoc_options: []
@@ -145,7 +161,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 4589063138671751824
+      hash: -3056213331410753270
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -154,7 +170,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 4589063138671751824
+      hash: -3056213331410753270
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.23