capybara-json 0.2.4 → 0.3.0.beta1

data/CHANGELOG.md

@@ -1,5 +1,8 @@
+## 0.3.0.beta1
+* Capybara 2.x support, but test not working now... (thanks to gkellogg)
+
 ## 0.2.4
-* add __FILE__ and __LINE__ to module_eval (@mad_p)
+* Added __FILE__ and __LINE__ so that pry can find generated methods (thanks to @mad_p)
 
 ## 0.2.3
 * ENHANCEMENT

data/VERSION

@@ -1 +1 @@
-0.2.4
+0.3.0.beta1

data/lib/capybara/httpclient_json/driver.rb

@@ -82,13 +82,27 @@ class Capybara::HTTPClientJson::Driver < Capybara::Json::Driver::Base
       }
   end
 
+  def needs_server?
+    true
+  end
+
   def reset!
     @client = nil
   end
 
   protected
   def process(method, path, params = {}, headers = {}, options = {})
-    @current_url = @rack_server.url(path)
+    @current_url = if @rack_server.respond_to?(:url)
+      @rack_server.url(path)
+    elsif path !~ /^http/
+      if Capybara.app_host
+        Capybara.app_host + path.to_s
+      else
+        "http://#{@rack_server.host}:#{@rack_server.port}" + path.to_s
+      end
+    else
+      path
+    end
 
     begin
       @response = client.__send__(method, @current_url, params, headers, options)

data/lib/capybara/json/driver/base.rb

@@ -9,5 +9,6 @@ module Capybara::Json::Driver
         raise NotImplementedError
       end
     end
+    def needs_server?; false; end
   end
 end

data/lib/capybara/json.rb

@@ -30,14 +30,6 @@ module Capybara
       DEF
     end
 
-    %w[ json ].each do |method|
-      module_eval <<-DEF, __FILE__, __LINE__ + 1
-        def #{method}
-          page.driver.#{method}
-        end
-      DEF
-    end
-
     autoload :Error, 'capybara/json/error'
 
     module Driver

metadata

@@ -1,15 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: capybara-json
 version: !ruby/object:Gem::Version
-  version: 0.2.4
-  prerelease: 
+  version: 0.3.0.beta1
+  prerelease: 6
 platform: ruby
 authors:
 - okitan
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-09-01 00:00:00.000000000 Z
+date: 2012-12-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: capybara
@@ -236,9 +236,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
-  - - ! '>='
+  - - ! '>'
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubyforge_project: capybara-json
 rubygems_version: 1.8.24