crabfarm 0.6.1 → 0.6.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 81f0d2fe698cac2db1ccf56dc0d7acf57cca4baf
-  data.tar.gz: e616ed1e42c48a9ebcd3ba129c7ab89ad581373a
+  metadata.gz: 09ceb80d5125962d7f54f0b7d9f79bc568221f18
+  data.tar.gz: f72e8f9951b3ae981bece342c9a7364b007677e9
 SHA512:
-  metadata.gz: 9cfe9480badc022cba89c2682e426769f1c235a5fffdb34dd8a4fc910275d3e382f1ba36e5fe727296dcbe6dc5b400bbd2bf6ffd500ec1a0cf89d2cda64e7a19
-  data.tar.gz: 0ea03b0afec02db914b7e50d40a17134edfe631fa498673def3dd060f01df3ffc230030ef31eb85f3f4cd02368075d5d1c4bce92ba3b5bc72329ea9fc6a1a6ee
+  metadata.gz: 1572b106739d6f9a7b2ae385bb640b926f05707e31daf0a99758bb308ab8020a374636fc9df7eb56cf868c3a67aaa861d9538d859438367bc7a300e440613bf5
+  data.tar.gz: 39049c8c5b3b5c115dfdc11c92a67bb81411aff7512c16b524c6874c66cf0638adcb9a1a369628e83f5a50d667cabb8c494325f534b94a468ea941969f9790b7

data/assets/live-tools/tools.js

@@ -52,7 +52,6 @@ if(!window.crabfarm) {
 
 			var removeOverlay = function() {
 				overlay.remove();
-				window.crabfarm.showSelectorGadget();
 			};
 
 			overlay.bind("click", removeOverlay);

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

@@ -1,38 +1,31 @@
+require 'crabfarm/adapters/browser/base'
+
 module Crabfarm
   module Adapters
     module Browser
-      class AbstractWebdriver
+      class AbstractWebdriver < Base
 
-        attr_accessor :config, :viewer
+        attr_accessor :config
 
-        def initialize(_proxy=nil, _viewer=nil)
+        def initialize(_proxy=nil)
           @config = load_driver_config
           @config[:proxy] = _proxy
-          @viewer = _viewer
         end
 
-        def prepare_driver_services
-          start_server if viewer.nil?
+        def build_driver(_session_id)
+          wrap_driver build_webdriver_instance
         end
 
-        def cleanup_driver_services
-          stop_server if viewer.nil?
+        def reset_driver(_wrapped)
+          _wrapped.driver.manage.delete_all_cookies # pincers exposes driver?
         end
 
-        def build_driver(_session_id)
-          wrap_driver(if viewer.nil?
-            build_webdriver_instance
-          else
-            viewer.attach _session_id == :default_driver
-          end)
+        def extract_webdriver(_wrapped)
+          _wrapped.driver
         end
 
-        def release_driver(_session_id, _wrapped)
-          if viewer.nil?
-            _wrapped.driver.quit rescue nil
-          else
-            viewer.detach _wrapped.driver
-          end
+        def release_driver(_wrapped)
+          _wrapped.driver.quit rescue nil
         end
 
       private
@@ -47,14 +40,6 @@ module Crabfarm
           raise NotImplementedError.new
         end
 
-        def start_server
-          # Nothing by default
-        end
-
-        def stop_server
-          # Nothing by default
-        end
-
         def load_driver_config
           {
             capabilities: Crabfarm.config.webdriver_capabilities,

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

@@ -0,0 +1,43 @@
+module Crabfarm
+  module Adapters
+    module Browser
+      class Base
+
+        def headless?
+          true
+        end
+
+        def build_driver(_session_id)
+          ensure_implementation :build_driver
+        end
+
+        def reset_driver(_driver)
+          nil
+        end
+
+        def extract_webdriver(_driver)
+          nil
+        end
+
+        def release_driver(_driver)
+          nil
+        end
+
+        def prepare_driver_services
+          # Nothing by default
+        end
+
+        def cleanup_driver_services
+          # Nothing by default
+        end
+
+      private
+
+        def ensure_implementation(_name)
+          raise NotImplementedError.new "Missing #{_name} implementation on browser adapter"
+        end
+
+      end
+    end
+  end
+end

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

@@ -1,11 +1,15 @@
 require 'crabfarm/support/webdriver_factory'
-require "crabfarm/adapters/browser/abstract_webdriver"
+require 'crabfarm/adapters/browser/abstract_webdriver'
 
 module Crabfarm
   module Adapters
     module Browser
       class Chrome < AbstractWebdriver
 
+        def headless?
+          false
+        end
+
       private
 
         def build_webdriver_instance

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

@@ -6,6 +6,10 @@ module Crabfarm
     module Browser
       class Firefox < AbstractWebdriver
 
+        def headless?
+          false
+        end
+
       private
 
         def build_webdriver_instance

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

@@ -1,24 +1,17 @@
+require "crabfarm/adapters/browser/base"
+
 module Crabfarm
   module Adapters
     module Browser
-      class Noop
+      class Noop < Base
 
         def initialize(_proxy=nil)
         end
 
-        def prepare_driver_services
-        end
-
-        def cleanup_driver_services
-        end
-
         def build_driver(_session_id)
           _session_id || :noop
         end
 
-        def release_driver(_driver)
-        end
-
       end
     end
   end

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

@@ -7,21 +7,21 @@ module Crabfarm
     module Browser
       class PhantomJs < AbstractWebdriver
 
-      private
-
-        def build_webdriver_instance
-          Support::WebdriverFactory.build_remote_driver driver_config
-        end
-
-        def start_server
+        def prepare_driver_services
           @phantom = load_and_start_phantom if @phantom.nil?
         end
 
-        def stop_server
+        def cleanup_driver_services
           @phantom.stop unless @phantom.nil?
           @phantom = nil
         end
 
+      private
+
+        def build_webdriver_instance
+          Support::WebdriverFactory.build_remote_driver driver_config
+        end
+
         def load_and_start_phantom
           new_phantom = Support::PhantomRunner.new phantom_config
           new_phantom.start

data/lib/crabfarm/adapters/driver_wrapper/pincers.rb

@@ -1,3 +1,9 @@
+class Pincers::Core::RootContext
+  def driver
+    document
+  end
+end
+
 class Pincers::Core::SearchContext
   def webdriver_elements
     elements

data/lib/crabfarm/cli.rb

@@ -155,18 +155,12 @@ module Crabfarm
       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 Crabfarm.inside_crawler_app?
 
           Crabfarm.with_context options[:memento] do |context|
             require "crabfarm/modes/recorder/snapshot"
-            Crabfarm::Modes::Recorder::Snapshot.start context, args[0], options[:query]
+            Crabfarm::Modes::Recorder::Snapshot.start context, args[0]
           end
         end
 

data/lib/crabfarm/context.rb

@@ -32,7 +32,7 @@ module Crabfarm
   private
 
     def load_services
-      init_driver_factory
+      init_browser_adapter
       init_driver_pool
       init_http_client
     end
@@ -45,27 +45,23 @@ module Crabfarm
     def unload_services
       release_http_client
       release_driver_pool
-      release_driver_factory
+      release_browser_adapter
     end
 
-    def init_driver_factory
-      if @factory.nil?
-        @factory = build_driver_factory
-        @factory.prepare_driver_services
+    def init_browser_adapter
+      if @browser_adapter.nil?
+        @browser_adapter = build_browser_adapter proxy
+        @browser_adapter.prepare_driver_services
       end
     end
 
-    def build_driver_factory
-      Strategies.load(:browser, config.browser).new proxy, viewer
-    end
-
-    def release_driver_factory
-      @factory.cleanup_driver_services unless @factory.nil?
-      @factory.nil?
+    def release_browser_adapter
+      @browser_adapter.cleanup_driver_services unless @browser_adapter.nil?
+      @browser_adapter.nil?
     end
 
     def init_driver_pool
-      @pool = DriverPool.new @factory if @pool.nil?
+      @pool = DriverPool.new @browser_adapter if @pool.nil?
     end
 
     def release_driver_pool
@@ -74,11 +70,15 @@ module Crabfarm
     end
 
     def init_http_client
-      @http = build_http_client if @http.nil?
+      @http = build_http_client proxy if @http.nil?
+    end
+
+    def build_browser_adapter(_proxy)
+      Strategies.load(:browser, config.browser).new _proxy
     end
 
-    def build_http_client
-      HttpClient.new proxy, viewer
+    def build_http_client(_proxy)
+      HttpClient.new _proxy
     end
 
     def release_http_client
@@ -89,10 +89,6 @@ module Crabfarm
       config.proxy
     end
 
-    def viewer
-      nil # no viewer provided by default
-    end
-
     def config
       Crabfarm.config
     end

data/lib/crabfarm/driver_pool.rb

@@ -15,13 +15,14 @@ module Crabfarm
 
     def reset(_session_id=nil)
       if _session_id.nil?
-        @drivers.each { |k, d| @factory.release_driver(k, d) }
+        @drivers.values.each { |d| @factory.release_driver d }
         @drivers = Hash.new
       else
         _session_id = _session_id.to_sym
         driver = @drivers.delete _session_id
-        @factory.release_driver(_session_id, driver) unless driver.nil?
+        @factory.release_driver(driver) unless driver.nil?
       end
+      nil
     end
 
     def release

data/lib/crabfarm/errors.rb

@@ -56,4 +56,6 @@ module Crabfarm
     end
   end
 
+  class LiveInterrupted < StandardError; end
+
 end

data/lib/crabfarm/http_client.rb

@@ -24,7 +24,7 @@ module Crabfarm
 
     attr_reader :proxy_addr, :proxy_port
 
-    def initialize(_proxy=nil, _viewer=nil)
+    def initialize(_proxy=nil)
       if _proxy.nil?
         @proxy_addr = nil
         @proxy_port = nil

data/lib/crabfarm/live/context.rb

@@ -1,3 +1,4 @@
+require 'crabfarm/adapters/browser/base'
 require 'crabfarm/utils/webdriver'
 
 module Crabfarm
@@ -9,11 +10,40 @@ module Crabfarm
       end
 
       def proxy
+        # override proxy so every context service points to crabtrap
         "127.0.0.1:#{@manager.proxy_port}"
       end
 
-      def viewer
-        @manager
+    private
+
+      def build_browser_adapter(_proxy)
+        # use a special browser adapter to override primary driver
+        return BrowserAdapter.new @manager
+      end
+
+      # TODO: override build_http_client, i would like to tap into the http requests and show downloaded data in viewer
+
+      class BrowserAdapter < Crabfarm::Adapters::Browser::Base
+
+        def initialize(_manager)
+          @manager = _manager
+        end
+
+        def build_driver(_session_id)
+          if _session_id == :default_driver
+            @manager.primary_driver
+          else
+            @manager.browser_adapter.build_driver _session_id
+          end
+        end
+
+        def release_driver(_driver)
+          if _driver != @manager.primary_driver
+            @manager.browser_adapter.release_driver _driver
+          end
+          nil
+        end
+
       end
 
     end

data/lib/crabfarm/live/controller.rb

@@ -11,24 +11,36 @@ module Crabfarm
       end
 
       def display_external_error(_exc)
-        @manager.reset_driver_status
+        try_reset
+
         display_error_feedback _exc
       end
 
       def execute_live(_class)
+        try_reset
+
         begin
-          runner = build_runner_for _class
-          prepare_session_for runner
-          runner.execute
+          build_runner_for(_class).execute
         rescue Exception => exc
           display_error_feedback exc
-        ensure
-          clean_up_session
         end
       end
 
     private
 
+      def try_reset
+        begin
+          @manager.reset
+        rescue Exception => exc
+          # restart manager if reset failed
+          @manager.stop rescue nil
+          @manager.start
+
+          Utils::Console.error "Something went wrong, restarting live mode:"
+          Utils::Console.exception exc
+        end
+      end
+
       def build_runner_for(_class)
         raise ArgumentError.new "'#{_class.to_s} is not Interactable" unless _class < Interactable
 
@@ -50,17 +62,8 @@ module Crabfarm
         runner
       end
 
-      def prepare_session_for(_runner)
-        @manager.reset_driver_status
-      end
-
-      def clean_up_session
-        # leave crabtrap running for debugging purposes.
-      end
-
       def display_error_feedback(_exc)
-        @manager.inject_web_tools
-        @manager.show_dialog(
+        @manager.show_message(
           :error,
           'Crawler error!',
           "#{_exc.class.to_s}: #{_exc.to_s}",