ae_page_objects 0.0.1.beta.5 → 0.0.1.beta.6.0.0

data/lib/ae_page_objects.rb

@@ -22,7 +22,6 @@ module AePageObjects
   
   module Dsl
     autoload :Element,            'ae_page_objects/core/dsl/element'
-    autoload :NestedElement,      'ae_page_objects/core/dsl/nested_element'
     autoload :Collection,         'ae_page_objects/core/dsl/collection'
     autoload :FormFor,            'ae_page_objects/core/dsl/form_for'
   end
@@ -38,7 +37,6 @@ module AePageObjects
   autoload :Element,           'ae_page_objects/element'
   autoload :ElementProxy,      'ae_page_objects/element_proxy'
   
-  autoload :HasOne,            'ae_page_objects/elements/has_one'
   autoload :Collection,        'ae_page_objects/elements/collection'
   autoload :Form,              'ae_page_objects/elements/form'
   autoload :Select,            'ae_page_objects/elements/select'

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

@@ -15,9 +15,9 @@ module AePageObjects
           end
         end
         
-        def element(name, options = {})
-          options = options.dup
-          klass   = field_klass(options)
+        def element(name, options = {}, &block)
+          options = options.dup 
+          klass   = field_klass(options, &block)
           
           self.element_attributes[name.to_sym] = klass
         
@@ -30,13 +30,13 @@ module AePageObjects
       
       private
       
-        def field_klass(options)
-          field_type = options.delete(:is)
-        
-          if field_type.is_a? Class
-            field_type
+        def field_klass(options, &block)
+          klass = options.delete(:is) || ::AePageObjects::Element
+          
+          if block_given?
+            klass.new_subclass(&block)
           else
-            ::AePageObjects::Element
+            klass
           end
         end
       end

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

@@ -19,9 +19,9 @@ module AePageObjects
       
           element(form_name, options)
         
-          klass.element_attributes.each do |node_name, node_klazz|
-            delegate node_name, :to => form_name
-            self.element_attributes[node_name] = node_klazz
+          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

data/lib/ae_page_objects/elements/collection.rb

@@ -1,5 +1,5 @@
 module AePageObjects
-  class Collection < HasOne
+  class Collection < Element
     class_attribute :item_class, :instance_writer => false
     self.item_class = Element
 

data/lib/ae_page_objects/node.rb

@@ -4,7 +4,6 @@ module AePageObjects
       extend ActiveSupport::Concern
 
       include Dsl::Element
-      include Dsl::NestedElement
       include Dsl::Collection
       include Dsl::FormFor
 

data/lib/ae_page_objects/version.rb

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

metadata

@@ -1,15 +1,17 @@
 --- !ruby/object:Gem::Specification 
 name: ae_page_objects
 version: !ruby/object:Gem::Version 
-  hash: -1687695904
+  hash: -9661606936
   prerelease: 6
   segments: 
   - 0
   - 0
   - 1
   - beta
-  - 5
-  version: 0.0.1.beta.5
+  - 6
+  - 0
+  - 0
+  version: 0.0.1.beta.6.0.0
 platform: ruby
 authors: 
 - Donnie Tognazzini
@@ -17,7 +19,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2013-01-04 00:00:00 Z
+date: 2013-01-08 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: activesupport
@@ -135,7 +137,6 @@ files:
 - 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/dsl/nested_element.rb
 - lib/ae_page_objects/core/internal_helpers.rb
 - lib/ae_page_objects/core/rake_router.rb
 - lib/ae_page_objects/document.rb
@@ -144,7 +145,6 @@ files:
 - lib/ae_page_objects/elements/checkbox.rb
 - lib/ae_page_objects/elements/collection.rb
 - lib/ae_page_objects/elements/form.rb
-- lib/ae_page_objects/elements/has_one.rb
 - lib/ae_page_objects/elements/select.rb
 - lib/ae_page_objects/node.rb
 - lib/ae_page_objects/version.rb

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

@@ -1,24 +0,0 @@
-module AePageObjects
-  module Dsl
-    module NestedElement
-      extend ActiveSupport::Concern
-      include Dsl::Element
-    
-      module ClassMethods
-        
-        def element(name, options = {}, &block)
-          raise ArgumentError, ":is option and block not supported together" if options[:is].present? && block_given?
-          
-          if block_given?
-            klass = ::AePageObjects::HasOne.new_subclass(&block)
-            
-            options = options.dup
-            options[:is] = klass
-          end
-          
-          super(name, options)
-        end
-      end
-    end
-  end
-end

data/lib/ae_page_objects/elements/has_one.rb

@@ -1,11 +0,0 @@
-module AePageObjects
-  class HasOne < Element
-    def __full_name__
-      if parent.respond_to?(:__full_name__)
-        "#{parent.__full_name__}_#{__name__}_attributes"
-      else
-        "#{__name__}_attributes"
-      end
-    end
-  end
-end