ae_page_objects 2.0.0.beta1 → 2.0.0.beta2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2dec9e34721561ba781508ef0b2c14b254fa4f5f
-  data.tar.gz: 33356ca72c8529bbb1c64169c42c290c545b486b
+  metadata.gz: 4d1047792e65a7c7ddf5deca452f5f687e3d0ac1
+  data.tar.gz: d56f0eb00934b7e97aab199c5629867d06bd6c1a
 SHA512:
-  metadata.gz: 3ff183bf91b4049702f1fbb32192e7f92d05e279743c1091e0a5740ea50dc89ccf595a7fdefa3ae7c3cdf14a77fef9c3f214d9ad5a8f1bcf58d5ae4b6b9e12ea
-  data.tar.gz: 4b7c1c3de1d8f16b7f38b2cfaf4f67e5b5f0b1671b614d0be8a5e147bcf568104c82e00362d06428e2bebce6bdd29c939acb486441a8efd343eea461056b2ecf
+  metadata.gz: b4e0f544e11d234643955e2c2464df9fcaac81f70c0a9f7e399ea72123e7f96373f0d51e5674234653a41c694bb1adcf25198052625ae2d5c3ddd09f118b9905
+  data.tar.gz: cbdd37fb41439a93f26e019f8c0bf55d052a77aefb428915e96117528a2f509c3b3b3d4c81e1ece1dfac1902a5902a44e780e0f435edb3d48e335a11a1e3b650

data/lib/ae_page_objects.rb

@@ -5,39 +5,9 @@ require 'ae_page_objects/version'
 require 'ae_page_objects/exceptions'
 
 module AePageObjects
-  autoload :Universe,             'ae_page_objects/core/universe'
-  autoload :Site,                 'ae_page_objects/core/site'
-  autoload :BasicRouter,          'ae_page_objects/core/basic_router'
-  autoload :ApplicationRouter,    'ae_page_objects/core/application_router'
-  autoload :Dsl,                  'ae_page_objects/core/dsl'
-
-  autoload :Singleton,            'ae_page_objects/util/singleton'
-  autoload :InternalHelpers,      'ae_page_objects/util/internal_helpers'
-  autoload :HashSymbolizer,       'ae_page_objects/util/hash_symbolizer'
-  autoload :Inflector,            'ae_page_objects/util/inflector'
-
-  module MultipleWindows
-    autoload :Browser,                   'ae_page_objects/multiple_windows/browser'
-    autoload :Window,                    'ae_page_objects/multiple_windows/window'
-    autoload :CrossWindowLoaderStrategy, 'ae_page_objects/multiple_windows/cross_window_loader_strategy'
-    autoload :WindowList,                'ae_page_objects/multiple_windows/window_list'
-    autoload :WindowHandleManager,       'ae_page_objects/multiple_windows/window_handle_manager'
-  end
-
-  module SingleWindow
-    autoload :Browser,                   'ae_page_objects/single_window/browser'
-    autoload :Window,                    'ae_page_objects/single_window/window'
-    autoload :SameWindowLoaderStrategy,  'ae_page_objects/single_window/same_window_loader_strategy'
-  end
-
-  autoload :DocumentQuery,     'ae_page_objects/document_query'
-  autoload :DocumentLoader,    'ae_page_objects/document_loader'
-
   autoload :Node,              'ae_page_objects/node'
   autoload :Document,          'ae_page_objects/document'
-  autoload :DocumentProxy,     'ae_page_objects/document_proxy'
   autoload :Element,           'ae_page_objects/element'
-  autoload :ElementProxy,      'ae_page_objects/element_proxy'
 
   autoload :Collection,        'ae_page_objects/elements/collection'
   autoload :Form,              'ae_page_objects/elements/form'
@@ -45,6 +15,7 @@ module AePageObjects
   autoload :Checkbox,          'ae_page_objects/elements/checkbox'
 
   class << self
+    attr_accessor :default_router
 
     def browser
       @browser ||= begin
@@ -52,8 +23,10 @@ module AePageObjects
 
         case driver
         when Capybara::Selenium::Driver then
