webdrone 0.9.2 → 0.9.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2dc6f71d72ff761c21d45ebd9d6010902e618dbe
-  data.tar.gz: 748f43843c70c3227e41c03a8c21a246f160922a
+  metadata.gz: e3a26ea163cdfb711c8037ff6e8550bb9ba27787
+  data.tar.gz: 02e5a85d31ddde91b0448c24a7ee48d5ba759db4
 SHA512:
-  metadata.gz: 11ef20f24ed0b30de204b5cbc16b11a642e7affd4a6c9b04dc68dee9e41c23a0e63fa505a5e24f4235deaf05eeee6ed04ad7d1b0d4050ed801bbb8700e9036c0
-  data.tar.gz: c8e39f3bc080681d5a3d982b21da6ae1dc4a91cccb8639c8bf3f00f9f32c4b2381421c8407b48f3df1dda91c06ae9b59220335800ec6637ba4a72eb7cd420a71
+  metadata.gz: f55b9f99a04f3b36013c2371f7ff5ff567889dad77cb0d3d68b3f51556ca2386a0e7d66ff1b33c5c797618725ba4444670197d04a6a81413d8897828063ffbf3
+  data.tar.gz: 38be7081da5b436cefaf46c3fa80663e98a0ae0343e0f3a8f3c2fc17c33a8efaec0c1dd4d5720dcd933c55a6e323b6fa27fa57bff04564d1074defe95f98e9cf

data/README.md

@@ -16,10 +16,14 @@ And then execute:
 
     $ bundle
 
-Install it yourself as:
+Or install it yourself as:
 
     $ gem install webdrone
 
+Check for updates:
+
+    $ gem update webdrone
+
 ## Usage
 
 Create a browser:
