page_magic 0.8.8 → 0.8.9

data/Gemfile

@@ -1,13 +1,14 @@
 source "http://rubygems.org"
 
-gem "watir-webdriver"
 gem 'capybara'
 gem 'wait'
 
 group :test do
+  gem "watir-webdriver"
   gem 'sinatra'
   gem "rspec", require: 'rspec/core/rake_task'
   gem "simplecov", require: false
+  gem 'poltergeist'
 end
 
 group :development do

data/Gemfile.lock

@@ -9,8 +9,9 @@ GEM
       xpath (~> 2.0)
     childprocess (0.3.9)
       ffi (~> 1.0, >= 1.0.11)
+    cliver (0.2.2)
     diff-lcs (1.2.4)
-    ffi (1.8.1)
+    ffi (1.9.3)
     git (1.2.5)
     jeweler (1.8.4)
       bundler (~> 1.0)
@@ -23,6 +24,11 @@ GEM
     multi_json (1.7.3)
     nokogiri (1.6.0)
       mini_portile (~> 0.5.0)
+    poltergeist (1.4.1)
+      capybara (~> 2.1.0)
+      cliver (~> 0.2.1)
+      multi_json (~> 1.0)
+      websocket-driver (>= 0.2.0)
     rack (1.5.2)
     rack-protection (1.5.0)
       rack
@@ -40,10 +46,10 @@ GEM
       diff-lcs (>= 1.1.3, < 2.0)
     rspec-mocks (2.14.4)
     rubyzip (0.9.9)
-    selenium-webdriver (2.32.1)
+    selenium-webdriver (2.35.1)
       childprocess (>= 0.2.5)
       multi_json (~> 1.0)
-      rubyzip
+      rubyzip (< 1.0.0)
       websocket (~> 1.0.4)
     simplecov (0.7.1)
       multi_json (~> 1.0)
@@ -58,6 +64,7 @@ GEM
     watir-webdriver (0.6.4)
       selenium-webdriver (>= 2.18.0)
     websocket (1.0.7)
+    websocket-driver (0.3.0)
     xpath (2.0.0)
       nokogiri (~> 1.3)
 
@@ -67,6 +74,7 @@ PLATFORMS
 DEPENDENCIES
   capybara
   jeweler (~> 1.8.4)
+  poltergeist
   rspec
   simplecov
   sinatra

data/VERSION

@@ -1 +1 @@
-0.8.8
+0.8.9

data/lib/page_magic.rb

@@ -14,16 +14,34 @@ require 'page_magic/page_section'
 module PageMagic
   class << self
     def session browser=nil, options = {}
-      if browser
-        Capybara.register_driver browser do |app|
-          options[:browser] = browser
-          Capybara::Selenium::Driver.new(app, options)
-        end
-        Session.new(Capybara::Session.new(browser, nil))
+      if browser.is_a?(Hash)
+        Session.new(Capybara::Session.new(:rack_test, browser[:application]))
       else
-        Capybara.reset!
-        Session.new(Capybara.current_session)
+        if browser
+          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!
+          Session.new(Capybara.current_session)
+        end
       end
+
     end
 
     def included clazz

data/page_magic.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "page_magic"
-  s.version = "0.8.8"
+  s.version = "0.8.9"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Leon Davis"]
-  s.date = "2013-11-10"
+  s.date = "2013-11-13"
   s.description = "Framework for modeling and interacting with webpages which wraps capybara"
   s.email = "info@lad-tech.com"
   s.extra_rdoc_files = [
@@ -50,27 +50,24 @@ Gem::Specification.new do |s|
   s.homepage = "https://github.com/ladtech/page_magic"
   s.licenses = ["ruby"]
   s.require_paths = ["lib"]
-  s.rubygems_version = "1.8.25"
+  s.rubygems_version = "1.8.10"
   s.summary = "Framework for modeling and interacting with webpages"
 
   if s.respond_to? :specification_version then
     s.specification_version = 3
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
-      s.add_runtime_dependency(%q<watir-webdriver>, [">= 0"])
       s.add_runtime_dependency(%q<capybara>, [">= 0"])
       s.add_runtime_dependency(%q<wait>, [">= 0"])
       s.add_development_dependency(%q<jeweler>, ["~> 1.8.4"])
       s.add_runtime_dependency(%q<watir-webdriver>, [">= 0"])
     else
-      s.add_dependency(%q<watir-webdriver>, [">= 0"])
       s.add_dependency(%q<capybara>, [">= 0"])
       s.add_dependency(%q<wait>, [">= 0"])
       s.add_dependency(%q<jeweler>, ["~> 1.8.4"])
       s.add_dependency(%q<watir-webdriver>, [">= 0"])
     end
   else
-    s.add_dependency(%q<watir-webdriver>, [">= 0"])
     s.add_dependency(%q<capybara>, [">= 0"])
     s.add_dependency(%q<wait>, [">= 0"])
     s.add_dependency(%q<jeweler>, ["~> 1.8.4"])

data/spec/page_magic_spec.rb

@@ -1,9 +1,21 @@
 require 'spec_helper'
+require 'capybara/rspec'
+require 'sinatra/base'
 
 describe 'page magic' do
+  include Capybara::DSL
 
   describe 'class level' do
+    let(:app_class) do
+      Class.new do
+        def call env
+          [200, {}, ["hello world!!"]]
+        end
+      end
+    end
+
     context 'session' do
+
       it 'should setup a session using the specified browser' do
         Capybara::Session.should_receive(:new).with(:chrome, nil).and_return(:chrome_session)
 
@@ -18,6 +30,31 @@ describe 'page magic' do
         session = PageMagic.session
         session.browser.mode.should == :rack_test
       end
+
+      it 'should use the supplied Rack application' do
+        session = PageMagic.session(application: app_class.new)
+        session.browser.visit('/')
+        session.browser.text.should == 'hello world!!'
+      end
+
+      it 'should use the rack app with a given browser' do
+        session = PageMagic.session(:rack_test, application: app_class.new)
+        session.browser.mode.should == :rack_test
+        session.browser.visit('/')
+        session.browser.text.should == 'hello world!!'
+      end
+
+      context 'supported browsers' do
+        it 'should support the poltergeist browser' do
+          session = PageMagic.session(:poltergeist, application: app_class.new)
+          session.browser.driver.is_a?(Capybara::Poltergeist::Driver).should be_true
+        end
+
+        it 'should support the selenium browser' do
+          session = PageMagic.session(:firefox, application: app_class.new)
+          session.browser.driver.is_a?(Capybara::Selenium::Driver).should be_true
+        end
+      end
     end
   end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: page_magic
 version: !ruby/object:Gem::Version
-  version: 0.8.8
+  version: 0.8.9
   prerelease: 
 platform: ruby
 authors:
@@ -9,27 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-11-10 00:00:00.000000000 Z
+date: 2013-11-13 00:00:00.000000000 Z
 dependencies:
-- !ruby/object:Gem::Dependency
-  name: watir-webdriver
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
 - !ruby/object:Gem::Dependency
   name: capybara
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &10020580 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -37,15 +21,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+  version_requirements: *10020580
 - !ruby/object:Gem::Dependency
   name: wait
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &10019480 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -53,15 +32,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+  version_requirements: *10019480
 - !ruby/object:Gem::Dependency
   name: jeweler
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &10018320 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -69,15 +43,10 @@ dependencies:
         version: 1.8.4
   type: :development
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 1.8.4
+  version_requirements: *10018320
 - !ruby/object:Gem::Dependency
   name: watir-webdriver
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &10033700 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -85,12 +54,7 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+  version_requirements: *10033700
 description: Framework for modeling and interacting with webpages which wraps capybara
 email: info@lad-tech.com
 executables: []
@@ -143,7 +107,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 4130538887016609819
+      hash: 1067897609518748407
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -152,7 +116,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.25
+rubygems_version: 1.8.10
 signing_key: 
 specification_version: 3
 summary: Framework for modeling and interacting with webpages