page_magic 1.0.0.alpha4 → 1.0.0.alpha5

data/lib/page_magic/session.rb

@@ -3,11 +3,11 @@ module PageMagic
   class Session
     attr_accessor :current_page, :raw_session, :transitions
 
-    def initialize browser
+    def initialize(browser)
       @raw_session = browser
     end
 
-    def define_page_mappings transitions
+    def define_page_mappings(transitions)
       @transitions = transitions
     end
 
@@ -19,23 +19,13 @@ module PageMagic
       @current_page
     end
 
-    def find_mapped_page path
+    def find_mapped_page(path)
       mapping = transitions.keys.find do |key|
         string_matches?(path, key)
       end
       transitions[mapping]
     end
 
-    def string_matches?(string, matcher)
-      if matcher.is_a?(Regexp)
-        string =~ matcher
-      elsif matcher.is_a?(String)
-        string == matcher
-      else
-        false
-      end
-    end
-
     def visit(page, url: nil)
       raw_session.visit url || page.url
       @current_page = page.new self
@@ -50,14 +40,29 @@ module PageMagic
       raw_session.current_url
     end
 
-    def wait_until &block
+    def wait_until(&block)
       @wait ||= Wait.new
       @wait.until &block
     end
 
-    def method_missing name, *args, &block
+    def method_missing(name, *args, &block)
       current_page.send(name, *args, &block)
     end
 
+    def respond_to?(*args)
+      super || current_page.respond_to?(*args)
+    end
+
+    private
+
+    def string_matches?(string, matcher)
+      if matcher.is_a?(Regexp)
+        string =~ matcher
+      elsif matcher.is_a?(String)
+        string == matcher
+      else
+        false
+      end
+    end
   end
-end
+end

data/lib/page_magic.rb

@@ -9,19 +9,16 @@ require 'page_magic/page_magic'
 require 'page_magic/drivers'
 
 module PageMagic
-  class UnspportedBrowserException < Exception;end
+  class UnspportedBrowserException < Exception; end
 
   class << self
-
     def drivers
-      @drivers ||= Drivers.new.tap do |drivers|
-        drivers.load
-      end
+      @drivers ||= Drivers.new.tap(&:load)
     end
 
     def session(application: nil, browser: :rack_test, options: {})
       driver = drivers.find(browser)
-      raise UnspportedBrowserException unless driver
+      fail UnspportedBrowserException unless driver
 
       Capybara.register_driver browser do |app|
         driver.build(app, browser: browser, options: options)
@@ -30,17 +27,17 @@ module PageMagic
       Session.new(Capybara::Session.new(browser, application))
     end
 
-    def included clazz
+    def included(clazz)
       clazz.extend Elements
       pages << clazz if clazz.is_a? Class
 
       class << clazz
-        def url url=nil
+        def url(url = nil)
           @url = url if url
           @url
         end
 
-        def inherited clazz
+        def inherited(clazz)
           clazz.element_definitions.merge!(element_definitions)
           PageMagic.pages << clazz
         end
@@ -48,7 +45,7 @@ module PageMagic
     end
 
     def pages
-      @pages||=[]
+      @pages ||= []
     end
   end
 end

data/page_magic.gemspec

@@ -4,74 +4,73 @@
 # -*- encoding: utf-8 -*-
 
 Gem::Specification.new do |s|
-  s.name = "page_magic"
-  s.version = "0.11.0.alpha3"
+  s.name = 'page_magic'
+  s.version = '0.11.0.alpha3'
 
