From 59ba8611ba6388cf5262eb31ec06cea34fa66698 Mon Sep 17 00:00:00 2001
From: Joe Ferris <jferris@thoughtbot.com>
Date: Fri, 20 Jan 2012 09:40:30 -0500
Subject: [PATCH] Bump to 0.8.0; add json as a dependency

---
 Gemfile.lock                          | 22 ++++++++++++----------
 capybara-webkit.gemspec               |  1 +
 gemfiles/1.0.gemfile.lock             | 12 +++++++-----
 gemfiles/1.1.gemfile.lock             | 12 +++++++-----
 lib/capybara/driver/webkit/version.rb |  2 +-
 5 files changed, 28 insertions(+), 21 deletions(-)

diff --git a/Gemfile.lock b/Gemfile.lock
index b0b1114..94f4c05 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -1,8 +1,9 @@
 PATH
   remote: .
   specs:
-    capybara-webkit (0.7.2)
+    capybara-webkit (0.8.0)
       capybara (>= 1.0.0, < 1.2)
+      json
 
 GEM
   remote: http://rubygems.org/
@@ -10,21 +11,22 @@ GEM
     appraisal (0.4.0)
       bundler
       rake
-    capybara (1.1.1)
+    capybara (1.1.2)
       mime-types (>= 1.16)
       nokogiri (>= 1.3.3)
       rack (>= 1.0.0)
       rack-test (>= 0.5.4)
       selenium-webdriver (~> 2.0)
       xpath (~> 0.1.4)
-    childprocess (0.2.2)
+    childprocess (0.2.3)
       ffi (~> 1.0.6)
     diff-lcs (1.1.2)
-    ffi (1.0.9)
-    json_pure (1.6.1)
-    mime-types (1.16)
+    ffi (1.0.11)
+    json (1.6.3)
+    mime-types (1.17.2)
     mini_magick (3.2.1)
       subexec (~> 0.0.4)
+    multi_json (1.0.4)
     nokogiri (1.5.0)
     rack (1.3.2)
     rack-test (0.6.1)
@@ -38,11 +40,11 @@ GEM
     rspec-expectations (2.6.0)
       diff-lcs (~> 1.1.2)
     rspec-mocks (2.6.0)
-    rubyzip (0.9.4)
-    selenium-webdriver (2.7.0)
+    rubyzip (0.9.5)
+    selenium-webdriver (2.15.0)
       childprocess (>= 0.2.1)
-      ffi (>= 1.0.7)
-      json_pure
+      ffi (~> 1.0.9)
+      multi_json (~> 1.0.4)
       rubyzip
     sinatra (1.1.2)
       rack (~> 1.1)
diff --git a/capybara-webkit.gemspec b/capybara-webkit.gemspec
index 853bfd6..b445189 100644
--- a/capybara-webkit.gemspec
+++ b/capybara-webkit.gemspec
@@ -16,6 +16,7 @@ Gem::Specification.new do |s|
   s.extensions = "extconf.rb"
 
   s.add_runtime_dependency("capybara", [">= 1.0.0", "< 1.2"])
+  s.add_runtime_dependency("json")
 
   s.add_development_dependency("rspec", "~> 2.6.0")
   s.add_development_dependency("sinatra")
diff --git a/gemfiles/1.0.gemfile.lock b/gemfiles/1.0.gemfile.lock
index 23462e2..3944e7e 100644
--- a/gemfiles/1.0.gemfile.lock
+++ b/gemfiles/1.0.gemfile.lock
@@ -1,8 +1,9 @@
 PATH
-  remote: /Users/gabe/thoughtbot/capybara-webkit
+  remote: /Users/jferris/Source/capybara-webkit
   specs:
-    capybara-webkit (0.7.2)
+    capybara-webkit (0.8.0)
       capybara (>= 1.0.0, < 1.2)
+      json
 
 GEM
   remote: http://rubygems.org/
@@ -21,6 +22,7 @@ GEM
       ffi (~> 1.0.6)
     diff-lcs (1.1.3)
     ffi (1.0.10)
+    json (1.6.3)
     json_pure (1.6.1)
     mime-types (1.17.2)
     mini_magick (3.3)
@@ -47,9 +49,9 @@ GEM
       json_pure
       rubyzip
     sinatra (1.3.1)
-      rack (>= 1.3.4, ~> 1.3)
-      rack-protection (>= 1.1.2, ~> 1.1)
-      tilt (>= 1.3.3, ~> 1.3)
+      rack (~> 1.3, >= 1.3.4)
+      rack-protection (~> 1.1, >= 1.1.2)
+      tilt (~> 1.3, >= 1.3.3)
     subexec (0.1.0)
     tilt (1.3.3)
     xpath (0.1.4)
diff --git a/gemfiles/1.1.gemfile.lock b/gemfiles/1.1.gemfile.lock
index f097d45..15d3335 100644
--- a/gemfiles/1.1.gemfile.lock
+++ b/gemfiles/1.1.gemfile.lock
@@ -1,8 +1,9 @@
 PATH
-  remote: /Users/gabe/thoughtbot/capybara-webkit
+  remote: /Users/jferris/Source/capybara-webkit
   specs:
-    capybara-webkit (0.7.2)
+    capybara-webkit (0.8.0)
       capybara (>= 1.0.0, < 1.2)
+      json
 
 GEM
   remote: http://rubygems.org/
@@ -21,6 +22,7 @@ GEM
       ffi (~> 1.0.6)
     diff-lcs (1.1.3)
     ffi (1.0.10)
+    json (1.6.3)
     json_pure (1.6.1)
     mime-types (1.17.2)
     mini_magick (3.3)
@@ -47,9 +49,9 @@ GEM
       json_pure
       rubyzip
     sinatra (1.3.1)
-      rack (>= 1.3.4, ~> 1.3)
-      rack-protection (>= 1.1.2, ~> 1.1)
-      tilt (>= 1.3.3, ~> 1.3)
+      rack (~> 1.3, >= 1.3.4)
+      rack-protection (~> 1.1, >= 1.1.2)
+      tilt (~> 1.3, >= 1.3.3)
     subexec (0.1.0)
     tilt (1.3.3)
     xpath (0.1.4)
diff --git a/lib/capybara/driver/webkit/version.rb b/lib/capybara/driver/webkit/version.rb
index c618372..4ae89c2 100644
--- a/lib/capybara/driver/webkit/version.rb
+++ b/lib/capybara/driver/webkit/version.rb
@@ -1,7 +1,7 @@
 module Capybara
   module Driver
     class Webkit
-      VERSION = '0.7.2'.freeze
+      VERSION = '0.8.0'.freeze
     end
   end
 end