ae_page_objects 0.0.1.beta.6.0.0 → 0.1.0

data/lib/ae_page_objects/concerns/visitable.rb

@@ -32,13 +32,11 @@ module AePageObjects
       
         def can_load_from_current_url?
           return true if paths.empty?
-        
-          Capybara.current_session.wait_until do
-            url = current_url_without_params
-        
-            paths.any? do |path|
-              application.path_recognizes_url?(path, url)
-            end
+
+          url = current_url_without_params
+
+          paths.any? do |path|
+            application.path_recognizes_url?(path, url)
           end
         end
       

data/lib/ae_page_objects/core/application.rb

@@ -1,61 +1,42 @@
-require "active_support/dependencies"
-
 module AePageObjects
   class Application
     include Configurable
       
     class << self
-      attr_accessor :called_from
       private :new
 
-      def inherited(base)
+      delegate :initialize!, :to => :instance
+
+      def inherited(application_class)
         super
-        
-        base.called_from = begin
-          call_stack = caller.map { |p| p.sub(/:\d+.*/, '') }
-          File.dirname(call_stack.detect { |p| p !~ %r[railties[\w.-]*/lib/rails|rack[\w.-]*/lib/rack] })
-        end
-        
-        base.parent.send(:include, ConstantResolver)
-      end
-      
-      def initialize!
-        instance.initialize!
+        application_class.parent.send(:include, ConstantResolver)
       end
     end
-    
+
+    delegate :router, :to => :config
+    delegate :path_recognizes_url?, :to => :router
+    delegate :generate_path, :to => :router
+
     def initialize
-      set_autoload_paths
+      ActiveSupport::Dependencies.autoload_paths.unshift(*all_autoload_paths)
+
+      # Freeze so future modifications will fail rather than do nothing mysteriously
+      config.eager_load_paths.freeze
     end
 
     def config
-      @config ||= Configuration.new(self, find_root_with_flag("config.ru", Dir.pwd))
+      @config ||= Configuration.new(self)
     end
 
     def initialize!
       eager_load!
     end
-    
-    delegate :path_recognizes_url?, :to => :router
-    delegate :generate_path, :to => :router
-    
+
     def all_autoload_paths
-      @all_autoload_paths ||= (config.autoload_paths + config.eager_load_paths).uniq
-    end
-    
-  private
-  
-    def router
-      @router ||= config.router
+      @all_autoload_paths ||= config.eager_load_paths.uniq
     end
-    
-    def set_autoload_paths
-      ActiveSupport::Dependencies.autoload_paths.unshift(*all_autoload_paths)
 
-      # Freeze so future modifications will fail rather than do nothing mysteriously
-      config.autoload_paths.freeze
-      config.eager_load_paths.freeze
-    end
+  private
 
     def eager_load!
       config.eager_load_paths.each do |load_path|
@@ -67,19 +48,5 @@ module AePageObjects
         end
       end
     end
-
-    def find_root_with_flag(flag, default=nil)
-      root_path = self.class.called_from
-
-      while root_path && File.directory?(root_path) && !File.exist?("#{root_path}/#{flag}")
-        parent = File.dirname(root_path)
-        root_path = parent != root_path && parent
-      end
-
-      root = File.exist?("#{root_path}/#{flag}") ? root_path : default
-      raise "Could not find root path for #{self}" unless root
-      
-      Pathname.new(root).realpath
-    end
   end
 end

data/lib/ae_page_objects/core/application_router.rb

@@ -11,6 +11,7 @@ module AePageObjects
             return true if route.name.to_s == path.to_s
           end
         end
+        false
       end
     end
 

data/lib/ae_page_objects/core/configuration.rb

@@ -1,28 +1,13 @@
-require 'rails/paths'
-
 module AePageObjects
   class Configuration
     attr_writer :router
     
-    def initialize(application, root)
+    def initialize(application)
       @application = application
-      @root        = root
     end
 
-    def paths
-      @paths ||= begin
-        paths = Rails::Paths::Root.new(@root)
-        paths.add "test/page_objects", :eager_load => true
-        paths
-      end
-    end
-    
     def eager_load_paths
