pincers 0.5.2 → 0.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 51cc155a36f380781aa91b00a53f5996aae5b9b1
-  data.tar.gz: b7ef59a62aa573b6be45914692fc603ef91195c0
+  metadata.gz: b243194fe1a23f2a16a34c0e7007de2d9f4eecfc
+  data.tar.gz: b442f0a02e79c6fc600d1b50cff6187ffc0bc3d4
 SHA512:
-  metadata.gz: 78e3f46f2d2a4bd2bcb82d6ca2c5eda70f2683f5bc769eb086204eb82e7168b7b02a6687550b47870187f2172319184d6f47d1b98a33984f7fc50860f40a0868
-  data.tar.gz: 95d1bbf4b2cc3ccea044ecc0c8bfea63477b56d489487edf2d9f110943e5b231d955f25c47e25a0e8c661a593d696c9003642cacdceaace35ad26f1ae7943c5b
+  metadata.gz: 9814b3a3c6139e62e53fea8b0448173196e2fd657656b9cfb49aa7856fd12e0d312842de844284e481821d223af838abf25f547107f7c90db921e10ee5969554
+  data.tar.gz: d91861c7c3ab3b717acfc703f758de7ea09dd1a89d6394b5c80932c069b4710a3d17b0b16dbc8004378ed4ce1d6985a77b4d631f9b5f1055515de171738bb95c

data/lib/pincers.rb

@@ -1,3 +1,4 @@
+require "nokogiri"
 require "forwardable"
 require "pincers/version"
 require "pincers/errors"

data/lib/pincers/backend/nokogiri.rb

@@ -1,4 +1,3 @@
-require 'nokogiri'
 require 'pincers/backend/base'
 
 module Pincers::Backend

data/lib/pincers/core/download.rb

@@ -1,4 +1,5 @@
 module Pincers::Core
+
   class Download < Struct.new(:mime, :data)
 
     def self.from_http_response(_response)

data/lib/pincers/core/query.rb

@@ -0,0 +1,72 @@
+require 'pincers/css/parser'
+require 'pincers/support/xpath_builder'
+
+module Pincers::Core
+  class Query
+
+    def self.build_from_options(_backend, _selector, _options={}, &_block)
+      limit = _options.delete(:limit)
+      lang = :xpath
+      exp = nil
+
+      if _selector
+        parser = Pincers::CSS::Parser.new _selector
+        if parser.is_extended?
+          exp = parser.to_xpath('.//') # Should we use // for root?
+          exp = exp.first if exp.length == 1
+        else
+          lang = :css
+          exp = _selector
+        end
+      elsif _options[:xpath]
+        exp = _options[:xpath]
+      else
+        builder = Pincers::Support::XPathBuilder.new _options
+        _block.call builder unless _block.nil?
+        exp = builder.expression
+      end
+
+      self.new _backend, lang, exp, limit
+    end
+
+    attr_reader :lang, :query, :limit
+
+    def initialize(_backend, _lang, _query, _limit)
+      @backend = _backend
+      @lang = _lang
+      @query = _query
+      @limit = _limit
+    end
+
+    def execute(_elements, _force_limit=nil)
+      fun = case @lang
+      when :xpath then :search_by_xpath
+      else :search_by_css end
+
+      query_elements _elements, fun, _force_limit || @limit
+    end
+
+  private
+
+    def query_elements(_elements, _fun, _limit)
+      elements = []
+      explode_elements(_elements) do |element, query|
+        limit = _limit.nil? ? nil : _limit - elements.count
+        elements += @backend.send(_fun, element, query, limit)
+        break if !_limit.nil? && elements.length >= _limit
+      end
+      elements
+    end
+
+    def explode_elements(_elements)
+      _elements.each do |element|
+        if @query.is_a? Array
+          @query.each { |q| yield element, q }
+        else
+          yield element, @query
+        end
+      end
+    end
+
+  end
+end

data/lib/pincers/core/root_context.rb

@@ -116,7 +116,7 @@ module Pincers::Core
       when :parent
         backend.switch_to_parent_frame
       when String
-        backend.switch_to_frame css(_frame).element!
+        backend.switch_to_frame search(_frame).element!
       when SearchContext
         backend.switch_to_frame _frame.element!
       else

data/lib/pincers/core/search_context.rb