@@ -120,7 +124,9 @@ a0.vrfy.link  'link', attr: 'disabled', eq: 'true'
 a0.vrfy.link  'link', attr: 'sample', contains: 'something'
 ```
 
+## Documentation
 
+Docs can be found [here](http://www.rubydoc.info/gems/webdrone).
 
 ## Development
 

data/lib/webdrone/clic.rb

@@ -12,8 +12,8 @@ module Webdrone
       @a0 = a0
     end
 
-    def id(text)
-      @a0.find.id(text).click
+    def id(text, n: 1, all: false, visible: true)
+      @a0.find.id(text, n: n, all: all, visible: visible).click
     rescue => exception
       Webdrone.report_error(@a0, exception, Kernel.caller_locations)
     end

data/lib/webdrone/error.rb

@@ -74,8 +74,14 @@ module Webdrone
     def report_screenshot
       begin
         write_title "AUTOMATIC SCREENSHOT"
-        file = @a0.shot.screen 'a0_webdrone_error_report'
-        write_line "Saved: #{file.path}"
+        begin
+          @a0.ctxt.with_conf error: :raise do
+            file = @a0.shot.screen 'a0_webdrone_error_report'
+            write_line "Screenshot Saved filename: #{file.path}"
+          end
+        rescue => exception
+          write_line "Error Saving screenhot: #{exception}"
+        end
 
         dump_error_report
       rescue
@@ -108,8 +114,9 @@ module Webdrone
   end
 
   def self.report_error(a0, exception, caller_locations)
+    return if a0.conf.error == :ignore
     exception = WebdroneError.new(exception.message, exception, a0, caller_locations) if exception.class != WebdroneError
-    
+
     raise exception if a0.conf.error == :raise or a0.conf.error == :raise_report
   end
 end

data/lib/webdrone/find.rb

@@ -12,9 +12,10 @@ module Webdrone
       @a0 = a0
     end
 
-    def id(text)
+    def id(text, n: 1, all: false, visible: true)
       @a0.wait.for do
-        @a0.driver.find_element :id, text
+        items = @a0.driver.find_elements :id, text
+        choose(items, n, all, visible)
       end
     rescue => exception
       Webdrone.report_error(@a0, exception, Kernel.caller_locations)
@@ -75,8 +76,6 @@ module Webdrone
         end
         if all
           list
-        elsif n == 1
-          list.first
         else
           list[n - 1]
         end

data/lib/webdrone/html.rb

@@ -0,0 +1,36 @@
+module Webdrone
+  class Browser
+    def html
+      @html ||= Html.new self
+    end
+  end
+
+  class Html
+    attr_accessor :a0
+
+    def initialize(a0)
+      @a0 = a0
+    end
+
+    def find_html(text, n: 1, all: false, visible: true)
+      item = @a0.find.send __callee__, text, n: n, all: all, visible: visible
+      if item.is_a? Array
+        item.collect { |x| x.attribute 'innerHTML'}
+      else
+        item.attribute 'innerHTML'
+      end
+    rescue => exception
+      Webdrone.report_error(@a0, exception, Kernel.caller_locations)
+    end
+
+    alias_method :id,     :find_html
+    alias_method :css,    :find_html
+    alias_method :link,   :find_html
+    alias_method :button, :find_html
+    alias_method :on,     :find_html
+    alias_method :option, :find_html
+    alias_method :xpath,  :find_html
+
+    protected :find_html
+  end
+end

data/lib/webdrone/mark.rb

@@ -12,8 +12,8 @@ module Webdrone
       @a0 = a0
     end
 
-    def id(text, color: 'red')
-      flash @a0.find.id(text), color: color
+    def id(text, color: 'red', n: 1, all: false, visible: true)
+      flash @a0.find.id(text, n: n, all: all, visible: visible), color: color
     rescue => exception
       Webdrone.report_error(@a0, exception, Kernel.caller_locations)
     end
@@ -57,11 +57,11 @@ module Webdrone
     def flash(item, color: 'red')
       3.times do
         border item, 'white'
-        sleep 0.1
-        border item, 'blue'
-        sleep 0.1
+        sleep 0.05
+        border item, 'black'
+        sleep 0.05
         border item, color
-        sleep 0.1
+        sleep 0.05
       end
       item
     end

data/lib/webdrone/text.rb

@@ -12,52 +12,31 @@ module Webdrone
       @a0 = a0
     end
 
-    def id(text)
-      @a0.find.id(text).text
+    def find_text(text, n: 1, all: false, visible: true)
+      item = @a0.find.send __callee__, text, n: n, all: all, visible: visible
+      if item.is_a? Array
+        item.collect(&:text)
+      else
+        item.text
+      end
     rescue => exception
       Webdrone.report_error(@a0, exception, Kernel.caller_locations)
     end
 
-    def css(text)
-      @a0.find.css(text).text
-    rescue => exception
-      Webdrone.report_error(@a0, exception, Kernel.caller_locations)
-    end
-
-    def link(text, n: 1, all: false, visible: true)
-      @a0.find.link(text, n: n, all: all, visible: visible).text
-    rescue => exception
-      Webdrone.report_error(@a0, exception, Kernel.caller_locations)
-    end
-
-    def button(text, n: 1, all: false, visible: true)
-      @a0.find.button(text, n: n, all: all, visible: visible).text
-    rescue => exception
-      Webdrone.report_error(@a0, exception, Kernel.caller_locations)
-    end
-
-    def on(text, n: 1, all: false, visible: true)
-      @a0.find.on(text, n: n, all: all, visible: visible).text
-    rescue => exception
-      Webdrone.report_error(@a0, exception, Kernel.caller_locations)
-    end
-
-    def option(text, n: 1, all: false, visible: true)
-      @a0.find.option(text, n: n, all: all, visible: visible).text
-    rescue => exception
-      Webdrone.report_error(@a0, exception, Kernel.caller_locations)
-    end
-
-    def xpath(text, n: 1, all: false, visible: true)
-      @a0.find.xpath(text, n: n, all: all, visible: visible).text
-    rescue => exception
-      Webdrone.report_error(@a0, exception, Kernel.caller_locations)
-    end
+    alias_method :id,     :find_text
+    alias_method :css,    :find_text
+    alias_method :link,   :find_text
+    alias_method :button, :find_text
+    alias_method :on,     :find_text
+    alias_method :option, :find_text
+    alias_method :xpath,  :find_text
     
     def page_title
       @a0.driver.title
     rescue => exception
       Webdrone.report_error(@a0, exception, Kernel.caller_locations)
     end
+
+    protected :find_text
   end
 end

data/lib/webdrone/version.rb

@@ -1,3 +1,3 @@
 module Webdrone
-  VERSION = "0.9.2"
+  VERSION = "0.9.8"
 end

data/lib/webdrone/vrfy.rb

@@ -12,13 +12,13 @@ module Webdrone
       @a0 = a0
     end
 
-    def id(text, attr: nil, eq: nil, contains: nil)
+    def id(text, n: 1, visible: true, attr: nil, eq: nil, contains: nil)
       vrfy @a0.find.id(text), attr: attr, eq: eq, contains: contains
     rescue => exception
       Webdrone.report_error(@a0, exception, Kernel.caller_locations)
     end
 
-    def css(text, attr: nil, eq: nil, contains: nil)
+    def css(text, n: 1, visible: true, attr: nil, eq: nil, contains: nil)
       vrfy @a0.find.css(text), attr: attr, eq: eq, contains: contains
     rescue => exception
       Webdrone.report_error(@a0, exception, Kernel.caller_locations)

data/lib/webdrone.rb

@@ -14,6 +14,7 @@ require 'webdrone/ctxt'
 require 'webdrone/wait'
 require 'webdrone/text'
 require 'webdrone/vrfy'
+require 'webdrone/html'
 require 'selenium-webdriver'
 require 'xpath'
 require 'rubyXL'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: webdrone
 version: !ruby/object:Gem::Version
-  version: 0.9.2
+  version: 0.9.8
 platform: ruby
 authors:
 - Aldrin Martoq
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-03-18 00:00:00.000000000 Z
+date: 2016-03-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -163,6 +163,7 @@ files:
 - lib/webdrone/exec.rb
 - lib/webdrone/find.rb
 - lib/webdrone/form.rb
+- lib/webdrone/html.rb
 - lib/webdrone/mark.rb
 - lib/webdrone/open.rb
 - lib/webdrone/shot.rb