-      @eager_load_paths ||= paths.eager_load
-    end
-    
-    def autoload_paths
-      @autoload_paths ||= paths.autoload_paths
+      @eager_load_paths ||= ["test/page_objects"]
     end
     
     def router

data/lib/ae_page_objects/core/dsl/collection.rb

@@ -11,74 +11,82 @@ module AePageObjects
         # collection. collection() defines a method on the class that returns an instance of a collection
         # class which contains instances of the collection's item class.
         #
-        # Supported signatures are described below. 
-        # 
-        # ------------------------------------------------        
-        # Signature: (:is, no :contains, no block)
-        # 
-        #     collection :addresses, :is => AddressList
-        # 
-        #   Collection class: AddressList
-        #   Item class:       AddressList.item_class
-        # 
-        # ------------------------------------------------
-        # Signature: (no :is, :contains, no block)
-        # 
-        #     collection :addresses, :contains => Address
-        # 
-        #   Collection class: one-off subclass of ::AePageObjects::Collection  
-        #   Item class:       Address
-        # 
+        # Supported signatures are described below.
+        #
         # ------------------------------------------------
-        # Signature: (:is, :contains, no block)
-        # 
-        #     collection :addresses, :is => AddressList, :contains => ExtendedAddress
-        # 
-        #   Collection class: one-off subclass ofAddressList
-        #   Item class:       ExtendedAddress
-        #   
+        # Signature: (no :is, no :contains, no block)
+        #
+        #     collection :addresses
+        #
+        #   Collection class: ::AePageObjects::Collection
+        #   Item class:       ::AePageObjects::Element
+        #
         # ------------------------------------------------
         # Signature: (no :is, no :contains, block)
-        # 
+        #
         #     collection :addresses do
         #       element :city
         #       element :state
         #     end
-        #   
+        #
         #   Collection class: one-off subclass of ::AePageObjects::Collection
         #   Item class:       one-off subclass of ::AePageObjects::Element
         #   Methods defined on item class:
         #     city()  # -> instance of ::AePageObjects::Element
         #     state() # -> instance of ::AePageObjects::Element
-        # 
+        #
         # ------------------------------------------------
-        # Signature: (:is, no :contains, block)
-        # 
-        #   collection :addresses, :is => AddressList do
+        # Signature: (no :is, :contains, no block)
+        #
+        #     collection :addresses, :contains => Address
+        #
+        #   Collection class: one-off subclass of ::AePageObjects::Collection
+        #   Item class:       Address
+        #
+        # ------------------------------------------------
+        # Signature: (no :is, :contains, block)
+        #
+        #   collection :addresses, :contains => Address do
         #     element :longitude
         #     element :latitude
         #   end
-        # 
-        #   Collection class: one-off subclass of AddressList  
-        #   Item class:       one-off subclass of AddressList.item_class
+        #
+        #   Collection class: one-off subclass of ::AePageObjects::Collection  element
+        #   Item class:       one-off subclass of Address
         #   Methods defined on item class:
         #     longitude()  # -> instance of ::AePageObjects::Element
         #     latitude() # -> instance of ::AePageObjects::Element
-        # 
+        #
         # ------------------------------------------------
-        # Signature: (no :is, :contains, block)
-        # 
-        #   collection :addresses, :contains => Address do
+        # Signature: (:is, no :contains, no block)
+        #
+        #     collection :addresses, :is => AddressList
+        #
+        #   Collection class: AddressList
+        #   Item class:       AddressList.item_class
+        #
+        # ------------------------------------------------
+        # Signature: (:is, no :contains, block)
+        #
+        #   collection :addresses, :is => AddressList do
         #     element :longitude
         #     element :latitude
         #   end
-        # 
-        #   Collection class: one-off subclass of ::AePageObjects::Collection  element
-        #   Item class:       one-off subclass of Address
+        #
+        #   Collection class: one-off subclass of AddressList
+        #   Item class:       one-off subclass of AddressList.item_class
         #   Methods defined on item class:
         #     longitude()  # -> instance of ::AePageObjects::Element
         #     latitude() # -> instance of ::AePageObjects::Element
