page_magic 0.11.0.alpha6 → 0.11.0.alpha7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 56f774d5606a8b3fbe8f0e8ea337bd54bd360d70
-  data.tar.gz: 318201438260f08156d1afa43a5baa2479143eb5
+  metadata.gz: aea679cbb291387aa604e03d5d0e3cb5adf28141
+  data.tar.gz: 52fde80f96207b3632b89fbd98d4cb16e083ffb8
 SHA512:
-  metadata.gz: ce887cd3a1b4e3d8fbd6cd0c82b9d78036d46f075c821d213049ef60ff6ec453c601bb55f79359dae1bfab91d4aa1443dfbd8e4aef10b6ea873aee5c618c5a0f
-  data.tar.gz: 5b0b401f94a6d9fb856efc935157fb3a9754fb98d004c1fdb1590e440b79353ad97ba923970fe8c968bf0b0b686bb0f88b7e88812d46f8a61dc320d82c4b0531
+  metadata.gz: e67be00ed38102cf53891a69fb815042020cbe51e6f8a5d82c83ca0a0041ddbe688b69061174a2ab00946410648a13202320abcc48a3311019b2019b6871c48d
+  data.tar.gz: 13b0e6b736234d5f48d6669b3b39a75f6c32e869c3710ec4efdffe0dde5a543bb117bdb5384b56542961416a06d8aeb977239d5bc45d7ce0cebda3f9212c927e

data/.ruby-version

@@ -1 +1 @@
-2.0.0
+2.1

data/.travis.yml

@@ -1,4 +1,4 @@
 rvm:
-  - '1.9.3'
-  - '2.0.0'
+  - '2.1'
+  - '2.2
 

data/Gemfile

@@ -1,6 +1,7 @@
 source "http://rubygems.org"
 
 gem 'capybara'
+gem 'activesupport'
 gem 'wait'
 
 group :test do

data/Gemfile.lock

@@ -1,6 +1,12 @@
 GEM
   remote: http://rubygems.org/
   specs:
+    activesupport (4.2.3)
+      i18n (~> 0.7)
+      json (~> 1.7, >= 1.7.7)
+      minitest (~> 5.1)
+      thread_safe (~> 0.3, >= 0.3.4)
+      tzinfo (~> 1.1)
     addressable (2.3.6)
     builder (3.2.2)
     capybara (2.1.0)
@@ -38,6 +44,7 @@ GEM
       guard (~> 2.0)
     hashie (2.0.5)
     highline (1.6.21)
+    i18n (0.7.0)
     jeweler (2.0.1)
       builder
       bundler (>= 1.0)
@@ -58,6 +65,7 @@ GEM
     method_source (0.8.2)
     mime-types (1.25)
     mini_portile (0.5.1)
+    minitest (5.7.0)
     multi_json (1.7.3)
     multi_xml (0.5.5)
     multipart-post (1.2.0)
@@ -113,8 +121,11 @@ GEM
       tilt (~> 1.3, >= 1.3.4)
     slop (3.5.0)
     thor (0.19.1)
+    thread_safe (0.3.5)
     tilt (1.4.1)
     timers (1.1.0)
+    tzinfo (1.2.2)
+      thread_safe (~> 0.1)
     wait (0.5.1)
     watir-webdriver (0.6.4)
       selenium-webdriver (>= 2.18.0)
@@ -127,6 +138,7 @@ PLATFORMS
   ruby
 
 DEPENDENCIES
+  activesupport
   capybara
   guard
   guard-ctags-bundler

data/VERSION

@@ -1 +1 @@
-1.0.0.alpha2
+0.11.0.alpha7

data/lib/page_magic/driver.rb

@@ -0,0 +1,19 @@
+module PageMagic
+  class Driver
+    attr_reader :supported_browsers, :handler
+    def initialize(*supported_browsers, &block)
+      @handler = block
+      @supported_browsers = supported_browsers
+    end
+
+    def support? browser
+      supported_browsers.include?(browser)
+    end
+
+    def build(app, browser:, options:{})
+      options[:browser] = browser
+      driver_clazz = handler.call
+      driver_clazz.new(app, options)
+    end
+  end
+end

data/lib/page_magic/drivers/poltergeist.rb

@@ -0,0 +1,9 @@
+module PageMagic
+  class Drivers
+    Poltergeist = Driver.new(:poltergeist) do
+      require 'capybara/poltergeist'
+      Capybara::Poltergeist::Driver
+    end
+  end
+
+end

data/lib/page_magic/drivers/rack_test.rb