-  s.required_rubygems_version = Gem::Requirement.new("> 1.3.1") if s.respond_to? :required_rubygems_version=
-  s.authors = ["Leon Davis"]
-  s.date = "2014-04-05"
-  s.description = "Framework for modeling and interacting with webpages which wraps capybara"
-  s.email = "info@lad-tech.com"
+  s.required_rubygems_version = Gem::Requirement.new('> 1.3.1') if s.respond_to? :required_rubygems_version=
+  s.authors = ['Leon Davis']
+  s.date = '2014-04-05'
+  s.description = 'Framework for modeling and interacting with webpages which wraps capybara'
+  s.email = 'info@lad-tech.com'
   s.extra_rdoc_files = [
-    "README.md"
+    'README.md'
   ]
   s.files = [
-    ".rspec",
-    ".ruby-gemset",
-    ".ruby-version",
-    ".travis.yml",
-    "Gemfile",
-    "Gemfile.lock",
-    "README.md",
-    "Rakefile",
-    "VERSION",
-    "lib/ext/string.rb",
-    "lib/page_magic.rb",
-    "lib/page_magic/ajax_support.rb",
-    "lib/page_magic/browser.rb",
-    "lib/page_magic/element.rb",
-    "lib/page_magic/element_context.rb",
-    "lib/page_magic/elements.rb",
-    "lib/page_magic/exceptions.rb",
-    "lib/page_magic/page_magic.rb",
-    "lib/page_magic/session.rb",
-    "page_magic.gemspec",
-    "spec/browser_spec.rb",
-    "spec/element_context_spec.rb",
-    "spec/element_spec.rb",
-    "spec/helpers/capybara.rb",
-    "spec/member_methods_spec.rb",
-    "spec/page_magic/elements_spec.rb",
-    "spec/page_magic/usage/defining_page_elements_spec.rb",
-    "spec/page_magic/usage/defining_pages_spec.rb",
-    "spec/page_magic/usage/include_page_magic_spec.rb",
-    "spec/page_magic/usage/interacting_with_pages_spec.rb",
-    "spec/page_magic/usage/starting_a_session_spec.rb",
-    "spec/session_spec.rb",
-    "spec/spec_helper.rb"
+    '.rspec',
+    '.ruby-gemset',
+    '.ruby-version',
+    '.travis.yml',
+    'Gemfile',
+    'Gemfile.lock',
+    'README.md',
+    'Rakefile',
+    'VERSION',
+    'lib/ext/string.rb',
+    'lib/page_magic.rb',
+    'lib/page_magic/ajax_support.rb',
+    'lib/page_magic/browser.rb',
+    'lib/page_magic/element.rb',
+    'lib/page_magic/element_context.rb',
+    'lib/page_magic/elements.rb',
+    'lib/page_magic/exceptions.rb',
+    'lib/page_magic/page_magic.rb',
+    'lib/page_magic/session.rb',
+    'page_magic.gemspec',
+    'spec/browser_spec.rb',
+    'spec/element_context_spec.rb',
+    'spec/element_spec.rb',
+    'spec/helpers/capybara.rb',
+    'spec/member_methods_spec.rb',
+    'spec/page_magic/elements_spec.rb',
+    'spec/page_magic/usage/defining_page_elements_spec.rb',
+    'spec/page_magic/usage/defining_pages_spec.rb',
+    'spec/page_magic/usage/include_page_magic_spec.rb',
+    'spec/page_magic/usage/interacting_with_pages_spec.rb',
+    'spec/page_magic/usage/starting_a_session_spec.rb',
+    'spec/session_spec.rb',
+    'spec/spec_helper.rb'
   ]
-  s.homepage = "https://github.com/ladtech/page_magic"
-  s.licenses = ["ruby"]
-  s.require_paths = ["lib"]
-  s.rubygems_version = "2.0.3"
-  s.summary = "Framework for modeling and interacting with webpages"
+  s.homepage = 'https://github.com/ladtech/page_magic'
+  s.licenses = ['ruby']
+  s.require_paths = ['lib']
+  s.rubygems_version = '2.0.3'
+  s.summary = 'Framework for modeling and interacting with webpages'
 
-  if s.respond_to? :specification_version then
+  if s.respond_to? :specification_version
     s.specification_version = 4
 
-    if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
-      s.add_runtime_dependency(%q<capybara>, [">= 0"])
-      s.add_runtime_dependency(%q<wait>, [">= 0"])
-      s.add_development_dependency(%q<jeweler>, [">= 0"])
+    if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0')
+      s.add_runtime_dependency('capybara', ['>= 0'])
+      s.add_runtime_dependency('wait', ['>= 0'])
+      s.add_development_dependency('jeweler', ['>= 0'])
     else