@@ -1,7 +1,7 @@
 require 'pincers/extension/queries'
 require 'pincers/extension/actions'
 require 'pincers/extension/labs'
-require 'pincers/support/query'
+require 'pincers/core/query'
 
 module Pincers::Core
   class SearchContext
@@ -91,18 +91,15 @@ module Pincers::Core
       if elements.last.nil? then nil else wrap_siblings [elements.last] end
     end
 
-    def css(_selector, _options={})
-      wrap_errors do
-        query = Pincers::Support::Query.new backend, :css, _selector, _options[:limit]
-        wrap_childs query
+    def search(_selector=nil, _options={}, &_block)
+      if _selector.is_a? Hash
+        _options = _selector
+        _selector = nil
       end
-    end
 
-    def xpath(_selector, _options={})
-      wrap_errors do
-        query = Pincers::Support::Query.new backend, :xpath, _selector, _options[:limit]
-        wrap_childs query
-      end
+      query = Query.build_from_options(backend, _selector, _options, &_block)
+
+      wrap_errors { wrap_childs query }
     end
 
     def attribute(_name, _value=nil)

data/lib/pincers/css/parser.rb

@@ -0,0 +1,29 @@
+require 'pincers/css/xpath_visitor'
+
+module Pincers::CSS
+
+  class Parser
+
+    IS_EXTENDED_RGX = /:(contains|has|first|last|even|odd|eq|gt|lt|button|checkbox|file|image|password|radio|reset|submit|text|selected|checked)([^\w\-]|$)/
+
+    attr_reader :selector
+
+    def is_extended?
+      IS_EXTENDED_RGX === selector
+    end
+
+    def initialize(_selector)
+      @selector = _selector
+    end
+
+    def to_xpath(_prefix='//')
+      # use nokogiri parser and our custom visitor
+      ::Nokogiri::CSS.xpath_for @selector, {
+        prefix: _prefix,
+        visitor: XPathVisitor.new
+      }
+    end
+
+  end
+
+end

data/lib/pincers/css/xpath_visitor.rb

@@ -0,0 +1,81 @@
+module Pincers::CSS
+
+  class XPathVisitor < ::Nokogiri::CSS::XPathVisitor
+
+    # jQuery extended functions and classes
+
+    def visit_function_contains(_node) # override nokofiri impl to search in value attribute too
+      "(contains(., #{_node.value[1]}) or contains(@value, #{_node.value[1]}))"
+    end
+
+    def visit_function_has(_node)
+      _node.value[1].accept(self)
+    end
+
+    def visit_function_eq(_node) # override nokogiri impl to make it zero-based
+      "(position()-1)=#{_node.value[1]}"
+    end
+
+    def visit_function_gt(_node) # override nokogiri impl to make it zero-based
+      # "((#{_node.value[1]} >= 0 and position() > #{_node.value[1]}) or (#{_node.value[1]} < 0 and position() < #{_node.value[1]}))"
+      "(position()-1)>#{_node.value[1]}"
+    end
+
+    def visit_function_lt(_node)
+      "(position()-1)<#{_node.value[1]}"
+    end
+
+    def visit_pseudo_class_input(_node)
+      "((name()='input' and not(@type='hidden')) or name()='textarea' or name()='select' or name()='button')"
+    end
+
+    def visit_pseudo_class_button(_node)
+      "(name()='button' or (name()='input' and @type='button'))"
+    end
+
+    def visit_pseudo_class_checkbox(_node)
+      "@type='checkbox'"
+    end
+
+    def visit_pseudo_class_file(_node)
+      "@type='file'"
+    end
+
+    def visit_pseudo_class_image(_node)
+      "@type='image'"
+    end
+
+    def visit_pseudo_class_password(_node)
+      "@type='password'"
+    end
+
+    def visit_pseudo_class_radio(_node)
+      "@type='radio'"
+    end
+
+    def visit_pseudo_class_reset(_node)
+      "@type='reset'"
+    end
+
+    def visit_pseudo_class_text(_node)
+      "@type='text'"
+    end
+
+    def visit_pseudo_class_selected(_node)
+      "@selected"
+    end
+
+    def visit_pseudo_class_checked(_node)
+      "@checked"
+    end
+
+    def visit_pseudo_class_odd(_node)
+      "position() mod 2 = 1"
+    end
+
+    def visit_pseudo_class_even(_node)
+      "position() mod 2 = 0"
+    end
+
+  end
+end

