capybara-envjs 0.1.0.pre2 → 0.1.0

data/CHANGELOG.rdoc

@@ -1,3 +1,8 @@
+=== 0.1.0 / 2010-03-29
+
+* updated to use stock capybara 3.6
+* add support for both rack-test and external modes
+
 === 0.1.0.pre2 / 2010-02-25
 
 * initial commit

data/Rakefile

@@ -9,14 +9,14 @@ Hoe.plugins.delete :rubyforge
 
 Hoe.spec 'capybara-envjs' do
   developer 'Steven Parkes', 'smparkes@smparkes.net'
-  self.version = "0.1.0.pre2"
+  self.version = "0.1.0"
 
   self.readme_file      = 'README.rdoc'
   self.extra_rdoc_files = Dir['*.rdoc']
 
   self.extra_deps = [
-    ['capybara', '>= 0.3.0'],
-    ['envjs', '>= 0.1.6']
+    ['capybara', '>= 0.3.6'],
+    ['envjs', '>= 0.3.0']
   ]
 
   self.extra_dev_deps = [

data/lib/capybara/driver/envjs_driver.rb

@@ -1,4 +1,25 @@
-require 'rack/test'
+if false # for testing ... but seems okay
+  class Thread
+    def self.start
+      puts caller(0)
+      raise "hell"
+    end
+    def initialize *args
+      puts caller(0)
+      raise "hell"
+    end
+  end
+
+  module Timeout
+    def timeout *args
+      # p "!!! #{args.inspect}"
+      # puts caller(0)
+      return yield
+      raise "hell #{args.inspect}"
+    end
+    module_function :timeout
+  end
+end
 
 class Capybara::Driver::Envjs < Capybara::Driver::Base
   class Node < Capybara::Node
@@ -38,7 +59,8 @@ class Capybara::Driver::Envjs < Capybara::Driver::Base
         node.innerText = value
       else
         case node.getAttribute("type")
-        when "checkbox", "radio"; node.checked = value
+        when "checkbox", "radio"
+          node.click if node.checked != value
         else; node.setAttribute("value",value)
         end
       end
@@ -48,7 +70,6 @@ class Capybara::Driver::Envjs < Capybara::Driver::Base
       option_node = all_unfiltered("//option[text()='#{option}']") || all_unfiltered("//option[contains(.,'#{option}')]")
       option_node[0].node.selected = true
     rescue Exception => e
-      # print e
       options = all_unfiltered(".//option").map { |o| "'#{o.text}'" }.join(', ')
       raise Capybara::OptionNotFound, "No such option '#{option}' in this select box. Available options: #{options}"
     end
@@ -62,7 +83,6 @@ class Capybara::Driver::Envjs < Capybara::Driver::Base
         option_node = (all_unfiltered("//option[text()='#{option}']") || all_unfiltered("//option[contains(.,'#{option}')]")).first
         option_node.node.selected = false
       rescue Exception => e
-        # print e
         options = all_unfiltered(".//option").map { |o| "'#{o.text}'" }.join(', ')
         raise Capybara::OptionNotFound, "No such option '#{option}' in this select box. Available options: #{options}"
       end
@@ -113,68 +133,88 @@ class Capybara::Driver::Envjs < Capybara::Driver::Base
 
   end
 
-  include ::Rack::Test::Methods
   attr_reader :app
+  attr_reader :app_host
 
-  alias_method :response, :last_response
-  alias_method :request, :last_request
+  def rack_test?
+    @rack_test
+  end
 
   def initialize(app)
-    @app = app
 
-    master_load = browser.master["load"]
 
-    browser.master["load"] = proc do |*args|
-      if args.size == 2 and args[1].to_s != "[object split_global]"
-        file, window = *args
-        get(file, {}, env)
-        window["evaluate"].call response.body
-      else
-        master_load.call *args
+    @app_host = (ENV["CAPYBARA_APP_HOST"] || Capybara.app_host || "http://example.com")
+
+    @rack_test = @app_host =~ %r{^https?://[^.]*\.?example\.(com|org)}
+
+    if rack_test?
+      require 'rack/test'
+      class << self; self; end.instance_eval do
+        include ::Rack::Test::Methods
+        alias_method :response, :last_response
+        alias_method :request, :last_request
       end
     end
 
-    browser["window"]["$envx"]["connection"] =
-    browser.master["connection"] = @connection = proc do |*args|
-      xhr, responseHandler, data = *args
-      url = xhr.url.sub %r{^http://example.com}, ""
-      params = data || {}
-      method = xhr["method"].downcase.to_sym
-      e = env;
-      if method == :post or method == :put
-        e.merge! "CONTENT_TYPE" => xhr.headers["Content-Type"]
-      end
-      if e["CONTENT_TYPE"] =~ %r{^multipart/form-data;}
-        e["CONTENT_LENGTH"] ||= params.length
+    @app = app
+
+    master_load = browser.master["load"]
+
+    if rack_test?
+      browser.master["load"] = proc do |*args|
+        if args.size == 2 and args[1].to_s != "[object split_global]"
+          file, window = *args
+          get(file, {}, env)
+          window["evaluate"].call response.body
+        else
+          master_load.call *args
+        end
       end
-      begin
-        # puts "send #{method} #{url} #{params}"
-        send method, url, params, e
-        while response.status == 302
-          params = {}
-          method = :get
-          url = response.location
-          # puts "redirect #{method} #{url} #{params}"
+
+      browser["window"]["$envx"]["connection"] =
+      browser.master["connection"] = @connection = proc do |*args|
+        xhr, responseHandler, data = *args
+        url = xhr.url
+        if url.index(app_host) == 0
+          url.slice! 0..(app_host.length-1)
+        end
+        params = data || {}
+        method = xhr["method"].downcase.to_sym
+        e = env;
+        if method == :post or method == :put
+          e.merge! "CONTENT_TYPE" => xhr.headers["Content-Type"]
+        end
+        if e["CONTENT_TYPE"] =~ %r{^multipart/form-data;}
+          e["CONTENT_LENGTH"] ||= params.length
+        end
+        begin
+          # puts "send #{method} #{url} #{params}"
           send method, url, params, e
+          while response.status == 302
+            params = {}
+            method = :get
+            url = response.location
+            # puts "redirect #{method} #{url} #{params}"
+            send method, url, params, e
+          end
+        rescue Exception => e
+          print "got #{e} #{response.inspect}\n"
+          raise e
         end
-      rescue Exception => e
-        print "got #{e} #{response.inspect}\n"
-        raise e
-      end
-      @source = response.body
-      response.headers.each do |k,v|
-        xhr.responseHeaders[k] = v
+        @source = response.body
+        response.headers.each do |k,v|
+          xhr.responseHeaders[k] = v
+        end
+        xhr.status = response.status
+        xhr.responseText = response.body
+        responseHandler.call
       end
-      xhr.status = response.status
-      xhr.responseText = response.body
-      responseHandler.call
     end
   end
 
   def visit(path)
-    # puts "visit #{path}"
     as_url = URI.parse path
-    base = URI.parse "http://example.com"
+    base = URI.parse app_host
     path = (base + as_url).to_s
     browser["window"].location.href = path
   end
@@ -184,15 +224,24 @@ class Capybara::Driver::Envjs < Capybara::Driver::Base
   end
   
   def source
-    @source
+    browser["window"].document.__original_text__
   end
 
   def body
     browser["window"].document.xml
   end
 
+  class Headers
+    def initialize hash
+      @hash = hash
+    end
+    def [] key
+      @hash[key.downcase]
+    end
+  end
+
   def response_headers
-    response.headers
+    rack_test? ? response.headers : Headers.new(browser["window"]["document"]["__headers__"])
   end
 
   def find(selector)
@@ -223,18 +272,14 @@ class Capybara::Driver::Envjs < Capybara::Driver::Base
     unless @_browser
       require 'johnson/tracemonkey'
       require 'envjs/runtime'
-      @_browser = Johnson::Runtime.new :size => 0x4000000
+      @_browser = Johnson::Runtime.new :size => Integer(ENV["JOHNSON_HEAP_SIZE"] || 0x4000000)
       @_browser.extend Envjs::Runtime
     end
     
     @_browser
   end
 
-  def obeys_absolute_xpath
-    true
-  end
-
-  def has_shortcircuit_timeout
+  def has_shortcircuit_timeout?
     true
   end
 

data/spec/driver/envjs_driver_spec.rb

@@ -12,6 +12,5 @@ describe Capybara::Driver::Envjs do
   it_should_behave_like "driver"
   it_should_behave_like "driver with javascript support"
   it_should_behave_like "driver with header support"
-  it_should_behave_like "driver with node path support"
   
 end

metadata

@@ -1,13 +1,12 @@
 --- !ruby/object:Gem::Specification 
 name: capybara-envjs
 version: !ruby/object:Gem::Version 
-  prerelease: true
+  prerelease: false
   segments: 
   - 0
   - 1
   - 0
-  - pre2
-  version: 0.1.0.pre2
+  version: 0.1.0
 platform: ruby
 authors: 
 - Steven Parkes
@@ -15,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-02-25 00:00:00 -08:00
+date: 2010-03-29 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -28,8 +27,8 @@ dependencies:
         segments: 
         - 0
         - 3
-        - 0
-        version: 0.3.0
+        - 6
+        version: 0.3.6
   type: :runtime
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
@@ -41,9 +40,9 @@ dependencies:
       - !ruby/object:Gem::Version 
         segments: 
         - 0
-        - 1
-        - 6
-        version: 0.1.6
+        - 3
+        - 0
+        version: 0.3.0
   type: :runtime
   version_requirements: *id002
 - !ruby/object:Gem::Dependency 
@@ -134,13 +133,11 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
   requirements: 
-  - - ">"
+  - - ">="
     - !ruby/object:Gem::Version 
       segments: 
-      - 1
-      - 3
-      - 1
-      version: 1.3.1
+      - 0
+      version: "0"
 requirements: []
 
 rubyforge_project: capybara-envjs