ae_page_objects 2.0.0.beta3 → 2.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: af66a2c786218a814f14fd33c4c565fd5dd5326e
-  data.tar.gz: 3a75738d3b40ed53f93362381404cfd058e5ec27
+  metadata.gz: 07b1aa2d9ab91e3a68f304324dd9dc0cdcbebed7
+  data.tar.gz: 13159dd12b104dc829e8c6450abd1c2424e008ef
 SHA512:
-  metadata.gz: 265b3d6d7837809c42e4dc79d3f1869d51707f90bd6efa97ed91b31ca783ebf60186d4a6468a6b09ba5f7b4a2bfb930f07683fcf2d9ffd3712447592c279c4bd
-  data.tar.gz: ef0f45f8e1c6103a5f9a9f8a3d6f189a0753c2a8e3aaef012de27e6f957f7da949517a75cfdf14047d6eefdab769b9c74cd1b25c1bd6e7609703d798509516aa
+  metadata.gz: a3b15a9735cd27e4469fdb91e9e2b45915be6c3d25be77245c1ec029f299d68052d441a474276a4ecef78674c5bf285f9fca238f8d51d0f9d0b697fa6e24c7b6
+  data.tar.gz: d0a87ab50beee65b9354a637cb6f66a7e0e350750548dac3ada72be78dac3b557921fb980714f4d8e9c62108c22b9d35f3529aa85c805c13073fcdd5ea97a826

data/lib/ae_page_objects/core/dsl.rb

@@ -16,18 +16,23 @@ module AePageObjects
     end
 
     def element(name, options = {}, &block)
-      options = options.dup
+      options        = options.dup
       options[:name] ||= name
+      options[:is]   ||= Element
+
+      if block_given?
+        options[:is] = Class.new(options[:is], &block)
+      end
 
-      klass   = field_klass(options, &block)
+      element_class = options[:is]
 
-      self.element_attributes[name.to_sym] = klass
+      self.element_attributes[name.to_sym] = element_class
 
       define_method name do
-        ElementProxy.new(klass, self, options)
+        self.element(options)
       end
 
-      klass
+      element_class
     end
 
     # Defines a collection of elements. Blocks are evaluated on the item class used by the
@@ -182,17 +187,5 @@ module AePageObjects
         self.element_attributes[element_name] = element_klazz
       end
     end
-
-  private
-
-    def field_klass(options, &block)
-      klass = options.delete(:is) || Element
-
-      if block_given?
-        Class.new(klass, &block)
-      else
-        klass
-      end
-    end
   end
 end

data/lib/ae_page_objects/elements/collection.rb

@@ -57,7 +57,7 @@ module AePageObjects
     end
 
     def item_at(index)
-      ElementProxy.new(item_class_at(index), self, :name => index, :locator => item_locator_at(index))
+      element(is: item_class_at(index), name: index, locator: item_locator_at(index))
     end
 
     def item_class_at(index)

data/lib/ae_page_objects/node.rb

@@ -60,6 +60,18 @@ module AePageObjects
       RUBY
     end
 
+    def element(options_or_locator)
+      options = if options_or_locator.is_a?(Hash)
+                  options_or_locator.dup
+                else
+                  {:locator => options_or_locator}
+                end
+
+      element_class = options.delete(:is) || Element
+
+      ElementProxy.new(element_class, self, options)
+    end
+
     private
 
     def eval_locator(locator)

data/lib/ae_page_objects/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ae_page_objects
 version: !ruby/object:Gem::Version
-  version: 2.0.0.beta3
+  version: 2.0.0
 platform: ruby
 authors:
 - Donnie Tognazzini
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-06-07 00:00:00.000000000 Z
+date: 2016-06-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: capybara
@@ -75,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: 1.3.1
+      version: '0'
 requirements: []
 rubyforge_project: 
 rubygems_version: 2.4.3