-      s.add_dependency(%q<capybara>, [">= 0"])
-      s.add_dependency(%q<wait>, [">= 0"])
-      s.add_dependency(%q<jeweler>, [">= 0"])
+      s.add_dependency('capybara', ['>= 0'])
+      s.add_dependency('wait', ['>= 0'])
+      s.add_dependency('jeweler', ['>= 0'])
     end
   else
-    s.add_dependency(%q<capybara>, [">= 0"])
-    s.add_dependency(%q<wait>, [">= 0"])
-    s.add_dependency(%q<jeweler>, [">= 0"])
+    s.add_dependency('capybara', ['>= 0'])
+    s.add_dependency('wait', ['>= 0'])
+    s.add_dependency('jeweler', ['>= 0'])
   end
 end
-

data/spec/element_spec.rb

@@ -1,6 +1,4 @@
 describe 'Page elements' do
-
-
   before :each do
     Capybara.app = Class.new(Sinatra::Base) do
       get '/' do
@@ -18,7 +16,6 @@ describe 'Page elements' do
   end
 
   describe 'inheriting' do
-
     include_context :webapp
 
     it 'lets you create custom elements' do
@@ -31,7 +28,6 @@ describe 'Page elements' do
         end
       end
 
-
       page = Class.new do
         include PageMagic
         url '/elements'
@@ -44,9 +40,26 @@ describe 'Page elements' do
     end
   end
 
-  describe 'browser_element' do
-    it 'should raise an error if a selector has not been specified' do
-      expect { PageMagic::Element.new(:name, Object.new, type: :element).browser_element }.to raise_error(PageMagic::UndefinedSelectorException)
+  it 'should raise an error if a selector has not been specified' do
+    expect { PageMagic::Element.new(:name, Object.new, type: :element).browser_element }.to raise_error(PageMagic::UndefinedSelectorException)
+  end
+
+  describe '#respond_to?' do
+    subject do
+      PageMagic::Element.new(:name, Object.new, type: :element, browser_element: double(element_method: '')) do
+        element :sub_element, css: '.sub-element'
+      end
+    end
+    it 'checks for methods on self' do
+      expect(subject.respond_to?(:session)).to eq(true)
+    end
+
+    it 'checks against registered elements' do
+      expect(subject.respond_to?(:sub_element)).to eq(true)
+    end
+
+    it 'checks for the method of the browser_element' do
+      expect(subject.respond_to?(:element_method)).to eq(true)
     end
   end
 
@@ -61,60 +74,58 @@ describe 'Page elements' do
 
     context 'options supplied to selector' do
       it 'passes them on to the cappybara finder method' do
-        options = {key: :value}
+        options = { key: :value }
         xpath_selector = '//input'
         expect(Capybara.current_session).to receive(:find).with(:xpath, xpath_selector, options)
-        PageMagic::Element.new(:my_input, page, type: :text_field, selector: {xpath: xpath_selector}.merge(options)).browser_element
+        PageMagic::Element.new(:my_input, page, type: :text_field, selector: { xpath: xpath_selector }.merge(options)).browser_element
       end
     end
 
     it 'should find by xpath' do
-      element = PageMagic::Element.new(:my_input, page, type: :text_field, selector: {xpath: '//input'}).browser_element
+      element = PageMagic::Element.new(:my_input, page, type: :text_field, selector: { xpath: '//input' }).browser_element
       element.value == 'filled in'
     end
 
     it 'should locate an element using its id' do
-      element = PageMagic::Element.new(:my_input, page, type: :text_field, selector: {id: 'field_id'}).browser_element
+      element = PageMagic::Element.new(:my_input, page, type: :text_field, selector: { id: 'field_id' }).browser_element
       element.value.should == 'filled in'
     end
 
     it 'should locate an element using its name' do
-      element = PageMagic::Element.new(:my_input, page, type: :text_field, selector: {name: 'field_name'}).browser_element
+      element = PageMagic::Element.new(:my_input, page, type: :text_field, selector: { name: 'field_name' }).browser_element
       element.value.should == 'filled in'
     end
 
