ae_page_objects 0.5.2 → 1.0.0

data/lib/ae_page_objects/document.rb

@@ -2,13 +2,19 @@ module AePageObjects
   class Document < Node
     include Concerns::Visitable
 
-    attr_reader :window
-    
     def initialize
       super(Capybara.current_session)
+    end
 
-      @window = Window.current
-      @window.current_document = self
+    if defined? Selenium::WebDriver
+      attr_reader :window
+    
+      def initialize
+        super(Capybara.current_session)
+
+        @window = Window.current
+        @window.current_document = self
+      end
     end
     
     def document

data/lib/ae_page_objects/element.rb

@@ -1,15 +1,7 @@
 module AePageObjects
   class Element < Node
     attr_reader :parent
-    
-    class << self
-      def new(*args)
-        super(*args).tap do |me|
-          yield me if block_given?
-        end
-      end
-    end
-    
+
     def initialize(parent, options_or_locator = {})
       @parent       = parent
       @locator      = nil

data/lib/ae_page_objects/element_proxy.rb

@@ -1,3 +1,5 @@
+require 'timeout'
+
 module AePageObjects
   class ElementProxy
     
@@ -9,36 +11,25 @@ module AePageObjects
       end
     end
     
-    def initialize(element_class, *args, &block)
+    def initialize(element_class, *args)
       @element_class = element_class
       @args          = args
-      @block         = block
-      
-      # Yield to the block immediately by creating 
-      # the element. Block use assumes presence. Since
-      # the underlying element is passed when yielding
-      # the block level variable won't have access to
-      # the proxy methods, but that's ok.
-      if block_given?
-        element
-      end
     end
     
     # Provided so that visible? can be asked without
     # an explicit check for present? first.
     def visible?
-      inst = presence
-      ! inst.nil? && inst.visible?
+      wait_for do
+        inst = presence
+        !! inst && inst.visible?
+      end
     end
     
     def not_visible?
-      Capybara.current_session.wait_until do
-        Capybara.using_wait_time(0) do
-          ! visible?
-        end
+      wait_for do
+        inst = presence
+        inst.nil? || ! inst.visible?
       end
-    rescue Capybara::TimeoutError
-      false  
     end
 
     def present?
@@ -46,13 +37,9 @@ module AePageObjects
     end
     
     def not_present?
-      Capybara.current_session.wait_until do
-        Capybara.using_wait_time(0) do
-          ! present?
-        end
+      wait_for do
+        ! present?
       end
-    rescue Capybara::TimeoutError
-      false
     end
     
     def presence
@@ -82,9 +69,18 @@ module AePageObjects
     end
     
   private
-  
+
+    def wait_for(&block)
+      Timeout.timeout(Capybara.default_wait_time) do
+        sleep(0.05) until value = Capybara.using_wait_time(0, &block)
+        value
+      end
+    rescue Timeout::Error
+      false
+    end
+
     def element
-      @element ||= @element_class.new(*@args, &@block)
+      @element ||= @element_class.new(*@args)
     end
   end
 end

data/lib/ae_page_objects/elements/collection.rb

@@ -19,19 +19,20 @@ module AePageObjects
       self.class.item_class
     end
 
-    def at(index, &block)
+
+    def at(index)
       if index >= size || index < 0
         nil
       else
-        item_at(index, &block)
+        item_at(index)
       end
     end
 
-    def [](index, &block)
-      at(index, &block)
+    def [](index)
+      at(index)
     end
     
-    def each(&block)
+    def each
       (0..(size - 1)).each do |index|
         yield at(index)
       end
@@ -41,8 +42,8 @@ module AePageObjects
       node.all(:xpath, item_xpath).size
     end
 
-    def last(&block)
-      self.at(size - 1, &block)
+    def last
+      self.at(size - 1)
     end
 
   private
@@ -53,8 +54,8 @@ module AePageObjects
       @item_locator = options.delete(:item_locator) || default_item_locator
     end
 
-    def item_at(index, &block)
-      ElementProxy.new(item_class_at(index), self, :name => index, :locator => item_locator_at(index), &block)
+    def item_at(index)
+      ElementProxy.new(item_class_at(index), self, :name => index, :locator => item_locator_at(index))
     end
 
     def item_class_at(index)
@@ -62,7 +63,26 @@ module AePageObjects
     end
 
     def item_xpath
-      @item_xpath ||= Capybara::Selector.normalize(*eval_locator(@item_locator)).xpaths.first
+      @item_xpath ||= begin
+        evaled_locator = eval_locator(@item_locator)
+
+        if Capybara::VERSION =~ /\A1/
+          Capybara::Selector.normalize(*evaled_locator).xpaths.first
+        else
+          query_args = evaled_locator + [{:exact => true}]
+          query = Capybara::Query.new(*query_args)
+
+          result = query.xpath
+
+          # if it's CSS, we need to run it through XPath as Capybara::Query#xpath only
+          # works when the selector is xpath. Lame.
+          if query.selector.format == :css
+            result = XPath.css(query.xpath).to_xpath
+          end
+
+          result
+        end
+      end
     end
 
     def item_locator_at(index)

data/lib/ae_page_objects/version.rb

@@ -1,3 +1,3 @@
 module AePageObjects
-  VERSION = '0.5.2'.freeze
+  VERSION = '1.0.0'.freeze
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ae_page_objects
 version: !ruby/object:Gem::Version
-  version: 0.5.2
+  version: 1.0.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,24 +9,30 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-10-29 00:00:00.000000000 Z
+date: 2014-01-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: capybara
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ~>
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '1.1'
+    - - <
+      - !ruby/object:Gem::Version
+        version: '2.3'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ~>
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '1.1'
+    - - <
+      - !ruby/object:Gem::Version
+        version: '2.3'
 description: Capybara Page Objects pattern
 email:
 - engineering@appfolio.com
@@ -75,7 +81,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 947206196524353569
+      hash: 472038393023831036
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: