Update for merb 1.1.

paulcarey · May 4, 2010 · e94d133 · e94d133
1 parent a52bcfe
commit e94d133
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 6 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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/"