omnibrowser 0.0.6 → 0.0.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ca9faf3378bff0064d5fae7ac9b352554da8ab8b
-  data.tar.gz: d2c9f47c1fcccbfd44257493f828f5d005c71d38
+  metadata.gz: 4549c62b32e8df4e719f492362a4be13ec5ac06f
+  data.tar.gz: 14a1152ec1a2fc05bc1ac57278079355225aa3a3
 SHA512:
-  metadata.gz: ed326265040e4343e09fbb226dc825c420761df2314f09bcd09878d4791a09bdfbd5a7e9104a0668ea5128e005d9f185f0902097a1e1e202cca406626b0a0084
-  data.tar.gz: 5683cf5a548f957debf2061e7e1529f0e0da8394c404e24773a4e755f969a34ca5d4babc49629f898915f3ddb87e6f41e8b3dddcbee9f000586434880a8a610e
+  metadata.gz: fc49d1acefc932f0c82d77726ad11ada77bb4aeff700c359d71fadb90597131c77dcb6d09c1b74bbe0a48958f5794b9f39eb3ec9d857aab2d104f307d43f01ab
+  data.tar.gz: ed61f9aa7f753ca37056450aad446042475603855d26ec2fd77502766cd43ea387501e04d34d08620085717c004716d36568e132fd12a906e5827a4456da68af

data/lib/basic_browser.rb

@@ -0,0 +1,75 @@
+require 'flex_core'
+
+class BasicBrowser
+
+  FIREFOX_41 = 'Mozilla/5.0 (Windows NT 6.1; WOW64; rv:40.0) Gecko/20100101 Firefox/40.1'
+
+  CHROME = 'Mozilla/5.0 (Windows NT 6.1) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/41.0.2228.0 Safari/537.36'
+
+  def initialize (*configs)
+
+    @profile = Selenium::WebDriver::Firefox::Profile.new
+    @profile['javascript.enabled'] = false if configs.include?(:no_java)
+    @profile['general.useragent.override'] =
+        case
+          when configs.include?(:firefox_41)
+            FIREFOX_41
+          else
+            CHROME
+        end
+
+    @browser = Watir::Browser.new(:firefox, profile: @profile)
+
+  end
+
+  def resize (width, height = nil)
+    height = width if height.nil?
+    @browser.window.resize_to(width, height)
+  end
+
+  def move (x, y)
+    @browser.window.move_to(x, y)
+  end
+
+  def zoom_out (times)
+    times.times do
+      @browser.send_keys([:command, :subtract])
+    end
+  end
+
+  def position
+    @browser.windows.first.position.to_a
+  end
+
+  def size
+    @browser.windows.first.size.to_a
+  end
+
+  def method_missing (method, *args)
+
+    nav_methods = [:goto, :refresh, :back]
+
+    begin
+      result = @browser.send(method, *args)
+    rescue Timeout::Error => _
+      sputs 'page timed out'
+      @browser.stop
+      @browser.refresh
+    end
+
+    sleep(0.88)
+    lprint '.' if method.is_in?(nav_methods)
+
+    result
+  end
+
+  def save_html (path)
+    path = path
+    path << '.html' unless path =~ /.+\.html\z/
+
+    file = File.open(path, 'w')
+    file.puts @browser.html
+    file.close
+  end
+
+end

data/lib/omni_browser.rb

@@ -6,11 +6,13 @@ require 'omni_browser/website'
 require 'watir-webdriver'
 require 'watir-webdriver/extensions/alerts'
 
-class OmniBrowser
+require_relative 'basic_browser'
 
-  FIREFOX_41 = 'Mozilla/5.0 (Windows NT 6.1; WOW64; rv:40.0) Gecko/20100101 Firefox/40.1'
+class BasicBrowser
 
-  CHROME = 'Mozilla/5.0 (Windows NT 6.1) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/41.0.2228.0 Safari/537.36'
+end
+
+class OmniBrowser < BasicBrowser
 
   attr_reader :database, :config, :logging_db, :domains_db, :ip_db
   attr_accessor :tunnel, :allowance, :my_ip
@@ -59,29 +61,6 @@ class OmniBrowser
     @dom_id = nil
   end
 
-  def resize (width, height = nil)
-    height = width if height.nil?
-    @browser.window.resize_to(width, height)
-  end
-
-  def move (x, y)
-    @browser.window.move_to(x, y)
-  end
-
-  def zoom_out (times)
-    times.times do
-      @browser.send_keys([:command, :subtract])
-    end
-  end
-
-  def position
-    @browser.windows.first.position.to_a
-  end
-
-  def size
-    @browser.windows.first.size.to_a
-  end
-
   def method_missing (method, *args)
     if [:goto, :refresh, :back].include?(method)
       save_domain
@@ -143,13 +122,4 @@ class OmniBrowser
     @browser.url.scan(/[^\/]+/)[1].strip
   end
 
-  def save_html (path)
-    path = path
-    path << '.html' unless path =~ /.+\.html\z/
-
-    file = File.open(path, 'w')
-    file.puts @browser.html
-    file.close
-  end
-
 end

data/lib/omni_browser/action_logging.rb

@@ -2,7 +2,11 @@ require 'flex_config'
 require 'flex_pg'
 require 'open-uri'
 
-class OmniBrowser
+class BasicBrowser
+
+end
+
+class OmniBrowser < BasicBrowser
 
   def get_my_ip
     puts 'Getting IP'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: omnibrowser
 version: !ruby/object:Gem::Version
-  version: 0.0.6
+  version: 0.0.7
 platform: ruby
 authors:
 - Eugene Lai
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-03-05 00:00:00.000000000 Z
+date: 2016-03-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: flex_pg
@@ -58,6 +58,7 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- lib/basic_browser.rb
 - lib/omni_browser.rb
 - lib/omni_browser/action_logging.rb
 - lib/omni_browser/action_logging/watir_mods.rb
@@ -82,7 +83,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.2
+rubygems_version: 2.6.1
 signing_key: 
 specification_version: 4
 summary: A powerful automated browser