ae_page_objects 0.2.0 → 0.3.0

data/lib/ae_page_objects.rb

@@ -1,28 +1,20 @@
 require 'capybara'
 require 'capybara/dsl'
-require 'active_support'
-require 'active_support/core_ext/module/delegation'
-require 'active_support/core_ext/hash/keys'
-require 'active_support/core_ext/object/try'
-require 'active_support/core_ext/class'
-require 'active_support/core_ext/module/introspection'
 
 require 'ae_page_objects/version'
 
 module AePageObjects
   autoload :Universe,             'ae_page_objects/core/universe'
-  autoload :Singleton,            'ae_page_objects/core/singleton'
   autoload :Application,          'ae_page_objects/core/application'
   autoload :ApplicationRouter,    'ae_page_objects/core/application_router'
   autoload :RakeRouter,           'ae_page_objects/core/rake_router'
-  autoload :InternalHelpers,      'ae_page_objects/core/internal_helpers'
-  
-  module Dsl
-    autoload :Element,            'ae_page_objects/core/dsl/element'
-    autoload :Collection,         'ae_page_objects/core/dsl/collection'
-    autoload :FormFor,            'ae_page_objects/core/dsl/form_for'
-  end
-  
+  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 Concerns
     autoload :LoadEnsuring,     'ae_page_objects/concerns/load_ensuring'
     autoload :Staleable,        'ae_page_objects/concerns/staleable'
@@ -40,6 +32,9 @@ module AePageObjects
   autoload :Checkbox,          'ae_page_objects/elements/checkbox'  
 end
 
+require 'ae_page_objects/core_ext/module'
+
+
 
 
 

data/lib/ae_page_objects/concerns/load_ensuring.rb

@@ -4,8 +4,7 @@ module AePageObjects
   
   module Concerns
     module LoadEnsuring
-      extend ActiveSupport::Concern
-    
+
       def initialize(*args)
         super
         ensure_loaded!

data/lib/ae_page_objects/concerns/staleable.rb

@@ -4,8 +4,7 @@ module AePageObjects
 
   module Concerns  
     module Staleable
-      extend ActiveSupport::Concern
-  
+
       def stale?
         @stale
       end

data/lib/ae_page_objects/concerns/visitable.rb

@@ -4,8 +4,11 @@ module AePageObjects
   
   module Concerns
     module Visitable
-      extend ActiveSupport::Concern
-    
+
+      def self.included(target)
+        target.extend ClassMethods
+      end
+
     private
     
       def ensure_loaded!

data/lib/ae_page_objects/core/application.rb

@@ -1,11 +1,17 @@
 module AePageObjects
   class Application
-    include AePageObjects::Singleton
+    extend AePageObjects::Singleton
       
     class << self
       private :new
 
-      delegate :initialize!, :router=, :to => :instance
+      def initialize!
+        instance.initialize!
+      end
+
+      def router=(router)
+        instance.router = router
+      end
 
       def inherited(application_class)
         super
@@ -33,10 +39,17 @@ module AePageObjects
 
     attr_writer :router
 
-    delegate :universe, :to => 'self.class'
+    def universe
+      self.class.universe
+    end
 
-    delegate :path_recognizes_url?, :to => :router
-    delegate :generate_path,        :to => :router
+    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

data/lib/ae_page_objects/core/dsl.rb

