poltergeist 0.7.0 → 1.0.0

data/lib/capybara/poltergeist/cookie.rb

@@ -0,0 +1,35 @@
+module Capybara::Poltergeist
+  class Cookie
+    def initialize(attributes)
+      @attributes = attributes
+    end
+
+    def name
+      @attributes['name']
+    end
+
+    def value
+      @attributes['value']
+    end
+
+    def domain
+      @attributes['domain']
+    end
+
+    def path
+      @attributes['path']
+    end
+
+    def secure?
+      @attributes['secure']
+    end
+
+    def httponly?
+      @attributes['httponly']
+    end
+
+    def expires
+      Time.parse @attributes['expires']
+    end
+  end
+end

data/lib/capybara/poltergeist/driver.rb

@@ -1,9 +1,11 @@
+require 'uri'
+
 module Capybara::Poltergeist
   class Driver < Capybara::Driver::Base
     DEFAULT_TIMEOUT = 30
+    DEFAULT_PORT    = 44678 # 'GHOST' on a keypad :)
 
     attr_reader :app, :app_server, :server, :client, :browser, :options
-    attr_accessor :headers
 
     def initialize(app, options = {})
       @app       = app
@@ -12,7 +14,6 @@ module Capybara::Poltergeist
       @inspector = nil
       @server    = nil
       @client    = nil
-      @headers   = {}
 
       @app_server = Capybara::Server.new(app)
       @app_server.boot if Capybara.run_server
@@ -27,7 +28,10 @@ module Capybara::Poltergeist
     end
 
     def server
-      @server ||= Server.new(options.fetch(:timeout, DEFAULT_TIMEOUT))
+      @server ||= Server.new(
+        options.fetch(:port,    DEFAULT_PORT),
+        options.fetch(:timeout, DEFAULT_TIMEOUT)
+      )
     end
 
     def client
@@ -75,7 +79,7 @@ module Capybara::Poltergeist
     end
 
     def visit(path)
-      browser.visit app_server.url(path), @headers
+      browser.visit app_server.url(path)
     end
 
     def current_url
@@ -107,13 +111,16 @@ module Capybara::Poltergeist
       nil
     end
 
-    def within_frame(id, &block)
-      browser.within_frame(id, &block)
+    def within_frame(name, &block)
+      browser.within_frame(name, &block)
+    end
+
+    def within_window(name, &block)
+      browser.within_window(name, &block)
     end
 
     def reset!
       browser.reset
-      @headers = {}
     end
 
     def render(path, options = {})
@@ -123,11 +130,36 @@ module Capybara::Poltergeist
     def resize(width, height)
       browser.resize(width, height)
     end
+    alias_method :resize_window, :resize
 
     def network_traffic
       browser.network_traffic
     end
 
+    def headers=(headers)
+      browser.set_headers(headers)
+    end
+
+    def response_headers
+      browser.response_headers
+    end
+
+    def cookies
+      browser.cookies
+    end
+
+    def set_cookie(name, value, options = {})
+      browser.set_cookie({
+        :name   => name,
+        :value  => value,
+        :domain => URI.parse(app_server.url('')).host
+      }.merge(options))
+    end
+
+    def remove_cookie(name)
+      browser.remove_cookie(name)
+    end
+
     def debug
       if @options[:inspector]
         inspector.open

data/lib/capybara/poltergeist/inspector.rb

@@ -1,23 +1,23 @@
 module Capybara::Poltergeist
   class Inspector
-    BROWSERS = %w(chromium chromium-browser google-chrome safari)
+    BROWSERS     = %w(chromium chromium-browser google-chrome open)
+    DEFAULT_PORT = 9664
 
     def self.detect_browser
-      @browser ||= BROWSERS.find { |name| system("which #{name} &>/dev/null") }
+      @browser ||= BROWSERS.find { |name| browser_binary_exists?(name) }
     end
 
-    def initialize(browser = nil)
+    attr_reader :port
+
+    def initialize(browser = nil, port = DEFAULT_PORT)
       @browser = browser.respond_to?(:to_str) ? browser : nil
+      @port    = port
     end
 
     def browser
       @browser ||= self.class.detect_browser
     end
 
-    def port
-      @port ||= Util.find_available_port
-    end
-
     def url
       "http://localhost:#{port}/"
     end
@@ -31,5 +31,16 @@ module Capybara::Poltergeist
                      "as a configuration option for Poltergeist."
       end
     end
+
+    def self.browser_binary_exists?(browser)
+      exts = ENV['PATHEXT'] ? ENV['PATHEXT'].split(';') : ['']
+      ENV['PATH'].split(File::PATH_SEPARATOR).each do |path|
+        exts.each { |ext|
+          exe = "#{path}#{File::SEPARATOR}#{browser}#{ext}"
+          return exe if File.executable? exe
+        }
+      end
+      return nil
+    end
   end
 end

data/lib/capybara/poltergeist/server.rb

@@ -2,8 +2,8 @@ module Capybara::Poltergeist
   class Server
     attr_reader :port, :socket, :timeout
 
-    def initialize(timeout = nil)
-      @port    = Util.find_available_port
+    def initialize(port, timeout = nil)
+      @port    = port
       @timeout = timeout
       start
     end

data/lib/capybara/poltergeist/version.rb

@@ -1,5 +1,5 @@
 module Capybara
   module Poltergeist
-    VERSION = "0.7.0"
+    VERSION = "1.0.0"
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: poltergeist
 version: !ruby/object:Gem::Version
-  version: 0.7.0
+  version: 1.0.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-07-24 00:00:00.000000000 Z
+date: 2012-10-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: capybara
@@ -193,6 +193,22 @@ dependencies:
     - - ~>
       - !ruby/object:Gem::Version
         version: 1.0.0
+- !ruby/object:Gem::Dependency
+  name: rspec-rerun
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '0.1'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '0.1'
 description: PhantomJS driver for Capybara
 email:
 - j@jonathanleighton.com
@@ -206,7 +222,6 @@ files:
 - lib/capybara/poltergeist/browser.rb
 - lib/capybara/poltergeist/inspector.rb
 - lib/capybara/poltergeist/errors.rb
-- lib/capybara/poltergeist/util.rb
 - lib/capybara/poltergeist/web_socket_server.rb
 - lib/capybara/poltergeist/json.rb
 - lib/capybara/poltergeist/network_traffic/request.rb
@@ -227,6 +242,7 @@ files:
 - lib/capybara/poltergeist/client/browser.coffee
 - lib/capybara/poltergeist/client/agent.coffee
 - lib/capybara/poltergeist/node.rb
+- lib/capybara/poltergeist/cookie.rb
 - lib/capybara/poltergeist/network_traffic.rb
 - LICENSE
 - README.md
@@ -244,7 +260,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 557027964753938347
+      hash: -4328509354684293409
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -253,7 +269,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 557027964753938347
+      hash: -4328509354684293409
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.24

data/lib/capybara/poltergeist/util.rb

@@ -1,12 +0,0 @@
-require 'socket'
-
-module Capybara::Poltergeist
-  module Util
-    def self.find_available_port
-      server = TCPServer.new('127.0.0.1', 0)
-      server.addr[1]
-    ensure
-      server.close if server
-    end
-  end
-end