lib/couch_potato/database.rb in andrewtimberlake-couch_potato-0.2.8.3 vs lib/couch_potato/database.rb in andrewtimberlake-couch_potato-0.2.8.4

@@ -1,76 +1,77 @@
 module CouchPotato
   class Database
-    
+
     class ValidationsFailedError < ::StandardError; end
-  
+
     def initialize(couchrest_database)
       @database = couchrest_database
       begin
-        couchrest_database.info 
+        couchrest_database.info
       rescue RestClient::ResourceNotFound
         raise "Database '#{couchrest_database.name}' does not exist."
       end
     end
-    
+
     def view(spec)
       results = CouchPotato::View::ViewQuery.new(database,
         spec.design_document, spec.view_name, spec.map_function,
         spec.reduce_function).query_view!(spec.view_parameters)
       spec.process_results results
     end
-  
+
     def save_document(document)
       return true unless document.dirty?
       if document.new?
         create_document document
       else
         update_document document
       end
     end
     alias_method :save, :save_document
-  
+
     def save_document!(document)
       save_document(document) || raise(ValidationsFailedError.new(document.errors.full_messages))
     end
     alias_method :save!, :save_document!
-  
+
     def destroy_document(document)
       document.run_callbacks :before_destroy
       document._deleted = true
       database.delete_doc document.to_hash
       document.run_callbacks :after_destroy
       document._id = nil
       document._rev = nil
     end
     alias_method :destroy, :destroy_document
-  
+
     def load_document(id)
       raise "Can't load a document without an id (got nil)" if id.nil?
       begin
         json = database.get(id)
-        instance = Class.const_get(json['ruby_class']).json_create json
+        klass = json['ruby_class'].split('::').inject(Class){|scope, const| scope.const_get(const)}
+        instance = klass.json_create json
         instance.database = self
         instance
       rescue(RestClient::ResourceNotFound)
         nil
       end
     end
     alias_method :load, :load_document
-  
+
     def inspect
       "#<CouchPotato::Database>"
     end
-  
+
     private
 
     def clean_hash(hash)
       hash.each do |k,v|
         hash.delete k unless v
       end
     end
-  
+
     def create_document(document)
       document.database = self
       document.run_callbacks :before_validation_on_save
       document.run_callbacks :before_validation_on_create
       return unless document.valid?
@@ -81,11 +82,11 @@
       document._id = res['id']
       document.run_callbacks :after_save
       document.run_callbacks :after_create
       true
     end
-  
+
     def update_document(document)
       document.run_callbacks :before_validation_on_save
       document.run_callbacks :before_validation_on_update
       return unless document.valid?
       document.run_callbacks :before_save
@@ -94,12 +95,12 @@
       document._rev = res['rev']
       document.run_callbacks :after_save
       document.run_callbacks :after_update
       true
     end
-  
+
     def database
       @database
     end
-  
+
   end
-end
\ No newline at end of file
+end