pincers 0.6.0 → 0.7.0

data/lib/pincers/version.rb

@@ -1,3 +1,3 @@
 module Pincers
-  VERSION = "0.6.0"
+  VERSION = "0.7.0"
 end

data/lib/pincers/{backend/webdriver.rb → webdriver/backend.rb}

@@ -1,18 +1,19 @@
-require "selenium-webdriver"
-require "pincers/backend/base"
-require "pincers/support/http_client"
-require "pincers/core/download"
+require 'selenium-webdriver'
+require 'pincers/core/base_backend'
+require 'pincers/http/client'
+require 'pincers/webdriver/http_document'
 
-module Pincers::Backend
-
-  class Webdriver < Base
+module Pincers::Webdriver
+  class Backend < Pincers::Core::BaseBackend
 
     DOM_PROPERTIES = [:selected, :disabled, :checked, :value, :required]
 
-    alias :driver :document
+    attr_reader :driver
+
+    alias :document :driver
 
     def initialize(_driver)
-      super _driver
+      @driver = _driver
     end
 
     def javascript_enabled?
@@ -143,6 +144,11 @@ module Pincers::Backend
       actions.drag_and_drop(_element, _on).perform
     end
 
+    def submit_form(_element)
+      _element = ensure_element _element
+      _element.submit
+    end
+
     def switch_to_frame(_element)
       driver.switch_to.frame _element
     end
@@ -151,10 +157,13 @@ module Pincers::Backend
       driver.switch_to.default_content
     end
 
-    def fetch_resource(_url)
-      url = URI::join(driver.current_url, _url)
-      response = as_http_client.get url
-      Pincers::Core::Download.from_http_response response
+    def as_http_client
+      session = Pincers::Http::Session.new
+      session.headers['User-Agent'] = user_agent
+      session.proxy = proxy_address
+      driver.manage.all_cookies.each { |c| session.cookie_jar.set c }
+
+      Pincers::Http::Client.new session, HttpDocument.new(self)
     end
 
   private
@@ -200,16 +209,6 @@ module Pincers::Backend
       _element
     end
 
-    def as_http_client
-      Pincers::Support::HttpClient.new({
-        proxy: proxy_address,
-        cookies: cookie_jar,
-        headers: {
-          'User-Agent' => user_agent
-        }
-      })
-    end
-
     def user_agent
       driver.execute_script("return navigator.userAgent;")
     end
@@ -218,13 +217,5 @@ module Pincers::Backend
       proxy = driver.capabilities.proxy
       proxy.nil? ? nil : (proxy.http || proxy.ssl)
     end
-
-    def cookie_jar
-      jar = Pincers::Support::CookieJar.new
-      driver.manage.all_cookies.each { |c| jar.set c }
-      jar
-    end
-
   end
-
 end

data/lib/pincers/{factories/webdriver.rb → webdriver/factory.rb}

@@ -1,8 +1,8 @@
-require 'pincers/factories/base'
-require 'pincers/backend/webdriver'
+require 'pincers/core/base_factory'
+require 'pincers/webdriver/backend'
 
