page_magic 1.2.4 → 1.2.5.alpha1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a01cd88b94fa1511623032da51898df9c1cb9de1
-  data.tar.gz: 62713284d4126f200963f884b57e054ae617c01f
+  metadata.gz: 6ce815c4de6f42f92abe1cd4ed039a149d24b345
+  data.tar.gz: 50c30aa422018e788ba192cafae8867872cbab32
 SHA512:
-  metadata.gz: 9d2e8fc5f2b2c04d02af1117fac8ed218d35a835fcaf6b2c52d4d8543d3845678f58bb3c329ba1255cc12c6f55bd4d7c189b87c337fdffa90a70f24136fba57d
-  data.tar.gz: cb8af92ca9f20fc992a3db52be8f94e0c21d7501a84393f10b69df870b69b0825fb265076fd6099a1fb94d395b1b3341519908f3e33b74ddf218e6ec16205201
+  metadata.gz: 08563d7022df224ce434f63e29a13d4f54663720e0641ee4ea41df8b0c4d53169ac6e174b66c707898558721a7853499a247f491b14de55bf2e66c518ba4787e
+  data.tar.gz: f214be5face9359d38fff47f5ea546a76081d7dee0adac598f25e389387a39290b9e560ae426a24f55583aefb51d8ea06a1ae75df5372e597260a07e16ed77e3

data/VERSION

@@ -1 +1 @@
-1.2.4
+1.2.5.alpha1

data/lib/page_magic/element.rb

@@ -85,15 +85,20 @@ module PageMagic
         browser_element.send(method, *args)
       end
     end
+
     def method_missing(method, *args, &block)
       ElementContext.new(self).send(method, *args, &block)
     rescue ElementMissingException
-      return super unless browser_element.respond_to?(method)
-      browser_element.send(method, *args, &block)
+      begin
+        return browser_element.send(method, *args, &block) if browser_element.respond_to?(method)
+        return parent_element.send(method, *args, &block)
+      rescue NoMethodError
+        super
+      end
     end
 
     def respond_to?(*args)
-      super || element_context.respond_to?(*args) || browser_element.respond_to?(*args)
+      super || contains_element?(args.first) || browser_element.respond_to?(*args) || parent_element.respond_to?(*args)
     end
 
     # @!method session
@@ -115,6 +120,10 @@ module PageMagic
       end
     end
 
+    def contains_element?(name)
+      element_definitions.keys.include?(name)
+    end
+
     def element_context
       ElementContext.new(self)
     end

data/lib/page_magic/element_context.rb

@@ -19,6 +19,8 @@ module PageMagic
 
       builder = page_element.element_by_name(method, *args)
 
+      super unless builder
+
       prefecteched_element = builder.element
       return builder.build(prefecteched_element) if prefecteched_element
 
@@ -27,7 +29,7 @@ module PageMagic
     end
 
     def respond_to?(*args)
-      page_element.element_definitions.keys.include?(args.first)
+      page_element.respond_to?(*args) || super
     end
 
     private

data/lib/page_magic/exceptions.rb

@@ -1,34 +1,68 @@
 module PageMagic
-  class ElementMissingException < Exception
+  class ElementMissingException < RuntimeError
   end
 
-  class InvalidElementNameException < Exception
+  class InvalidElementNameException < RuntimeError
   end
 
-  class InvalidMethodNameException < Exception
+  class InvalidMethodNameException < RuntimeError
   end
 
-  class InvalidURLException < Exception
+  class InvalidURLException < RuntimeError
   end
 
-  class MatcherInvalidException < Exception
+  class MatcherInvalidException < RuntimeError
   end
 
-  class TimeoutException < Exception
+  class TimeoutException < RuntimeError
   end
 
-  class UnspportedBrowserException < Exception
+  class UnspportedBrowserException < RuntimeError
   end
 
-  class UnsupportedCriteriaException < Exception
+  class UnsupportedCriteriaException < RuntimeError
   end
 
-  class UnsupportedSelectorException < Exception
+  class UnsupportedSelectorException < RuntimeError
   end
 
-  class UndefinedSelectorException < Exception
+  class UndefinedSelectorException < RuntimeError
   end
 
-  class NotSupportedException < Exception
+  class NotSupportedException < RuntimeError
+  end
+end
+module PageMagic
+  class ElementMissingException < RuntimeError
+  end
+
+  class InvalidElementNameException < RuntimeError
+  end
+
+  class InvalidMethodNameException < RuntimeError
+  end
+
+  class InvalidURLException < RuntimeError
+  end
+
+  class MatcherInvalidException < RuntimeError
+  end
+
+  class TimeoutException < RuntimeError
+  end
+
+  class UnspportedBrowserException < RuntimeError
+  end
+
+  class UnsupportedCriteriaException < RuntimeError
+  end
+
+  class UnsupportedSelectorException < RuntimeError
+  end
+
+  class UndefinedSelectorException < RuntimeError
+  end
+
+  class NotSupportedException < RuntimeError
   end
 end

