ae_page_objects 0.5.2.mw1 → 0.5.2.mw2

data/lib/ae_page_objects.rb

@@ -26,6 +26,7 @@ module AePageObjects
   autoload :Window,            'ae_page_objects/window'
   autoload :Node,              'ae_page_objects/node'
   autoload :Document,          'ae_page_objects/document'
+  autoload :DocumentFinder,    'ae_page_objects/document_finder'
   autoload :VariableDocument,  'ae_page_objects/variable_document'
   autoload :Element,           'ae_page_objects/element'
   autoload :ElementProxy,      'ae_page_objects/element_proxy'

data/lib/ae_page_objects/document.rb

@@ -3,54 +3,12 @@ module AePageObjects
     include Concerns::Visitable
 
     class << self
-
-      def find(&extra_condition)
-        original_window = AePageObjects::Window.current
-
-        # Loop through all the windows and attempt to instantiate the Document. Continue to loop around
-        # until finding a Document that can be instantiated or timing out.
-        Capybara.wait_until do
-          find_window(&extra_condition)
-        end
-
-      rescue Capybara::TimeoutError
-        original_window.switch_to
-
-        all_windows = AePageObjects::Window.all.map do |window|
-          name = window.current_document && window.current_document.to_s || "<none>"
-          {:window_handle => window.handle, :document => name }
-        end
-
-        raise PageNotFound, "Couldn't find page #{self.name} in any of the open windows: #{all_windows.inspect}"
+      def find(*args, &block)
+        DocumentFinder.new(self).find(*args, &block)
       end
 
     private
 
-      def find_window(&extra_condition)
-        AePageObjects::Window.all.each do |window|
-          window.switch_to
-
-          if inst = attempt_to_load(&extra_condition)
-            return inst
-          end
-        end
-
-        nil
-      end
-
-      def attempt_to_load(&extra_condition)
-        inst = new
-
-        if extra_condition.nil? || inst.instance_eval(&extra_condition)
-          return inst
-        end
-
-        nil
-      rescue AePageObjects::LoadingFailed
-        # These will happen from the new() call above.
-        nil
-      end
-
       def site
         @site ||= AePageObjects::Site.from(self)
       end
@@ -69,4 +27,4 @@ module AePageObjects
       self
     end
   end
-end
+end

data/lib/ae_page_objects/document_finder.rb

@@ -0,0 +1,77 @@
+module AePageObjects
+  class DocumentFinder
+
+    def initialize(document_class)
+      @document_class = document_class
+    end
+
+    class Conditions
+      def initialize(conditions, block_condition)
+        @conditions = conditions || {}
+        @conditions[:block] = block_condition if block_condition
+      end
+
+      def match?(page)
+        @conditions.each do |type, value|
+          case type
+          when :title then
+            return false unless browser.title.include?(value)
+          when :url then
+            return false unless page.current_url.include?(value)
+          when :block then
+            return false unless value.call(page)
+          end
+        end
+
+        true
+      end
+    end
+
+    def find(conditions = {}, &extra_condition)
+      original_window = AePageObjects::Window.current
+
+      # Loop through all the windows and attempt to instantiate the Document. Continue to loop around
+      # until finding a Document that can be instantiated or timing out.
+      Capybara.wait_until do
+        find_window(Conditions.new(conditions, extra_condition))
+      end
+
+    rescue Capybara::TimeoutError
+      original_window.switch_to
+
+      all_windows = AePageObjects::Window.all.map do |window|
+        name = window.current_document && window.current_document.to_s || "<none>"
+        {:window_handle => window.handle, :document => name }
+      end
+
+      raise PageNotFound, "Couldn't find page #{@document_class.name} in any of the open windows: #{all_windows.inspect}"
+    end
+
+  private
+
+    def find_window(conditions)
+      AePageObjects::Window.all.each do |window|
+        window.switch_to
+
+        if inst = attempt_to_load(conditions)
+          return inst
+        end
+      end
+
+      nil
+    end
+
+    def attempt_to_load(conditions)
+      inst = @document_class.new
+
+      if conditions.match?(inst)
+        return inst
+      end
+
+      nil
+    rescue AePageObjects::LoadingFailed
+      # These will happen from the new() call above.
+      nil
+    end
+  end
+end

data/lib/ae_page_objects/variable_document.rb

@@ -36,7 +36,7 @@ module AePageObjects
     end
 
     def implicit_document
-      @implicit_document ||= implicit_document_class.new
+      @implicit_document ||= as_a(implicit_document_class)
     end
 
     def method_missing(name, *args, &block)

data/lib/ae_page_objects/version.rb

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

metadata

@@ -1,15 +1,15 @@
 --- !ruby/object:Gem::Specification 
 name: ae_page_objects
 version: !ruby/object:Gem::Version 
-  hash: 807327821
+  hash: -4066462860
   prerelease: 6
   segments: 
   - 0
   - 5
   - 2
   - mw
-  - 1
-  version: 0.5.2.mw1
+  - 2
+  version: 0.5.2.mw2
 platform: ruby
 authors: 
 - Donnie Tognazzini
@@ -17,7 +17,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2013-10-29 00:00:00 Z
+date: 2013-11-08 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: capybara
@@ -56,6 +56,7 @@ files:
 - lib/ae_page_objects/core/universe.rb
 - lib/ae_page_objects/core_ext/module.rb
 - lib/ae_page_objects/document.rb
+- lib/ae_page_objects/document_finder.rb
 - lib/ae_page_objects/element.rb
 - lib/ae_page_objects/element_proxy.rb
 - lib/ae_page_objects/elements/checkbox.rb