+          require 'ae_page_objects/multiple_windows/browser'
           MultipleWindows::Browser.new
         else
+          require 'ae_page_objects/single_window/browser'
           SingleWindow::Browser.new
         end
       end
@@ -89,14 +62,5 @@ module AePageObjects
   end
 end
 
-require 'ae_page_objects/core_ext/module'
-
-
-
-
-
-
-
-
-
-
+require 'ae_page_objects/core/basic_router'
+AePageObjects.default_router = AePageObjects::BasicRouter.new

data/lib/ae_page_objects/core/dsl.rb

@@ -1,3 +1,6 @@
+require 'ae_page_objects/util/internal_helpers'
+require 'ae_page_objects/element_proxy'
+
 module AePageObjects
   module Dsl
     include InternalHelpers

data/lib/ae_page_objects/document.rb

@@ -1,13 +1,25 @@
 module AePageObjects
   class Document < Node
     class << self
+      attr_writer :router
+
+      def router
+        @router ||= begin
+          if [self, superclass].include?(Document)
+            AePageObjects.default_router
+          else
+            superclass.router
+          end
+        end
+      end
+
       def can_load_from_current_url?
         return true if paths.empty?
 
         url = current_url_without_params
 
         paths.any? do |path|
-          site.path_recognizes_url?(path, url)
+          router.path_recognizes_url?(path, url)
         end
       end
 
@@ -17,7 +29,7 @@ module AePageObjects
 
         path = inner_options.delete(:via) || paths.first
 
-        full_path = site.generate_path(path, *args)
+        full_path = router.generate_path(path, *args)
         raise PathNotResolvable, "#{self.name} not visitable via #{paths.first}(#{args.inspect})" unless full_path
 
         Capybara.current_session.visit(full_path)
@@ -36,10 +48,6 @@ module AePageObjects
 
         paths << path_method
       end
-
-      def site
-        @site ||= Site.from(self)
-      end
     end
 
     attr_reader :window

data/lib/ae_page_objects/element.rb

@@ -1,3 +1,5 @@
+require 'ae_page_objects/util/hash_symbolizer'
+
 module AePageObjects
   class Element < Node
     attr_reader :parent

data/lib/ae_page_objects/elements/collection.rb

@@ -1,3 +1,5 @@
+require 'ae_page_objects/element_proxy'
+
 module AePageObjects
   class Collection < Element
     include Enumerable

data/lib/ae_page_objects/exceptions.rb

@@ -4,14 +4,10 @@ module AePageObjects
   class StalePageObject < Error
   end
 
-  # TODO: 2.0 - remove this base class.
-  class LoadingFailed < Error
+  class LoadingPageFailed < Error
   end
 
-  class LoadingPageFailed < LoadingFailed
-  end
-
-  class LoadingElementFailed < LoadingFailed
+  class LoadingElementFailed < Error
   end
 
   class ElementExpectationError < Error

data/lib/ae_page_objects/multiple_windows/browser.rb

@@ -1,3 +1,10 @@
+require 'ae_page_objects/multiple_windows/cross_window_loader_strategy'
+require 'ae_page_objects/multiple_windows/window_list'
+
+require 'ae_page_objects/document_loader'
+require 'ae_page_objects/document_proxy'
+require 'ae_page_objects/document_query'
+
 module AePageObjects
   module MultipleWindows
     class Browser

data/lib/ae_page_objects/multiple_windows/cross_window_loader_strategy.rb

@@ -1,3 +1,5 @@
+require 'ae_page_objects/single_window/same_window_loader_strategy'
+
 module AePageObjects
   module MultipleWindows
     class CrossWindowLoaderStrategy

data/lib/ae_page_objects/multiple_windows/window.rb

@@ -1,3 +1,7 @@
+require 'ae_page_objects/multiple_windows/window_handle_manager'
+
+require 'ae_page_objects/single_window/window'
+
 module AePageObjects
   module MultipleWindows
     class Window < SingleWindow::Window
@@ -25,4 +29,4 @@ module AePageObjects
       end
     end
   end
-end
+end

data/lib/ae_page_objects/multiple_windows/window_list.rb

@@ -1,3 +1,6 @@
+require 'ae_page_objects/multiple_windows/window_handle_manager'
+require 'ae_page_objects/multiple_windows/window'
+
 module AePageObjects
   module MultipleWindows
     class WindowList
@@ -57,4 +60,4 @@ module AePageObjects
       end
     end
   end
-end
+end

data/lib/ae_page_objects/node.rb

@@ -1,3 +1,5 @@
+require 'ae_page_objects/core/dsl'
+
 module AePageObjects
   class Node
     extend Dsl

data/lib/ae_page_objects/rails.rb

@@ -0,0 +1,3 @@
+require 'ae_page_objects/rails/application_router'
+
+AePageObjects.default_router = AePageObjects::ApplicationRouter.new

data/lib/ae_page_objects/{core → rails}/application_router.rb

@@ -1,3 +1,5 @@
+require 'ae_page_objects/core/basic_router'
+
 module AePageObjects
   class ApplicationRouter < BasicRouter
 

data/lib/ae_page_objects/single_window/browser.rb

@@ -1,3 +1,5 @@
+require 'ae_page_objects/single_window/window'
+
 module AePageObjects
   module SingleWindow
     class Browser
@@ -8,4 +10,4 @@ module AePageObjects
       end
     end
   end
-end
+end

data/lib/ae_page_objects/single_window/window.rb

@@ -1,3 +1,9 @@
+require 'ae_page_objects/single_window/same_window_loader_strategy'
+
+require 'ae_page_objects/document_loader'
+require 'ae_page_objects/document_proxy'
+require 'ae_page_objects/document_query'
+
 module AePageObjects
   module SingleWindow
     class Window

data/lib/ae_page_objects/version.rb

@@ -1,3 +1,3 @@
 module AePageObjects
-  VERSION = '2.0.0.beta1'.freeze
+  VERSION = '2.0.0.beta2'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ae_page_objects
 version: !ruby/object:Gem::Version
-  version: 2.0.0.beta1
+  version: 2.0.0.beta2
 platform: ruby
 authors:
 - Donnie Tognazzini
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-05-13 00:00:00.000000000 Z
+date: 2016-06-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: capybara
@@ -32,12 +32,8 @@ extensions: []
 extra_rdoc_files: []
 files:
 - lib/ae_page_objects.rb
-- lib/ae_page_objects/core/application_router.rb
 - lib/ae_page_objects/core/basic_router.rb
 - lib/ae_page_objects/core/dsl.rb
-- lib/ae_page_objects/core/site.rb
-- 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_loader.rb
 - lib/ae_page_objects/document_proxy.rb
@@ -55,14 +51,14 @@ files:
 - lib/ae_page_objects/multiple_windows/window_handle_manager.rb
 - lib/ae_page_objects/multiple_windows/window_list.rb
 - lib/ae_page_objects/node.rb
+- lib/ae_page_objects/rails.rb
+- lib/ae_page_objects/rails/application_router.rb
 - lib/ae_page_objects/single_window/browser.rb
 - lib/ae_page_objects/single_window/same_window_loader_strategy.rb
 - lib/ae_page_objects/single_window/window.rb
 - lib/ae_page_objects/util/hash_symbolizer.rb
-- lib/ae_page_objects/util/inflector.rb
 - lib/ae_page_objects/util/internal_helpers.rb
 - lib/ae_page_objects/util/page_polling.rb
-- lib/ae_page_objects/util/singleton.rb
 - lib/ae_page_objects/version.rb
 homepage: http://github.com/appfolio/ae_page_objects
 licenses:
@@ -79,9 +75,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: 1.9.3
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubyforge_project: 
 rubygems_version: 2.4.3

data/lib/ae_page_objects/core/site.rb

