davber_couch_potato 0.3.0 → 0.4.0

data/CHANGES.md

@@ -1,7 +1,24 @@
 ## Changes
 
-### 0.3.0 - cloned gem
+### 0.4.0
+* ruby 1.9.2 compatibility (langalex)
+* couch potato objects now behave correctly when used as keys in Hashes (langalex)
+* use as\_json instead of to\_s(:json), which is the rails way
+* use ActiveModel dirty tracking (langalex) - this means no more "deep tracking", e.g. `user.tags << 'new_tag'; user.dirty? # false`
+
+### 0.3.2
+* support yielding to blocks on #initialize (martinrehfeld)
+* support for negative numbers in Fixnum/Float properties (langalex)
+
+### 0.3.1
+* ActiveModel callbacks (kazjote)
+* do not use Rails.env in initializer as it will free Rails.env for all times and in Rails 2.3.x apps it will be called too early thus always beeing development (jweiss)
+* ruby 1.9.2 compatibility (langalex)
+* can configure validation framework in couchdb.yml, process couchdb.yml with erb (langalex)
+
+### 0.3.0 - cloned gem!
 * type field of documents now configurable, by using CouchPotato.type_field (davber)
+* the mapping from class to design document name is now configurable, by using CouchPotato.design_name_fun, which is supposed to be a Proc (davber)
 
 ### 0.3.0
 * support for lists (langalex)

data/README.md

@@ -22,6 +22,13 @@ Lastly Couch Potato aims to provide a seamless integration with Ruby on Rails, e
 * declarative views with either custom or generated map/reduce functions
 * extensive spec suite
 
+### Supported Environments
+
+* Ruby 1.8.7, 1.9.1, 1.9.2
+* CouchDB 1.0.1
+
+(Supported means I run the specs against those before releasing a new gem.)
+
 ### Installation
 
 Couch Potato is hosted as a gem which you can install like this:
