crabfarm 0.3.3 → 0.3.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4d125e666643d25a2a8ec454491bbbff92cf7f08
-  data.tar.gz: 20e33641d3f93933b304ef6aae3b3872f4eff6f9
+  metadata.gz: c304e14669cf10f756664e0971f04051644c41ed
+  data.tar.gz: 820b288d8a92ce0d9fdb2bba0a61441f49b773c5
 SHA512:
-  metadata.gz: 275850f791673c8a6357092d5a88ce63caeb18daf5e93446eee809181a258aa5e8309a604ce1e70401e66b4072be5a86377f576407da1414d02a02f3a8346416
-  data.tar.gz: d28ed53ade466f34d05564be93486cab3b48fb94ad4e94799bf81afe3516a1ff2a974963e758841dfc87562f1490e9c42c1f3b01eead193feb51ceaa333c3d9e
+  metadata.gz: 00c1879c2ec15db0706a42970822cc8b3431f602f224b51b2f8ea0e3ee4fb194020bb1299d191b90d00b541ec93941b85f75454446e24d46d65e3a1979f03a03
+  data.tar.gz: 2bdff2459cf55d9c936fa48d34af8e82d66df08d0e97ed7062dac4e1c6c79c14bcd4eeac53f76e9b3e4da434ae3bc30c9e0bb7630aad2cadee37afe53cf3bcef

data/lib/crabfarm/adapters/browser/abstract_webdriver.rb

@@ -19,12 +19,7 @@ module Crabfarm
         end
 
         def build_driver(_session_id)
-
-          # load driver and configure general selenium settings
-          driver = build_webdriver_instance
-          driver.manage.window.resize_to(config[:window_width], config[:window_height]) rescue nil
-
-          return wrap_driver driver
+          return wrap_driver build_webdriver_instance
         end
 
         def release_driver(_driver)

data/lib/crabfarm/adapters/browser/chrome.rb

@@ -1,3 +1,4 @@
+require 'crabfarm/support/webdriver_factory'
 require "crabfarm/adapters/browser/abstract_webdriver"
 
 module Crabfarm
@@ -8,14 +9,7 @@ module Crabfarm
       private
 
         def build_webdriver_instance
-          switches = []
-
-          if config[:proxy].present?
-            switches << "--proxy-server=#{config[:proxy]}"
-            switches << "--ignore-certificate-errors"
-          end
-
-          Selenium::WebDriver.for :chrome, :switches => switches
+          Support::WebdriverFactory.build_chrome_driver config
         end
 
       end

data/lib/crabfarm/adapters/browser/firefox.rb

@@ -1,3 +1,4 @@
+require 'crabfarm/support/webdriver_factory'
 require "crabfarm/adapters/browser/abstract_webdriver"
 
 module Crabfarm
@@ -8,16 +9,7 @@ module Crabfarm
       private
 
         def build_webdriver_instance
-          profile = Selenium::WebDriver::Firefox::Profile.new
-
-          if config.key? :proxy
-            profile.proxy = Selenium::WebDriver::Proxy.new({
-              :http => config[:proxy],
-              :ssl => config[:proxy]
-            })
-          end
-
-          Selenium::WebDriver.for :firefox, :profile => profile
+          Support::WebdriverFactory.build_firefox_driver config
         end
 
       end

data/lib/crabfarm/adapters/browser/phantom_js.rb

@@ -1,5 +1,6 @@
-require "crabfarm/adapters/browser/abstract_webdriver"
-require "crabfarm/phantom_runner"
+require 'crabfarm/support/webdriver_factory'
+require 'crabfarm/adapters/browser/abstract_webdriver'
+require 'crabfarm/phantom_runner'
 
 module Crabfarm
   module Adapters
@@ -18,19 +19,7 @@ module Crabfarm
       private
 
         def build_webdriver_instance