+        #
+        # ------------------------------------------------
+        # Signature: (:is, :contains, no block)
         # 
+        #     collection :addresses, :is => AddressList, :contains => ExtendedAddress
+        # 
+        #   Collection class: one-off subclass ofAddressList
+        #   Item class:       ExtendedAddress
+        #   
         # ------------------------------------------------
         # Signature: (:is, :contains, block)
         # 
@@ -111,8 +119,6 @@ module AePageObjects
             ensure_class_for_param!(:is, options[:is], ::AePageObjects::Collection)
           else
             options[:is] = ::AePageObjects::Collection
-            
-            raise ArgumentError, "Must specify either a block or a :contains option." if options[:contains].blank? && block.blank?
           end
           
           item_class = options.delete(:contains) || options[:is].item_class

data/lib/ae_page_objects/core/dsl/element.rb

@@ -16,13 +16,15 @@ module AePageObjects
         end
         
         def element(name, options = {}, &block)
-          options = options.dup 
+          options = options.dup
+          options[:name] ||= name
+
           klass   = field_klass(options, &block)
           
           self.element_attributes[name.to_sym] = klass
         
           define_method name do |&block|
-            ElementProxy.new(klass, self, name, options, &block)
+            ElementProxy.new(klass, self, options, &block)
           end
           
           klass

data/lib/ae_page_objects/core/rake_router.rb

@@ -92,8 +92,10 @@ module AePageObjects
     
     class Param < Struct.new(:name, :optional)
       include Comparable
-      
-      alias :optional? :optional
+
+      def optional?
+        optional
+      end
       
       def <=>(other)
         name.to_s <=> other.name.to_s

data/lib/ae_page_objects/element.rb

@@ -1,14 +1,23 @@
 module AePageObjects
   class Element < Node
-    attr_reader :parent, :default_name
+    attr_reader :parent
     
-    def initialize(parent, name, options_or_locator = {})
+    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
-      @default_name = name.to_s
       @locator      = nil
       @name         = nil
       
       configure(parse_options(options_or_locator))
+
+      raise ArgumentError, ":name or :locator is required" unless @name || @locator
       
       @locator ||= default_locator
       
@@ -26,26 +35,30 @@ module AePageObjects
         node
       end
     end
-    
+
     def __full_name__
       if parent.respond_to?(:__full_name__)
-        "#{parent.__full_name__}_#{__name__}"
+        [ parent.__full_name__, __name__ ].compact.join('_')
       else
         __name__
       end
     end
-    
-    alias_method :full_name, :__full_name__
-    
+
+    def full_name
+      __full_name__
+    end
+
     def __name__
-      @name || default_name
+      @name
+    end
+
+    def name
+      __name__
     end
-    
-    alias_method :name, :__name__
     
     def to_s
       super.tap do |str|
-        str << "#name:<#{__name__}>"
+        str << "@name:<#{@name}>; #@locator:<#{@locator}>"
       end
     end
     

data/lib/ae_page_objects/element_proxy.rb

@@ -30,14 +30,28 @@ module AePageObjects
       !!presence.try(:visible?)
     end
     
+    def not_visible?
+      Capybara.current_session.wait_until do
+        Capybara.using_wait_time(0) do
+          ! visible?
+        end
+      end
+    rescue Capybara::TimeoutError
+      false  
+    end
+
     def present?
       presence.present?
     end
     
-    def not_present?(timeout = 0)
-      Capybara.using_wait_time(timeout) do
-        ! present?
+    def not_present?
+      Capybara.current_session.wait_until do
+        Capybara.using_wait_time(0) do
+          ! present?
+        end
       end
+    rescue Capybara::TimeoutError
+      false
     end
     
     def presence
@@ -49,7 +63,10 @@ module AePageObjects
     def is_a?(type)
       type == @element_class || type == ElementProxy
     end
