pincers 0.4.5 → 0.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 66624ff64ae020984d9fef2a0519f18955074fb7
-  data.tar.gz: e34f21d327306298b6305b5add3aef01fab0ea5c
+  metadata.gz: 90b1470b17e772e804f87e809335d6b6f6bbc705
+  data.tar.gz: 8604135f3c47aba37b6426905eb90974cd683494
 SHA512:
-  metadata.gz: 38f8343d3f554a483881dcdfa5e71483c8fea2678e97f6f6cb247ab397fcd68ac3f412ceff8c0b10d917c542c2cfbb04c3dfda89eda9aea5fcc42826c0a6de84
-  data.tar.gz: e98ccee7ae47933bd2132d9a26bc3df0130a0bc6f79071bc76b6f88c83dec84b3ba82e8348f443b7dc5e8353186044339bc42c51bc2de8f63dcacc4ea3ad81b7
+  metadata.gz: b89aac01d30859041bf708e6ddac7f4207d8ea70541a9925806193f7b84dab9048b222013205d54558af4a87810f459599c43476b65a42b66809de55539741b0
+  data.tar.gz: 89f2ca14a776b9aba4c60f51b19a594d9b7a1c59705ebd260cb6aeb30bd5690af4571ae3444e6e076a4770d03bddf4964139d2ac311f7d4d63e125e4b5f88430

data/lib/pincers/backend/nokogiri.rb

@@ -5,6 +5,8 @@ module Pincers::Backend
 
   class Nokogiri < Base
 
+    BOOL_PROPERTIES = [:selected, :disabled, :checked, :required]
+
     def document_root
       [document]
     end
@@ -41,9 +43,14 @@ module Pincers::Backend
 
     def extract_element_attribute(_element, _name)
       _name = _name.to_sym
-
       value = _element[_name]
-      value = checkbox_value_fix _element, value if _name == :value
+
+      if BOOL_PROPERTIES.include? _name
+        value = !value.nil?
+      elsif _name == :value
+        value = checkbox_value_fix _element, value
+      end
+
       value
     end
 

data/lib/pincers/backend/webdriver.rb

@@ -5,6 +5,8 @@ module Pincers::Backend
 
   class Webdriver < Base
 
+    DOM_PROPERTIES = [:selected, :disabled, :checked, :value, :required]
+
     alias :driver :document
 
     def initialize(_driver)
@@ -76,11 +78,22 @@ module Pincers::Backend
 
     def extract_element_attribute(_element, _name)
       _element = ensure_element _element
-      _element[_name]
+      if DOM_PROPERTIES.include? _name.to_sym
+        driver.execute_script("return arguments[0]['#{_name}'];", _element)
+      else
+        _element[_name]
+      end
     end
 
     def set_element_attribute(_element, _name, _value)
-      driver.execute_script("arguments[0].setAttribute('#{_name}', #{_value.to_json})", _element)
+      _element = ensure_element _element
+      if DOM_PROPERTIES.include? _name.to_sym
+        driver.execute_script("arguments[0]['#{_name}'] = #{_value.to_json};", _element)
+      elsif _value == ''
+        driver.execute_script("arguments[0].removeAttribute('#{_name}')", _element)
+      else
+        driver.execute_script("arguments[0].setAttribute('#{_name}', #{_value.to_json})", _element)
+      end
     end
 
     def element_is_actionable?(_element)
@@ -136,18 +149,6 @@ module Pincers::Backend
       driver.switch_to.default_content
     end
 
-    def check_visible(_elements)
-      _elements.first.displayed?
-    end
-
-    def check_enabled(_elements)
-      check_visible(_elements) and _elements.first.enabled?
-    end
-
-    def check_not_visible(_elements)
-      not _elements.any? { |e| e.displayed? }
-    end
-
   private
 
     def search(_element, _query, _limit)

data/lib/pincers/core/search_context.rb

@@ -20,6 +20,7 @@ module Pincers::Core
       @scope = if @elements.nil? then nil else :all end
       @parent = _parent
       @query = _query
+      @waiting = false
     end
 
     def frozen?
@@ -49,8 +50,8 @@ module Pincers::Core
     end
 
     def element!
-      wait(:present) unless frozen? or advanced_mode?
-      raise Pincers::EmptySetError.new self if empty?
+      wait(:present) if should_wait?
+      raise Pincers::EmptySetError.new self if element.nil?
       element
     end
 
@@ -78,7 +79,7 @@ module Pincers::Core
     end
 
     def first
-      wait?(:present) unless frozen? or advanced_mode?
+      wait?(:present) if should_wait?
       if element.nil? then nil else wrap_siblings [element] end
     end
 
@@ -174,28 +175,46 @@ module Pincers::Core
 
     # waiting
 
-    def wait?(_condition, _options={}, &_block)
-      poll_until(_condition, _options) do
+    def wait?(_condition=nil, _options={}, &_block)
+
+      if _condition.is_a? Hash
+        _options = _condition
+        _condition = nil
+      end
+
+      poll_until(_options) do
+        next ensure_block _block if _block
+
         case _condition
         when :present
           ensure_present
         when :actionable
           ensure_present and ensure_actionable
+        when :enabled
+          ensure_present and !attribute(:disabled)
         else
