crabfarm 0.3.5 → 0.3.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5732944441ee66f0cfb3f4545c383cbd5b022549
-  data.tar.gz: 34fab2b972d79c63f852234d72c6580f4f9d9628
+  metadata.gz: 034f0f2656c2a21910734636aa34f9d7ba22fc02
+  data.tar.gz: f16ff3f1a110bdf38c4d58aea37e7effae1b8ccb
 SHA512:
-  metadata.gz: bc67baf038a0f87955a21d8a9a1baf851a2c1a32fe3f3861c9529e7ddf46aee7ffe5e16855443dca5ca5fcc3a839d56788c232efc673fb46cdc933b57f4afcbe
-  data.tar.gz: b35b59b5b5d5412c4a6290f00f636dd6e27ef6977f6de94f69940b8dde05d4b6c5f2d3e6580c32479514924c03f94c26a9eda43d2b46ca0789b688dea9516a3c
+  metadata.gz: 5b5563a6dc4ae2837a28b76eb10bbacb871db117450f065221aae73f314cd708f4ace2b0b06ca71dd0289dcc8e785879f1bd1742c0600b31687328c6b223e6c8
+  data.tar.gz: 2db01f23a912d304dd98046ddbc16406685c41327dbe17db21b5415ee27f355a8905fb6410380656047a670700fdf43f26974ee66175f47128708f864f595e0f

data/lib/crabfarm/base_navigator.rb

@@ -12,7 +12,7 @@ module Crabfarm
     def_delegators '@context', :http
     def_delegators '@context.store', :get, :fetch
 
-    def initialize(_context, _params)
+    def initialize(_context,  _params)
       @context = _context
       @params = _params
     end
@@ -60,10 +60,14 @@ module Crabfarm
       end
 
       reducer = _reducer_class.new _target, @params.merge(_options)
-      reducer.run
+      execute_reducer reducer
       reducer
     end
 