-    alias_method :kind_of?, :is_a?
+
+    def kind_of?(type)
+      is_a?(type)
+    end
             
     def method_missing(name, *args, &block)
       if name == "class"

data/lib/ae_page_objects/elements/collection.rb

@@ -7,11 +7,13 @@ module AePageObjects
       if index >= size || index < 0
         nil
       else
-        self.item_class.new(self, index, [:xpath, "#{row_xpath}[#{index + 1}]"], &block)
+        self.item_class.new(self, :name => index, :locator => [:xpath, "#{row_xpath}[#{index + 1}]"], &block)
       end
     end
-    
-    alias_method :[], :at
+
+    def [](index, &block)
+      at(index, &block)
+    end
     
     def each(&block)
       (0..(size - 1)).each do |index|

data/lib/ae_page_objects/node.rb

@@ -56,12 +56,6 @@ module AePageObjects
           klass.class_eval(&block) if block
           klass  
         end
-
-        def new(*args)
-          super(*args).tap do |me|
-            yield me if block_given?
-          end
-        end
       end
     end
     

data/lib/ae_page_objects/version.rb

@@ -1,3 +1,3 @@
 module AePageObjects
-  VERSION = '0.0.1.beta.6.0.0'.freeze
+  VERSION = '0.1.0'.freeze
 end

metadata

@@ -1,17 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: ae_page_objects
 version: !ruby/object:Gem::Version 
-  hash: -9661606936
-  prerelease: 6
+  hash: 27
+  prerelease: 
   segments: 
   - 0
-  - 0
   - 1
-  - beta
-  - 6
-  - 0
   - 0
-  version: 0.0.1.beta.6.0.0
+  version: 0.1.0
 platform: ruby
 authors: 
 - Donnie Tognazzini
@@ -19,12 +15,12 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2013-01-08 00:00:00 Z
+date: 2013-05-24 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
+  type: :runtime
   name: activesupport
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  version_requirements: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -35,28 +31,12 @@ dependencies:
         - 0
         - 0
         version: 3.0.0
-  type: :runtime
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: railties
+  requirement: *id001
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 7
-        segments: 
-        - 3
-        - 0
-        - 0
-        version: 3.0.0
-  type: :runtime
-  version_requirements: *id002
 - !ruby/object:Gem::Dependency 
+  type: :runtime
   name: capybara
-  prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  version_requirements: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -66,12 +46,12 @@ dependencies:
         - 1
         - 1
         version: "1.1"
-  type: :runtime
-  version_requirements: *id003
+  requirement: *id002
+  prerelease: false
 - !ruby/object:Gem::Dependency 
+  type: :development
   name: appraisal
-  prerelease: false
-  requirement: &id004 !ruby/object:Gem::Requirement 
+  version_requirements: &id003 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -82,28 +62,28 @@ dependencies:
         - 5
         - 1
         version: 0.5.1
-  type: :development
-  version_requirements: *id004
+  requirement: *id003
+  prerelease: false
 - !ruby/object:Gem::Dependency 
+  type: :development
   name: mocha
-  prerelease: false
-  requirement: &id005 !ruby/object:Gem::Requirement 
+  version_requirements: &id004 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
-        hash: 43
+        hash: 45
         segments: 
         - 0
-        - 9
-        - 8
-        version: 0.9.8
-  type: :development
-  version_requirements: *id005
+        - 13
+        - 3
+        version: 0.13.3
+  requirement: *id004
+  prerelease: false
 - !ruby/object:Gem::Dependency 
+  type: :development
   name: selenium-webdriver
-  prerelease: false
-  requirement: &id006 !ruby/object:Gem::Requirement 
+  version_requirements: &id005 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -112,8 +92,8 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  type: :development
-  version_requirements: *id006
+  requirement: *id005
+  prerelease: false
 description: Capybara Page Objects pattern
 email: 
 - engineering@appfolio.com
@@ -177,7 +157,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.8.24
+rubygems_version: 1.8.25
 signing_key: 
 specification_version: 3
 summary: Capybara Page Objects pattern