@@ -0,0 +1,195 @@
+module AePageObjects
+  module Dsl
+    include InternalHelpers
+
+    def inherited(subclass)
+      subclass.class_eval do
+        class << self
+          def element_attributes
+            @element_attributes ||= {}
+          end
+        end
+      end
+    end
+
+    def element(name, options = {}, &block)
+      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, options, &block)
+      end
+
+      klass
+    end
+
+    # Defines a collection of elements. Blocks are evaluated on the item class used by the
+    # 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: (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: (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 ::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: (: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 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)
+    #
+    #   collection :addresses, :is => AddressList, :contains => Address do
+    #     element :longitude
+    #     element :latitude
+    #   end
+    #
+    #   Collection class: one-off subclass of AddressList
+    #   Item class:       one-off subclass of Address
+    #   Methods defined on item class:
+    #     longitude()  # -> instance of ::AePageObjects::Element
+    #     latitude() # -> instance of ::AePageObjects::Element
+    #
+    def collection(name, options = {}, &block)
+      options ||= {}
+
+      # only a collection class is specified or the item class
+      # specified matches the collection's item class
+      if ! block_given? && options[:is] && (
+      options[:contains].nil? || options[:is].item_class == options[:contains]
+      )
+        return element(name, options)
+      end
+
+      options = options.dup
+
+      # create/get the collection class
+      if options[:is]
+        ensure_class_for_param!(:is, options[:is], ::AePageObjects::Collection)
+      else
+        options[:is] = ::AePageObjects::Collection
+      end
+
+      item_class = options.delete(:contains) || options[:is].item_class
+      if block_given?
+        item_class = item_class.new_subclass(&block).tap do |new_item_class|
+          new_item_class.element_attributes.merge!(item_class.element_attributes)
+        end
+      end
+
+      # since we are creating a new item class, we need to subclass the collection class
+      # so we can parameterize the collection class with an item class
+      options[:is] = options[:is].new_subclass
+      options[:is].item_class = item_class
+
+      element(name, options)
+    end
+
+    def form_for(form_name, options = {}, &block)
+      options ||= {}
+
+      raise ArgumentError, ":is option not supported" if options[:is]
+      raise ArgumentError, "Block required." if block.nil?
+
+      klass = ::AePageObjects::Form.new_subclass(&block)
+
+      options      = options.dup
+      options[:is] = klass
+
+      element(form_name, options)
+
+      klass.element_attributes.each do |element_name, element_klazz|
+        class_eval <<-RUBY
+          def #{element_name}(*args, &block)
+            #{form_name}.#{element_name}(*args, &block)
+          end
+        RUBY
+
+        self.element_attributes[element_name] = element_klazz
+      end
+    end
+
+  private
+
+    def field_klass(options, &block)
+      klass = options.delete(:is) || ::AePageObjects::Element
+
+      if block_given?
+        klass.new_subclass(&block)
+      else
+        klass
+      end
+    end
+  end
+end

data/lib/ae_page_objects/core/rake_router.rb

@@ -5,7 +5,7 @@ module AePageObjects
     
     def initialize(rake_routes, mounted_prefix = '')
       @mounted_prefix = mounted_prefix || ""
-      @routes = ActiveSupport::OrderedHash.new
+      @routes = {}
       route_line_regex = /(\w+)(?:\s[A-Z]+)?\s+(\/.*)\(.:format\).*$/
       
       rake_routes.split("\n").each do |line|
@@ -32,11 +32,11 @@ module AePageObjects
       end
       
       if route = @routes[named_route]
-        options = args.extract_options!
+        options = args.last.is_a?(Hash) ? args.pop : {}
         route.generate_path(options)
       end
     end
-    
+
   private
   
     class Path < String
@@ -50,7 +50,7 @@ module AePageObjects
       end
       
       def generate(param_values)
-        param_values = param_values.symbolize_keys
+        param_values = HashSymbolizer.new(param_values).symbolize_keys
         @params.values.inject(self) do |path, param|
           param.substitute(path, param_values)
         end
@@ -142,7 +142,7 @@ module AePageObjects
       end
 
       def generate_path(options)
-        options = options.symbolize_keys
+        options = HashSymbolizer.new(options).symbolize_keys
         @path.generate(options)
       end
     end

data/lib/ae_page_objects/core/universe.rb

@@ -1,10 +1,10 @@
 module AePageObjects
   module Universe
-    extend ActiveSupport::Concern
-
-    included do
-      class << self
-        attr_accessor :page_objects_application_class
+    def self.included(target)
+      target.class_eval do
+        class << self
+          attr_accessor :page_objects_application_class
+        end
       end
     end
   end

data/lib/ae_page_objects/core_ext/module.rb

@@ -0,0 +1,34 @@
+# 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/element.rb

@@ -38,7 +38,12 @@ module AePageObjects
 
     def __full_name__
       if parent.respond_to?(:__full_name__)
