From 544e9e5c3c3d138151fd046a42d894cb0f19bbc2 Mon Sep 17 00:00:00 2001
From: did <didier@nocoffee.fr>
Date: Wed, 28 Sep 2011 11:57:48 +0200
Subject: [PATCH] fix issue #225 (bson_ext version)

---
 Gemfile                |  2 +-
 Gemfile.lock           | 65 +++++++++++++++++++++---------------------
 locomotive_cms.gemspec |  4 +--
 3 files changed, 36 insertions(+), 35 deletions(-)

diff --git a/Gemfile b/Gemfile
index 426a9c84..50bfb29b 100644
--- a/Gemfile
+++ b/Gemfile
@@ -11,7 +11,7 @@ gem 'devise', '1.3.4'
 gem 'devise_bushido_authenticatable', '1.0.0.alpha10', :require => 'devise_cas_authenticatable'
 
 gem 'mongoid', '~> 2.0.2'
-gem 'bson_ext', '~> 1.3.0'
+gem 'bson_ext', '~> 1.4.0'
 gem 'locomotive_mongoid_acts_as_tree', '0.1.5.7', :require => 'mongoid_acts_as_tree'
 gem 'will_paginate', '~> 3.0.0'
 
diff --git a/Gemfile.lock b/Gemfile.lock
index ce4b55bd..dc9d4c27 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -7,7 +7,7 @@ GEM
     Platform (0.4.0)
     RedCloth (4.2.8)
     SystemTimer (1.2.3)
-    ZenTest (4.6.1)
+    ZenTest (4.6.2)
     abstract (1.0.0)
     actionmailer (3.0.10)
       actionpack (= 3.0.10)
@@ -42,8 +42,8 @@ GEM
     autotest (4.4.6)
       ZenTest (>= 4.4.1)
     bcrypt-ruby (2.1.4)
-    bson (1.3.1)
-    bson_ext (1.3.1)
+    bson (1.4.0)
+    bson_ext (1.4.0)
     builder (2.1.2)
     bushido (0.0.35)
       highline (>= 1.6.1)
@@ -53,7 +53,7 @@ GEM
     bushido_stub (0.0.3)
       activesupport (>= 3.0.7)
     cancan (1.6.5)
-    capybara (1.0.1)
+    capybara (1.1.1)
       mime-types (>= 1.16)
       nokogiri (>= 1.3.3)
       rack (>= 1.0.0)
@@ -62,20 +62,20 @@ GEM
       xpath (~> 0.1.4)
     carrierwave (0.5.6)
       activesupport (~> 3.0)
-    cells (3.6.5)
+    cells (3.6.6)
       actionpack (~> 3.0)
       railties (~> 3.0)
-    childprocess (0.2.1)
+    childprocess (0.2.2)
       ffi (~> 1.0.6)
     columnize (0.3.4)
     configuration (1.3.1)
     crack (0.1.8)
-    cucumber (1.0.2)
+    cucumber (1.0.6)
       builder (>= 2.1.2)
       diff-lcs (>= 1.1.2)
-      gherkin (~> 2.4.5)
+      gherkin (~> 2.4.18)
       json (>= 1.4.6)
-      term-ansicolor (>= 1.0.5)
+      term-ansicolor (>= 1.0.6)
     cucumber-rails (1.0.2)
       capybara (>= 1.0.0)
       cucumber (~> 1.0.0)
@@ -99,15 +99,16 @@ GEM
       devise
       devise (>= 1.0.6)
       rubycas-client (>= 2.2.1)
-    diff-lcs (1.1.2)
-    dragonfly (0.9.5)
+    diff-lcs (1.1.3)
+    dragonfly (0.9.8)
       rack
     erubis (2.6.6)
       abstract (>= 1.0.0)
-    excon (0.6.5)
-    factory_girl (2.0.4)
-    factory_girl_rails (1.1.0)
-      factory_girl (~> 2.0.0)
+    excon (0.6.6)
+    factory_girl (2.1.2)
+      activesupport
+    factory_girl_rails (1.2.0)
+      factory_girl (~> 2.1.0)
       railties (>= 3.0.0)
     ffi (1.0.9)
     fog (0.8.2)
@@ -119,12 +120,12 @@ GEM
       net-ssh (>= 2.1.3)
       nokogiri (>= 1.4.4)
       ruby-hmac
-    formatador (0.2.0)
+    formatador (0.2.1)
     formtastic (1.2.4)
       actionpack (>= 2.3.7)
       activesupport (>= 2.3.7)
       i18n (~> 0.4)
