mohiam-merb_couchrest 0.1.3 → 0.1.4

data/Rakefile

@@ -5,7 +5,7 @@ require 'merb-core'
 require 'merb-core/tasks/merb'
 
 GEM_NAME = "merb_couchrest"
-GEM_VERSION = "0.1.3"
+GEM_VERSION = "0.1.4"
 AUTHOR = "Alexander Veenendaal"
 EMAIL = "odogono@gmail.com"
 HOMEPAGE = "http://github.com/mohiam/merb_couchrest"

data/lib/merb_couchrest.rb

@@ -5,22 +5,25 @@ if defined?(Merb::Plugins)
   Merb::Plugins.config[:merb_couchrest] = {}
   require File.join(File.dirname(__FILE__) / "merb" / "orms" / "couchrest" / "connection" )
   
-  Merb::BootLoader.before_app_loads do
-    
-    Merb::Orms::CouchRest.connect
-    
-    if Merb::Config.session_stores.include?(:couchrest)
-      Merb.logger.debug "Using CouchRest sessions"
-      require File.join(File.dirname(__FILE__) / "merb" / "session" / "couchrest_session")
-    end
-    
-  end
   
-  Merb::BootLoader.after_app_loads do
-    
-    # TODO - How do we disconnect if, in fact, we need to ?
+  class Merb::Orms::CouchRest::Connect < Merb::BootLoader
+    after BeforeAppLoads
+  
+    def self.run
+
+      Merb::Orms::CouchRest.connect
+      
+      Merb.logger.verbose! "Checking if we need to use CouchRest sessions"
+      
+      if Merb::Config.session_stores.include?(:couchrest)
+        Merb.logger.debug "Using CouchRest sessions"
+        require File.join(File.dirname(__FILE__) / "merb" / "session" / "couchrest_session")
+      end
+      
+    end
     
   end
+
   
   Merb::Plugins.add_rakefiles "merb_couchrest/merbtasks"
   

data/lib/merb_couchrest/merbtasks.rb

@@ -12,7 +12,7 @@ namespace :couchrest do
     task :clear => :merb_start do
       
       Merb::CouchRestSessionStore.all.each{ |doc| doc.database.delete_doc(doc,true) }
-      Merb::CouchRestSessionStore.bulk_save()
+      Merb::CouchRestSessionStore.database.bulk_save()
       
     end
     

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: mohiam-merb_couchrest
 version: !ruby/object:Gem::Version 
-  version: 0.1.3
+  version: 0.1.4
 platform: ruby
 authors: 
 - Alexander Veenendaal