-
     it 'should locate an element using its label' do
-      element = PageMagic::Element.new(:my_link, page, type: :link, selector: {label: 'enter text'}).browser_element
+      element = PageMagic::Element.new(:my_link, page, type: :link, selector: { label: 'enter text' }).browser_element
       element[:id].should == 'field_id'
     end
 
     it 'should raise an exception when finding another element using its text' do
-      expect { PageMagic::Element.new(:my_link, page, type: :text_field, selector: {text: 'my link'}).browser_element }.to raise_error(PageMagic::UnsupportedSelectorException)
+      expect { PageMagic::Element.new(:my_link, page, type: :text_field, selector: { text: 'my link' }).browser_element }.to raise_error(PageMagic::UnsupportedSelectorException)
     end
 
     it 'should locate an element using css' do
-      element = PageMagic::Element.new(:my_link, page, type: :link, selector: {css: "input[name='field_name']"}).browser_element
+      element = PageMagic::Element.new(:my_link, page, type: :link, selector: { css: "input[name='field_name']" }).browser_element
       element[:id].should == 'field_id'
     end
 
-
     it 'should return a prefetched value' do
       PageMagic::Element.new(:help, page, type: :link, browser_element: :prefetched_object).browser_element.should == :prefetched_object
     end
 
     it 'should raise errors for unsupported selectors' do
-      expect { PageMagic::Element.new(:my_link, page, type: :link, selector: {unsupported: ""}).browser_element }.to raise_error(PageMagic::UnsupportedSelectorException)
+      expect { PageMagic::Element.new(:my_link, page, type: :link, selector: { unsupported: '' }).browser_element }.to raise_error(PageMagic::UnsupportedSelectorException)
     end
 
     context 'text selector' do
       it 'should locate a link' do
-        element = PageMagic::Element.new(:my_link, page, type: :link, selector: {text: 'my link'}).browser_element
+        element = PageMagic::Element.new(:my_link, page, type: :link, selector: { text: 'my link' }).browser_element
         element[:id].should == 'my_link'
       end
 
       it 'should locate a button' do
-        element = PageMagic::Element.new(:my_button, page, type: :button, selector: {text: 'my button'}).browser_element
+        element = PageMagic::Element.new(:my_button, page, type: :button, selector: { text: 'my button' }).browser_element
         element[:id].should == 'my_button'
       end
     end
@@ -123,7 +134,7 @@ describe 'Page elements' do
   describe '#section?' do
     context 'element definitions exist' do
       subject do
-        PageMagic::Element.new(:my_link, :page, type: :link, selector: {text: 'my link'}) do
+        PageMagic::Element.new(:my_link, :page, type: :link, selector: { text: 'my link' }) do
           element :thing, text: 'text'
         end
       end
@@ -134,7 +145,7 @@ describe 'Page elements' do
 
     context 'method defined' do
       subject do
-        PageMagic::Element.new(:my_link, :page, type: :link, selector: {text: 'my link'}) do
+        PageMagic::Element.new(:my_link, :page, type: :link, selector: { text: 'my link' }) do
           def custom_method
           end
         end
@@ -147,7 +158,7 @@ describe 'Page elements' do
 
     context 'neither method or elements defined' do
       subject do
-        PageMagic::Element.new(:my_link, :page, type: :link, selector: {text: 'my link'})
+        PageMagic::Element.new(:my_link, :page, type: :link, selector: { text: 'my link' })
       end
       it 'returns false' do
         expect(subject.section?).to eq(false)
@@ -166,7 +177,6 @@ describe 'Page elements' do
     end
   end
 
-
   context 'tests coppied in from section' do
     include_context :webapp
 
@@ -176,7 +186,6 @@ describe 'Page elements' do
     end
 
     let!(:elements_page) do
-
       Class.new do
         include PageMagic
         url '/elements'
@@ -206,6 +215,4 @@ describe 'Page elements' do
       @elements_page.form_by_css.link_in_form.visible?.should be_true
     end
   end
-
-
 end

data/spec/helpers/capybara.rb

@@ -1,10 +1,10 @@
 module Capybara
   module Selenium
     class Driver