-    gherkin (2.4.6)
+    gherkin (2.4.21)
       json (>= 1.4.6)
     growl-glue (1.0.7)
     haml (3.1.2)
@@ -132,7 +133,7 @@ GEM
     heroku (1.19.1)
       activesupport (>= 2.1.0)
       launchy (~> 0.3.2)
-      rest-client (>= 1.4.0, < 1.7.0)
+      rest-client (< 1.7.0, >= 1.4.0)
     highline (1.6.2)
     httparty (0.7.8)
       crack (= 0.1.8)
@@ -142,8 +143,8 @@ GEM
       responders (~> 0.6.0)
     jammit (0.6.3)
       yui-compressor (>= 0.9.3)
-    json (1.5.3)
-    json_pure (1.5.3)
+    json (1.6.1)
+    json_pure (1.6.1)
     kgio (2.6.0)
     launchy (0.3.7)
       configuration (>= 0.0.5)
@@ -167,23 +168,23 @@ GEM
     mimemagic (0.1.8)
     mimetype-fu (0.1.2)
     mocha (0.9.12)
-    mongo (1.3.1)
-      bson (>= 1.3.1)
+    mongo (1.4.0)
+      bson (= 1.4.0)
     mongoid (2.0.2)
       activemodel (~> 3.0)
       mongo (~> 1.3)
       tzinfo (~> 0.3.22)
-    net-ssh (2.1.4)
+    net-ssh (2.2.1)
     nokogiri (1.5.0)
     open4 (1.1.0)
     orm_adapter (0.0.5)
-    pickle (0.4.8)
+    pickle (0.4.10)
       cucumber (>= 0.8)
       rake
     polyglot (0.3.2)
     proxies (0.2.1)
-    rack (1.2.3)
-    rack-cache (1.0.2)
+    rack (1.2.4)
+    rack-cache (1.1)
       rack (>= 0.4)
     rack-mount (0.6.14)
       rack (>= 1.0.0)
@@ -207,7 +208,7 @@ GEM
     rake (0.9.2)
     rdoc (3.9.4)
     responders (0.6.4)
-    rest-client (1.6.3)
+    rest-client (1.6.7)
       mime-types (>= 1.16)
     rmagick (2.12.2)
     rspec (2.6.0)
@@ -249,9 +250,9 @@ GEM
     s3 (0.3.8)
       proxies (~> 0.2.0)
     sanitize (2.0.3)
-      nokogiri (>= 1.4.4, < 1.6)
+      nokogiri (< 1.6, >= 1.4.4)
     sass (3.1.2)
-    selenium-webdriver (2.4.0)
+    selenium-webdriver (2.7.0)
       childprocess (>= 0.2.1)
       ffi (>= 1.0.7)
       json_pure
@@ -263,13 +264,13 @@ GEM
       polyglot
       polyglot (>= 0.3.1)
     tzinfo (0.3.29)
-    unicorn (4.0.1)
+    unicorn (4.1.1)
       kgio (~> 2.4)
       rack
       raindrops (~> 0.6)
     warden (1.0.5)
       rack (>= 1.0)
-    will_paginate (3.0.0)
+    will_paginate (3.0.2)
     xpath (0.1.4)
       nokogiri (~> 1.3)
     yui-compressor (0.9.6)
@@ -284,7 +285,7 @@ DEPENDENCIES
   ZenTest
   actionmailer-with-request
   autotest
-  bson_ext (~> 1.3.0)
+  bson_ext (~> 1.4.0)
   bushido (= 0.0.35)
   bushido_stub (= 0.0.3)
   cancan
diff --git a/locomotive_cms.gemspec b/locomotive_cms.gemspec
index 6b58d8a5..8ef5992b 100644
--- a/locomotive_cms.gemspec
+++ b/locomotive_cms.gemspec
@@ -21,8 +21,8 @@ Gem::Specification.new do |s|
   s.add_dependency 'warden'
   s.add_dependency 'devise', '1.3.4'
   s.add_dependency 'devise_bushido_authenticatable', '1.0.0.alpha10'
-  s.add_dependency 'mongoid', '2.0.2'
-  s.add_dependency 'bson_ext', '~> 1.3.0'
+  s.add_dependency 'mongoid', '~> 2.0.2'
+  s.add_dependency 'bson_ext', '~> 1.4.0'
   s.add_dependency 'locomotive_mongoid_acts_as_tree', '0.1.5.7'
   s.add_dependency 'will_paginate', '~> 3.0.0'