@@ -51,18 +58,40 @@ Optionally you can configure which framework you want to use for validations (ei
 
 #### Using with Rails
 
-Add to your config/environment.rb:
+Create a config/couchdb.yml:
+
+    default: &default
+      validation_framework: :active_model #optional
+
+    development:
+      <<: *default
+      database: development_db_name
+    test:
+      <<: *default
+      database: test_db_name
+    production:
+      <<: *default
+      database: <%= ENV['DB_NAME'] %>
+
+#### Rails 2.x
+
+Add to your _config/environment.rb_:
 
     config.gem 'davber_couch_potato', :source => 'http://gemcutter.org'
     config.frameworks -= [:active_record] # if you switch completely
+    
+#### Rails 3.x
 
-Then create a config/couchdb.yml:
+Add to your _Gemfile_:
 
-    development: development_db_name
-    test: test_db_name
-    production: http://db.server/production_db_name
+    # gem 'rails' # we don't want to load activerecord so we can't require rails
+    gem 'railties'
+    gem 'actionpack'
+    gem 'actionmailer'
+    gem 'activemodel'
+    gem "couch_potato"
 
-Alternatively you can also install Couch Potato directly as a plugin.
+Note: please make sure that when you run `Date.today.as_json` in the Rails console it returns something like `2010/12/10` and not `2010-12-10` - if it does another gem has overwritten Couch Potato's Date patches - in this case move Couch Potato further down in your Gemfile or whereever you load it.
 
 ### Introduction
 

data/VERSION.yml

@@ -1,5 +1,5 @@
 --- 
 :major: 0
-:minor: 3
+:minor: 4
 :patch: 0
 :build: 

data/lib/core_ext/date.rb

@@ -1,18 +1,11 @@
 class Date
   def to_json(*a)
-    %("#{to_s(:json)}")
+    %("#{as_json}")
   end
   
-  def to_s_with_json(*args)
-    if args[0] == :json
-      strftime("%Y/%m/%d")
-    else
-      to_s_without_json *args
-    end
+  def as_json(*args)
+    strftime("%Y/%m/%d")
   end
-  alias_method :to_s_without_json, :to_s
-  alias_method :to_s, :to_s_with_json
-  
   
   def self.json_create string
     return nil if string.nil?

data/lib/core_ext/string.rb

@@ -4,5 +4,9 @@ module ActiveSupportMethods
       $1.upcase
     end
   end
+
+  def blank?
+    empty?
+  end
 end
-String.send :include, ActiveSupportMethods unless String.new.respond_to?(:underscore)
+String.send :include, ActiveSupportMethods unless String.new.respond_to?(:underscore)

data/lib/core_ext/time.rb

@@ -1,17 +1,11 @@
 class Time
   def to_json(*a)
-    %("#{to_s(:json)}")
+    %("#{as_json}")
   end
   
-  def to_s_with_json(*args)
-    if args[0] == :json
-      getutc.strftime("%Y/%m/%d %H:%M:%S +0000")
-    else
-      to_s_without_json *args
-    end
+  def as_json(*args)
+    getutc.strftime("%Y/%m/%d %H:%M:%S +0000")
   end
-  alias_method :to_s_without_json, :to_s
-  alias_method :to_s, :to_s_with_json
   
   def self.json_create string
     return nil if string.nil?

data/lib/couch_potato/database.rb

@@ -63,7 +63,7 @@ module CouchPotato
 
     # saves a document. returns true on success, false on failure
     def save_document(document, validate = true)
-      return true unless document.dirty?
+      return true unless document.dirty? || document.new?
       if document.new?
         create_document(document, validate)
       else
@@ -79,10 +79,10 @@ module CouchPotato
     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.run_callbacks :destroy do
+        document._deleted = true
+        database.delete_doc document.to_hash
+      end
       document._id = nil
       document._rev = nil
     end
@@ -102,7 +102,7 @@ module CouchPotato
     alias_method :load, :load_document
 
     def inspect #:nodoc:
-      "#<CouchPotato::Database>"
+      "#<CouchPotato::Database @root=\"#{database.root}\">"
     end
 
     private
@@ -112,35 +112,39 @@ module CouchPotato
       
       if validate
         document.errors.clear
-        document.run_callbacks :before_validation_on_save
-        document.run_callbacks :before_validation_on_create
-        return false unless valid_document?(document)
+        document.run_callbacks :validation_on_save do
+          document.run_callbacks :validation_on_create do
+            return false unless valid_document?(document)
+          end
+        end
       end
       
-      document.run_callbacks :before_save
-      document.run_callbacks :before_create
-      res = database.save_doc document.to_hash
-      document._rev = res['rev']
-      document._id = res['id']
-      document.run_callbacks :after_save
-      document.run_callbacks :after_create
+      document.run_callbacks :save do
+        document.run_callbacks :create do
+          res = database.save_doc document.to_hash
+          document._rev = res['rev']
+          document._id = res['id']
+        end
+      end
       true
     end
 
     def update_document(document, validate)
       if validate
         document.errors.clear
-        document.run_callbacks :before_validation_on_save
-        document.run_callbacks :before_validation_on_update
-        return false unless valid_document?(document)
+        document.run_callbacks :validation_on_save do
+          document.run_callbacks :validation_on_update do
+            return false unless valid_document?(document)
+          end
+        end
+      end
+
+      document.run_callbacks :save do
+        document.run_callbacks :update do
+          res = database.save_doc document.to_hash
+          document._rev = res['rev']
+        end
       end
-      
-      document.run_callbacks :before_save
-      document.run_callbacks :before_update
-      res = database.save_doc document.to_hash
-      document._rev = res['rev']
-      document.run_callbacks :after_save
-      document.run_callbacks :after_update
       true
     end
 
@@ -158,4 +162,4 @@ module CouchPotato
     end
 
   end
-end
+end

data/lib/couch_potato/persistence.rb

@@ -18,9 +18,10 @@ module CouchPotato
   module Persistence
     
     def self.included(base) #:nodoc:
-      base.send :include, Properties, Callbacks, Validation, Json, CouchPotato::View::CustomViews, CouchPotato::View::Lists
+      base.send :include, Properties, Callbacks, Json, CouchPotato::View::CustomViews, CouchPotato::View::Lists
       base.send :include, DirtyAttributes, GhostAttributes, Attachments
       base.send :include, MagicTimestamps, ActiveModelCompliance
+      base.send :include, Validation
       base.class_eval do
         attr_accessor :_id, :_rev, :_deleted, :database
         alias_method :id, :_id
@@ -29,7 +30,8 @@ module CouchPotato
     end
 
     # initialize a new instance of the model optionally passing it a hash of attributes.
-    # the attributes have to be declared using the #property method
+    # the attributes have to be declared using the #property method.
+    # the new model will be yielded to an optionally given block.
     # 
     # example: 
     #   class Book
@@ -37,11 +39,20 @@ module CouchPotato
     #     property :title
     #   end
     #   book = Book.new :title => 'Time to Relax'
+    #
+    #   OR
+    #
+    #   book = Book.new do |b|
+    #     b.title = 'Time to Relax'
+    #   end
     #   book.title # => 'Time to Relax'
     def initialize(attributes = {})
-      attributes.each do |name, value|
-        self.send("#{name}=", value)
-      end if attributes
+      if attributes
+        attributes.each do |name, value|
+          self.send("#{name}=", value)
+        end
+      end
+      yield self if block_given?
     end
     
     # assign multiple attributes at once.
@@ -96,6 +107,14 @@ module CouchPotato
     def ==(other) #:nodoc:
       other.class == self.class && self.to_json == other.to_json
     end
+    
+    def eql?(other)
+      self == other
+    end
+    
+    def hash
+      _id.hash * (_id.hash.to_s.size ** 10) + _rev.hash
+    end
    
     def inspect
       attributes_as_string = attributes.map {|attribute, value| "#{attribute}: #{value.inspect}"}.join(", ")

data/lib/couch_potato/persistence/callbacks.rb

@@ -1,62 +1,29 @@
+require 'active_support/concern'
+require 'active_model/callbacks'
+
 module CouchPotato
   module Persistence
     module Callbacks
       def self.included(base) #:nodoc:
-        base.extend ClassMethods
+        base.extend ActiveModel::Callbacks
 
         base.class_eval do
           attr_accessor :skip_callbacks
-          def self.callbacks #:nodoc:
-            @callbacks ||= {:before_validation => [], :before_validation_on_create => [], 
-              :before_validation_on_update => [], :before_validation_on_save => [], :before_create => [], 
-              :after_create => [], :before_update => [], :after_update => [],
-              :before_save => [], :after_save => [],
-              :before_destroy => [], :after_destroy => []}
-          end
+
+          define_model_callbacks :create, :save, :update, :destroy
+          define_model_callbacks *[:save, :create, :update].map {|c| :"validation_on_#{c}"}
+          define_model_callbacks :validation unless Config.validation_framework == :active_model
         end
       end
 
       # Runs all callbacks on a model with the given name, e.g. :after_create.
       # 
       # This method is called by the CouchPotato::Database object when saving/destroying an object 
-      def run_callbacks(name)
+      def run_callbacks(name, &block)
         return if skip_callbacks
-        
-        callbacks = self.class.ancestors.map do |clazz|
-          clazz.callbacks[name] if clazz.respond_to?(:callbacks)
-        end.flatten.compact.uniq
-        
-        callbacks.each do |callback|
-          if [Symbol, String].include?(callback.class)
-            send callback
-          elsif callback.is_a?(Proc)
-            callback.call self
-          else
-            raise "Don't know how to handle callback of type #{callback.class.name}"
-          end
-        end
-      end
 
-      module ClassMethods
-        [
-          :before_validation,
-          :before_validation_on_create,
-          :before_validation_on_update,
-          :before_validation_on_save,
-          :before_create,
-          :before_save,
-          :before_update,
-          :before_destroy,
-          :after_update,
-          :after_save,
-          :after_create,
-          :after_destroy
-        ].each do |callback|
-          define_method callback do |*names|
-            callbacks[callback].push *names
-          end
-        end
+        send(:"_run_#{name}_callbacks", &block)
       end
     end
   end
-end
+end

data/lib/couch_potato/persistence/dirty_attributes.rb

@@ -4,21 +4,20 @@ module CouchPotato
     module DirtyAttributes
       
       def self.included(base) #:nodoc:
+        base.send :include, ActiveModel::Dirty
         base.class_eval do
           after_save :reset_dirty_attributes
-          
-          def initialize(attributes = {})
-            super
-            assign_attribute_copies_for_dirty_tracking
-          end
         end
       end
       
+      def initialize(attributes = {})
+        super
+        # assign_attribute_copies_for_dirty_tracking
+      end
+    
       # returns true if a model has dirty attributes, i.e. their value has changed since the last save
       def dirty? 
-        new? || @forced_dirty || self.class.properties.inject(false) do |res, property|
-          res || property.dirty?(self)
-        end
+        changed? || @forced_dirty
       end
       
       # marks a model as dirty
@@ -26,19 +25,21 @@ module CouchPotato
         @forced_dirty = true
       end
       
-      private
-      
-      def assign_attribute_copies_for_dirty_tracking
-        attributes.each do |name, value|
-          self.instance_variable_set("@#{name}_was", clone_attribute(value))
-        end if attributes
+      def method_missing(name, *args)
+        if(name.to_s.include?('_will_change!'))
+          self.class.define_attribute_methods self.class.property_names
+          send(name, *args)
+        else
+          super
+        end
       end
       
+      private
+      
       def reset_dirty_attributes
+        @previously_changed = changes
+        @changed_attributes.clear
         @forced_dirty = nil
-        self.class.properties.each do |property|
-          instance_variable_set("@#{property.name}_was", clone_attribute(send(property.name)))
-        end
       end
       
       def clone_attribute(value)

data/lib/couch_potato/persistence/ghost_attributes.rb

@@ -3,20 +3,25 @@ module CouchPotato
     def self.included(base)
       base.class_eval do
         attr_accessor :_document
-        def self.json_create(json)
-          instance = super
+        def self.json_create_with_ghost(json)
+          instance = json_create_without_ghost(json)
           instance._document = json if json
           instance
         end
         
-        def method_missing(name, *args)
-          if(value = _document && _document[name.to_s])
-            value
-          else
-            super
-          end
+        class << self
+          alias_method_chain :json_create, :ghost
         end
       end
     end
+    
+    def method_missing(name, *args)
+      if(value = _document && _document[name.to_s])
+        value
+      else
+        super
+      end
+    end
   end
-end
+end
+

data/lib/couch_potato/persistence/json.rb

@@ -35,9 +35,12 @@ module CouchPotato
           instance = self.new
           instance._id = json[:_id] || json['_id']
           instance._rev = json[:_rev] || json['_rev']
+          instance.instance_variable_set('@skip_dirty_tracking', true)
           properties.each do |property|
             property.build(instance, json)
           end
+          instance.instance_variable_set('@skip_dirty_tracking', false)
+          # instance.instance_variable_get("@changed_attributes").clear if instance.instance_variable_get("@changed_attributes")
           instance
         end
       end

data/lib/couch_potato/persistence/magic_timestamps.rb

@@ -7,13 +7,14 @@ module CouchPotato
         
         before_create lambda {|model|
           model.created_at ||= Time.now
-          model.created_at_not_changed
+          @changed_attributes.delete 'created_at'
           model.updated_at ||= Time.now
-          model.updated_at_not_changed
+          @changed_attributes.delete 'updated_at'
         }
         before_update lambda {|model|
           model.updated_at = Time.now
-          model.updated_at_not_changed}
+          @changed_attributes.delete 'updated_at'
+        }
       end
     end
   end

