crabfarm 0.0.15 → 0.0.16

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f9c3775845087acaaa1cc6a8ba773a034d52e8ed
-  data.tar.gz: 78156359fc8d036ad54a591be1923ac96eb5aa72
+  metadata.gz: 01f53897c32d27e6253c74660a0842b9cb7c3c97
+  data.tar.gz: 7993ac4152d6128ce8b69950458e48dfe042089a
 SHA512:
-  metadata.gz: f4aa1971119f25c19a1bae8f606464cc20e0025a02b02ea960749b22ed3602acb6d69b4a58dfa4af18851ecfacba528646b2fc0c6bb4cd8b0c8a8239bd6f9f07
-  data.tar.gz: d7ecd4359f474d94b109a62b48f35e2af394d3aa0aad62e27d8ef6ac3f00f99037897c56f68fc285470dfa72c14246f3d6e1219d9be71efd05a470bb54950c4f
+  metadata.gz: af73913311cb5404d95724470ce07bb37e3ed686abb02a39e20b6a85b0ad028a31ef4524c8ffd09381ce20157e107da7cbe20ddea22c08f3908997d81c1e37b1
+  data.tar.gz: 3345f29499e15089b3fd6feccf984f9121187500e9859a2016ccfaf14947d363ca335b0212025722b9eac273996171a6f133e2c37f9d0fa5f2bd649952333742

data/lib/crabfarm.rb

@@ -7,6 +7,7 @@ require "crabfarm/version"
 require "crabfarm/errors"
 require "crabfarm/configuration"
 require "crabfarm/loader_service"
+require "crabfarm/parser_service"
 require "crabfarm/driver_bucket"
 require "crabfarm/driver_bucket_pool"
 require "crabfarm/default_driver_factory"
@@ -45,6 +46,9 @@ module Crabfarm
     register :browser_dsl, :watir, 'Crabfarm::WatirBrowserDsl', 'crabfarm/adapters/browser/watir'
     register :browser_dsl, :capybara, 'Crabfarm::CapybaraBrowserDsl', 'crabfarm/adapters/browser/capybara'
 
+    # bundled parsers dsl adapters
+    register :parser_dsl, :nokogiri, 'Crabfarm::NokogiriDsl', 'crabfarm/adapters/parser/nokogiri'
+
     # bundled state output builders
     register :output_builder, :hash, 'Crabfarm::HashOutputBuilder', 'crabfarm/adapters/output/hash'
     register :output_builder, :ostruct, 'Crabfarm::OStructOutputBuilder', 'crabfarm/adapters/output/ostruct'

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

@@ -1,5 +1,24 @@
 require 'watir-webdriver'
 
+class Watir::Browser
+  def parse(_parser_class, _options={})
+    Crabfarm::ParserService.parse _parser_class, html, _options
+  end
+end
+
+class Watir::Element
+  def parse(_parser_class, _options={})
+    Crabfarm::ParserService.parse _parser_class, html, _options
+  end
+end
+
+class Watir::ElementCollection
+  def parse(_parser_class, _options={})
+    full_html = self.map(&:html).join
+    Crabfarm::ParserService.parse _parser_class, full_html, _options
+  end
+end
+
 module Crabfarm
   class WatirBrowserDsl
     def self.wrap(_bucket)

data/lib/crabfarm/adapters/parser/nokogiri.rb

@@ -0,0 +1,9 @@
+require 'nokogiri'
+
+module Crabfarm
+  class NokogiriDsl
+    def self.parse(_html)
+      Nokogiri::HTML _html
+    end
+  end
+end

data/lib/crabfarm/base_parser.rb

@@ -1,18 +1,18 @@
 module Crabfarm
   class BaseParser < Delegator
 
-    attr_reader :browser, :params
+    attr_reader :params, :root
 
-    def self.browser_dsl(_dsl)
-      @browser_dsl = _dsl
+    def self.parser_dsl(_dsl)
+      @parser_dsl = _dsl
     end
 
-    def initialize(_driver, _params)
-      dsl_class = Strategies.load(:browser_dsl, class_browser_dsl || Crabfarm.config.browser_dsl)
-      @browser = dsl_class.wrap _driver
+    def initialize(_html, _params)
+      dsl_class = Strategies.load(:parser_dsl, class_parser_dsl || Crabfarm.config.parser_dsl)
+      @root = dsl_class.parse _html
       @params = _params
 
-      super @browser
+      super @root
     end
 
     def parse
@@ -20,17 +20,17 @@ module Crabfarm
     end
 
     def __getobj__
-      @browser
+      @root
     end
 
     def __setobj__(obj)
-      @browser = obj
+      @root = obj
     end
 
   private
 
-    def class_browser_dsl
-      self.class.instance_variable_get :@browser_dsl
+    def class_parser_dsl
+      self.class.instance_variable_get :@parser_dsl
     end
   end
 end

data/lib/crabfarm/configuration.rb

