page_magic 0.9.6 → 0.10.0

data/VERSION

@@ -1 +1 @@
-0.9.6
+0.10.0

data/lib/page_magic/elements.rb

@@ -60,8 +60,15 @@ module PageMagic
             end
 
             page_section.parent_browser_element = parent_browser_element.browser_element
-            page_section.selector selector if selector
 
+            case selector
+              when Hash
+                page_section.selector selector
+              else
+                page_section.browser_element = selector
+            end
+
+            block = block || Proc.new{}
             page_section.class_exec *args_for_section, &block
             page_section.new(parent_browser_element, name, selector)
           end
@@ -86,4 +93,4 @@ module PageMagic
       @element_definitions ||= {}
     end
   end
-end
+end

data/lib/page_magic/section.rb

@@ -5,13 +5,15 @@ module PageMagic
       def locate_in browser_element, selector
         method, selector = selector.to_a.flatten
         case method
-                             when :id
-                               browser_element.find("##{selector}")
-                             when :css
-                               browser_element.find(:css, selector)
-                             else
-                               raise UnsupportedSelectorException
-                           end
+          when :id
+            browser_element.find("##{selector}")
+          when :css
+            browser_element.find(:css, selector)
+          when :xpath
+            browser_element.find(:xpath, selector)
+          else
+            raise UnsupportedSelectorException
+        end
       end
     end
     class UndefinedSelectorException < Exception
@@ -45,10 +47,12 @@ module PageMagic
             @selector = selector
             @parent_page_element = parent_page_element
 
-            @selector = selector ? selector : self.class.selector
+            @selector = selector.is_a?(Hash) ? selector : self.class.selector
+
+            @browser_element = self.class.browser_element
+            raise UndefinedSelectorException, "Pass a selector to the constructor/define one the class" unless @selector || @browser_element
 
-            raise UndefinedSelectorException, "Pass a selector to the constructor/define one the class" unless @selector
-            @browser_element = locate_in(@parent_page_element.browser_element, @selector)
+            @browser_element = locate_in(@parent_page_element.browser_element, @selector) unless @browser_element
             if name
               @name = name
             else
@@ -98,4 +102,4 @@ module PageMagic
 
 
   end
-end
+end