data/lib/couch_potato/persistence/properties.rb

@@ -59,13 +59,6 @@ module CouchPotato
           properties.map(&:name)
         end
 
-        def json_create(json) #:nodoc:
-          return if json.nil?
-          instance = super
-          instance.send(:assign_attribute_copies_for_dirty_tracking)
-          instance
-        end
-
         # Declare a property on a model class. Properties are not typed by default.
         # You can store anything in a property that can be serialized into JSON.
         # If you want a property to be of a custom class you have to define it using the :type option.

data/lib/couch_potato/persistence/simple_property.rb

@@ -37,8 +37,6 @@ module CouchPotato
       
       def define_accessors(base, name, options)
         base.class_eval do
-          attr_reader "#{name}_was"
-
           define_method "#{name}" do
             value = self.instance_variable_get("@#{name}")
             if value.nil? && options[:default]
@@ -51,20 +49,14 @@ module CouchPotato
           end
           
           define_method "#{name}=" do |value|
-            self.instance_variable_set("@#{name}", type_caster.cast(value, options[:type]))
+            typecasted_value = type_caster.cast(value, options[:type])
+            send("#{name}_will_change!") unless @skip_dirty_tracking || typecasted_value == send(name)
+            self.instance_variable_set("@#{name}", typecasted_value)
           end
           
           define_method "#{name}?" do
             !self.send(name).nil? && !self.send(name).try(:blank?)
           end
