pincers 0.4.3 → 0.4.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: afcbc879c147d169e6aad79cf754a63087d4c19d
-  data.tar.gz: cb45e178c172df008ad21d599b43eb9d19d876dc
+  metadata.gz: e16b32dabf298054ed5e1d29154cba02910c1820
+  data.tar.gz: 2b4a3b62cdaeca0b9339abc309eefff40a6d7aaa
 SHA512:
-  metadata.gz: 7fb0a694e3a07b9dbe26f9d75c791c954967111b036f1d39442ebbad690fa972622872482278127a3b81411edbc14f12e18b910458efb9bfee6f693eef6e95e8
-  data.tar.gz: bef7aad58f7ed7dc93f109fcda0f06c3e43bb1423bf4b1f91b1b72661e4da943f091d9c419b0cbfca0e4fd3273d9264f8800b2b61d5920cbbb1abf59b24ae46d
+  metadata.gz: d13a6b8b6c4cfadc7a995654c2a0f745861c4aadbee9e725d452cb895d2d43ec0141027245a3d39bb0e5d8ad3ba423d7e53c42846e97f52836e43949e18aa77d
+  data.tar.gz: a7adb7894c79e32000cb61d8d54d20c803886d4aa3be30b226e3d526525483e529ea22442250fe4cefca2ed5d90489a1d60fffcfb5486e78fee658d407f3f3ed

data/lib/pincers/core/search_context.rb

@@ -2,7 +2,6 @@ require 'pincers/extension/queries'
 require 'pincers/extension/actions'
 require 'pincers/extension/labs'
 require 'pincers/support/query'
-require 'pincers/support/xpath_builder'
 
 module Pincers::Core
   class SearchContext
@@ -94,15 +93,7 @@ module Pincers::Core
       end
     end
 
-    def xpath(_selector=nil, _options={}, &_block)
-      _options = _selector if _selector.is_a? Hash
-
-      unless _block.nil?
-        builder = Pincers::Support::XPathBuilder.new
-        _block.call builder
-        _selector = builder.expression
-      end
-
+    def xpath(_selector, _options={})
       wrap_errors do
         query = Pincers::Support::Query.new backend, :xpath, _selector, _options[:limit]
         wrap_childs query

data/lib/pincers/extension/queries.rb

@@ -1,8 +1,21 @@
+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 value
       case input_mode
       when :checkbox, :radio

data/lib/pincers/support/xpath_builder.rb

@@ -1,12 +1,22 @@
 module Pincers::Support
   class XPathBuilder
 
-    def initialize
+    def initialize(_options={})
       @parts = []
+      by_tag _options.delete(:tag) if _options.key? :tag
+      by_content _options.delete(:content) if _options.key? :content
+
+      if _options.key? :class
+        _options.delete(:class).split(' ').each { |c| by_class c }
+      end
+
+      _options.each do |key, value|
+        by_attribute key, contains: value
+      end
     end
 
     def expression
-      "//*[#{@parts.join(' and ')}]"
+      ".//*[#{@parts.join(' and ')}]"
     end
 
     def by_tag(_name)
@@ -14,7 +24,7 @@ module Pincers::Support
       self
     end
 
-    def by_contents(_contents, _options={})
+    def by_content(_contents, _options={})
       # TODO: more options, lowercase support?
       # xpath("//*[text()='#{_contents}'] | //*[@value='#{_contents}']", _options)
       add "(contains(text(), '#{_contents}') or contains(@value, '#{_contents}'))"

data/lib/pincers/version.rb

@@ -1,3 +1,3 @@
 module Pincers
-  VERSION = "0.4.3"
+  VERSION = "0.4.4"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: pincers
 version: !ruby/object:Gem::Version
-  version: 0.4.3
+  version: 0.4.4
 platform: ruby
 authors:
 - Ignacio Baixas