-          client = Selenium::WebDriver::Remote::Http::Default.new
-          client.timeout = config[:remote_timeout]
-
-          driver = Selenium::WebDriver.for :remote, {
-            :url => phantom_url,
-            :http_client => client,
-            :desired_capabilities => config[:capabilities] || Selenium::WebDriver::Remote::Capabilities.firefox
-          }
-
-          # TODO: not sure if this is necessary...
-          # driver.send(:bridge).setWindowSize(config[:window_width], config[:window_height])
-
-          return driver
+          Support::WebdriverFactory.build_remote_driver driver_config
         end
 
         def load_and_start_phantom
@@ -49,10 +38,17 @@ module Crabfarm
           }
         end
 
-         def phantom_url
+        def phantom_url
           "http://localhost:#{@phantom.port}"
         end
 
+        def driver_config
+          config.merge({
+            remote_host: phantom_url,
+            proxy: nil
+          })
+        end
+
       end
     end
   end

data/lib/crabfarm/adapters/browser/remote_webdriver.rb

@@ -1,3 +1,4 @@
+require 'crabfarm/support/webdriver_factory'
 require "crabfarm/adapters/browser/abstract_webdriver"
 
 module Crabfarm
@@ -8,21 +9,7 @@ module Crabfarm
       private
 
         def build_webdriver_instance
-          client = Selenium::WebDriver::Remote::Http::Default.new
-          client.timeout = config[:remote_timeout]
-
-          if config.has_key? :proxy
-            client.proxy = Selenium::WebDriver::Proxy.new({
-              :http => config[:proxy],
-              :ssl => config[:proxy]
-            })
-          end
-
-          Selenium::WebDriver.for(:remote, {
-            :url => config[:remote_host],
-            :http_client => client,
-            :desired_capabilities => config[:capabilities] || Selenium::WebDriver::Remote::Capabilities.firefox
-          })
+          WebdriverFactory.build_remote_driver config
         end
 
       end

data/lib/crabfarm/configuration.rb

@@ -65,7 +65,7 @@ module Crabfarm
         phantom_ssl: 'any',
         phantom_bin_path: 'phantomjs',
         crabtrap_bin_path: 'crabtrap',
-        recorder_driver: :firefox
+        recorder_driver: :chrome
       }
     end
 

data/lib/crabfarm/modes/recorder.rb

@@ -1,33 +1,28 @@
 require 'rainbow'
 require 'rainbow/ext/string'
+require 'crabfarm/support/webdriver_factory'
 require 'crabfarm/crabtrap_runner'
 
 module Crabfarm
   module Modes
     module Recorder
+      extend self
 
-      def self.memento_path(_name)
+      def memento_path(_name)
         File.join(GlobalState.mementos_path, _name + '.json.gz')
       end
 
-      def self.start(_target, _replay=false)
+      def start(_target, _replay=false)
         return puts "Must provide a recording target" unless _target.is_a? String
 
         target_path = memento_path _target
         return puts "Memento file does not exist: #{target_path}" if _replay and not File.exist? target_path
 
-        crabtrap_config = Crabfarm.config.crabtrap_config
-        crabtrap_config[:mode] = _replay ? :replay : :capture
-        crabtrap_config[:port] = Utils::PortDiscovery.find_available_port
-        crabtrap_config[:bucket_path] = target_path
-
-        crabtrap = CrabtrapRunner.new crabtrap_config
-        crabtrap.start
+        start_crabtrap _replay, target_path
 
         begin
-          browser_name = Crabfarm.config.recorder_driver
-          browser_factory = Strategies.load(:browser, browser_name).new "127.0.0.1:#{crabtrap.port}"
-          driver = browser_factory.build_driver nil
+          driver = build_driver Crabfarm.config.recorder_driver
+          return puts "Invalid recorder_driver name '#{Crabfarm.config.recorder_driver}'" if driver.nil?
 
           begin
             puts "Press Ctrl-C or close browser to stop #{_replay ? 'playback' : 'capturing'}."