-          check_method = "check_#{_condition}"
-          raise Pincers::MissingFeatureError.new check_method unless backend.respond_to? check_method
-          ensure_present and check_method.call(elements)
+          ensure_present and !!attribute(_condition)
         end
       end
     end
 
-    def wait(_condition, _options={})
-      raise Pincers::ConditionTimeoutError.new self, _condition unless wait?(_condition, _options)
+    def wait(_condition=nil, _options={}, &_block)
+
+      if _condition.is_a? Hash
+        _options = _condition
+        _condition = nil
+      end
+
+      raise Pincers::ConditionTimeoutError.new(self, _condition) unless wait?(_condition, _options, &_block)
       return self
     end
 
   private
 
+    def should_wait?
+      !frozen? && !advanced_mode? && !@waiting
+    end
+
     def advanced_mode?
       root.advanced_mode?
     end
@@ -209,6 +228,17 @@ module Pincers::Core
       backend.element_is_actionable? element
     end
 
+    def ensure_block(_block)
+      begin
+        @waiting = true
+        _block.call(self) != false
+      rescue Pincers::NavigationError
+        return false
+      ensure
+        @waiting = false
+      end
+    end
+
     def wrap_errors
       begin
         yield
@@ -221,7 +251,7 @@ module Pincers::Core
 
     def perform_action
       wrap_errors do
-        wait(:actionable) unless advanced_mode?
+        wait(:actionable) if should_wait?
         yield elements.first
       end
       self
@@ -258,7 +288,7 @@ module Pincers::Core
       end
     end
 
-    def poll_until(_description, _options={})
+    def poll_until(_options={})
       timeout = _options.fetch :timeout, root.default_timeout
       interval = _options.fetch :interval, root.default_interval
       end_time = Time.now + timeout

data/lib/pincers/errors.rb

@@ -34,23 +34,31 @@ module Pincers
 
   end
 
-  class EmptySetError < ContextError
+  class NavigationError < ContextError; end
 
-    def initialize(_context)
-      super _context, "This set is empty"
+  class ConditionTimeoutError < NavigationError
+
+    def initialize(_context, _condition)
+      message = if _condition
+        "Timed out waiting element to be #{_condition}"
+      else
+        "Timed out waiting for element match custom condition"
+      end
+
+      super _context, message
     end
 
   end
 
-  class ConditionTimeoutError < ContextError
+  class EmptySetError < NavigationError
 
-    def initialize(_context, _condition)
-      super _context, "Timed out waiting element to be #{_condition}"
+    def initialize(_context)
+      super _context, "This set is empty"
     end
 
   end
 
-  class BackendError < ContextError
+  class BackendError < NavigationError
 
     attr_reader :document
     attr_reader :original

data/lib/pincers/extension/actions.rb

@@ -10,12 +10,16 @@ module Pincers::Extension
 
       case input_mode
       when :text
+        wait :enabled
         set_text _value.to_s
       when :select
+        wait :enabled
         return set_selected _value, _options
       when :checkbox, :radio
+        wait :enabled
         return set_checked _value
       when :button
+        wait :enabled
         click if _value
       else
         return false

data/lib/pincers/extension/queries.rb

@@ -16,6 +16,10 @@ module Pincers::Extension
       xpath builder.expression, query_options
     end
 
+    def id
+      self[:id]
+    end
+
     def value
       case input_mode
       when :checkbox, :radio
@@ -27,7 +31,7 @@ module Pincers::Extension
 
     [:selected, :checked, :disabled, :required].each do |attr_name|
       define_method "#{attr_name}?" do
-        not self[attr_name].nil?
+        self[attr_name]
       end
     end
 

data/lib/pincers/factories/base.rb

@@ -1,5 +1,3 @@
-require 'pincers/core/root_context'
-
 module Pincers::Factories
 
   class Base

data/lib/pincers/version.rb

@@ -1,3 +1,3 @@
 module Pincers
-  VERSION = "0.4.5"
+  VERSION = "0.5.0"
 end

data/lib/pincers.rb

@@ -1,6 +1,7 @@
 require "forwardable"
 require "pincers/version"
 require "pincers/errors"
+require 'pincers/core/root_context'
 require "pincers/factory"
 require "pincers/support/configuration"
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pincers
 version: !ruby/object:Gem::Version
-  version: 0.4.5
+  version: 0.5.0
 platform: ruby
 authors:
 - Ignacio Baixas
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-09-01 00:00:00.000000000 Z
+date: 2015-09-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nokogiri
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.6.6
+        version: '1.6'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.6.6
+        version: '1.6'
 - !ruby/object:Gem::Dependency
   name: selenium-webdriver
   requirement: !ruby/object:Gem::Requirement
@@ -56,70 +56,70 @@ dependencies:
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ~>
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ~>
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ~>
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ~>
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec-nc
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ~>
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ~>
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: guard
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ~>
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ~>
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: guard-rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ~>
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ~>
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
@@ -128,85 +128,85 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.6.1
+        version: '1.6'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.6.1
+        version: '1.6'
 - !ruby/object:Gem::Dependency
   name: pry
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ~>
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ~>
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: pry-remote
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ~>
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ~>
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: pry-nav
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ~>
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ~>
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rack
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ~>
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ~>
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: thin
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ~>
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ~>
       - !ruby/object:Gem::Version
         version: '0'
-description: 
+description: Web automation DSL on top of webdriver and nokogiri
 email:
 - ignacio@platan.us
 executables: []