data/lib/pincers/extension/actions.rb

@@ -49,11 +49,11 @@ module Pincers::Extension
     end
 
     def find_option_by_label(_label, _options)
-      css("option", _options).find { |o| o.text == _label }
+      search(_options.merge(xpath: ".//option[contains(.,'#{_label}')]")).first
     end
 
     def find_option_by_value(_value, _options)
-      css("option", _options).find { |o| o[:value] == _value.to_s }
+      search(_options.merge(xpath: ".//option[@value='#{_value}']")).first
     end
 
   end

data/lib/pincers/extension/labs.rb

@@ -5,7 +5,7 @@ module Pincers::Extension
       nk_root = Pincers.for_nokogiri to_html
 
       unless root?
-        nk_root = nk_root.css('body > *') # nokogiri will inject valid html structure around contents
+        nk_root = nk_root.search('body > *') # nokogiri will inject valid html structure around contents
       end
 
       if _block.nil?

data/lib/pincers/extension/queries.rb

@@ -1,21 +1,8 @@
-require 'pincers/support/xpath_builder'
-
 module Pincers::Extension
   module Queries
 
     TEXT_INPUTS = ['text', 'email', 'number', 'email', 'color', 'password', 'search', 'tel', 'url']
 
-    def search(_options={}, &_block)
-      query_options = {
-        limit: _options.delete(:limit)
-      }
-
-      builder = Pincers::Support::XPathBuilder.new _options
-      _block.call builder unless _block.nil?
-
-      xpath builder.expression, query_options
-    end
-
     def id
       self[:id]
     end
@@ -40,11 +27,11 @@ module Pincers::Extension
     end
 
     def selected(_options={})
-      first!.css('option', _options).select { |opt| opt.selected? }
+      first!.search('option', _options).select(&:selected?)
     end
 
     def checked(_options={})
-      first!.css('input', _options).select { |opt| opt.checked? }
+      first!.search('input', _options).select(&:checked?)
     end
 
     def input_mode

data/lib/pincers/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pincers
 version: !ruby/object:Gem::Version
-  version: 0.5.2
+  version: 0.6.0
 platform: ruby
 authors:
 - Ignacio Baixas
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-09-04 00:00:00.000000000 Z
+date: 2015-09-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nokogiri
@@ -219,8 +219,11 @@ files:
 - lib/pincers/backend/webdriver.rb
 - lib/pincers/core/cookies.rb
 - lib/pincers/core/download.rb
+- lib/pincers/core/query.rb
 - lib/pincers/core/root_context.rb
 - lib/pincers/core/search_context.rb
+- lib/pincers/css/parser.rb
+- lib/pincers/css/xpath_visitor.rb
 - lib/pincers/errors.rb
 - lib/pincers/extension/actions.rb
 - lib/pincers/extension/labs.rb
@@ -233,7 +236,6 @@ files:
 - lib/pincers/support/cookie.rb
 - lib/pincers/support/cookie_jar.rb
 - lib/pincers/support/http_client.rb
-- lib/pincers/support/query.rb
 - lib/pincers/support/xpath_builder.rb
 - lib/pincers/version.rb
 homepage: https://github.com/platanus/pincers

data/lib/pincers/support/query.rb

@@ -1,31 +0,0 @@
-module Pincers::Support
-  class Query
-
-    attr_reader :lang, :query, :limit
-
-    def initialize(_backend, _lang, _query, _limit)
-      @backend = _backend
-      @lang = _lang
-      @query = _query
-      @limit = _limit
-    end
-
-    def execute(_elements, _force_limit=nil)
-      fun = case @lang
-      when :xpath then :search_by_xpath
-      else :search_by_css end
-
-      explode_elements _elements, fun, _force_limit || @limit
-    end
-
-    def explode_elements(_elements, _fun, _limit)
-      _elements.inject([]) do |r, element|
-        limit = _limit.nil? ? nil : _limit - r.count
-        r = r + @backend.send(_fun, element, @query, limit)
-        break r if !_limit.nil? && r.length >= _limit
-        next r
-      end
-    end
-
-  end
-end