kirchhoff 0.0.1 → 0.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 93385da45d96e5210f24498c36c53abbac104398
-  data.tar.gz: da60e781babe27f02338317b550bbb7fc7d2b493
+  metadata.gz: 4b4685b6ac03e6611ca24f2337f79d12078ea07a
+  data.tar.gz: 87cc14431e9556168881c17e0d2ddd08255dcab4
 SHA512:
-  metadata.gz: 903a4da81905ece05686438c7cbdd6e584dcd301ebc3e7488700e0500bd729623e95cf41091019f4db9cf8a291608a79c2fbe9bdf21a903e8116cd32b265fe81
-  data.tar.gz: 9b3ec2e8bad85de60acf365e22fcc3ca8d6ce8eadcc9ef6a104565b6270f5283eaf529cbee2d15390480a52a486d287a2549d61bb3169a64606246b3c83beeda
+  metadata.gz: 2b7fe60b4f1676c657dac0c62f67cb75c2e0a16370732a5029a0ec462ad6a260d6af6b485dc7c5b6cc63f117f23a01f07bb7c91cfbcc5351fd85b12b312fb4e9
+  data.tar.gz: 962ae7e2550548e7bb6992ff575c9b0d04802daae0beafe32316e63dc098c66a65f1279907ab601de49f714571f2a51f53d9f82a7642d75094472a6c94ea5a90

data/bin/console

@@ -1,7 +1,8 @@
 #!/usr/bin/env ruby
 
 require "bundler/setup"
-require "smart_driver"
+require "kirchhoff"
+
 
 # You can add fixtures and/or initialization code here to make experimenting
 # with your gem easier. You can also use a different console, if you like.

data/exe/kirchhoff

@@ -1,3 +1,3 @@
 #!/usr/bin/env ruby
 
-require "smart_driver"
+require "kirchhoff"

data/lib/kirchhoff/version.rb

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

data/lib/kirchhoff.rb

@@ -6,7 +6,7 @@ require 'kirchhoff/logger'
 
 module Kirchhoff
   class Driver
-    attr_accessor :__driver__
+    attr_accessor :__driver__, :default_timeout
     attr_reader :log_dir_path
     include Kirchhoff::CommonInterface
 
@@ -22,12 +22,16 @@ module Kirchhoff
       @__driver__.current_url
     end
 
-    def initialize(url=nil, browser=:chrome)
-      @__driver__ = Selenium::WebDriver.for(browser)
-      go(url) if url
+    def quit
+      @__driver__.quit
     end
 
-    def go(url, &block)
+    def initialize(browser: :chrome, default_timeout: 6)
+      @__driver__      = Selenium::WebDriver.for(browser)
+      @default_timeout = default_timeout
+    end
+
+    def go url
       @__driver__.navigate.to(url)
       Kirchhoff::Logger.call :info, "visiting #{url}..."
     end
@@ -57,14 +61,26 @@ module Kirchhoff
       @__driver__.switch_to.window @__driver__.window_handles[num]
     end
 
-    def wait_element selector, t=10
-      wait = Selenium::WebDriver::Wait.new(timeout: t)
+    def wait_element(selector, maybe: true, t: nil)
+      wait = Selenium::WebDriver::Wait.new(timeout: (t || @default_timeout))
       wait.until { self.find_element(css: selector) }
+    rescue Selenium::WebDriver::Error::TimeOutError
+      unless maybe
+        raise Selenium::WebDriver::Error::TimeOutError, "selector: #{selector}"
+      end
     end
 
-    def wait_text text, t=10
-      wait = Selenium::WebDriver::Wait.new(timeout: t)
+    def wait_text(text, maybe: true, t: nil)
+      wait = Selenium::WebDriver::Wait.new(timeout: (t || @default_timeout))
       wait.until { self.find_element(xpath: "//*[text()[contains(.,\"#{text}\")]]") }
+    rescue Selenium::WebDriver::Error::TimeOutError
+      unless maybe
+        raise Selenium::WebDriver::Error::TimeOutError, "text: #{text}"
+      end
+    end
+
+    def to_html
+      self.__driver__.page_source
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: kirchhoff
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
 platform: ruby
 authors:
 - gogotanaka
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-05-05 00:00:00.000000000 Z
+date: 2016-05-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: selenium-webdriver