@@ -5,7 +5,8 @@ module Crabfarm
     class Option < Struct.new(:name, :type, :text); end
 
     OPTIONS = [
-      [:browser_dsl, :string, 'Default browser dsl used by parsers and states'],
+      [:browser_dsl, :string, 'Default browser dsl used by states'],
+      [:parser_dsl, :string, 'Default parser dsl used by parsers'],
       [:output_builder, :string, 'Default json output builder used by states'],
       [:driver_factory, :mixed, 'Driver factory, disabled if phantom_mode is used'],
       [:log_path, :string, 'Path where logs should be stored'],
@@ -50,6 +51,7 @@ module Crabfarm
     def reset
       @values = {
         browser_dsl: :surfer,
+        parser_dsl: :nokogiri,
         output_builder: :hash,
         driver_factory: nil,
         log_path: nil,

data/lib/crabfarm/driver_bucket.rb

@@ -14,13 +14,6 @@ module Crabfarm
       @factory = _factory
     end
 
-    def parse(_parser_class, _options={})
-      _parser_class = LoaderService.load_parser(_parser_class) if _parser_class.is_a? String or _parser_class.is_a? Symbol
-      parser = _parser_class.new self, _options
-      parser.parse
-      return parser
-    end
-
     def original
       @driver ||= @factory.build_driver(@session_id)
     end

data/lib/crabfarm/dsl/surfer/search_context.rb

@@ -49,7 +49,6 @@ module Crabfarm
           wrap_errors { (element!['class'] || '').split(' ') }
         end
 
-        # searches for elements that match a given selector
         def search(_selector=nil, _options={})
           _options[:css] = _selector if _selector
 
@@ -85,7 +84,6 @@ module Crabfarm
           end
         end
 
-        # clears and sends_keys to this context main element
         def fill(_value)
           wrap_errors do
             element!.clear
@@ -93,6 +91,14 @@ module Crabfarm
           end
         end
 
+        def parse(_parser_class, _params={})
+          ParserService.parse _parser_class, to_html, _params
+        end
+
+        def to_html
+          elements.map { |e| e['outerHTML'] }.join
+        end
+
         # Any methods missing are forwarded to the main element (first).
         def method_missing(_method, *_args, &_block)
           wrap_errors do

data/lib/crabfarm/dsl/surfer/surf_context.rb

@@ -3,7 +3,7 @@ module Crabfarm
     module Surfer
       class SurfContext < SearchContext
 
-        def_delegators :@bucket, :parse, :setup
+        def_delegators :@bucket, :setup
         def_delegators 'driver.navigate', :back, :forward, :refresh
 
         def initialize(_bucket)
@@ -19,6 +19,10 @@ module Crabfarm
           [driver]
         end
 
+        def to_html
+          driver.page_source
+        end
+
         def driver
           @bucket.original
         end

data/lib/crabfarm/parser_service.rb

@@ -0,0 +1,12 @@
+module Crabfarm
+  class ParserService
+
+    def self.parse(_parser_class, _html, _options={})
+      _parser_class = LoaderService.load_parser(_parser_class) if _parser_class.is_a? String or _parser_class.is_a? Symbol
+      parser = _parser_class.new _html, _options
+      parser.parse
+      parser
+    end
+
+  end
+end

data/lib/crabfarm/rspec.rb

@@ -1,4 +1,5 @@
 require 'crabfarm/crabtrap_context'
+require 'net/http'
 
 CF_TEST_CONTEXT = Crabfarm::CrabtrapContext::new
 CF_TEST_CONTEXT.load
@@ -9,13 +10,13 @@ module Crabfarm
 
     def parse(_snap_or_url, _options={})
       fixture = Pathname.new(File.join(ENV['SNAPSHOT_DIR'], _snap_or_url))
-      if fixture.exist?
-        CF_TEST_BUCKET.get("file://#{fixture.realpath}")
+      html = if fixture.exist?
+        File.read fixture.realpath
       else
-        CF_TEST_BUCKET.get(_snap_or_url)
+        Net::HTTP.get(URI.parse _snap_or_url)
       end
 
-      CF_TEST_BUCKET.parse(described_class, _options)
+      ParserService.parse described_class, html, _options
     end
 
     def crawl(_state=nil, _params={})

data/lib/crabfarm/version.rb

@@ -1,3 +1,3 @@
 module Crabfarm
-  VERSION = "0.0.15"
+  VERSION = "0.0.16"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: crabfarm
 version: !ruby/object:Gem::Version
-  version: 0.0.15
+  version: 0.0.16
 platform: ruby
 authors:
 - Ignacio Baixas
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-03-06 00:00:00.000000000 Z
+date: 2015-03-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: jbuilder
@@ -66,6 +66,20 @@ dependencies:
     - - '>='
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: nokogiri
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 1.6.6
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 1.6.6
 - !ruby/object:Gem::Dependency
   name: activesupport
   requirement: !ruby/object:Gem::Requirement
@@ -324,6 +338,7 @@ files:
 - lib/crabfarm/adapters/output/hash.rb
 - lib/crabfarm/adapters/output/jbuilder.rb
 - lib/crabfarm/adapters/output/ostruct.rb
+- lib/crabfarm/adapters/parser/nokogiri.rb
 - lib/crabfarm/base_parser.rb
 - lib/crabfarm/base_state.rb
 - lib/crabfarm/cli.rb
@@ -347,6 +362,7 @@ files:
 - lib/crabfarm/modes/publisher.rb
 - lib/crabfarm/modes/recorder.rb
 - lib/crabfarm/modes/server.rb
+- lib/crabfarm/parser_service.rb
 - lib/crabfarm/phantom_driver_factory.rb
 - lib/crabfarm/phantom_runner.rb
 - lib/crabfarm/rspec.rb