-module Pincers::Factories
-  class Webdriver < Base
+module Pincers::Webdriver
+  class Factory < Pincers::Core::BaseFactory
 
     DEFAULT_SETUP = {
       page_timeout: 60000
@@ -17,7 +17,7 @@ module Pincers::Factories
         setup_driver driver, _options
       end
 
-      ::Pincers::Backend::Webdriver.new driver
+      Pincers::Webdriver::Backend.new driver
     end
 
   private

data/lib/pincers/webdriver/http_document.rb

@@ -0,0 +1,23 @@
+require 'pincers/http/utils'
+
+module Pincers::Webdriver
+  class HttpDocument
+
+    def initialize(_backend)
+      @backend = _backend
+    end
+
+    def uri
+      Pincers::Http::Utils.parse_uri @backend.document_url
+    end
+
+    def content_type
+      'text/html'
+    end
+
+    def content
+      @backend
+    end
+
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pincers
 version: !ruby/object:Gem::Version
-  version: 0.6.0
+  version: 0.7.0
 platform: ruby
 authors:
 - Ignacio Baixas
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-09-13 00:00:00.000000000 Z
+date: 2015-10-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nokogiri
@@ -206,6 +206,20 @@ dependencies:
     - - ~>
       - !ruby/object:Gem::Version
         version: '1.6'
+- !ruby/object:Gem::Dependency
+  name: webmock
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '1.22'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '1.22'
 description: Web automation DSL on top of webdriver and nokogiri
 email:
 - ignacio@platan.us
@@ -214,12 +228,19 @@ extensions: []
 extra_rdoc_files: []
 files:
 - lib/pincers.rb
-- lib/pincers/backend/base.rb
-- lib/pincers/backend/nokogiri.rb
-- lib/pincers/backend/webdriver.rb
+- lib/pincers/chenso/backend.rb
+- lib/pincers/chenso/browsing_context.rb
+- lib/pincers/chenso/browsing_manager.rb
+- lib/pincers/chenso/factory.rb
+- lib/pincers/chenso/html_form_request.rb
+- lib/pincers/chenso/html_page_request.rb
+- lib/pincers/core/base_backend.rb
+- lib/pincers/core/base_factory.rb
 - lib/pincers/core/cookies.rb
-- lib/pincers/core/download.rb
-- lib/pincers/core/query.rb
+- lib/pincers/core/helpers/form.rb
+- lib/pincers/core/helpers/query.rb
+- lib/pincers/core/replicas/form.rb
+- lib/pincers/core/replicas/link.rb
 - lib/pincers/core/root_context.rb
 - lib/pincers/core/search_context.rb
 - lib/pincers/css/parser.rb
@@ -228,16 +249,24 @@ files:
 - lib/pincers/extension/actions.rb
 - lib/pincers/extension/labs.rb
 - lib/pincers/extension/queries.rb
-- lib/pincers/factories/base.rb
-- lib/pincers/factories/nokogiri.rb
-- lib/pincers/factories/webdriver.rb
 - lib/pincers/factory.rb
+- lib/pincers/http/base_document.rb
+- lib/pincers/http/client.rb
+- lib/pincers/http/cookie.rb
+- lib/pincers/http/cookie_jar.rb
+- lib/pincers/http/errors.rb
+- lib/pincers/http/request.rb
+- lib/pincers/http/response_document.rb
+- lib/pincers/http/session.rb
+- lib/pincers/http/utils.rb
+- lib/pincers/nokogiri/backend.rb
+- lib/pincers/nokogiri/factory.rb
 - lib/pincers/support/configuration.rb
-- lib/pincers/support/cookie.rb
-- lib/pincers/support/cookie_jar.rb
-- lib/pincers/support/http_client.rb
 - lib/pincers/support/xpath_builder.rb
 - lib/pincers/version.rb
+- lib/pincers/webdriver/backend.rb
+- lib/pincers/webdriver/factory.rb
+- lib/pincers/webdriver/http_document.rb
 homepage: https://github.com/platanus/pincers
 licenses:
 - MIT

data/lib/pincers/backend/nokogiri.rb

@@ -1,66 +0,0 @@
-require 'pincers/backend/base'
-
-module Pincers::Backend
-
-  class Nokogiri < Base
-
-    BOOL_PROPERTIES = [:selected, :disabled, :checked, :required]
-
-    def document_root
-      [document]
-    end
-
-    def document_title
-      document.title
-    end
-
-    def close_document
-      # no closing needed
-    end
-
-    def search_by_css(_element, _selector, _limit)
-      # nokogiri does not do any query level optimization when searching just one node
-      _element.css _selector
-    end
-
-    def search_by_xpath(_element, _selector, _limit)
-      # nokogiri does not do any query level optimization when searching just one node
-      _element.xpath _selector
-    end
-
-    def extract_element_tag(_element)
-      _element.name
-    end
-
-    def extract_element_text(_element)
-      _element.content
-    end
-
-    def extract_element_html(_element)
-      _element.to_html
-    end
-
-    def extract_element_attribute(_element, _name)
-      _name = _name.to_sym
-      value = _element[_name]
-
-      if BOOL_PROPERTIES.include? _name
-        value = !value.nil?
-      elsif _name == :value
-        value = checkbox_value_fix _element, value
-      end
-
-      value
-    end
-
-  private
-
-    def checkbox_value_fix(_element, _value)
-      if _value.nil? and _element.name.downcase == 'input' and ['checkbox', 'radio'].include? _element[:type].downcase
-        'on'
-      else _value end
-    end
-
-  end
-
-end

data/lib/pincers/core/download.rb

@@ -1,14 +0,0 @@
-module Pincers::Core
-
-  class Download < Struct.new(:mime, :data)
-
-    def self.from_http_response(_response)
-      self.new _response['Content-Type'] || 'text/plain', _response.body
-    end
-
-    def store(_path)
-      File.write _path, data
-    end
-
-  end
-end

data/lib/pincers/support/http_client.rb

@@ -1,123 +0,0 @@
-require "uri"
-require "pincers/support/cookie_jar"
-
-module Pincers::Support
-  class HttpClient
-
-    class HttpRequestError < StandardError
-      extend Forwardable
-
-      def_delegators :@response, :code, :body
-
-      attr_reader :response
-
-      def initialize(_response)
-        @response = _response
-        super _response.message
-      end
-    end
-
-    class MaximumRedirectsError < StandardError
-      def initialize
-        super 'Redirection loop detected!'
-      end
-    end
-
-    attr_reader :proxy_addr, :proxy_port, :cookies
-
-    def initialize(_options={})
-      if _options[:proxy]
-        @proxy_addr, @proxy_port = _options[:proxy].split ':'
-      end
-
-      @cookies = if _options[:cookies]
-        _options[:cookies].copy
-      else
-        CookieJar.new
-      end
-
-      @default_headers = _options[:headers]
-    end
-
-    def get(_url, _query={}, _headers={})
-      # TODO: append query string?
-      perform_request Net::HTTP::Get, URI(_url), _headers
-    end
-
-    def post(_url, _data, _headers={})
-      perform_request Net::HTTP::Post, URI(_url), _headers do |req|
-        req.body = prepare_data(_data)
-      end
-    end
-
-    def put(_url, _data, _headers={})
-      perform_request Net::HTTP::Put, URI(_url), _headers do |req|
-        req.body = prepare_data(_data)
-      end
-    end
-
-    def delete(_url)
-      perform_request Net::HTTP::Delete, URI(_url), _headers
-    end
-
-  private
-
-    def perform_request(_req_type, _uri, _headers, _limit=10)
-
-      raise MaximumRedirectsError.new if _limit == 0
-
-      request = _req_type.new(_uri.request_uri.empty? ? '/' : _uri.request_uri)
-      build_headers(request, _headers)
-      set_cookies(request, _uri)
-      yield request if block_given?
-
-      response = build_client(_uri).request request
-
-      case response
-      when Net::HTTPSuccess then
-        update_cookies(_uri, response)
-        response
-      when Net::HTTPRedirection then
-        location = response['location']
-        perform_request(_req_type, URI.parse(location), _headers, _limit - 1)
-      else
-        handle_error_response response
-      end
-    end
-
-    def build_client(uri)
-      client = Net::HTTP.new uri.host, uri.port || 80, proxy_addr, proxy_port
-      client.use_ssl = true if uri.scheme == 'https'
-      client.verify_mode = OpenSSL::SSL::VERIFY_NONE
-      client
-    end
-
-    def handle_error_response(_response)
-      raise HttpRequestError.new _response
-    end
-
-    def prepare_data(_data)
-      if _data.is_a? Hash
-        _data.keys.map { |k| "#{k}=#{_data[k]}" }.join '&'
-      else _data end
-    end
-
-    def build_headers(_request, _headers)
-      copy_headers _request, @default_headers if @default_headers
-      copy_headers _request, _headers
-    end
-
-    def set_cookies(_request, _uri)
-      _request['Cookie'] = @cookies.for_origin_as_header _uri
-    end
-
-    def update_cookies(_uri, _response)
-      cookies = _response.get_fields('set-cookie')
-      cookies.each { |raw| @cookies.set_raw _uri, raw } if cookies
-    end
-
-    def copy_headers(_request, _headers)
-      _headers.keys.each { |k| _request[k] = _headers[k] }
-    end
-  end
-end