capy 1.4.3 → 1.4.4

data/README.md

@@ -39,12 +39,20 @@ and capy with '-w' option
 
     $ capy -w example.capy
 
-### To access the elements within iframe
+### To access the elements within IFrame
 
     within_frame('IFRAME_ID') do
       click_on 'link'
     end
 
+### Take Screenshot
+
+    take_screenshot
+
+or
+
+    take_screenshot 'foo.png'
+
 ### JavaScript Mode
 
     # example.js

data/examples/twitter.capy

@@ -0,0 +1,7 @@
+visit 'http://twitter.com/'
+fill_in 'session[username_or_email]', :with => USERNAME
+fill_in 'session[password]', :with => PASSWORD
+click_on 'Sign in'
+browser.keyboard.send_keys('n')
+browser.keyboard.send_keys('Tweet from capy!')
+click_on 'Tweet'

data/lib/capy.rb

@@ -150,9 +150,15 @@ module Capy
       instance_eval script
     end
 
-    def save_screenshot(png_path = nil)
-      png_path = gen_uniq_file_name('png') unless png_path
-      browser.save_screenshot(png_path)
+    def take_screenshot(png_path = nil)
+      png_path = gen_uniq_file_name('Screen Shot', 'png') unless png_path
+      case Capybara.current_driver
+      when :webkit
+        driver.render(png_path)
+      else
+        browser.save_screenshot(png_path)
+      end
+      png_path
     end
 
     def driver
@@ -173,8 +179,8 @@ module Capy
 
     private
 
-    def gen_uniq_file_name(extension)
-      file_name = Time.now.to_s
+    def gen_uniq_file_name(prefix, extension)
+      file_name = "#{prefix} #{Time.now}"
       i = 2
       while File.exists?("#{file_name}.#{extension}")
         file_name = if file_name =~ /\(\d+\)$/

data/lib/capy/version.rb

@@ -1,3 +1,3 @@
 module Capy
-  VERSION = "1.4.3"
+  VERSION = "1.4.4"
 end

data/spec/capy_spec.rb

@@ -102,15 +102,15 @@ describe Capy do
 
     context 'when file does not exists' do
       it do
-        evaluater.send(:gen_uniq_file_name, :png).should == "#{now}.png"
+        evaluater.send(:gen_uniq_file_name, 'Foo', :png).should == "Foo #{now}.png"
       end
     end
 
     context 'when file already exists' do
       it do
-        mock(File).exists?("#{now}.png") { true }
-        mock(File).exists?("#{now} (2).png") { false }
-        evaluater.send(:gen_uniq_file_name, :png).should == "#{now} (2).png"
+        mock(File).exists?("Foo #{now}.png") { true }
+        mock(File).exists?("Foo #{now} (2).png") { false }
+        evaluater.send(:gen_uniq_file_name, 'Foo', :png).should == "Foo #{now} (2).png"
       end
     end
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: capy
 version: !ruby/object:Gem::Version
-  version: 1.4.3
+  version: 1.4.4
   prerelease: 
 platform: ruby
 authors:
@@ -13,7 +13,7 @@ date: 2012-04-25 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: slop
-  requirement: &70367040411320 !ruby/object:Gem::Requirement
+  requirement: &70245184336920 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,10 +21,10 @@ dependencies:
         version: '3.1'
   type: :runtime
   prerelease: false
-  version_requirements: *70367040411320
+  version_requirements: *70245184336920
 - !ruby/object:Gem::Dependency
   name: capybara
-  requirement: &70367040410880 !ruby/object:Gem::Requirement
+  requirement: &70245184336300 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70367040410880
+  version_requirements: *70245184336300
 - !ruby/object:Gem::Dependency
   name: colored
-  requirement: &70367040410420 !ruby/object:Gem::Requirement
+  requirement: &70245184335660 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70367040410420
+  version_requirements: *70245184335660
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70367040409960 !ruby/object:Gem::Requirement
+  requirement: &70245184334940 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70367040409960
+  version_requirements: *70245184334940
 - !ruby/object:Gem::Dependency
   name: rr
-  requirement: &70367040409520 !ruby/object:Gem::Requirement
+  requirement: &70245184333980 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,7 +65,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70367040409520
+  version_requirements: *70245184333980
 description: Capybara Script Runner
 email:
 - jugyo.org@gmail.com
@@ -82,7 +82,7 @@ files:
 - bin/capy
 - capy.gemspec
 - examples/google_search.capy
-- examples/twitter.js
+- examples/twitter.capy
 - examples/wikipedia_search.capy
 - lib/capy.rb
 - lib/capy/version.rb

data/examples/twitter.js

@@ -1,2 +0,0 @@
-#!/usr/bin/env capy -s -j
-location.href = 'http://twitter.com'