couch_potato 0.2.15 → 0.2.16

data/CHANGES.md

@@ -1,5 +1,9 @@
 ## Changes
 
+### 0.2.16
+* fixed problem with classes being not loaded in rails development mode (langalex)
+* fixed persist boolean false value (bernd)
+
 ### 0.2.15
 * ability to change the name of the attribute that stores the ruby class in the documents by setting JSON.create_id (lennart)
 * fixed double loading issue with bundler (jweiss)

data/VERSION.yml

@@ -1,5 +1,4 @@
 --- 
-:build: 
-:minor: 2
-:patch: 15
 :major: 0
+:minor: 2
+:patch: 16

data/lib/couch_potato/database.rb

@@ -65,7 +65,7 @@ module CouchPotato
 
     def clean_hash(hash)
       hash.each do |k,v|
-        hash.delete k unless v
+        hash.delete k if v.nil?
       end
     end
 

data/lib/couch_potato/persistence/properties.rb

@@ -62,7 +62,7 @@ module CouchPotato
           instance
         end
 
-        # Declare a proprty on a model class. properties are not typed by default. You can use any of the basic types by JSON (String, Integer, Fixnum, Array, Hash). If you want a property to be of a custom class you have to define it using the :class option.
+        # Declare a property on a model class. properties are not typed by default. You can use any of the basic types by JSON (String, Integer, Fixnum, Array, Hash). If you want a property to be of a custom class you have to define it using the :class option.
         #
         # example:
         #  class Book
@@ -78,4 +78,4 @@ module CouchPotato
       end
     end
   end
-end
+end

data/lib/couch_potato/persistence/simple_property.rb

@@ -11,7 +11,7 @@ module CouchPotato
       end
       
       def build(object, json)
-        value = json[name.to_s] || json[name.to_sym]
+        value = json[name.to_s].nil? ? json[name.to_sym] : json[name.to_s]
         typecast_value =  if type && !value.instance_of?(type)
                             type.json_create value
                           else

data/rails/init.rb

@@ -1,6 +1,7 @@
 # this is for rails only
 
 require File.expand_path(File.dirname(__FILE__) + '/../lib/couch_potato')
+require File.expand_path(File.dirname(__FILE__) + '/reload_classes')
 
 CouchPotato::Config.database_name = YAML::load(File.read(Rails.root.to_s + '/config/couchdb.yml'))[RAILS_ENV]
 

data/rails/reload_classes.rb

@@ -0,0 +1,37 @@
+module CouchPotato
+  module Persistence
+    
+    def self.persistent_classes #:nodoc:
+      @persistent_classes ||= []
+    end
+
+    def self.reload_persistent_classes #:nodoc:
+      persistent_classes.each do |clazz|
+        eval clazz.name
+      end
+    end
+    
+    
+    def self.included_with_class_reloading(base) #:nodoc:
+      persistent_classes << base
+      included_without_class_reloading(base)
+    end
+    
+    class << self
+      alias_method :included_without_class_reloading, :included
+      alias_method :included, :included_with_class_reloading
+    end
+  end
+  
+  Database.class_eval do
+    def load_document_with_class_reloading(id)
+      Persistence.reload_persistent_classes
+      load_document_without_class_reloading id
+    end
+    
+    alias_method :load_document_without_class_reloading, :load_document
+    alias_method :load_document, :load_document_with_class_reloading
+    alias_method :load, :load_document
+  end
+end
+

data/spec/property_spec.rb

@@ -107,7 +107,7 @@ describe 'properties' do
   end
   
   it "should persist an object" do
-    p = Person.new :name => 'Bob'
+    p = Person.new
     a = Address.new :city => 'Denver'
     p.ship_address = a
     CouchPotato.database.save_document! p
@@ -116,13 +116,21 @@ describe 'properties' do
   end
   
   it "should persist null for a null " do
-    p = Person.new :name => 'Bob'
+    p = Person.new
     p.ship_address = nil
     CouchPotato.database.save_document! p
     p = CouchPotato.database.load_document p.id
     p.ship_address.should be_nil
   end
-  
+
+  it "should persist false for a false" do
+    p = Person.new
+    p.ship_address = false
+    CouchPotato.database.save_document! p
+    p = CouchPotato.database.load_document p.id
+    p.ship_address.should be_false
+  end
+
   describe "predicate" do
     it "should return true if property set" do
       Comment.new(:title => 'title').title?.should be_true

data/spec/rails_spec.rb

@@ -0,0 +1,22 @@
+require File.dirname(__FILE__) + '/spec_helper'
+require File.dirname(__FILE__) + '/../rails/reload_classes'
+
+class Autoloader
+  def self.const_missing(name)
+    eval("#{name} = Class.new; #{name}.send(:include, CouchPotato::Persistence)")
+  end
+end
+
+
+describe CouchPotato::Database, 'rails specific behavior' do
+  
+  it "should load load models whose constants are currently uninitialized (like with rails in development mode)" do
+    Autoloader::Uninitialized
+    Autoloader.send :remove_const, 'Uninitialized'
+    recreate_db
+    CouchPotato.couchrest_database.save_doc(JSON.create_id => 'Autoloader::Uninitialized', '_id' => '1')
+    CouchPotato.database.load('1').class.name.should == 'Autoloader::Uninitialized'
+  end
+  
+end
+

data/spec/unit/database_spec.rb

@@ -43,7 +43,6 @@ describe CouchPotato::Database, 'full_url_to_database' do
   end
 end
 
-
 describe CouchPotato::Database, 'load' do
   it "should raise an exception if nil given" do
     db = CouchPotato::Database.new(stub('couchrest db', :info => nil))
@@ -64,6 +63,7 @@ describe CouchPotato::Database, 'load' do
     db = CouchPotato::Database.new(stub('couchrest db', :info => nil, :get => Parent::Child.json_create({JSON.create_id => '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: couch_potato
 version: !ruby/object:Gem::Version 
-  version: 0.2.15
+  version: 0.2.16
 platform: ruby
 authors: 
 - Alexander Lang
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-11-09 00:00:00 +01:00
+date: 2009-11-22 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -85,6 +85,7 @@ files:
 - lib/couch_potato/view/raw_view_spec.rb
 - lib/couch_potato/view/view_query.rb
 - rails/init.rb
+- rails/reload_classes.rb
 - spec/attachments_spec.rb
 - spec/callbacks_spec.rb
 - spec/create_spec.rb
@@ -94,6 +95,7 @@ files:
 - spec/fixtures/address.rb
 - spec/fixtures/person.rb
 - spec/property_spec.rb
+- spec/rails_spec.rb
 - spec/spec.opts
 - spec/spec_helper.rb
 - spec/unit/attributes_spec.rb
@@ -146,6 +148,7 @@ test_files:
 - spec/fixtures/address.rb
 - spec/fixtures/person.rb
 - spec/property_spec.rb
+- spec/rails_spec.rb
 - spec/spec_helper.rb
 - spec/unit/attributes_spec.rb
 - spec/unit/callbacks_spec.rb