+    def execute_reducer(_reducer)
+      _reducer.run
+    end
+
     def start_forked_navigation(_name, _value, _block, _mutex)
       Thread.new {
         fork = ForkedNavigator.new @context, self, _name, _mutex

data/lib/crabfarm/base_reducer.rb

@@ -4,7 +4,7 @@ module Crabfarm
   class BaseReducer < Delegator
     include Assertion::Fields
 
-    attr_reader :params, :document
+    attr_reader :raw_document, :document, :params
 
     def self.use_parser(_parser_name)
       @parser_name = _parser_name
@@ -26,8 +26,8 @@ module Crabfarm
     def initialize(_target, _params)
       reset_fields
 
-      @parsed_data = parser.preprocess_parsing_target _target
-      @document = parser.parse @parsed_data
+      @raw_document = parser.preprocess_parsing_target _target
+      @document = parser.parse @raw_document
       @params = _params
 
       super @document
@@ -37,21 +37,6 @@ module Crabfarm
       raise NotImplementedError.new
     end
 
-    def take_snapshot(_name=nil)
-      file_path = self.class.snapshot_path _name
-
-      dir_path = file_path.split(File::SEPARATOR)[0...-1]
-      FileUtils.mkpath dir_path.join(File::SEPARATOR) if dir_path.length > 0
-
-      File.write file_path, @parsed_data
-      file_path
-    end
-
-    def take_snapshot_and_fail(_name=nil)
-      file_path = take_snapshot _name
-      raise ArgumentError.new "New snapshot for #{self.class.to_s} generated in '#{file_path}'"
-    end
-
     def as_json(_options=nil)
       field_hash
     end

data/lib/crabfarm/cli.rb

@@ -114,7 +114,7 @@ module Crabfarm
       end
 
       c.desc "Generates a new crabfarm struct"
-      c.command :reducer do |sub|
+      c.command :struct do |sub|
         sub.action do |global_options,options,args|
           next puts "This command can only be ran inside a crabfarm application" unless GlobalState.inside_crawler_app?
 
@@ -124,16 +124,42 @@ module Crabfarm
       end
     end
 
-    desc "Perform a memento recording for use in tests"
+    desc "Crawler fixture recorders"
     command [:record, :r] do |c|
-      c.desc "Run recorder in playback mode"
-      c.switch [:p, :playback], :default_value => false
 
-      c.action do |global_options, options, args|
-        next puts "This command can only be ran inside a crabfarm application" unless GlobalState.inside_crawler_app?
+      c.desc "Perform a memento recording for use in tests"
+      c.command :memento do |memento|
+
+        memento.desc "Run recorder in playback mode"
+        memento.switch [:p, :playback], :default_value => false
+
+        memento.action do |global_options, options, args|
+          next puts "This command can only be ran inside a crabfarm application" unless GlobalState.inside_crawler_app?
+
+          require "crabfarm/modes/recorder/memento"
+          Crabfarm::Modes::Recorder::Memento.start args[0], options[:playback]
+        end
+
+      end
+
+      c.desc "Take snapshots from a navigator run"
+      c.command [:snapshot, :snap] do |snap|
+
+        snap.desc "Navigate on a memento"
+        snap.flag [:m, :memento]
+
+        snap.desc "Navigation query string, if not given navigator is run in interactive mode"
+        snap.flag [:q, :query]
+
+        snap.action do |global_options, options, args|
+          next puts "This command can only be ran inside a crabfarm application" unless GlobalState.inside_crawler_app?
+
+          ContextFactory.with_context options[:memento] do |context|
+            require "crabfarm/modes/recorder/snapshot"
+            Crabfarm::Modes::Recorder::Snapshot.start context, args[0], options[:query]
+          end
+        end
 
-        require "crabfarm/modes/recorder"
-        Crabfarm::Modes::Recorder.start args[0], options[:playback]
       end
     end
 

data/lib/crabfarm/context_factory.rb

@@ -21,8 +21,8 @@ module Crabfarm
 
     def load_crabtrap_context(_memento)
       require 'crabfarm/crabtrap_context'
-      require 'crabfarm/modes/recorder'
-      m_path = Modes::Recorder.memento_path _memento
+      require 'crabfarm/modes/recorder/memento'
+      m_path = Modes::Recorder::Memento.memento_path _memento
       raise ResourceNotFoundError.new "Could not find memento '#{_name}'" unless File.exists? m_path
       Crabfarm::CrabtrapContext.new :replay, m_path
     end

data/lib/crabfarm/engines/async_state_manager.rb

@@ -38,7 +38,7 @@ module Crabfarm
         start
       end
 
-      def transition(_name, _params={}, _wait=nil)
+      def navigate(_name, _params={}, _wait=nil)
         @lock.synchronize {
           if @fatal
             raise CrawlerError.new @fatal

data/lib/crabfarm/engines/sync_state_manager.rb

@@ -5,12 +5,14 @@ module Crabfarm
   module Engines
     class SyncStateManager
 
+      attr_reader :context
+
       def initialize(_context)
         @context = _context
         @lock = Mutex.new
       end
 
-      def reload!
+      def reload
         @lock.synchronize {
           ActiveSupport::Dependencies.clear
           @context.reset
@@ -23,7 +25,7 @@ module Crabfarm
         }
       end
 
-      def transition(_name, _params={})
+      def navigate(_name, _params={})
         @lock.synchronize {
           output = { name: _name, params: _params }
 

data/lib/crabfarm/modes/console.rb

@@ -6,65 +6,98 @@ require 'crabfarm/engines/sync_state_manager'
 
 module Crabfarm
   module Modes
-    class Console
+    module Console
 
-      class ConsoleDsl < Engines::SyncStateManager
+      module Colors
+        NOTICE = '555555'
+        QUESTION = '555555'
+        WARNING = :yellow
+        ERROR = :red
+        RESULT = '00FF00'
+      end
+
+      class ConsoleDsl
+
+        def initialize(_manager)
+          @manager = _manager
+        end
 
         def reload!
-          puts "Reloading crawler source".color(:green)
-          super
+          puts "Reloading crawler source".color Colors::NOTICE
+          @manager.reload
+          nil
         end
 
         def reset
-          puts "Resetting crawling context".color(:green)
-          super
+          puts "Resetting crawling context".color Colors::NOTICE
+          @manager.reset
+          nil
         end
 
         def navigate(_name=nil, _params={})
           if _name.nil?
-            puts "Must provide a navigator name".color(:red)
+            puts "Must provide a navigator name".color Colors::ERROR
             return
           end
 
           begin
-            puts "Navigating to #{_name.to_s.camelize} state"
-            output = super
+            puts "Navigating...".color Colors::NOTICE
+            output = @manager.navigate _name, _params
+            puts JSON.pretty_generate(output.doc).gsub(/(^|\\n)/, '  ').color Colors::RESULT
+            puts "Completed in #{output.elapsed.real} s".color Colors::NOTICE
+
+          rescue Exception => e
+            puts "#{e.to_s}".color Colors::ERROR
+            puts e.backtrace
+          end
+        end
 
-            puts "State changed, generated document:"
-            puts JSON.pretty_generate(output.doc).color(:green).gsub(/(^|\\n)/, '  ')
-            puts "Completed in #{output.elapsed.real} s"
+        def snap(_name=nil, _params={})
+          if _name.nil?
+            puts "Must provide a navigator name".color Colors::ERROR
+            return
+          end
+
+          begin
+            puts "Navigating, waiting to hit a reducer...".color Colors::NOTICE
+            require 'crabfarm/modes/shared/snapshot_decorator'
+            TransitionService.with_navigator_decorator Shared::SnapshotDecorator do
+              @manager.navigate _name, _params
+            end
+            puts "Navigation completed".color Colors::NOTICE
 
           rescue Exception => e
-            puts "#{e.to_s}".color(:red)
+            puts "#{e.to_s}".color Colors::ERROR
             puts e.backtrace
           end
         end
 
         def help
           puts "Ejem..."
+          nil
         end
 
-        alias :n :navigate
-        alias :r :reset
+        alias :nav :navigate
       end
 
       def self.process_input(_context)
-        dsl = ConsoleDsl.new _context
+        dsl = ConsoleDsl.new Engines::SyncStateManager.new _context
 
         loop do
           begin
-            dsl.instance_eval Readline.readline("> ", true)
+            output = dsl.instance_eval Readline.readline("> ", true)
+            puts output.inspect unless output.nil?
           rescue SyntaxError => se
-            puts "Syntax error: #{se.message}".color(:red)
+            puts "Syntax error: #{se.message}".color(Colors::ERROR)
           rescue SystemExit, Interrupt
             break
           rescue => e
-            puts "#{e.to_s}".color(:red)
+            puts "#{e.to_s}".color(Colors::ERROR)
             puts e.backtrace
           end
         end
 
-        puts "Exiting".color(:green)
+        puts "Exiting".color(Colors::NOTICE)
       end
 
     end

data/lib/crabfarm/modes/recorder/memento.rb

@@ -0,0 +1,81 @@
+require 'rainbow'
+require 'rainbow/ext/string'
+require 'crabfarm/support/webdriver_factory'
+require 'crabfarm/crabtrap_runner'
+
+module Crabfarm
+  module Modes
+    module Recorder
+      module Memento
+        extend self
+
+        def memento_path(_name)
+          File.join(GlobalState.mementos_path, _name + '.json.gz')
+        end
+
+        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
+
+          start_crabtrap _replay, target_path
+
+          begin
+            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'}."
+              loop do
+                driver.current_url
+                sleep 1.0
+              end
+            rescue Exception => e
+              # noop
+            end
+
+            puts "Releasing crawling context".color(:green)
+            driver.quit rescue nil
+          ensure
+            crabtrap.stop
+          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
+end

data/lib/crabfarm/modes/recorder/snapshot.rb

@@ -0,0 +1,56 @@
+require 'rainbow'
+require 'rainbow/ext/string'
+require 'crabfarm/modes/console'
+require 'crabfarm/modes/shared/snapshot_decorator'
+require 'crabfarm/modes/shared/interactive_decorator'
+
+module Crabfarm
+  module Modes
+    module Recorder
+      module Snapshot
+        extend self
+
+        def start(_context, _navigator, _query=nil)
+          return puts "Must provide a navigator name" unless _navigator.is_a? String
+
+          begin
+            puts "Navigating, waiting to hit a reducer...".color(Console::Colors::NOTICE)
+            service.with_navigator_decorator Shared::SnapshotDecorator do
+              if _query.nil?
+                service.with_navigator_decorator Shared::InteractiveDecorator do
+                  service.transition _context, _navigator
+                end
+              else
+                _query = parse_query_string _query
+                service.transition _context, _navigator, _query
+              end
+            end
+            puts "Navigation completed".color(Console::Colors::NOTICE)
+          rescue Exception => e
+            puts "#{e.to_s}".color Console::Colors::ERROR
+            puts e.backtrace
+          end
+        end
+
+      private
+
+        def service
+          TransitionService
+        end
+
+        def parse_query_string(_string)
+          result = {}
+
+          parts = _string.split '&'
+          parts.each do |part|
+            key, val = part.split '='
+            result[key.to_sym] = Shared::InteractiveDecorator::InteractiveHash.parse_input val
+          end
+
+          result
+        end
+
+      end
+    end
+  end
+end

data/lib/crabfarm/modes/server.rb

@@ -54,7 +54,7 @@ module Crabfarm
           optional :wait, type: Float
         end
         put :state do
-          print_state evaluator.transition params[:name], params[:params], wait
+          print_state evaluator.navigate params[:name], params[:params], wait
         end
       end
 

data/lib/crabfarm/modes/shared/interactive_decorator.rb

@@ -0,0 +1,71 @@
+require 'inquirer'
+require 'crabfarm/modes/console'
+
+module Crabfarm
+  module Modes
+    module Shared
+      module InteractiveDecorator
+
+        module Colors
+          include Crabfarm::Modes::Console::Colors
+        end
+
+        class InteractiveHash < Hash
+
+          def self.parse_input(_val)
+            case _val
+            when 'true' then true
+            when 'false' then false
+            when 'nil' then nil
+            when /^\d+$/ then _val.to_i
+            when /^\d*\.\d+$/ then _val.to_f
+            when /^:[^\s]+$/ then _val.to_sym
+            when /^\'.*?\'$/ then _val[1...-1]
+            when /^\".*?\"$/ then _val[1...-1]
+            else _val end
+          end
+
+          ['[]', :fetch, :has_key?, :key?, :include?].each do |method|
+            define_method method do |*args|
+              cache_value args[0]
+              super(*args)
+            end
+          end
+
+          def merge(*args)
+            InteractiveHash.new.merge! super
+          end
+
+        private
+
+          def cache
+            @cache ||= self.to_h
+          end
+
+          def cache_value(_key)
+            unless cache.key? _key
+              value = cache[_key] = Ask.input("Value for '#{_key}'? (blank to skip)".color Colors::QUESTION).strip
+              self[_key] = parse_input value unless value.empty?
+            end
+          end
+
+          def parse_input(*_args)
+            self.class.parse_input(*_args)
+          end
+
+        end
+
+        def self.decorate(_navigator)
+
+          def _navigator.params
+            @i_params ||= InteractiveHash.new.merge! @params
+          end
+
+          _navigator
+        end
+
+      end
+
+    end
+  end
+end

data/lib/crabfarm/modes/shared/snapshot_decorator.rb

@@ -0,0 +1,46 @@
+require 'inquirer'
+require 'crabfarm/modes/console'
+
+module Crabfarm
+  module Modes
+    module Shared
+      module SnapshotDecorator
+
+        module Colors
+          include Crabfarm::Modes::Console::Colors
+        end
+
+        def self.decorate(_navigator)
+
+          def _navigator.execute_reducer(_reducer)
+            loop do
+              name = Ask.input "-- Name for #{_reducer.class.to_s} snapshot (blank to skip)".color Colors::QUESTION
+              if name.empty?
+                puts "-- Skipping snapshot".color Colors::WARNING
+                break
+              else
+                file_path = _reducer.class.snapshot_path name
+
+                if File.exist? file_path
+                  puts "-- Could not save snapshot, file already exist!".color Colors::ERROR
+                else
+                  dir_path = file_path.split(File::SEPARATOR)[0...-1]
+                  FileUtils.mkpath dir_path.join(File::SEPARATOR) if dir_path.length > 0
+                  File.write file_path, _reducer.raw_document
+                  puts "-- Snapshot written to #{file_path}".color Colors::RESULT
+                  break
+                end
+              end
+            end
+
+            _reducer.run
+          end
+
+          _navigator
+        end
+
+      end
+
+    end
+  end
+end

data/lib/crabfarm/rspec.rb

@@ -14,7 +14,7 @@ module Crabfarm
       end
 
       snapshot_path = described_class.snapshot_path _snapshot
-      raise Error.new "Snapshot does not exist #{_snapshot}" unless File.exist? snapshot_path
+      raise Error.new "Snapshot does not exist #{snapshot_path}" unless File.exist? snapshot_path
 
       data = File.read snapshot_path
       reducer = described_class.new data, _options
@@ -43,8 +43,6 @@ module Crabfarm
       @state ||= navigate
     end
 
-    alias :navigator :state
-
     def last_state
       @last_state
     end
@@ -54,7 +52,7 @@ module Crabfarm
     end
 
     def browser(_session_id=nil)
-      @context.pool.browser(_session_id)
+      @context.pool.driver(_session_id)
     end
 
   end

data/lib/crabfarm/templates/dot_crabfarm.erb

@@ -6,4 +6,4 @@ files:
 - Gemfile.lock
 - boot.rb
 - app/**/*.*
-- bin/**/*.*
+- bin/*

data/lib/crabfarm/templates/navigator.rb.erb

@@ -1,18 +1,10 @@
 class <%= navigator_class %> < Crabfarm::BaseNavigator
 
   def run
-<% if navigator_url.nil? %>
-    # replace the following by your navigation code:
-    raise NotImplementedError.new 'You must provide some navigation code for <%= navigator_class %>'
-<% else %>
-    browser.goto '<%= navigator_url %>'
-<% end %>
+    <% unless navigator_url.nil? %>browser.goto '<%= navigator_url %>'
+
+    <% end %># Add some navigation code here.
 
-    # Call the homonymous reducer over the entire document and output it by default
-    # You can call other reducers by using the `reduce` method, like this:
-    #
-    #     reduce browser.search('td').first, using: MyOtherReducer
-    #
     reduce_with_defaults
   end
 

data/lib/crabfarm/templates/reducer.rb.erb

@@ -1,8 +1,7 @@
 class <%= reducer_class %> < Crabfarm::BaseReducer
 
   def run
-    # You can replace the following line after running the owner navigator specs once.
-    take_snapshot_and_fail
+    # Put some data extraction code here.
   end
 
 end

data/lib/crabfarm/transition_service.rb

@@ -1,6 +1,19 @@
 module Crabfarm
   class TransitionService
 
+    def self.with_navigator_decorator(_decorator)
+      @decorator = DecoratorChain.new @decorator, _decorator
+      begin
+        yield
+      ensure
+        @decorator = @decorator.base
+      end
+    end
+
+    def self.current_decorator
+      @decorator
+    end
+
     def self.transition(_context, _name, _params={})
       self.new(_context).transition(_name, _params)
     end
@@ -18,6 +31,7 @@ module Crabfarm
 
       @context.prepare
       @navigator = navigator_class.new @context, _params
+      @navigator = current_decorator.decorate @navigator unless current_decorator.nil?
 
       @document = @navigator.run
       @document = @document.as_json if @document.respond_to? :as_json
@@ -27,10 +41,31 @@ module Crabfarm
 
   private
 
+    def current_decorator
+      self.class.current_decorator
+    end
+
     def load_class_from_uri(_uri)
       class_name = Utils::Naming.decode_crabfarm_uri _uri
       class_name.constantize
     end
 
+    class DecoratorChain
+
+      attr_reader :base, :new
+
+      def initialize(_base, _new)
+        @base = _base
+        @new = _new
+      end
+
+      def decorate(_navigator)
+        _navigator = @new.decorate _navigator
+        return _navigator if @base.nil?
+        @base.decorate _navigator
+      end
+
+    end
+
   end
 end

data/lib/crabfarm/version.rb

@@ -1,3 +1,3 @@
 module Crabfarm
-  VERSION = "0.3.5"
+  VERSION = "0.3.6"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: crabfarm
 version: !ruby/object:Gem::Version
-  version: 0.3.5
+  version: 0.3.6
 platform: ruby
 authors:
 - Ignacio Baixas
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-04-15 00:00:00.000000000 Z
+date: 2015-04-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -412,8 +412,11 @@ files:
 - lib/crabfarm/modes/console.rb
 - lib/crabfarm/modes/generator.rb
 - lib/crabfarm/modes/publisher.rb
-- lib/crabfarm/modes/recorder.rb
+- lib/crabfarm/modes/recorder/memento.rb
+- lib/crabfarm/modes/recorder/snapshot.rb
 - lib/crabfarm/modes/server.rb
+- lib/crabfarm/modes/shared/interactive_decorator.rb
+- lib/crabfarm/modes/shared/snapshot_decorator.rb
 - lib/crabfarm/phantom_runner.rb
 - lib/crabfarm/rspec.rb
 - lib/crabfarm/state_store.rb

data/lib/crabfarm/modes/recorder.rb

@@ -1,81 +0,0 @@
-require 'rainbow'
-require 'rainbow/ext/string'
-require 'crabfarm/support/webdriver_factory'
-require 'crabfarm/crabtrap_runner'
-
-module Crabfarm
-  module Modes
-    module Recorder
-      extend self
-
-      def memento_path(_name)
-        File.join(GlobalState.mementos_path, _name + '.json.gz')
-      end
-
-      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
-
-        start_crabtrap _replay, target_path
-
-        begin
-          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'}."
-            loop do
-              driver.current_url
-              sleep 1.0
-            end
-          rescue Exception => e
-            # noop
-          end
-
-          puts "Releasing crawling context".color(:green)
-          driver.quit rescue nil
-        ensure
-          crabtrap.stop
-        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