data/lib/page_magic/instance_methods.rb

@@ -33,7 +33,7 @@ module PageMagic
     end
 
     def respond_to?(*args)
-      super || element_context.respond_to?(*args)
+      contains_element?(args.first) || super
     end
 
     # @return the current page title
@@ -55,6 +55,10 @@ module PageMagic
 
     private
 
+    def contains_element?(method)
+      element_definitions.keys.include?(method)
+    end
+
     def element_context
       ElementContext.new(self)
     end

data/lib/page_magic/watcher.rb

@@ -21,7 +21,7 @@ module PageMagic
     # @param [Object] subject - subject to run watcher against
     def check(subject = nil)
       @last = if block
-                block.call
+                subject.instance_eval(&block)
               else
                 object = subject.send(name)
                 attribute ? object.send(attribute) : object

data/spec/element_spec.rb

@@ -196,7 +196,10 @@ module PageMagic
       before do
         page_class.class_eval do
           element :form_by_css, css: '.form' do
-            link(:link_in_form, text: 'a in a form')
+            def parent_method
+              :parent_method_called
+            end
+            link(:link_in_form, text: 'link in a form')
           end
         end
       end
@@ -206,8 +209,14 @@ module PageMagic
       end
 
       context 'no element definition and not a capybara method' do
-        it 'throws and exception' do
-          expect { page.form_by_css.bobbins }.to raise_exception NoMethodError
+        it 'calls method on parent element' do
+          expect(page.form_by_css.link_in_form.parent_method).to eq(:parent_method_called)
+        end
+
+        context 'method not found on parent' do
+          it 'throws and exception' do
+            expect { page.form_by_css.link_in_a_form.bobbins }.to raise_exception ElementMissingException
+          end
         end
       end
     end

data/spec/page_magic/element_context_spec.rb

@@ -84,14 +84,35 @@ module PageMagic
           described_class.new(page).prefetched
         end
       end
+
+      context 'method not found on page_element or as a element definition' do
+        it 'raises an error' do
+          expect { elements_page.missing_method }.to raise_error(NoMethodError)
+        end
+      end
     end
 
     describe '#respond_to?' do
+      let(:page_element) do
+        Class.new(Element) do
+          link(:a_link, css: '.link')
+        end
+      end
+
       subject do
-        described_class.new(elements_page.new(session))
+        described_class.new(page_element.new(session))
       end
-      it 'checks against the names of the elements passed in' do
-        expect(subject.respond_to?(:a_link)).to eq(true)
+
+      context 'page_element responds to method name' do
+        it 'returns true' do
+          expect(subject.respond_to?(:a_link)).to eq(true)
+        end
+      end
+
+      context 'method is not on page_element' do
+        it 'calls super' do
+          expect(subject.respond_to?(:methods)).to eq(true)
+        end
       end
     end
   end

data/spec/page_magic/instance_methods_spec.rb

@@ -40,7 +40,7 @@ module PageMagic
         expect(subject.respond_to?(:visit)).to eq(true)
       end
 
-      it 'checks the current page' do
+      it 'checks element definitions' do
         expect(subject.respond_to?(:next_page)).to eq(true)
       end
     end

data/spec/watcher_spec.rb

@@ -35,13 +35,25 @@ module PageMagic
       end
 
       context 'block supplied to constructor' do
+        def method_on_self(value = nil)
+          return @value unless value
+          @value = value
+        end
+
         subject do
           described_class.new(:custom_watcher) do
+            method_on_self(:called)
             :result
           end
         end
+
+        it 'is called on self' do
+          subject.check(self)
+          expect(method_on_self).to be(:called)
+        end
+
         it 'assigns last to the resut of the block' do
-          expect(subject.check.last).to eq(:result)
+          expect(subject.check(self).last).to eq(:result)
         end
       end
     end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: page_magic
 version: !ruby/object:Gem::Version
-  version: 1.2.4
+  version: 1.2.5.alpha1
 platform: ruby
 authors:
 - Leon Davis
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-06-29 00:00:00.000000000 Z
+date: 2016-07-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: capybara
@@ -194,12 +194,12 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '2.1'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.6
+rubygems_version: 2.4.8
 signing_key: 
 specification_version: 4
 summary: Framework for modeling and interacting with webpages