data/page_magic.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "page_magic"
-  s.version = "0.9.6"
+  s.version = "0.10.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Leon Davis"]
-  s.date = "2013-11-17"
+  s.date = "2013-12-16"
   s.description = "Framework for modeling and interacting with webpages which wraps capybara"
   s.email = "info@lad-tech.com"
   s.extra_rdoc_files = [

data/spec/elements_spec.rb

@@ -51,7 +51,8 @@ describe PageMagic::Elements do
 
         def == object
           object.class.is_a?(PageMagic::Section) &&
-              object.name == self.name
+              object.name == self.name &&
+              object.browser_element == self.browser_element
         end
       end
     end
@@ -84,80 +85,98 @@ describe PageMagic::Elements do
       end
     end
 
-    context 'using a class as a definition' do
-      it 'should add a section' do
-        page_elements.section section_class, :page_section, selector
-        page_elements.elements(parent_page_element).first.should == section_class.new(parent_page_element, :page_section, selector)
+    describe 'definition' do
+
+
+      context 'using a class as a definition' do
+        it 'should add a section' do
+          page_elements.section section_class, :page_section, selector
+          page_elements.elements(parent_page_element).first.should == section_class.new(parent_page_element, :page_section, selector)
+        end
       end
-    end
 
-    context 'using a block to define a section inline' do
+      it 'should not require a block' do
+        expect { page_elements.section :page_section, :object }.not_to raise_exception
+      end
 
-      context 'browser_element' do
-        before :each do
+      context 'an object that has already been found' do
+        it 'should add a section' do
+          page_elements.section :page_section, :object
 
-          @browser, @element, @parent_page_element = double('browser'), double('element'), double('parent_page_element')
-          @parent_page_element.stub(:browser_element).and_return(@browser)
-          @browser.should_receive(:find).with(:css, :selector).twice.and_return(@element)
+          section_class.browser_element = :object
+          expected_section = section_class.new(parent_page_element, :page_section, nil)
+          expected_section.should == page_elements.elements(parent_page_element).first
         end
+      end
 
-        it 'should be assigned when selector is passed to section method' do
-          element = @element
 
-          page_elements.section :page_section, css: :selector do
-            browser_element.should == element
+      context 'using a block to define a section inline' do
+
+        context 'browser_element' do
+          before :each do
+
+            @browser, @element, @parent_page_element = double('browser'), double('element'), double('parent_page_element')
+            @parent_page_element.stub(:browser_element).and_return(@browser)
+            @browser.should_receive(:find).with(:css, :selector).and_return(@element)
           end
 
-          page_elements.element_definitions[:page_section].call(@parent_page_element)
-        end
+          it 'should be assigned when selector is passed to section method' do
+            element = @element
 
-        it 'should be assigned when selector is defined in the block passed to the section method' do
-          element = @element
+            page_elements.section :page_section, css: :selector do
+              browser_element.should == element
+            end
 
-          page_elements.section :page_section do
-            browser_element.should == nil
-            selector css: :selector
-            browser_element.should == element
+            page_elements.element_definitions[:page_section].call(@parent_page_element)
           end
 
-          page_elements.elements(@parent_page_element, nil)
+          it 'should be assigned when selector is defined in the block passed to the section method' do
+            element = @element
+
+            page_elements.section :page_section do
+              browser_element.should == nil
+              selector css: :selector
+              browser_element.should == element
+            end
+
+            page_elements.elements(@parent_page_element, nil)
+          end
         end
-      end
 
-      it 'should raise an exception if the selector is not passed' do
+        it 'should raise an exception if the selector is not passed' do
 
-        arg, browser, element = {}, double('browser'), double('element')
-        parent_page_element = double('parent_browser_element', browser_element: browser)
+          arg, browser, element = {}, double('browser'), double('element')
+          parent_page_element = double('parent_browser_element', browser_element: browser)
 
-        page_elements.section :page_section, nil do
-        end
+          page_elements.section :page_section, nil
 
-        expect { page_elements.elements(parent_page_element, arg) }.to raise_error(PageMagic::Section::UndefinedSelectorException)
-      end
+          expect { page_elements.elements(parent_page_element, arg) }.to raise_error(PageMagic::Section::UndefinedSelectorException)
+        end
 
 
+        it 'should pass args through to the block' do
+          page_elements.section :page_section, css: '.blah' do |arg|
+            arg[:passed_through] = true
+          end
 
-      it 'should pass args through to the block' do
-        page_elements.section :page_section, css: '.blah' do |arg|
-          arg[:passed_through] = true
+          arg, browser = {}, double('browser', find: :browser_element)
+          parent_page_element = double('parent_browser_element', browser_element: browser)
+          page_elements.elements(parent_page_element, arg)
+          arg[:passed_through].should be_true
         end
 
-        arg, browser = {}, double('browser', find: :browser_element)
-        parent_page_element = double('parent_browser_element', browser_element: browser)
-        page_elements.elements(parent_page_element, arg)
-        arg[:passed_through].should be_true
       end
 
-    end
-
-    it 'should return your a copy of the core definition' do
-      page_elements.section section_class, :page_section, selector
-      first = page_elements.element_definitions[:page_section].call(parent_page_element)
-      second = page_elements.element_definitions[:page_section].call(parent_page_element)
-      first.should_not equal(second)
+      it 'should return your a copy of the core definition' do
+        page_elements.section section_class, :page_section, selector
+        first = page_elements.element_definitions[:page_section].call(parent_page_element)
+        second = page_elements.element_definitions[:page_section].call(parent_page_element)
+        first.should_not equal(second)
+      end
     end
   end
 
+
   describe 'restrictions' do
     it 'should not allow method names that match element names' do
       expect do

data/spec/section_spec.rb

@@ -47,6 +47,11 @@ describe PageMagic::Section do
         section.selector css: '.form'
         section.browser_element[:id].should == 'form'
       end
+
+      it 'should find by xpath' do
+        section.selector xpath: '//div'
+        section.browser_element[:id].should == 'form'
+      end
     end
   end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: page_magic
 version: !ruby/object:Gem::Version
-  version: 0.9.6
+  version: 0.10.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-11-17 00:00:00.000000000 Z
+date: 2013-12-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: capybara
@@ -125,7 +125,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -3173894650534542993
+      hash: 537336402356197264
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: