andrewtimberlake-couch_potato 0.2.8.3 → 0.2.8.4

data/lib/core_ext/time.rb

@@ -1,6 +1,6 @@
 class Time
   def to_json(*a)
-    %("#{strftime("%Y/%m/%d %H:%M:%S +0000")}")
+    %("#{strftime("%Y/%m/%d %H:%M:%S %z")}")
   end
   
   def self.json_create string

data/lib/couch_potato/database.rb

@@ -1,24 +1,24 @@
 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?
@@ -28,12 +28,12 @@ module CouchPotato
       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
@@ -43,12 +43,13 @@ module CouchPotato
       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)
@@ -56,11 +57,11 @@ module CouchPotato
       end
     end
     alias_method :load, :load_document
-  
+
     def inspect
       "#<CouchPotato::Database>"
     end
-  
+
     private
 
     def clean_hash(hash)
@@ -68,7 +69,7 @@ module CouchPotato
         hash.delete k unless v
       end
     end
-  
+
     def create_document(document)
       document.database = self
       document.run_callbacks :before_validation_on_save
@@ -83,7 +84,7 @@ module CouchPotato
       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
@@ -96,10 +97,10 @@ module CouchPotato
       document.run_callbacks :after_update
       true
     end
-  
+
     def database
       @database
     end
-  
+
   end
-end
+end

data/spec/unit/database_spec.rb

@@ -3,6 +3,13 @@ require File.dirname(__FILE__) + '/../spec_helper'
 class DbTestUser
 end
 
+# namespaced model
+module Parent
+  class Child
+    include CouchPotato::Persistence
+  end
+end
+
 describe CouchPotato::Database, 'new' do
   it "should raise an exception if the database doesn't exist" do
     lambda {
@@ -18,7 +25,7 @@ describe CouchPotato::Database, 'load' do
       db.load nil
     }.should raise_error("Can't load a document without an id (got nil)")
   end
-  
+
   it "should set itself on the model" do
     user = mock 'user'
     DbTestUser.stub!(:new).and_return(user)
@@ -26,6 +33,11 @@ describe CouchPotato::Database, 'load' do
     user.should_receive(:database=).with(db)
     db.load '1'
   end
+
+  it "should load namespaced models" do
+    db = CouchPotato::Database.new(stub('couchrest db', :info => nil, :get => {'ruby_class' => 'Parent::Child'}))
+    db.load('1').class.should == Parent::Child
+  end
 end
 
 describe CouchPotato::Database, 'save_document' do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: andrewtimberlake-couch_potato
 version: !ruby/object:Gem::Version 
-  version: 0.2.8.3
+  version: 0.2.8.4
 platform: ruby
 authors: 
 - Alexander Lang