-        [ parent.__full_name__, __name__ ].compact.presence.try(:join, '_')
+        name_parts = [ parent.__full_name__, __name__ ].compact
+        if name_parts.empty?
+          nil
+        else
+          name_parts.join('_')
+        end
       else
         __name__
       end
@@ -70,12 +75,14 @@ module AePageObjects
   
     def configure(options)
       @locator = options.delete(:locator)
-      @name    = options.delete(:name).try(:to_s)
+      @name    = options.delete(:name)
+
+      @name = @name.to_s if @name
     end
   
     def parse_options(options_or_locator)
       if options_or_locator.is_a?( Hash )
-        options_or_locator.symbolize_keys
+        HashSymbolizer.new(options_or_locator).symbolize_keys
       else
         {:locator => options_or_locator}
       end
@@ -88,7 +95,7 @@ module AePageObjects
     def scoped_node
       if @locator
         locator = eval_locator(@locator)
-        if locator.present?
+        if ! locator.empty?
           return parent.find(*locator)
         end
       end

data/lib/ae_page_objects/element_proxy.rb

@@ -27,7 +27,8 @@ module AePageObjects
     # Provided so that visible? can be asked without
     # an explicit check for present? first.
     def visible?
-      !!presence.try(:visible?)
+      inst = presence
+      ! inst.nil? && inst.visible?
     end
     
     def not_visible?
@@ -41,7 +42,7 @@ module AePageObjects
     end
 
     def present?
-      presence.present?
+      ! presence.nil?
     end
     
     def not_present?

data/lib/ae_page_objects/elements/collection.rb

@@ -1,8 +1,15 @@
 module AePageObjects
   class Collection < Element
-    class_attribute :item_class, :instance_writer => false
+    class << self
+      attr_accessor :item_class
+    end
+
     self.item_class = Element
 
+    def item_class
+      self.class.item_class
+    end
+
     def at(index, &block)
       if index >= size || index < 0
         nil

data/lib/ae_page_objects/node.rb

@@ -1,12 +1,6 @@
 module AePageObjects
   class Node
     module Methods
-      extend ActiveSupport::Concern
-
-      include Dsl::Element
-      include Dsl::Collection
-      include Dsl::FormFor
-
       def initialize(capybara_node = Capybara.current_session)
         @node = capybara_node
       end
@@ -19,20 +13,27 @@ module AePageObjects
         raise "Must implement!"
       end
 
-      delegate :current_url, :to => 'self.class'
-      delegate :current_url_without_params, :to => 'self.class'
+      def current_url
+        self.class.current_url
+      end
+
+      def current_url_without_params
+        self.class.current_url_without_params
+      end
 
