pincers 0.4.2 → 0.4.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9c0078909c37a17fd576c2406f34e2ac442ebd9e
-  data.tar.gz: 9eee825c40a7046971993756cc3470e1c3a0c801
+  metadata.gz: afcbc879c147d169e6aad79cf754a63087d4c19d
+  data.tar.gz: cb45e178c172df008ad21d599b43eb9d19d876dc
 SHA512:
-  metadata.gz: 168d81dd0e6e107a72272d8363ed8d0907af0e44b65af11c371a4f1dceec9cf8bf251479b71634c13fa788a26a640666f5cd094d7afaa7b3a31ee6145c8a6a14
-  data.tar.gz: 9cb9cca61f9c194623a3bc04ecc96cb01e7f4827befd35c813a266b06efda8234a258cb0c65ec69834b4f70f31e68fa00d9f4778b06afa5941748014ff2b5990
+  metadata.gz: 7fb0a694e3a07b9dbe26f9d75c791c954967111b036f1d39442ebbad690fa972622872482278127a3b81411edbc14f12e18b910458efb9bfee6f693eef6e95e8
+  data.tar.gz: bef7aad58f7ed7dc93f109fcda0f06c3e43bb1423bf4b1f91b1b72661e4da943f091d9c419b0cbfca0e4fd3273d9264f8800b2b61d5920cbbb1abf59b24ae46d

data/lib/pincers/core/search_context.rb

@@ -2,6 +2,7 @@ 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
@@ -74,6 +75,7 @@ module Pincers::Core
     end
 
     def first
+      wait?(:present) unless frozen? or advanced_mode?
       if element.nil? then nil else wrap_siblings [element] end
     end
 
@@ -92,7 +94,15 @@ module Pincers::Core
       end
     end
 
-    def xpath(_selector, _options={})
+    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
+
       wrap_errors do
         query = Pincers::Support::Query.new backend, :xpath, _selector, _options[:limit]
         wrap_childs query

data/lib/pincers/support/xpath_builder.rb

@@ -0,0 +1,50 @@
+module Pincers::Support
+  class XPathBuilder
+
+    def initialize
+      @parts = []
+    end
+
+    def expression
+      "//*[#{@parts.join(' and ')}]"
+    end
+
+    def by_tag(_name)
+      add "name()='#{_name.downcase}'"
+      self
+    end
+
+    def by_contents(_contents, _options={})
+      # TODO: more options, lowercase support?
+      # xpath("//*[text()='#{_contents}'] | //*[@value='#{_contents}']", _options)
+      add "(contains(text(), '#{_contents}') or contains(@value, '#{_contents}'))"
+    end
+
+    def by_class(_class, _options={})
+      add "contains(concat(' ', @class, ' '), ' #{_class} ')"
+    end
+
+    def by_attribute(_attribute, _options={})
+      add(if _options.key? :equals
+        "@#{_attribute}='#{_options.delete(:equals)}'"
+      elsif _options.key? :starts_with
+        "starts-with(@#{_attribute}, '#{_options.delete(:starts_with)}')"
+      elsif _options.key? :ends_with
+        ends_with = _options.delete(:ends_with)
+        "substring(@#{_attribute}, string-length(@#{_attribute}) - string-length('#{ends_with}') + 1)='#{ends_with}'"
+      elsif _options.key? :contains
+        "contains(@#{_attribute}, '#{_options.delete(:contains)}')"
+      else
+        "#{_attribute}"
+      end)
+    end
+
+  private
+
+    def add(_condition)
+      @parts << _condition
+      self
+    end
+
+  end
+end

data/lib/pincers/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pincers
 version: !ruby/object:Gem::Version
-  version: 0.4.2
+  version: 0.4.3
 platform: ruby
 authors:
 - Ignacio Baixas
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-08-27 00:00:00.000000000 Z
+date: 2015-09-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nokogiri
@@ -213,6 +213,7 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- lib/pincers.rb
 - lib/pincers/backend/base.rb
 - lib/pincers/backend/nokogiri.rb
 - lib/pincers/backend/webdriver.rb
@@ -229,8 +230,8 @@ files:
 - lib/pincers/support/configuration.rb
 - lib/pincers/support/cookie_jar.rb
 - lib/pincers/support/query.rb
+- lib/pincers/support/xpath_builder.rb
 - lib/pincers/version.rb
-- lib/pincers.rb
 homepage: https://github.com/platanus/pincers
 licenses:
 - MIT
@@ -251,7 +252,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.14
+rubygems_version: 2.4.8
 signing_key: 
 specification_version: 4
 summary: Web automation framework with multiple backend support