-      def == driver
-        driver.respond_to?(:options) && self.options == driver.options &&
-            driver.respond_to?(:app) && self.app == driver.app
+      def ==(driver)
+        driver.respond_to?(:options) && options == driver.options &&
+          driver.respond_to?(:app) && app == driver.app
       end
     end
   end
-end
+end

data/spec/member_methods_spec.rb

@@ -1,11 +1,2 @@
 describe 'member methods' do
-  
-
-
-
-
-
-
-
-
-end
+end

data/spec/page_magic/driver_spec.rb

@@ -2,15 +2,15 @@ require 'page_magic/driver'
 
 module PageMagic
   describe Driver do
-
     let(:driver_class) do
       Class.new do
         attr_reader :rack_app, :options
-        def initialize rack_app, options
+        def initialize(rack_app, options)
           @rack_app = rack_app
           @options = options
         end
-        def == driver
+
+        def ==(driver)
           driver.rack_app == rack_app && driver.options == options
         end
       end
@@ -40,8 +40,8 @@ module PageMagic
       end
 
       it 'creates an instance of the supplied driver' do
-        expect(subject.build(:rack_app,browser: :custom_browser, options: {})).to eq(driver_class.new(:rack_app, {browser: :custom_browser}))
+        expect(subject.build(:rack_app, browser: :custom_browser, options: {})).to eq(driver_class.new(:rack_app, browser: :custom_browser))
       end
     end
   end
-end
+end

data/spec/page_magic/drivers/poltergeist_spec.rb

@@ -2,9 +2,10 @@ require 'page_magic/drivers/poltergeist'
 module PageMagic
   class Drivers
     describe Poltergeist do
-      it %q{is capybara's poltergeist driver} do
-        expect(described_class.build(:app, browser: :poltergeist, options:{})).to be_a(Capybara::Poltergeist::Driver)
+      it "is capybara's poltergeist driver" do
+        driver = described_class.build(:app, browser: :poltergeist, options: {})
+        expect(driver).to be_a(Capybara::Poltergeist::Driver)
       end
     end
   end
-end
+end

data/spec/page_magic/drivers/rack_test_spec.rb

@@ -2,9 +2,10 @@ require 'page_magic/drivers/rack_test'
 module PageMagic
   class Drivers
     describe RackTest do
-      it %q{is capybara's rack test driver} do
-        expect(described_class.build(:app, browser: :rack_test, options:{})).to be_a(Capybara::RackTest::Driver)
+      it "is capybara's rack test driver" do
+        driver = described_class.build(:app, browser: :rack_test, options: {})
+        expect(driver).to be_a(Capybara::RackTest::Driver)
       end
     end
   end
-end
+end

data/spec/page_magic/drivers/selenium_spec.rb

@@ -3,8 +3,9 @@ module PageMagic
   class Drivers
     describe Selenium do
       it 'is selenium' do
-        expect(described_class.build(:app, browser: :selenium, options:{})).to be_a(Capybara::Selenium::Driver)
+        driver = described_class.build(:app, browser: :selenium, options: {})
+        expect(driver).to be_a(Capybara::Selenium::Driver)
       end
     end
   end
-end
+end

data/spec/page_magic/drivers_spec.rb

@@ -1,7 +1,6 @@
 require 'page_magic/drivers'
 
 module PageMagic
-
   describe Drivers do
     subject { described_class.new }
     let(:expected_driver) { Driver.new(:browser_driver) }
@@ -22,8 +21,7 @@ module PageMagic
     describe '#load' do
       include_context :files
       it 'loads the drivers in the specified path' do
-
-        class_definition=<<-RUBY
+        class_definition = <<-RUBY
           class CustomDriver;
             def self.support? browser
               true
@@ -31,11 +29,11 @@ module PageMagic
           end
         RUBY
 
-        File.write("#{scratch_dir}/custom_driver.rb", class_definition )
+        File.write("#{scratch_dir}/custom_driver.rb", class_definition)
 
         subject.load(scratch_dir)
         expect(subject.find(:custom_browser)).to be(::CustomDriver)
       end
     end
   end
-end
+end