@@ -1,61 +0,0 @@
-module AePageObjects
-  class Site
-    extend AePageObjects::Singleton
-
-    class << self
-      private :new
-
-      def initialize!
-        instance.initialize!
-      end
-
-      def router=(router)
-        instance.router = router
-      end
-
-      def inherited(site_class)
-        super
-
-        site_class.universe.send(:include, Universe)
-        site_class.universe.page_objects_site_class = site_class
-      end
-
-      def universe
-        parent
-      end
-
-      def from(from_mod)
-        until from_mod == Object
-          if from_mod < Universe
-            return from_mod.page_objects_site_class.instance
-          end
-
-          from_mod = from_mod.parent
-        end
-
-        nil
-      end
-    end
-
-    attr_writer :router
-
-    def universe
-      self.class.universe
-    end
-
-    def path_recognizes_url?(*args)
-      self.router.path_recognizes_url?(*args)
-    end
-
-    def generate_path(*args)
-      self.router.generate_path(*args)
-    end
-
-    def router
-      @router ||= ApplicationRouter.new
-    end
-
-    def initialize!
-    end
-  end
-end

data/lib/ae_page_objects/core/universe.rb

@@ -1,11 +0,0 @@
-module AePageObjects
-  module Universe
-    def self.included(target)
-      target.class_eval do
-        class << self
-          attr_accessor :page_objects_site_class
-        end
-      end
-    end
-  end
-end

data/lib/ae_page_objects/core_ext/module.rb

@@ -1,34 +0,0 @@
-# lifted from activesupport
-
-class Module
-
-  # Returns the name of the module containing this one.
-  #
-  #   M::N.parent_name # => "M"
-  def parent_name
-    unless defined? @parent_name
-      @parent_name = name =~ /::[^:]+\Z/ ? $`.freeze : nil
-    end
-    @parent_name
-  end
-
-  # Returns the module which contains this one according to its name.
-  #
-  #   module M
-  #     module N
-  #     end
-  #   end
-  #   X = M::N
-  #
-  #   M::N.parent # => M
-  #   X.parent    # => M
-  #
-  # The parent of top-level and anonymous modules is Object.
-  #
-  #   M.parent          # => Object
-  #   Module.new.parent # => Object
-  #
-  def parent
-    parent_name ? AePageObjects::Inflector.constantize(parent_name) : Object
-  end
-end

data/lib/ae_page_objects/util/inflector.rb

@@ -1,48 +0,0 @@
-module AePageObjects
-  module Inflector
-    extend self
-
-    # Ruby 1.9 introduces an inherit argument for Module#const_get and
-    # #const_defined? and changes their default behavior.
-    if Module.method(:const_get).arity == 1
-      # Tries to find a constant with the name specified in the argument string:
-      #
-      #   "Module".constantize     # => Module
-      #   "Test::Unit".constantize # => Test::Unit
-      #
-      # The name is assumed to be the one of a top-level constant, no matter whether
-      # it starts with "::" or not. No lexical context is taken into account:
-      #
-      #   C = 'outside'
-      #   module M
-      #     C = 'inside'
-      #     C               # => 'inside'
-      #     "C".constantize # => 'outside', same as ::C
-      #   end
-      #
-      # NameError is raised when the name is not in CamelCase or the constant is
-      # unknown.
-      def constantize(camel_cased_word)
-        names = camel_cased_word.split('::')
-        names.shift if names.empty? || names.first.empty?
-
-        constant = Object
-        names.each do |name|
-          constant = constant.const_defined?(name) ? constant.const_get(name) : constant.const_missing(name)
-        end
-        constant
-      end
-    else
-      def constantize(camel_cased_word) #:nodoc:
-        names = camel_cased_word.split('::')
-        names.shift if names.empty? || names.first.empty?
-
-        constant = Object
-        names.each do |name|
-          constant = constant.const_defined?(name, false) ? constant.const_get(name) : constant.const_missing(name)
-        end
-        constant
-      end
-    end
-  end
-end

data/lib/ae_page_objects/util/singleton.rb

@@ -1,22 +0,0 @@
-module AePageObjects
-  module Singleton
-
-    def instance
-      @instance ||= new
-    end
-
-    def respond_to?(*args)
-      super || instance.respond_to?(*args)
-    end
-
-    def configure(&block)
-      class_eval(&block)
-    end
-
-  protected
-
-    def method_missing(*args, &block)
-      instance.send(*args, &block)
-    end
-  end
-end