-          
-          define_method "#{name}_changed?" do
-            !self.instance_variable_get("@#{name}_not_changed") && self.send(name) != self.send("#{name}_was")
-          end
-          
-          define_method "#{name}_not_changed" do
-            self.instance_variable_set("@#{name}_not_changed", true)
-          end
         end
       end
     end

data/lib/couch_potato/persistence/type_caster.rb

@@ -3,15 +3,15 @@ module CouchPotato
     class TypeCaster #:nodoc:
       def cast(value, type)
         if type == :boolean
-          cast_boolen(value)
+          cast_boolean(value)
         else
           cast_native(value, type)
         end
       end
-      
+
       private
-      
-      def cast_boolen(value)
+
+      def cast_boolean(value)
         if [FalseClass, TrueClass].include?(value.class) || value.nil?
           value
         elsif [0, '0'].include?(value)
@@ -20,13 +20,13 @@ module CouchPotato
           true
         end
       end
-      
+
       def cast_native(value, type)
         if type && !value.instance_of?(type)
           if type == Fixnum
-            value.to_s.scan(/\d/).join.to_i unless value.blank?
+            value.to_s.scan(/-?\d+/).join.to_i unless value.blank?
           elsif type == Float
-            value.to_s.scan(/\d+\.?\d*/).join.to_f unless value.blank?
+            value.to_s.scan(/-?\d+\.?\d*/).join.to_f unless value.blank?
           else
             type.json_create value unless value.blank?
           end
@@ -34,7 +34,7 @@ module CouchPotato
           value
         end
       end
-      
+
     end
   end
-end
+end

data/lib/couch_potato/railtie.rb

@@ -1,18 +1,24 @@
 require File.expand_path(File.dirname(__FILE__) + '/../../rails/reload_classes')
