From e94d1331b68d6525d5b616c2bbf7dd44becf4e18 Mon Sep 17 00:00:00 2001
From: Paul Carey <paul.p.carey@gmail.com>
Date: Tue, 4 May 2010 12:39:31 +0100
Subject: [PATCH] Update for merb 1.1.

---
 Rakefile                      | 3 +--
 lib/merb_relaxdb.rb           | 4 +++-
 lib/merb_relaxdb/merbtasks.rb | 2 +-
 merb_relaxdb.gemspec          | 4 ++--
 4 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/Rakefile b/Rakefile
index 1d345a1..197740c 100644
--- a/Rakefile
+++ b/Rakefile
@@ -1,10 +1,9 @@
 require 'rubygems'
 require 'rake/gempackagetask'
-require 'merb-core/tasks/merb_rake_helper'
 
 PLUGIN = "merb_relaxdb"
 GEM_NAME = "merb_relaxdb"
-GEM_VERSION = "1.0"
+GEM_VERSION = "1.1"
 AUTHOR = "Paul Carey"
 EMAIL = "paul.p.carey@gmail.com"
 HOMEPAGE = "http://github.com/paulcarey/merb_relaxdb/"
diff --git a/lib/merb_relaxdb.rb b/lib/merb_relaxdb.rb
index ca723f2..39e79bc 100644
--- a/lib/merb_relaxdb.rb
+++ b/lib/merb_relaxdb.rb
@@ -1,6 +1,8 @@
 # make sure we're running inside Merb
 if defined?(Merb::Plugins)
-  dependency "relaxdb"
+  
+  # As of Merb 1.1 the RelaxDB dependency should be expressed in the app's Gemfile
+  # dependency "relaxdb"
 
   # Merb gives you a Merb::Plugins.config hash...feel free to put your stuff in your piece of it
   Merb::Plugins.config[:merb_relaxdb] = {
diff --git a/lib/merb_relaxdb/merbtasks.rb b/lib/merb_relaxdb/merbtasks.rb
index 4839e70..76cf3df 100644
--- a/lib/merb_relaxdb/merbtasks.rb
+++ b/lib/merb_relaxdb/merbtasks.rb
@@ -16,7 +16,7 @@
     puts "Creating auto generated views"
     RelaxDB.use_db RelaxDB.db.name    
     RelaxDB.enable_view_creation
-    Rake::Task["merb_env"].invoke
+    Rake::Task["merb_env"].invoke    
     RelaxDB::View.design_doc.save
   end
   
diff --git a/merb_relaxdb.gemspec b/merb_relaxdb.gemspec
index 1447c17..c1239ad 100644
--- a/merb_relaxdb.gemspec
+++ b/merb_relaxdb.gemspec
@@ -1,7 +1,7 @@
 Gem::Specification.new do |s|
   s.name = "merb_relaxdb"
-  s.version = "1.0"
-  s.date = "2008-11-27"
+  s.version = "1.1"
+  s.date = "2010-04-10"
   s.summary = "Merb plugin that provides integration with CouchDB"
   s.email = "paul.p.carey@gmail.com"
   s.homepage = "http://github.com/paulcarey/merb_relaxdb/"