-      delegate :find,     :to => :node
-      delegate :all,      :to => :node
-      delegate :value,    :to => :node
-      delegate :set,      :to => :node
-      delegate :text,     :to => :node
-      delegate :visible?, :to => :node
+      METHODS_TO_DELEGATE_TO_NODE = [:find, :all, :value, :set, :text, :visible?]
+      METHODS_TO_DELEGATE_TO_NODE.each do |m|
+        class_eval <<-RUBY
+          def #{m}(*args, &block)
+            node.send(:#{m}, *args, &block)
+          end
+        RUBY
+      end
 
     private
 
       def eval_locator(locator)
-        return unless locator
+        return [] unless locator
 
         if locator.respond_to?(:call)
           locator = instance_eval(&locator)
@@ -40,26 +41,29 @@ module AePageObjects
 
         locator.is_a?(Array) ? locator : [locator.to_s]
       end
+    end
 
-      module ClassMethods
-
-        def current_url
-          Capybara.current_session.current_url.sub(/^https?:\/\/[^\/]*/, '')
-        end
+    module ClassMethods
+      def current_url
+        Capybara.current_session.current_url.sub(/^https?:\/\/[^\/]*/, '')
+      end
 
-        def current_url_without_params
-          current_url.sub(/\?.*/, '')
-        end
+      def current_url_without_params
+        current_url.sub(/\?.*/, '')
+      end
 
-        def new_subclass(&block)
-          klass = Class.new(self)
-          klass.class_eval(&block) if block
-          klass  
-        end
+      def new_subclass(&block)
+        klass = Class.new(self)
+        klass.class_eval(&block) if block
+        klass
       end
     end
-    
+
+    extend Dsl
+
     include Methods
+    extend  ClassMethods
+
     include Concerns::LoadEnsuring
     include Concerns::Staleable
   end

data/lib/ae_page_objects/util/hash_symbolizer.rb

@@ -0,0 +1,16 @@
+module AePageObjects
+  class HashSymbolizer
+
+    def initialize(hash)
+      @hash = hash
+    end
+
+    def symbolize_keys
+      @hash.dup.tap do |hash|
+        hash.keys.each do |key|
+          hash[(key.to_sym rescue key) || key] = hash.delete(key)
+        end
+      end
+    end
+  end
+end

data/lib/ae_page_objects/util/inflector.rb

@@ -0,0 +1,48 @@
+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

@@ -0,0 +1,21 @@
+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

data/lib/ae_page_objects/version.rb

@@ -1,3 +1,3 @@
 module AePageObjects
-  VERSION = '0.2.0'.freeze
+  VERSION = '0.3.0'.freeze
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: ae_page_objects
 version: !ruby/object:Gem::Version 
-  hash: 23
+  hash: 19
   prerelease: 
   segments: 
   - 0
-  - 2
+  - 3
   - 0
-  version: 0.2.0
+  version: 0.3.0
 platform: ruby
 authors: 
 - Donnie Tognazzini
@@ -15,27 +15,12 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2013-07-05 00:00:00 Z
+date: 2013-07-08 00:00:00 Z
 dependencies: 
-- !ruby/object:Gem::Dependency 
-  type: :runtime
-  name: activesupport
-  version_requirements: &id001 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 7
-        segments: 
-        - 3
-        - 0
-        version: "3.0"
-  requirement: *id001
-  prerelease: false
 - !ruby/object:Gem::Dependency 
   type: :runtime
   name: capybara
-  version_requirements: &id002 !ruby/object:Gem::Requirement 
+  version_requirements: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -45,12 +30,12 @@ dependencies:
         - 1
         - 1
         version: "1.1"
-  requirement: *id002
+  requirement: *id001
   prerelease: false
 - !ruby/object:Gem::Dependency 
   type: :runtime
   name: nokogiri
-  version_requirements: &id003 !ruby/object:Gem::Requirement 
+  version_requirements: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -61,12 +46,12 @@ dependencies:
         - 5
         - 9
         version: 1.5.9
-  requirement: *id003
+  requirement: *id002
   prerelease: false
 - !ruby/object:Gem::Dependency 
   type: :development
   name: appraisal
-  version_requirements: &id004 !ruby/object:Gem::Requirement 
+  version_requirements: &id003 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -77,12 +62,12 @@ dependencies:
         - 5
         - 1
         version: 0.5.1
-  requirement: *id004
+  requirement: *id003
   prerelease: false
 - !ruby/object:Gem::Dependency 
   type: :development
   name: mocha
-  version_requirements: &id005 !ruby/object:Gem::Requirement 
+  version_requirements: &id004 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - "="
@@ -93,12 +78,12 @@ dependencies:
         - 13
         - 3
         version: 0.13.3
-  requirement: *id005
+  requirement: *id004
   prerelease: false
 - !ruby/object:Gem::Dependency 
   type: :development
   name: selenium-webdriver
-  version_requirements: &id006 !ruby/object:Gem::Requirement 
+  version_requirements: &id005 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -107,7 +92,7 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  requirement: *id006
+  requirement: *id005
   prerelease: false
 description: Capybara Page Objects pattern
 email: 
@@ -125,13 +110,10 @@ files:
 - lib/ae_page_objects/concerns/visitable.rb
 - lib/ae_page_objects/core/application.rb
 - lib/ae_page_objects/core/application_router.rb
-- lib/ae_page_objects/core/dsl/collection.rb
-- lib/ae_page_objects/core/dsl/element.rb
-- lib/ae_page_objects/core/dsl/form_for.rb
-- lib/ae_page_objects/core/internal_helpers.rb
+- lib/ae_page_objects/core/dsl.rb
 - lib/ae_page_objects/core/rake_router.rb
-- lib/ae_page_objects/core/singleton.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/element.rb
 - lib/ae_page_objects/element_proxy.rb
@@ -140,6 +122,10 @@ files:
 - lib/ae_page_objects/elements/form.rb
 - lib/ae_page_objects/elements/select.rb
 - lib/ae_page_objects/node.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/singleton.rb
 - lib/ae_page_objects/version.rb
 homepage: http://github.com/appfolio/ae_page_objects
 licenses: 

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

@@ -1,141 +0,0 @@
-module AePageObjects
-  module Dsl
-    module Collection
-      extend ActiveSupport::Concern
-      include Dsl::Element
-    
-      module ClassMethods
-        include InternalHelpers
-        
-        # Defines a collection of elements. Blocks are evaluated on the item class used by the 
-        # 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: (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: (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 ::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: (: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 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)
-        # 
-        #   collection :addresses, :is => AddressList, :contains => Address do
-        #     element :longitude
-        #     element :latitude
-        #   end
-        # 
-        #   Collection class: one-off subclass of AddressList
-        #   Item class:       one-off subclass of Address
-        #   Methods defined on item class:
-        #     longitude()  # -> instance of ::AePageObjects::Element
-        #     latitude() # -> instance of ::AePageObjects::Element
-        # 
-        def collection(name, options = {}, &block)
-          options ||= {}
-          
-          # only a collection class is specified or the item class
-          # specified matches the collection's item class
-          if block.blank? && options[:is] && ( 
-              options[:contains].blank? || options[:is].item_class == options[:contains] 
-            )
-            return element(name, options)
-          end
-          
-          options = options.dup
-          
-          # create/get the collection class
-          if options[:is]
-            ensure_class_for_param!(:is, options[:is], ::AePageObjects::Collection)
-          else
-            options[:is] = ::AePageObjects::Collection
-          end
-          
-          item_class = options.delete(:contains) || options[:is].item_class
-          if block.present?
-            item_class = item_class.new_subclass(&block).tap do |new_item_class|
-              new_item_class.element_attributes.merge!(item_class.element_attributes)
-            end
-          end
-          
-          # since we are creating a new item class, we need to subclass the collection class
-          # so we can parameterize the collection class with an item class
-          options[:is] = options[:is].new_subclass
-          options[:is].item_class = item_class
-        
-          element(name, options)
-        end
-      end
-    end
-  end
-end

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

@@ -1,47 +0,0 @@
-module AePageObjects
-  module Dsl
-    module Element
-      extend ActiveSupport::Concern
-    
-      module ClassMethods
-        
-        def inherited(subclass)
-          subclass.class_eval do
-            class << self
-              def element_attributes
-                @element_attributes ||= {}
-              end
-            end
-          end
-        end
-        
-        def element(name, options = {}, &block)
-          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, options, &block)
-          end
-          
-          klass
-        end
-      
-      private
-      
-        def field_klass(options, &block)
-          klass = options.delete(:is) || ::AePageObjects::Element
-          
-          if block_given?
-            klass.new_subclass(&block)
-          else
-            klass
-          end
-        end
-      end
-    end
-  end
-end

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

@@ -1,30 +0,0 @@
-module AePageObjects
-  module Dsl
-    module FormFor
-      extend ActiveSupport::Concern
-      include Dsl::Element
-    
-      module ClassMethods
-    
-        def form_for(form_name, options = {}, &block)
-          options ||= {}
-        
-          raise ArgumentError, ":is option not supported" if options[:is]
-          raise ArgumentError, "Block required." unless block.present?
-        
-          klass = ::AePageObjects::Form.new_subclass(&block)
-        
-          options      = options.dup
-          options[:is] = klass
-      
-          element(form_name, options)
-        
-          klass.element_attributes.each do |element_name, element_klazz|
-            delegate element_name, :to => form_name
-            self.element_attributes[element_name] = element_klazz
-          end
-        end
-      end
-    end
-  end
-end

data/lib/ae_page_objects/core/singleton.rb

@@ -1,25 +0,0 @@
-module AePageObjects
-  module Singleton
-    extend ActiveSupport::Concern
-
-    module ClassMethods
-      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
-end