+require 'erb'
 
 module CouchPotato
   def self.rails_init
-    CouchPotato::Config.database_name = YAML::load(File.read(Rails.root.join('config/couchdb.yml')))[Rails.env]
+    config = YAML::load(ERB.new(File.read(Rails.root.join('config/couchdb.yml'))).result)[RAILS_ENV]
+    if config.is_a?(String)
+      CouchPotato::Config.database_name = config
+    else
+      CouchPotato::Config.database_name = config['database']
+      CouchPotato::Config.validation_framework = config['validation_framework']
+    end
   end
 
   if defined?(::Rails::Railtie)
     class Railtie < ::Rails::Railtie
-      config.after_initialize do |app|
+      initializer 'couch_potato.load_config' do |app|
         CouchPotato.rails_init
       end
     end
   else
     rails_init
   end
-
 end

data/lib/couch_potato/validation/with_validatable.rb

@@ -11,16 +11,20 @@ module CouchPotato
         base.send :include, ::Validatable
         base.class_eval do
           # Override the validate method to first run before_validation callback
-          def valid?
+          def valid_with_before_validation_callback?
             errors.clear
-            run_callbacks :before_validation
-            before_validation_errors = errors.errors.dup
-            super
-            before_validation_errors.each do |k, v|
-              v.each {|message| errors.add(k, message)}
+            run_callbacks :validation do
+              before_validation_errors = errors.errors.dup
+              valid_without_before_validation_callback?
+              before_validation_errors.each do |k, v|
+                v.each {|message| errors.add(k, message)}
+              end
             end
             errors.empty?
           end
+          
+          alias_method :valid_without_before_validation_callback?, :valid?
+          alias_method :valid?, :valid_with_before_validation_callback?
         end
       end
     end

data/lib/couch_potato/view/view_query.rb

@@ -1,4 +1,16 @@
 module CouchPotato
+  # We can bypass creation of views completely, so we can use views
+  # that are created via other means, such as CouchApp.
+  # The default is not to bypass creation.
+  # TODO: enable this bypass for specific view in the view specification, instead of globally
+  def self.bypass_view_creation
+    @bypass_view_creation
+  end
+  
+  def self.bypass_view_creation= flag
+    @bypass_view_creation = flag
+  end
+  
   module View
     # Used to query views (and create them if they don't exist). Usually you won't have to use this class directly. Instead it is used internally by the CouchPotato::Database.view method.
     class ViewQuery
@@ -15,7 +27,7 @@ module CouchPotato
       end
 
       def query_view!(parameters = {})
-        update_view unless view_has_been_updated?
+        update_view unless CouchPotato::bypass_view_creation || view_has_been_updated?
         begin
           query_view parameters
         rescue RestClient::ResourceNotFound
@@ -37,7 +49,9 @@ module CouchPotato
           design_doc['lists'] ||= {}
           design_doc['lists'][@list_name.to_s] = @list_function 
         end
-        @database.save_doc(design_doc) if original_views != design_doc['views'] || original_lists != design_doc['lists']
+        # We do not save the design document if view creation is bypassed
+        @database.save_doc(design_doc) unless CouchPotato::bypass_view_creation ||
+          original_views == design_doc['views'] && original_lists == design_doc['lists']
       end
       
       def view_functions
@@ -49,14 +63,17 @@ module CouchPotato
       end
       
       def view_has_been_updated?
+        # TODO: decide what to do here in case CouchPotato::bypass_view_creation is true
         updated_views[[@design_document_name, @view_name]]
       end
       
       def view_updated
+        # TODO: decide what to do here in case CouchPotato::bypass_view_creation is true
         updated_views[[@design_document_name, @view_name]] = true
       end
       
       def updated_views
+        # TODO: decide what to do here in case CouchPotato::bypass_view_creation is true
         @@updated_views ||= {}
         @@updated_views
       end

data/rails/reload_classes.rb

@@ -7,7 +7,7 @@ module CouchPotato
       begin
         yield
       rescue ArgumentError => e