@@ -0,0 +1,7 @@
+module PageMagic
+  class Drivers
+    RackTest = Driver.new(:rack_test) do
+      Capybara::RackTest::Driver
+    end
+  end
+end

data/lib/page_magic/drivers/selenium.rb

@@ -0,0 +1,8 @@
+module PageMagic
+  class Drivers
+    Selenium = Driver.new(:chrome, :firefox)  do
+      require 'watir-webdriver'
+      Capybara::Selenium::Driver
+    end
+  end
+end

data/lib/page_magic/drivers.rb

@@ -0,0 +1,31 @@
+require 'page_magic/driver'
+module PageMagic
+  class Drivers
+    def all
+      @all ||=[]
+    end
+
+    def register(driver)
+      all << driver
+    end
+
+
+    def find browser
+      all.find{|driver|driver.support?(browser)}
+    end
+
+    def load path="#{__dir__}/drivers"
+      require 'active_support/inflector'
+
+      Dir["#{path}/*.rb"].each do |driver_file|
+        require driver_file
+        driver_name = File.basename(driver_file)[/(.*)\.rb$/, 1]
+        register eval(driver_name.classify)
+      end
+    end
+
+    def == other
+      other.is_a?(Drivers) && other.all == other.all
+    end
+  end
+end

data/lib/page_magic/session.rb

@@ -1,53 +1,34 @@
 require 'wait'
 module PageMagic
   class Session
-    attr_accessor :current_page, :raw_session, :transitions
+    attr_accessor :current_page, :raw_session
 
     def initialize browser
       @raw_session = browser
     end
 
-    def define_page_mappings transitions
+    def define_transitions transitions
       @transitions = transitions
     end
 
-    def current_page
-      if transitions
-        mapping = find_mapped_page(current_path)
-        @current_page = mapping.new(self) if mapping
-      end
-      @current_page
-    end
-
-    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
-      raw_session.visit page.url
+      @raw_session.visit page.url
       @current_page = page.new self
       self
     end
 
     def current_path
-      raw_session.current_path
+      @raw_session.current_path
     end
 
     def current_url
-      raw_session.current_url
+      @raw_session.current_url
+    end
+
+    def move_to page_class
+      page_class = eval(page_class) if page_class.is_a?(String)
+      @current_page = page_class.new self
+      wait_until { raw_session.current_url == page_class.url }
     end
 
     def wait_until &block
@@ -56,7 +37,7 @@ module PageMagic
     end
 
     def method_missing name, *args, &block
-      current_page.send(name, *args, &block)
+      @current_page.send(name, *args, &block)
     end
 
   end

data/lib/page_magic.rb

@@ -1,41 +1,33 @@
 $LOAD_PATH.unshift("#{File.dirname(__FILE__)}")
 require 'capybara'
 require 'page_magic/exceptions'
-require 'page_magic/browser'
 require 'page_magic/session'
 require 'page_magic/elements'
 require 'page_magic/element_context'
 require 'page_magic/element'
 require 'page_magic/page_magic'
+require 'page_magic/drivers'
 
 module PageMagic
+  class UnspportedBrowserException < Exception;end
+
   class << self
-    def session browser=nil, options = {}
-        if browser.is_a?(Symbol)
-          application = options.delete(:application)
-
-          Capybara.register_driver browser do |app|
-            options[:browser] = browser
-            case browser
-              when :poltergeist
-                require 'capybara/poltergeist'
-                Capybara::Poltergeist::Driver.new(app)
-              when :rack_test
-                Capybara::RackTest::Driver.new(app, options)
-              else
-                require 'watir-webdriver'
-                Capybara::Selenium::Driver.new(app, options)
-            end
-
-          end
-
-          Session.new(Capybara::Session.new(browser, application))
-        else
-          Capybara.reset!
-          Capybara.app = browser[:application] if browser.is_a?(Hash) && browser[:application]
-          Session.new(Capybara.current_session)
-        end
 
+    def drivers
+      @drivers ||= Drivers.new.tap do |drivers|
+        drivers.load
+      end
+    end
+
+    def session(application: nil, browser: :rack_test, options: {})
+      driver = drivers.find(browser)
+      raise UnspportedBrowserException unless driver
+
+      Capybara.register_driver browser do |app|
+        driver.build(app, browser: browser, options: options)
+      end
+
+      Session.new(Capybara::Session.new(browser, application))
     end
 
     def included clazz
@@ -53,11 +45,10 @@ module PageMagic
           PageMagic.pages << clazz
         end
       end
-
     end
 
     def pages
       @pages||=[]
     end
   end
-end
+end

data/page_magic.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "page_magic"
-  s.version = "0.11.0.alpha6"
+  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 = "2015-07-03"
+  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 = [
@@ -22,12 +22,12 @@ Gem::Specification.new do |s|
     ".travis.yml",
     "Gemfile",
     "Gemfile.lock",
-    "Guardfile",
     "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",
@@ -36,18 +36,18 @@ Gem::Specification.new do |s|
     "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/browser_spec.rb",
-    "spec/page_magic/element_context_spec.rb",
     "spec/page_magic/elements_spec.rb",
-    "spec/page_magic/session_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"

data/spec/page_magic/driver_spec.rb

@@ -0,0 +1,47 @@
+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
+          @rack_app = rack_app
+          @options = options
+        end
+        def == driver
+          driver.rack_app == rack_app && driver.options == options
+        end
+      end
+    end
+    subject do
+      described_class.new :custom_browser do
+        driver_class
+      end
+    end
+
+    describe '#supports?' do
+      context 'browser is in supported browsers' do
+        it 'returns true' do
+          expect(subject.support?(:custom_browser)).to eq(true)
+        end
+      end
+
+      context 'browser is not in supported browsers' do
+        it 'returns false' do
+          expect(subject.support?(:unsupported_browser)).to eq(false)
+        end
+      end
+    end
+    describe '#build' do
+      it 'adds the browser to the options supplied to the driver' do
+        expect(subject.build(:rack_app, browser: :custom_browser, options: {}).options).to eq(browser: :custom_browser)
+      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}))
+      end
+    end
+  end
+end

data/spec/page_magic/drivers/poltergeist_spec.rb

@@ -0,0 +1,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)
+      end
+    end
+  end
+end

data/spec/page_magic/drivers/rack_test_spec.rb

@@ -0,0 +1,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)
+      end
+    end
+  end
+end

data/spec/page_magic/drivers/selenium_spec.rb

@@ -0,0 +1,10 @@
+require 'page_magic/drivers/selenium'
+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)
+      end
+    end
+  end
+end

data/spec/page_magic/drivers_spec.rb

@@ -0,0 +1,41 @@
+require 'page_magic/drivers'
+
+module PageMagic
+
+  describe Drivers do
+    subject { described_class.new }
+    let(:expected_driver) { Driver.new(:browser_driver) }
+    describe '#register' do
+      it 'stores the driver' do
+        subject.register expected_driver
+        expect(subject.all).to eq([expected_driver])
+      end
+    end
+
+    describe '#find' do
+      it 'returns the registered driver' do
+        subject.register expected_driver
+        expect(subject.find(:browser_driver)).to eq(expected_driver)
+      end
+    end
+
+    describe '#load' do
+      include_context :files
+      it 'loads the drivers in the specified path' do
+
+        class_definition=<<-RUBY
+          class CustomDriver;
+            def self.support? browser
+              true
+            end
+          end
+        RUBY
+
+        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

data/spec/page_magic/session_spec.rb

@@ -3,7 +3,7 @@ describe PageMagic::Session do
   let(:page) do
     Class.new do
       include PageMagic
-      url '/page1'
+      url :url
 
       def my_method
         :called
@@ -20,56 +20,6 @@ describe PageMagic::Session do
 
   let(:browser) { double('browser', current_url: 'url') }
 
-  describe '#current_page' do
-    subject do
-      PageMagic::Session.new(browser).tap do |session|
-        session.define_page_mappings '/another_page1' => another_page_class
-      end
-    end
-    context 'page url has not changed' do
-      it 'returns the original page' do
-        browser.should_receive(:visit).with(page.url)
-        allow(browser).to receive(:current_path).and_return('/page1')
-        subject.visit(page)
-        expect(subject.current_page).to be_an_instance_of(page)
-      end
-    end
-
-    context 'page url has changed' do
-      it 'returns the mapped page object' do
-        browser.should_receive(:visit).with(page.url)
-        subject.visit(page)
-        allow(browser).to receive(:current_path).and_return('/another_page1')
-        expect(subject.current_page).to be_an_instance_of(another_page_class)
-      end
-    end
-  end
-
-  describe '#find_mapped_page' do
-    subject do
-      described_class.new(nil).tap do |session|
-        session.define_page_mappings '/page' => :mapped_page_using_string, /page\d/ => :mapped_page_using_regex
-      end
-    end
-
-    context 'mapping is string' do
-      it 'returns the page class' do
-        expect(subject.find_mapped_page('/page')).to be(:mapped_page_using_string)
-      end
-    end
-    context 'mapping is regex' do
-      it 'returns the page class' do
-        expect(subject.find_mapped_page('/page2')).to be(:mapped_page_using_regex)
-      end
-    end
-
-    context 'mapping is not found' do
-      it 'returns nil' do
-        expect(subject.find_mapped_page('/fake_page')).to be(nil)
-      end
-    end
-  end
-
   it 'should visit the given url' do
     browser.should_receive(:visit).with(page.url)
     session = PageMagic::Session.new(browser).visit(page)
@@ -88,4 +38,30 @@ describe PageMagic::Session do
       session.my_method.should be(:called)
     end
   end
+
+  context 'move_to moves the session object to another page' do
+    it 'can take a class' do
+      page_magic_session = PageMagic::Session.new(double(:browser, current_url: '/another_page1'))
+      page_magic_session.move_to(another_page_class)
+      page_magic_session.current_page.should be_a(another_page_class)
+    end
+
+    it 'can take the name of the class as a string' do
+      class ThePage
+        include PageMagic
+        url '/the_page'
+      end
+
+      page_magic_session = PageMagic::Session.new(double(:browser, current_url: '/the_page'))
+      page_magic_session.move_to("ThePage")
+      page_magic_session.current_page.should be_a(ThePage)
+    end
+
+    it 'should wait until the browser url has changed' do
+      mock_browser = double(:browser, current_url: 'a')
+      page_magic_session = PageMagic::Session.new(mock_browser)
+
+      expect { page_magic_session.move_to(another_page_class) }.to raise_error(Wait::ResultInvalid)
+    end
+  end
 end

data/spec/page_magic/usage/starting_a_session_spec.rb

@@ -1,4 +1,5 @@
 describe 'PageMagic.session' do
+
   let(:app_class) do
     Class.new do
       def call env
@@ -11,35 +12,10 @@ describe 'PageMagic.session' do
     Capybara.drivers[browser].call(nil)
   end
 
-  context 'using a symbol as a parameter' do
-    it 'sets up a session using the specified browser' do
-      Capybara::Session.should_receive(:new).with(:chrome, nil).and_return(:chrome_session)
-
-      session = PageMagic.session(:chrome)
-
-      registered_driver(:chrome).should == Capybara::Selenium::Driver.new(nil, browser: :chrome)
-
-      session.raw_session.should == :chrome_session
-    end
-
-    context 'browsers' do
-      it 'supports poltergeist' do
-        session = PageMagic.session(:poltergeist, application: app_class.new)
-        session.raw_session.driver.is_a?(Capybara::Poltergeist::Driver).should be_true
-      end
-
-      it 'supports selenium' do
-        session = PageMagic.session(:firefox, application: app_class.new)
-        session.raw_session.driver.is_a?(Capybara::Selenium::Driver).should be_true
-      end
-    end
-  end
-
-  context 'defaulting the browser used from PageMagic sessions' do
-    it "uses what ever Capybara's default_driver is set to" do
-      Capybara.default_driver = :rack_test
-      session = PageMagic.session
-      session.raw_session.mode.should == :rack_test
+  context 'specificying a browser' do
+    it 'loads the driver for the specified browser' do
+      session = PageMagic.session(browser: :firefox)
+      session.raw_session.driver.is_a?(Capybara::Selenium::Driver).should be_true
     end
   end
 
@@ -52,7 +28,7 @@ describe 'PageMagic.session' do
     end
 
     it 'can run against an rack application using a particular browser' do
-      session = PageMagic.session(:rack_test, application: app_class.new)
+      session = PageMagic.session(browser: :rack_test, application: app_class.new)
       session.raw_session.mode.should == :rack_test
       session.raw_session.visit('/')
       session.raw_session.text.should == 'hello world!!'

data/spec/page_magic_spec.rb

@@ -0,0 +1,44 @@
+require 'page_magic'
+
+describe PageMagic do
+  describe '::drivers' do
+    it 'returns loaded drivers' do
+      expected_drivers = described_class::Drivers.new.tap do |drivers|
+        drivers.load
+      end
+
+      expect(described_class.drivers).to eq(expected_drivers)
+    end
+  end
+
+  describe '::session' do
+    context 'specifying the browser' do
+      it 'loads the correct driver' do
+        session = described_class.session(browser: :firefox)
+        session.raw_session.driver.is_a?(Capybara::Selenium::Driver).should be_true
+      end
+    end
+
+    context 'specifying a rack application' do
+      it 'configures capybara to run against the app' do
+        session = described_class.session(application: :rack_application)
+        expect(session.raw_session.app).to be(:rack_application)
+      end
+    end
+
+    context 'specifying options' do
+      it 'passes the options to the browser driver' do
+        options = {option: :config}
+        session = described_class.session(options: options, browser: :chrome)
+
+        expect(session.raw_session.driver.options).to include(options)
+      end
+    end
+
+    context 'driver for browser not found' do
+      it 'raises an error' do
+        expect{described_class.session(browser: :invalid)}.to raise_exception described_class::UnspportedBrowserException
+      end
+    end
+  end
+end

data/spec/spec_helper.rb

@@ -11,7 +11,22 @@ require 'page_magic'
 require 'capybara/rspec'
 require 'helpers/capybara'
 
+shared_context :files do
+  require 'tmpdir'
+  def scratch_dir
+    @dir ||= Dir.mktmpdir
+  end
+end
 
+shared_context :rack_application do
+  let(:rack_application) do
+    Class.new do
+      def call env
+        [200, {}, ["hello world!!"]]
+      end
+    end
+  end
+end
 
 RSpec.configure do
 

metadata

@@ -1,55 +1,97 @@
 --- !ruby/object:Gem::Specification
 name: page_magic
 version: !ruby/object:Gem::Version
-  version: 0.11.0.alpha6
+  version: 0.11.0.alpha7
 platform: ruby
 authors:
 - Leon Davis
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-07-03 00:00:00.000000000 Z
+date: 2015-07-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: capybara
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: activesupport
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: wait
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: jeweler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: guard
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: guard-ctags-bundler
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 description: Framework for modeling and interacting with webpages which wraps capybara
@@ -59,10 +101,10 @@ extensions: []
 extra_rdoc_files:
 - README.md
 files:
-- .rspec
-- .ruby-gemset
-- .ruby-version
-- .travis.yml
+- ".rspec"
+- ".ruby-gemset"
+- ".ruby-version"
+- ".travis.yml"
 - Gemfile
 - Gemfile.lock
 - Guardfile
@@ -71,7 +113,11 @@ files:
 - VERSION
 - lib/ext/string.rb
 - lib/page_magic.rb
-- lib/page_magic/browser.rb
+- lib/page_magic/driver.rb
+- lib/page_magic/drivers.rb
+- lib/page_magic/drivers/poltergeist.rb
+- lib/page_magic/drivers/rack_test.rb
+- lib/page_magic/drivers/selenium.rb
 - lib/page_magic/element.rb
 - lib/page_magic/element_context.rb
 - lib/page_magic/elements.rb
@@ -82,7 +128,11 @@ files:
 - spec/element_spec.rb
 - spec/helpers/capybara.rb
 - spec/member_methods_spec.rb
-- spec/page_magic/browser_spec.rb
+- spec/page_magic/driver_spec.rb
+- spec/page_magic/drivers/poltergeist_spec.rb
+- spec/page_magic/drivers/rack_test_spec.rb
+- spec/page_magic/drivers/selenium_spec.rb
+- spec/page_magic/drivers_spec.rb
 - spec/page_magic/element_context_spec.rb
 - spec/page_magic/elements_spec.rb
 - spec/page_magic/session_spec.rb
@@ -91,6 +141,7 @@ files:
 - 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/page_magic_spec.rb
 - spec/spec_helper.rb
 homepage: https://github.com/ladtech/page_magic
 licenses:
@@ -102,17 +153,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>'
+  - - ">"
     - !ruby/object:Gem::Version
       version: 1.3.1
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.3
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: Framework for modeling and interacting with webpages

data/lib/page_magic/browser.rb

@@ -1,19 +0,0 @@
-module PageMagic
-  module Browser
-
-    class << self
-      attr_writer :default
-      def session
-        @session ||= PageMagic.session(default)
-      end
-
-      def default
-        @default || :firefox
-      end
-    end
-
-    def browser
-      Browser.session
-    end
-  end
-end

data/spec/page_magic/browser_spec.rb

@@ -1,35 +0,0 @@
-describe PageMagic::Browser do
-  let(:app) { Object.new }
-
-  before do
-    PageMagic::Browser.instance_variable_set(:@session, nil)
-    app.extend PageMagic::Browser
-  end
-
-  describe 'default' do
-    it 'should be firefox' do
-      PageMagic::Browser.default.should == :firefox
-    end
-  end
-
-  describe 'browser' do
-    it 'should return the existing session' do
-      session_instance = app.browser
-      app.browser.should == session_instance
-    end
-
-    it 'should create a session if not already set' do
-      new_session = double(:new_session)
-
-      PageMagic.should_receive(:session).with(:firefox).and_return new_session
-      app.browser.should == new_session
-    end
-
-    it 'should use custom browser' do
-      PageMagic.should_receive(:session).with(:custom_browser)
-
-      PageMagic::Browser.default = :custom_browser
-      app.browser
-    end
-  end
-end