capybara-envjs-fixes 0.0.3 → 0.0.4

data/VERSION

@@ -1 +1 @@
-0.0.3
+0.0.4

data/capybara-envjs-fixes.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{capybara-envjs-fixes}
-  s.version = "0.0.3"
+  s.version = "0.0.4"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Jason Morrison"]
-  s.date = %q{2010-07-30}
+  s.date = %q{2010-08-02}
   s.description = %q{Fixes on top of capybara-envjs}
   s.email = %q{jmorrison@thoughtbot.com}
   s.extra_rdoc_files = [
@@ -28,6 +28,7 @@ Gem::Specification.new do |s|
      "lib/capybara_envjs_fixes/cucumber_fixes/base64_upload.rb",
      "lib/capybara_envjs_fixes/cucumber_fixes/capybara_extensions.rb",
      "lib/capybara_envjs_fixes/cucumber_fixes/javascript.rb",
+     "lib/capybara_envjs_fixes/cucumber_fixes/redirect_fix.rb",
      "spec/capybara-envjs-fixes_spec.rb",
      "spec/spec.opts",
      "spec/spec_helper.rb"

data/lib/capybara_envjs_fixes/cucumber_fixes.rb

@@ -1,3 +1,4 @@
 require 'capybara_envjs_fixes/cucumber_fixes/javascript'
 require 'capybara_envjs_fixes/cucumber_fixes/capybara_extensions'
 require 'capybara_envjs_fixes/cucumber_fixes/base64_upload'
+require 'capybara_envjs_fixes/cucumber_fixes/redirect_fix'

data/lib/capybara_envjs_fixes/cucumber_fixes/capybara_extensions.rb

@@ -47,6 +47,107 @@ class Capybara::Driver::Envjs::Node
 end
 
 class Capybara::Driver::Envjs
+  def initialize(app)
+    default_host = @default_host = (Capybara.default_host || "www.example.com")
+    @default_url = "http://"+@default_host
+    @app_host = (ENV["CAPYBARA_APP_HOST"] || Capybara.app_host || @default_url)
+
+    @rack_test = @app_host == @default_url
+
+    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
+        define_method :build_rack_mock_session do
+          Rack::MockSession.new(app, default_host)
+        end
+      end
+    end
+
+    @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
+          body = nil
+          if file.index(app_host) == 0
+            get(file, {}, env)
+            body = response.body
+          else
+            body = Net::HTTP.get(URI.parse(file))
+          end
+          window["evaluate"].call body
+        else
+          master_load.call *args
+        end
+      end
+
+      browser["window"]["$envx"]["connection"] =
+      browser.master["connection"] = @connection = proc do |*args|
+        xhr, responseHandler, data = *args
+        url = xhr.url
+        params = data || {}
+        method = xhr["method"].downcase.to_sym
+
+        e = env;
+        xhr.headers.each do |k, v|
+          next if /^content-type$/i =~ k
+          next if /^content-length$/i =~ k
+          next if /^cookie$/i =~ k
+          e['HTTP_' + k.gsub(/-/o, '_').upcase] = v
+        end
+        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
+        times = 0
+        begin
+          if url.index(app_host) == 0
+            url.slice! 0..(app_host.length-1)
+          end
+          send method, url, params, e
+          while response.status == 302 || response.status == 301
+            if (times += 1) > 5
+              raise Capybara::InfiniteRedirectError, "redirected more than 5 times, check for infinite redirects."
+            end
+            params = {}
+            method = :get
+            url = response.location
+            if url.index(app_host) == 0
+              url.slice! 0..(app_host.length-1)
+            end
+            send method, url, params, 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
+        end
+        xhr.status = response.status
+        xhr.responseText = response.body
+        xhr.readyState = 4
+        if url.index(app_host) == 0
+          url.slice! 0..(app_host.length-1)
+        end
+        if url.slice(0..0) == "/"
+          url = app_host+url
+        end
+        xhr.__url = url
+        responseHandler.call
+      end
+    end
+  end
+
   def env
     env = {}
     begin

data/lib/capybara_envjs_fixes/cucumber_fixes/redirect_fix.rb

@@ -0,0 +1,28 @@
+class RedirectContentTypeRemover
+  def initialize(app)
+    @app = app
+  end
+
+  def call(env)
+    remove_content_type_from_redirect(env)
+    @app.call(env)
+  end
+
+  private
+
+  def remove_content_type_from_redirect(env)
+    if input_blank?(env)
+      env.delete('CONTENT_TYPE')
+    end
+  end
+
+  def input_blank?(env)
+    input = env['rack.input']
+    return true unless input
+    content = input.read
+    input.rewind
+    content.blank?
+  end
+end
+
+Capybara.app = RedirectContentTypeRemover.new(Capybara.app)

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: capybara-envjs-fixes
 version: !ruby/object:Gem::Version 
-  hash: 25
+  hash: 23
   prerelease: false
   segments: 
   - 0
   - 0
-  - 3
-  version: 0.0.3
+  - 4
+  version: 0.0.4
 platform: ruby
 authors: 
 - Jason Morrison
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-07-30 00:00:00 -04:00
+date: 2010-08-02 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -71,6 +71,7 @@ files:
 - lib/capybara_envjs_fixes/cucumber_fixes/base64_upload.rb
 - lib/capybara_envjs_fixes/cucumber_fixes/capybara_extensions.rb
 - lib/capybara_envjs_fixes/cucumber_fixes/javascript.rb
+- lib/capybara_envjs_fixes/cucumber_fixes/redirect_fix.rb
 - spec/capybara-envjs-fixes_spec.rb
 - spec/spec.opts
 - spec/spec_helper.rb