smart_driver 1.1.2 → 1.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5398ad2839372564d16484012594e95755586130
-  data.tar.gz: 91b1529e80bc77fd0fa247634f86c044c1beec92
+  metadata.gz: d8950af3cf27acea7863e03e51e09e5aaecd19d7
+  data.tar.gz: 564b0a0a7c9d3d5ddd108177a6217a2dd39ae710
 SHA512:
-  metadata.gz: 0c0b93b55e343c5675d0054a640f09fe8d377129e57abad21908e23eb9734db145044940c7249d0bcd3ab031457a0e2312e22c3ffecf945e2c9eb5bd9b2fc128
-  data.tar.gz: 909bfd55ca17f66f0c07afda69b0ad9011e9662c9a5e6e27c9646c555c4ddb5067b4869f521d79359dee5a0e5de2240bb16225e1dc333123935c3946917d0af8
+  metadata.gz: ef36a8861e420531bea3befb707c06589bfcd70f3e2bbc97ac2dae8cafc6dadb5a9f660e601c7396cdc4e112b8b375fbaa75e3e0a125640e8137a44382c317e1
+  data.tar.gz: c315138636715579852bcb920e33a8ee23e3bf1a03c57c36cd698cbdb036e837a3372b71bfc088efea22c8391813bae43e37758bd3a630804c33fdf0cd7a37b6

data/lib/smart_driver/common_interface.rb

@@ -1,5 +1,45 @@
 class SmartDriver
   module CommonInterface
+    def find(selector)
+      self.find_element(css: selector).tap do |e|
+        logging :info, "find #{selector}..."
+        yield(e) if block_given?
+      end
+    end
+
+    def finds(selector)
+      self.find_elements(css: selector).tap do |es|
+        logging :info, "finds #{selector}..."
+      end
+    end
+
+    def find_text(text)
+      self.find_element({xpath: "//*[text()[contains(.,\"#{text}\")]]"}).tap do |e|
+        logging :info, "find text '#{text}'..."
+        yield(e) if block_given?
+      end
+    end
+
+    def finds_text(text)
+      self.find_elements({xpath: "//*[text()[contains(.,\"#{text}\")]]"}).tap do |es|
+        logging :info, "finds text '#{text}'..."
+      end
+    end
+
+    def has?(selector)
+      self.find_element(css: selector)
+      true
+    rescue Selenium::WebDriver::Error::NoSuchElementError
+      false
+    end
+
+    def has_text?(text)
+      self.find_element({xpath: "//*[text()[contains(.,\"#{text}\")]]"})
+      true
+    rescue Selenium::WebDriver::Error::NoSuchElementError
+      false
+    end
+
     def to_html
       attribute("outerHTML")
     end

data/lib/smart_driver/version.rb

@@ -1,3 +1,3 @@
 class SmartDriver
-  VERSION = "1.1.2"
+  VERSION = "1.2.0"
 end

data/lib/smart_driver.rb

@@ -12,38 +12,6 @@ class SmartDriver
     go(url) if url
   end
 
-  def find(selector)
-    logging :info, "find #{selector}..."
-    @__driver__.find_element(css: selector)
-  rescue Selenium::WebDriver::Error::NoSuchElementError
-    logging :fail, "#{selector} cannot be found"
-    nil
-  end
-
-  def finds(selector)
-    logging :info, "finds #{selector}..."
-    @__driver__.find_elements(css: selector)
-  rescue Selenium::WebDriver::Error::NoSuchElementError
-    logging :fail, "#{selector} cannot be found"
-    nil
-  end
-
-  def find_text(text)
-    logging :info, "find text '#{text}'..."
-    @__driver__.find_element({xpath: "//*[text()[contains(.,\"#{text}\")]]"})
-  rescue Selenium::WebDriver::Error::NoSuchElementError
-    logging :fail, "text '#{text}' cannot be found"
-    nil
-  end
-
-  def finds_text(text)
-    logging :info, "finds text '#{text}'..."
-    @__driver__.find_elements({xpath: "//*[text()[contains(.,\"#{text}\")]]"})
-  rescue Selenium::WebDriver::Error::NoSuchElementError
-    logging :fail, "text #{text} cannot be found"
-    nil
-  end
-
   def go(url)
     logging :info, "visiting #{url}..."
     @__driver__.navigate.to(url)
@@ -53,9 +21,15 @@ class SmartDriver
     @__driver__.navigate.refresh
   end
 
-  def submit
+  def submit(n=20)
     logging :info, "submit form ..."
-    $focus.submit if $focus
+    $focus.submit
+    if block_given?
+      n.times do
+        break if yield()
+        sleep 0.5
+      end
+    end
   end
 
   def exec_js(js_code)
@@ -77,41 +51,26 @@ class SmartDriver
   def switch_window(num)
     @__driver__.switch_to.window @__driver__.window_handles[num]
   end
-end
 
-class Selenium::WebDriver::Element
-  include SmartDriver::CommonInterface
-
-  def find(selector)
-    logging :info, "find #{selector} in element..."
-    self.find_element(css: selector)
-  rescue Selenium::WebDriver::Error::NoSuchElementError
-    logging :fail, "#{selector} cannot be found in element..."
-    nil
-  end
-
-  def finds(selector)
-    logging :info, "finds #{selector} in element..."
-    self.find_elements(css: selector)
-  rescue Selenium::WebDriver::Error::NoSuchElementError
-    logging :fail, "#{selector} cannot be found in element..."
-    nil
-  end
-
-  def find_text(text)
-    logging :info, "find text '#{text}'..."
-    self.find_element({xpath: "//*[text()[contains(.,\"#{text}\")]]"})
+  def maybe(&block)
+    block.call()
   rescue Selenium::WebDriver::Error::NoSuchElementError
-    logging :fail, "text '#{text}' cannot be found"
     nil
   end
+end
 
-  def finds_text(text)
-    logging :info, "finds text '#{text}'..."
-    self.find_elements({xpath: "//*[text()[contains(.,\"#{text}\")]]"})
-  rescue Selenium::WebDriver::Error::NoSuchElementError
-    logging :fail, "text #{text} cannot be found"
-    nil
+class Selenium::WebDriver::Element
+  include SmartDriver::CommonInterface
+  alias :origin_click :click
+
+  def click(n=20)
+    origin_click()
+    if block_given?
+      n.times do
+        break if yield()
+        sleep 0.5
+      end
+    end
   end
 
   def fill(text)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: smart_driver
 version: !ruby/object:Gem::Version
-  version: 1.1.2
+  version: 1.2.0
 platform: ruby
 authors:
 - gogotanaka
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-01-03 00:00:00.000000000 Z
+date: 2016-01-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: selenium-webdriver