-        if(name = e.message.scan(/(can't find const|undefined class\/module) ([\w\:]+)/).first[1])
+        if(name = e.message.scan(/(can't find const|undefined class\/module) ([\w\:]+)/).try(:first).try(:[], 1))
           eval name.gsub(/\:+$/, '')
           retry
         else

data/spec/callbacks_spec.rb

@@ -22,9 +22,6 @@ class CallbackRecorder
   
   view :all, :key  => :required_property
   
-  attr_accessor :lambda_works
-  before_create lambda {|model| model.lambda_works = true }
-  
   def callbacks
     @callbacks ||= []
   end
@@ -58,7 +55,7 @@ describe "multiple callbacks at once" do
   
   it "should run all callback methods given to the callback method call" do
     monkey = Monkey.new
-    monkey.run_callbacks :before_create
+    monkey.run_callbacks :create
     monkey.eaten_banana.should be_true
     monkey.eaten_apple.should be_true
   end
@@ -263,14 +260,6 @@ describe "destroy callbacks" do
   end
 end
 
-describe "lambda callbacks" do
-  it "should run the lambda" do
-    recorder = CallbackRecorder.new
-    recorder.run_callbacks :before_create
-    recorder.lambda_works.should be_true
-  end
-end
-
 describe "validation callbacks" do
   class ValidatedUser
     include CouchPotato::Persistence
@@ -305,4 +294,4 @@ describe "validation callbacks" do
     user.valid?.should == true
     user.errors.on(:name).should == nil
   end
-end
+end

data/spec/property_spec.rb

@@ -1,6 +1,6 @@
 require 'spec_helper'
-require File.join(File.dirname(__FILE__), 'fixtures', 'address')
-require File.join(File.dirname(__FILE__), 'fixtures', 'person')
+require 'fixtures/address'
+require 'fixtures/person'
 
 class Watch
   include CouchPotato::Persistence

data/spec/rails_spec.rb

@@ -1,5 +1,4 @@
 require 'spec_helper'
-require File.dirname(__FILE__) + '/../rails/reload_classes'
 
 module LoadConst
   def const_missing(name)
@@ -33,7 +32,7 @@ describe CouchPotato::Database, 'rails specific behavior' do
       CouchPotato.couchrest_database.save_doc(JSON.create_id => 'Autoloader::Uninitialized', '_id' => '1')
       CouchPotato.database.load('1').class.name.should == 'Autoloader::Uninitialized'
     end
-  
+    
     it "should load nested models" do
       CouchPotato.couchrest_database.save_doc(JSON.create_id => 'Autoloader::Nested::Nested2', '_id' => '1')
       CouchPotato.database.load('1').class.name.should == 'Autoloader::Nested::Nested2'

data/spec/railtie_spec.rb

@@ -0,0 +1,63 @@
+require 'spec_helper'
+require 'yaml'
+require 'spec/mocks'
+
+RAILS_ENV = 'test'
+module Rails
+  class Railtie
+    def self.initializer(*args)
+    end
+  end
+  
+  def self.root
+    Spec::Mocks::Mock.new :join => ''
+  end
+end
+
+require 'couch_potato/railtie'
+
+describe "railtie" do
+  before(:all) do
+    @validation_framework = CouchPotato::Config.validation_framework
+  end
+  
+  after(:all) do
+    CouchPotato::Config.validation_framework = @validation_framework
+  end
+  
+  context 'yaml file contains only database names' do
+    it "should set the database name from the yaml file" do
+      File.stub(:read => "test: test_db")
+      
+      CouchPotato::Config.should_receive(:database_name=).with('test_db')
+      
+      CouchPotato.rails_init
+    end
+  end
+  
+  context 'yaml file contains more configuration' do
+    before(:each) do
+      File.stub(:read => "test: \n  database: test_db\n  validation_framework: :active_model")
+    end
+    
+    it "should set the database name from the yaml file" do
+      CouchPotato::Config.should_receive(:database_name=).with('test_db')
+      
+      CouchPotato.rails_init
+    end
+    
+    it "should set the validation framework from the yaml file" do
+      CouchPotato::Config.should_receive(:validation_framework=).with(:active_model)
+      
+      CouchPotato.rails_init
+    end
+  end
+  
+  it "should process the yml file with erb" do
+    File.stub(:read => "test: \n  database: <%= 'db' %>")
+
+    CouchPotato::Config.should_receive(:database_name=).with('db')
+    
+    CouchPotato.rails_init
+  end
+end

data/spec/spec_helper.rb

@@ -1,5 +1,6 @@
 require 'rubygems'
 require 'spec'
+require 'time'
 
 $:.unshift(File.dirname(__FILE__) + '/../lib')
 

data/spec/unit/attributes_spec.rb

@@ -58,6 +58,11 @@ describe "attributes" do
         @plant.typed_leaf_count.should == 4
       end
       
+      it "should convert a string into a negative fixnum" do
+        @plant.typed_leaf_count = '-4'
+        @plant.typed_leaf_count.should == -4
+      end
+      
       it "should leave a fixnum as is" do
         @plant.typed_leaf_count = 4
         @plant.typed_leaf_count.should == 4
@@ -94,6 +99,11 @@ describe "attributes" do
         @plant.typed_leaf_size = '5'
         @plant.typed_leaf_size.should == 5.0
       end
+      
+      it "should convert a negative number in a string" do
+        @plant.typed_leaf_size = '-5.0'
+        @plant.typed_leaf_size.should == -5.0
+      end
 
       it "should leave a float as it is" do
         @plant.typed_leaf_size = 0.5

data/spec/unit/callbacks_spec.rb

@@ -4,23 +4,15 @@ describe 'callbacks' do
   class Tree
     include CouchPotato::Persistence
 
-    before_validation :grow_leaf, 'grow_branch', lambda {|tree| tree.root_count ||= 0; tree.root_count += 1 }
+    before_validation :grow_leaf
 
     property :leaf_count
-    property :root_count
-    property :branch_count
     property :watered
-    
 
     def grow_leaf
       self.leaf_count ||= 0
       self.leaf_count += 1
     end
-    
-    def grow_branch
-      self.branch_count ||= 0
-      self.branch_count += 1
-    end
   end
   
   class AppleTree < Tree
@@ -37,31 +29,13 @@ describe 'callbacks' do
     end
   end
 
-  it "should call a method from a symbol when validated" do
-    tree = Tree.new(:leaf_count => 1, :root_count => 1)
-    tree.valid?
-    tree.leaf_count.should == 2
-  end
-  
-  it "should call a method from a string when validated" do
-    tree = Tree.new(:branch_count => 0)
-    tree.valid?
-    tree.branch_count.should == 1
-  end
-
-  it "should call a lambda when validated" do
-    tree = Tree.new(:leaf_count => 1, :root_count => 1)
-    tree.valid?
-    tree.root_count.should == 2
-  end
-  
   context 'inheritance' do
     it "should call the callbacks of the super class" do
       tree = AppleTree.new :leaf_count => 1
       tree.valid?
       tree.leaf_count.should == 2
     end
-    
+
     it "should call the callbacks of the child class" do
       tree = AppleTree.new :leaf_count => 1
       tree.valid?
@@ -69,4 +43,4 @@ describe 'callbacks' do
     end
   end
   
-end
+end

data/spec/unit/database_spec.rb

@@ -119,10 +119,10 @@ describe CouchPotato::Database, 'save_document' do
     it "should not run the validations when saved with false" do
       category = Category.new(:name => 'food')
       @db.save_document(category)
-      category.new?.should == false
+      category.new?.should be_false
       category.name = nil
       @db.save_document(category, false)
-      category.dirty?.should == false
+      category.dirty?.should be_false
     end
 
     it "should run the validations when saved with true" do

data/spec/unit/date_spec.rb

@@ -7,10 +7,10 @@ describe Date, 'to_json' do
   end
 end
 
-describe Date, 'to_s(:json)' do
+describe Date, 'as_json' do
   it "should format it in the same way as to_json does so i can use this to do queries over date attributes" do
     date = Date.parse('2009-01-01')
-    date.to_s(:json).should == "2009/01/01"
+    date.as_json.should == "2009/01/01"
   end
 end
 

data/spec/unit/dirty_attributes_spec.rb

@@ -33,24 +33,6 @@ describe 'dirty attribute tracking' do
       @couchrest_db.should_receive(:save_doc)
       @db.save_document(plate)
     end
-
-    it "should correctly track dirty hashes (deep clone)" do
-      plate = Plate.new :food => {:veggies => ['carrots', 'peas']}
-      @db.save_document(plate)
-      plate.food[:veggies] << 'beans'
-      @couchrest_db.should_receive(:save_doc)
-      @db.save_document(plate)
-    end
-
-    it "should correctly track dirty hashes (deep clone) after a save" do
-      plate = Plate.new :food => {:veggies => ['carrots', 'peas']}
-      @db.save_document(plate)
-      plate.food[:veggies] << 'beans'
-      @db.save_document(plate)
-      plate.food[:veggies] << 'cauliflower'
-      @couchrest_db.should_receive(:save_doc)
-      @db.save_document(plate)
-    end
   end
   
   describe "newly created object" do
@@ -67,21 +49,22 @@ describe 'dirty attribute tracking' do
       
       describe "with type BigDecimal" do
         before(:each) do
-          class ::Plate
+          class Bowl
+            include CouchPotato::Persistence
             property :price
           end
         end
         it "should not dup BigDecimal" do
 
           lambda {
-            Plate.new :price => BigDecimal.new("5.23") 
+            Bowl.new :price => BigDecimal.new("5.23") 
           }.should_not raise_error(TypeError)
         end
         
         it "should return the old value" do
-          plate = Plate.new :price => BigDecimal.new("5.23") 
-          plate.price = BigDecimal.new("2.23")
-          plate.price_was.should == 5.23
+          bowl = Bowl.new :price => BigDecimal.new("5.23") 
+          bowl.price = BigDecimal.new("2.23")
+          bowl.price_was.should == 5.23
         end
         
       end
@@ -94,13 +77,7 @@ describe 'dirty attribute tracking' do
       end
 
       it "should return false if attribute not changed" do
-        @plate.should_not be_food_changed
-      end
-      
-      it "should return false if attribute forced not changed" do
-        @plate.food = 'burger'
-        @plate.food_not_changed
-        @plate.should_not be_food_changed
+        Plate.new.should_not be_food_changed
       end
       
       it "should return true if forced dirty" do
@@ -128,13 +105,6 @@ describe 'dirty attribute tracking' do
         @plate.food = 'burger'
         @plate.should be_food_changed
       end
-      
-      it "should return true if array attribute changed" do
-        couchrest_db = stub('database', :get => Plate.json_create({'_id' => '1', '_rev' => '2', 'food' => ['sushi'], JSON.create_id => 'Plate'}), :info => nil)
-        plate = CouchPotato::Database.new(couchrest_db).load_document '1'
-        plate.food << 'burger'
-        plate.should be_food_changed
-      end
 
       it "should return false if attribute not changed" do
         @plate.should_not be_food_changed

data/spec/unit/initialize_spec.rb

@@ -0,0 +1,38 @@
+require 'spec_helper'
+
+class Document
+  include CouchPotato::Persistence
+  
+  property :title
+  property :content
+end
+
+describe "new" do
+  context "without arguments" do
+    subject { Document.new }
+
+    it { should be_a(Document) }
+    its(:title) { should be_nil }
+    its(:content) { should be_nil }
+  end
+
+  context "with an argument hash" do
+    subject { Document.new(:title => 'My Title') }
+
+    it { should be_a(Document) }
+    its(:title) { should == 'My Title'}
+    its(:content) { should be_nil }
+  end
+
+  context "yielding to a block" do
+    subject {
+      Document.new(:title => 'My Title') do |doc|
+        doc.content = 'My Content'
+      end
+    }
+
+    it { should be_a(Document) }
+    its(:title) { should == 'My Title'}
+    its(:content) { should == 'My Content'}
+  end
+end

data/spec/unit/time_spec.rb

@@ -7,10 +7,10 @@ describe Time, 'to_json' do
   end
 end
 
-describe Time, 'to_s(:json)' do
+describe Time, 'as_json' do
   it "should format it in the same way as to_json does so i can use this to do queries over time attributes" do
     time = Time.parse('2009-01-01 11:12:23 +0200')
-    time.to_s(:json).should == "2009/01/01 09:12:23 +0000"
+    time.as_json.should == "2009/01/01 09:12:23 +0000"
   end
 end
 

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: davber_couch_potato
 version: !ruby/object:Gem::Version 
-  hash: 19
+  hash: 15
   prerelease: false
   segments: 
   - 0
-  - 3
+  - 4
   - 0
-  version: 0.3.0
+  version: 0.4.0
 platform: ruby
 authors: 
 - David Bergman
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-08-14 00:00:00 -04:00
+date: 2011-02-04 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -40,13 +40,28 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 59
+        hash: 21
         segments: 
+        - 1
         - 0
-        - 24
-        version: "0.24"
+        - 1
+        version: 1.0.1
   type: :runtime
   version_requirements: *id002
+- !ruby/object:Gem::Dependency 
+  name: activemodel
+  prerelease: false
+  requirement: &id003 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  type: :runtime
+  version_requirements: *id003
 description: Ruby persistence layer for CouchDB
 email: davber@gmail.com
 executables: []
@@ -111,6 +126,7 @@ files:
 - spec/fixtures/person.rb
 - spec/property_spec.rb
 - spec/rails_spec.rb
+- spec/railtie_spec.rb
 - spec/spec.opts
 - spec/spec_helper.rb
 - spec/unit/active_model_compliance_spec.rb
@@ -123,6 +139,7 @@ files:
 - spec/unit/database_spec.rb
 - spec/unit/date_spec.rb
 - spec/unit/dirty_attributes_spec.rb
+- spec/unit/initialize_spec.rb
 - spec/unit/json_create_id_spec.rb
 - spec/unit/lists_spec.rb
 - spec/unit/model_view_spec_spec.rb
@@ -180,6 +197,7 @@ test_files:
 - spec/fixtures/person.rb
 - spec/property_spec.rb
 - spec/rails_spec.rb
+- spec/railtie_spec.rb
 - spec/spec_helper.rb
 - spec/unit/active_model_compliance_spec.rb
 - spec/unit/attributes_spec.rb
@@ -191,6 +209,7 @@ test_files:
 - spec/unit/database_spec.rb
 - spec/unit/date_spec.rb
 - spec/unit/dirty_attributes_spec.rb
+- spec/unit/initialize_spec.rb
 - spec/unit/json_create_id_spec.rb
 - spec/unit/lists_spec.rb
 - spec/unit/model_view_spec_spec.rb