page_magic 1.0.0.alpha6 → 1.0.0.alpha7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6e0a158fa38987dd01a9bbaf40198b81caa6d3ee
-  data.tar.gz: 67aacda193709e3afd2478e75560238b88507c76
+  metadata.gz: 41a82b83827dad40deb585e1dbf95b666630dfa4
+  data.tar.gz: 15441bd24c7ebb9ca36b8c62254e5db21874ea63
 SHA512:
-  metadata.gz: a9bc3934674edb7855550fdc421f6f9a9188839b909689e95abeb5884cc0e8bb2a4fe055a00a2a35e49fa7e95280d69e9fc20452da2f1810fe761341b964669c
-  data.tar.gz: c600d28f6ac0ef148d964bcad5cd6318d12c53c82b59d3657b9172b98ca9fcce0e78a2579b3812c1a6e1726c93db7a308ddee42a88b4b570597bcb3ce9ab8096
+  metadata.gz: 169bccf3af8aabefb37196e9b609cf6ba4839a4ad5e002caa4b21c8000c9683523112c595426bc13cd7e32a3c343ce789dc081fb4743489615c5d1b5fb3f1b52
+  data.tar.gz: 57fc09f6c058bb04b39a7a78d18865946f81959a36621a22d0b89012cdd59270c91dae7900df94b5c543b7c1ae2e90ca4d58f90ad09a6d767addc60dfbf4731c

data/VERSION

@@ -1 +1 @@
-1.0.0.alpha6
+1.0.0.alpha7

data/lib/page_magic/elements.rb

@@ -41,19 +41,23 @@ module PageMagic
             options[:browser_element] = object
           end
 
-          add_element_definition(name) do |*args_for_block|
-            page_section = PageMagic::Element.new name, args_for_block.delete_at(0), options
-            page_section.expand *args_for_block, &(block || proc {})
-            page_section
+          add_element_definition(name) do |*e_args|
+            Element.new(name, e_args.delete_at(0), options).tap do |section|
+              section.expand(*e_args, &(block || proc {}))
+            end
           end
 
-        elsif first_arg < PageMagic::Element
-          section_class, name, selector = args
+        elsif first_arg < Element
+          section_class = args.delete_at(0)
 
-          unless selector
-            selector = section_class.selector
-            name = section_class.name.demodulize.to_snake_case.to_sym
-          end
+          selector = args.find{|arg| arg.is_a?(Hash)}
+          args.delete(selector)
+
+          name = args.last
+
+          selector = section_class.selector unless selector
+
+          name = section_class.name.demodulize.to_snake_case.to_sym unless name
 
           add_element_definition(name) do |parent_browser_element|
             section_class.new(name, parent_browser_element, type: :section, selector: (selector || section_class.selector))

data/spec/page_magic/elements_spec.rb

@@ -5,7 +5,7 @@ describe PageMagic::Elements do
     end
   end
 
-  let(:selector) { { id: 'id' } }
+  let(:selector) { {id: 'id'} }
   let(:browser_element) { double('browser_element', find: :browser_element) }
   let(:parent_page_element) do
     double('parent_page_element', browser_element: browser_element)
@@ -25,12 +25,13 @@ describe PageMagic::Elements do
         Class.new(PageMagic::Element) do
           def ==(other)
             other.name == name &&
-              other.browser_element == browser_element
+                other.browser_element == browser_element
           end
         end
       end
 
       context 'using a predefined class' do
+
         it 'should add a section' do
           expected_section = section_class.new(:page_section, parent_page_element, type: :section, selector: selector)
 
@@ -38,11 +39,33 @@ describe PageMagic::Elements do
           page_elements.elements(parent_page_element).first.should == expected_section
         end
 
+        describe 'selector' do
+          it 'uses the supplied selector' do
+            page_elements.section section_class, :alias, selector
+            expect(page_elements.elements(parent_page_element).first.selector).to eq(selector)
+          end
+
+          context 'with no selector supplied' do
+            it 'defaults the selector to the one on the class' do
+              section_class.selector selector
+              page_elements.section section_class, :alias
+              expect(page_elements.elements(parent_page_element).first.selector).to eq(selector)
+            end
+          end
+        end
+
         context 'name' do
-          it 'should default to the name of the class if one is not supplied' do
-            section_class.stub(:name).and_return('PageSection')
-            page_elements.section section_class, selector
-            page_elements.elements(parent_page_element).first.name.should == :page_section
+          context 'with no name supplied' do
+            it 'should default to the name of the class if one is not supplied' do
+              section_class.stub(:name).and_return('PageSection')
+              page_elements.section section_class, selector
+              page_elements.elements(parent_page_element).first.name.should == :page_section
+            end
+          end
+
+          it 'should use the supplied name' do
+            page_elements.section section_class, :alias, selector
+            expect(page_elements.elements(parent_page_element).first.name).to eq(:alias)
           end
         end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: page_magic
 version: !ruby/object:Gem::Version
-  version: 1.0.0.alpha6
+  version: 1.0.0.alpha7
 platform: ruby
 authors:
 - Leon Davis
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-09-18 00:00:00.000000000 Z
+date: 2015-09-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: capybara