@@ -46,6 +41,41 @@ module Crabfarm
         end
       end
 
+    private
+
+      def start_crabtrap(_replay, _target_path)
+        crabtrap_config = Crabfarm.config.crabtrap_config
+        crabtrap_config[:mode] = _replay ? :replay : :capture
+        crabtrap_config[:port] = Utils::PortDiscovery.find_available_port
+        crabtrap_config[:bucket_path] = _target_path
+
+        @crabtrap = CrabtrapRunner.new crabtrap_config
+        @crabtrap.start
+      end
+
+      def crabtrap
+        @crabtrap
+      end
+
+      def build_driver(_name)
+        case _name.to_sym
+        when :firefox
+          Crabfarm::Support::WebdriverFactory.build_firefox_driver driver_config
+        when :chrome
+          Crabfarm::Support::WebdriverFactory.build_chrome_driver driver_config
+        else return nil end
+      end
+
+      def driver_config
+        {
+          proxy: "127.0.0.1:#{crabtrap.port}",
+          window_width: Crabfarm.config.webdriver_window_width,
+          window_height: Crabfarm.config.webdriver_window_height
+        }
+      end
+
+
+
     end
   end
 end

data/lib/crabfarm/support/webdriver_factory.rb

@@ -0,0 +1,59 @@
+require 'selenium-webdriver'
+
+module Crabfarm
+ module Support
+  module WebdriverFactory
+    extend self
+
+    def build_chrome_driver(_options={})
+      switches = []
+
+      if _options[:proxy].present?
+        switches << "--proxy-server=#{_options[:proxy]}"
+        switches << "--ignore-certificate-errors"
+      end
+
+      common_setup Selenium::WebDriver.for(:chrome, :switches => switches), _options
+    end
+
+    def build_firefox_driver(_options={})
+      profile = Selenium::WebDriver::Firefox::Profile.new
+
+      if _options[:proxy].present?
+        profile.proxy = Selenium::WebDriver::Proxy.new({
+          :http => _options[:proxy],
+          :ssl => _options[:proxy]
+        })
+      end
+
+      common_setup Selenium::WebDriver.for(:firefox, :profile => profile), _options
+    end
+
+    def build_remote_driver(_options={})
+      client = Selenium::WebDriver::Remote::Http::Default.new
+      client.timeout = _options[:remote_timeout]
+
+      if _options[:proxy].present?
+        client.proxy = Selenium::WebDriver::Proxy.new({
+          :http => _options[:proxy],
+          :ssl => _options[:proxy]
+        })
+      end
+
+      common_setup(Selenium::WebDriver.for(:remote, {
+        :url => _options[:remote_host],
+        :http_client => client,
+        :desired_capabilities => _options[:capabilities] || Selenium::WebDriver::Remote::Capabilities.firefox
+      }), _options)
+    end
+
+  private
+
+    def common_setup(_driver, _options)
+      _driver.manage.window.resize_to(_options[:window_width], _options[:window_height]) rescue nil
+      return _driver
+    end
+
+  end
+ end
+end

data/lib/crabfarm/version.rb

@@ -1,3 +1,3 @@
 module Crabfarm
-  VERSION = "0.3.3"
+  VERSION = "0.3.4"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: crabfarm
 version: !ruby/object:Gem::Version
-  version: 0.3.3
+  version: 0.3.4
 platform: ruby
 authors:
 - Ignacio Baixas
@@ -420,6 +420,7 @@ files:
 - lib/crabfarm/strategies.rb
 - lib/crabfarm/support/custom_puma.rb
 - lib/crabfarm/support/gli.rb
+- lib/crabfarm/support/webdriver_factory.rb
 - lib/crabfarm/templates/boot.rb.erb
 - lib/crabfarm/templates/crabfarm_bin.erb
 - lib/crabfarm/templates/Crabfile.erb