capybara-envjs 0.1.3 → 0.1.4

data/CHANGELOG.rdoc

@@ -1,3 +1,9 @@
+=== 0.1.4 / 2010-05-31
+
+* Fix URL handling edge cases
+* World is defined on self/main, not Object
+* make sure header lookup is case insensitive
+
 === 0.1.3 / 2010-05-19
 
 * alway return headers from doc ... the rack request might not be current

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.3"
+  self.version = "0.1.4"
 
   self.readme_file      = 'README.rdoc'
   self.extra_rdoc_files = Dir['*.rdoc']
 
   self.extra_deps = [
     ['capybara', '>= 0.3.8'],
-    ['envjs', '>= 0.3.5']
+    ['envjs', '>= 0.3.6']
   ]
 
   self.extra_dev_deps = [

data/lib/capybara/driver/envjs_driver.rb

@@ -144,7 +144,6 @@ class Capybara::Driver::Envjs < Capybara::Driver::Base
 
   def initialize(app)
 
-
     @app_host = (ENV["CAPYBARA_APP_HOST"] || Capybara.app_host || "http://example.com")
 
     @rack_test = @app_host =~ %r{^https?://[^.]*\.?example\.(com|org)}
@@ -183,9 +182,6 @@ class Capybara::Driver::Envjs < Capybara::Driver::Base
       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;
@@ -196,12 +192,18 @@ class Capybara::Driver::Envjs < Capybara::Driver::Base
           e["CONTENT_LENGTH"] ||= params.length
         end
         begin
+          if url.index(app_host) == 0
+            url.slice! 0..(app_host.length-1)
+          end
           # puts "send #{method} #{url} #{params}"
           send method, url, params, e
           while response.status == 302
             params = {}
             method = :get
             url = response.location
+            if url.index(app_host) == 0
+              url.slice! 0..(app_host.length-1)
+            end
             # puts "redirect #{method} #{url} #{params}"
             send method, url, params, e
           end
@@ -216,7 +218,12 @@ class Capybara::Driver::Envjs < Capybara::Driver::Base
         xhr.status = response.status
         xhr.responseText = response.body
         xhr.readyState = 4
-        url = app_host+url
+        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
@@ -247,7 +254,8 @@ class Capybara::Driver::Envjs < Capybara::Driver::Base
       @hash = hash
     end
     def [] key
-      @hash[key.downcase]
+      pair = @hash.find { |pair| pair[0].downcase == key.downcase }
+      pair && pair[1]
     end
   end
 

data/lib/capybara/envjs.rb

@@ -1,6 +1,6 @@
 require 'capybara'
 require 'capybara/driver/envjs_driver'
 
-if Object.const_defined? :Cucumber and Object.respond_to? :World
+if Object.const_defined? :Cucumber and self.respond_to? :World
   require 'capybara/envjs/cucumber'
 end

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 1
-  - 3
-  version: 0.1.3
+  - 4
+  version: 0.1.4
 platform: ruby
 authors: 
 - Steven Parkes
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-05-19 00:00:00 -07:00
+date: 2010-05-31 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -41,8 +41,8 @@ dependencies:
         segments: 
         - 0
         - 3
-        - 5
-        version: 0.3.5
+        - 6
+        version: 0.3.6
   type: :runtime
   version_requirements: *id002
 - !ruby/object:Gem::Dependency