couch_potato 0.2.12 → 0.2.13

data/CHANGES.md

@@ -1,5 +1,13 @@
 ## Changes
 
+### 0.2.13
+
+* support adding errors in before_validation callbacks (mattmatt)
+* support for inheritance (mattmatt)
+* support for save without validations (mattmatt)
+* improved (de)serialization now supports deserializing nested objects (railsbros, specs by hagenburger)
+* RSpec matchers for testing map/reduce functions (langalex)
+
 ### 0.2.10
 * fixed bug with hardcoded timezone
 

data/README.md

@@ -22,13 +22,11 @@ Lastly Couch Potato aims to provide a seamless integration with Ruby on Rails, e
 
 Couch Potato is hosted as a gem on github which you can install like this:
 
-    sudo gem source --add http://gems.github.com # if you haven't already
-    sudo gem install langalex-couch_potato
+    sudo gem install couch_potato --source http://gemcutter.org
 
 #### Using with your ruby application:
 
     require 'rubygems'
-    gem 'langalex-couch_potato'
     require 'couch_potato'
 
 Alternatively you can download or clone the source repository and then require lib/couch_potato.rb.
@@ -45,7 +43,8 @@ The server URL will default to http://localhost:5984/ unless specified:
 
 Add to your config/environment.rb:
 
-    config.gem 'langalex-couch_potato', :lib => 'couch_potato', :source => 'http://gems.github.com'
+    config.gem 'couch_potato', :source => 'http://gemcutter.org'
+    config.frameworks -= [:active_record] # if you switch completely
 
 Then create a config/couchdb.yml:
 
@@ -282,6 +281,36 @@ To make testing easier and faster database logic has been put into its own class
 
 By creating you own instances of CouchPotato::Database and passing them a fake CouchRest database instance you can completely disconnect your unit tests/spec from the database.
 
+##### Testing map/reduce functions
+
+Couch Potato provides custom RSpec matchers for testing the map and reduce functions of your views. For example you can do this:
+
+    Class User
+      include CouchPotato::Persistence
+      
+      view :by_name, :key => :name
+      view :by_age, :key => :age
+    end
+    
+    #RSpec
+    describe User, 'by_name' do
+      it "should map users to their name" do
+        User.by_name.should map({:name => 'bill', :age => 23}).to([['bill', null]])
+      end
+      
+      it "should reduce the users to the sum of their age" do
+        User.by_age.should reduce([], [[23], [22]]).to(45)
+      end
+      
+      it "should rereduce" do
+        User.by_age.should rereduce([], [[23], [22]]).to(45)
+      end
+    end
+    
+This will actually run your map/reduce functions in a JavaScript interpreter, passing the arguments as JSON and converting the results back to Ruby.
+
+In order for this to work you must have the `js` executable in your PATH. This is usually part of the _spidermonkey_ package/port. (On MacPorts that's _spidemonkey_, on Linux it could be one of _libjs_, _libmozjs_ or _libspidermonkey_). When you installed CouchDB via your packet manager Spidermonkey should already be there.
+
 ### Helping out
 
 Please fix bugs, add more specs, implement new features by forking the github repo at http://github.com/langalex/couch_potato.

data/VERSION.yml

@@ -1,4 +1,4 @@
 --- 
-:major: 0
 :minor: 2
-:patch: 12
+:patch: 13
+:major: 0

data/lib/couch_potato/database.rb

@@ -19,12 +19,13 @@ module CouchPotato
       spec.process_results results
     end
 
-    def save_document(document)
+
+    def save_document(document, validate = true)
       return true unless document.dirty?
       if document.new?
-        create_document document
+        create_document(document, validate)
       else
-        update_document document
+        update_document(document, validate)
       end
     end
     alias_method :save, :save_document
@@ -47,9 +48,7 @@ module CouchPotato
     def load_document(id)
       raise "Can't load a document without an id (got nil)" if id.nil?
       begin
-        json = database.get(id)
-        klass = json['ruby_class'].split('::').inject(Class){|scope, const| scope.const_get(const)}
-        instance = klass.json_create json
+        instance = database.get(id)
         instance.database = self
         instance
       rescue(RestClient::ResourceNotFound)
@@ -70,11 +69,16 @@ module CouchPotato
       end
     end
 
-    def create_document(document)
+    def create_document(document, validate)
       document.database = self
-      document.run_callbacks :before_validation_on_save
-      document.run_callbacks :before_validation_on_create
-      return unless document.valid?
+      
+      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)
+      end
+      
       document.run_callbacks :before_save
       document.run_callbacks :before_create
       res = database.save_doc clean_hash(document.to_hash)
@@ -85,10 +89,14 @@ module CouchPotato
       true
     end
 
-    def update_document(document)
-      document.run_callbacks :before_validation_on_save
-      document.run_callbacks :before_validation_on_update
-      return unless document.valid?
+    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)
+      end
+      
       document.run_callbacks :before_save
       document.run_callbacks :before_update
       res = database.save_doc clean_hash(document.to_hash)
@@ -98,6 +106,15 @@ module CouchPotato
       true
     end
 
+    def valid_document?(document)
+      errors = document.errors.errors.dup
+      document.valid?
+      errors.each do |k, v|
+        v.each {|message| document.errors.add(k, message)}
+      end
+      document.errors.empty?
+    end
+    
     def database
       @database
     end

data/lib/couch_potato/persistence/json.rb

@@ -15,7 +15,7 @@ module CouchPotato
         (self.class.properties).inject({}) do |props, property|
           property.serialize(props, self)
           props
-        end.merge('ruby_class' => self.class.name).merge(id_and_rev_json)
+        end.merge(JSON.create_id => self.class.name).merge(id_and_rev_json)
       end
       
       private

data/lib/couch_potato/persistence/properties.rb

@@ -3,12 +3,41 @@ require File.dirname(__FILE__) + '/simple_property'
 module CouchPotato
   module Persistence
     module Properties
+      class PropertyList
+        include Enumerable
+        
+        attr_accessor :list
+        
+        def initialize(clazz)
+          @clazz = clazz
+          @list = []
+        end
+        
+        def each
+          (list + inherited_properties).each {|property| yield property}
+        end
+        
+        def <<(property)
+          @list << property
+        end
+        
+        def inherited_properties
+          superclazz = @clazz.superclass
+          properties = []
+          while superclazz && superclazz.respond_to?(:properties)
+            properties << superclazz.properties.list
+            superclazz = superclazz.superclass
+          end
+          properties.flatten
+        end
+      end
+      
       def self.included(base)
         base.extend ClassMethods
         base.class_eval do
           def self.properties
             @properties ||= {}
-            @properties[self.name] ||= []
+            @properties[name] ||= PropertyList.new(self)
           end
         end
       end

data/lib/couch_potato/persistence/simple_property.rb

@@ -12,11 +12,11 @@ module CouchPotato
       
       def build(object, json)
         value = json[name.to_s] || json[name.to_sym]
-        typecast_value =  if type
-                              type.json_create value
-                            else
-                              value
-                            end
+        typecast_value =  if type && !value.instance_of?(type)
+                            type.json_create value
+                          else
+                            value
+                          end
         object.send "#{name}=", typecast_value
       end
       

data/lib/couch_potato/persistence/validation.rb

@@ -8,8 +8,14 @@ module CouchPotato
         base.class_eval do
           # Override the validate method to first run before_validation callback
           def valid?
-            self.run_callbacks :before_validation
+            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)}
+            end
+            errors.empty?
           end
         end
       end

data/lib/couch_potato/rspec/matchers/map_to_matcher.rb

@@ -0,0 +1,125 @@
+require 'json'
+
+module Spec
+  module Matchers
+    def map(document)
+      CouchPotato::RSpec::MapToProxy.new(document)
+    end
+    
+    def reduce(docs, keys)
+      CouchPotato::RSpec::ReduceToProxy.new(docs, keys)
+    end
+    
+    def rereduce(docs, keys)
+      CouchPotato::RSpec::ReduceToProxy.new(docs, keys, true)
+    end
+  end
+end
+
+module CouchPotato
+  module RSpec
+    
+    module RunJS
+      private
+      
+      def run_js(js)
+        path = 'couch_potato_js_runner.js'
+        File.open(path, 'w') {|f| f << js}
+        `js #{path}`
+      end
+    end
+    
+    
+    class MapToProxy
+      def initialize(input_ruby)
+        @input_ruby = input_ruby
+      end
+      
+      def to(expected_ruby)
+        MapToMatcher.new(expected_ruby, @input_ruby)
+      end
+    end
+    
+    class MapToMatcher
+      include RunJS
+      
+      def initialize(expected_ruby, input_ruby)
+        @expected_ruby = expected_ruby
+        @input_ruby = input_ruby
+      end
+      
+      def matches?(view_spec)
+        js = <<-JS
+          #{File.read(File.dirname(__FILE__) + '/print_r.js')}
+          var doc = #{@input_ruby.to_json};
+          var map = #{view_spec.map_function};
+          var result = [];
+          var emit = function(key, value) {
+            result.push([key, value]);
+          };
+          map(doc);
+          print(print_r(result));
+        JS
+        @actual_ruby = JSON.parse(run_js(js))
+        @expected_ruby == @actual_ruby
+      end
+      
+      def failure_message_for_should
+        "Expected to map to #{@expected_ruby.inspect} but got #{@actual_ruby.inspect}."
+      end
+      
+      def failure_message_for_should_not
+        "Expected not to map to #{@actual_ruby.inspect} but did."
+      end
+    end
+
+    class ReduceToProxy
+      def initialize(docs, keys, rereduce = false)
+        @docs, @keys, @rereduce = docs, keys, rereduce
+      end
+      
+      def to(expected_ruby)
+        ReduceToMatcher.new(expected_ruby, @docs, @keys, @rereduce)
+      end
+    end
+    
+    class ReduceToMatcher
+      include RunJS
+      
+      def initialize(expected_ruby, docs, keys, rereduce = false)
+        @expected_ruby, @docs, @keys, @rereduce = expected_ruby, docs, keys, rereduce
+      end
+      
+      def matches?(view_spec)
+        js = <<-JS
+          #{File.read(File.dirname(__FILE__) + '/print_r.js')}
+          
+          sum = function(values) {
+            var rv = 0;
+            for (var i in values) {
+              rv += values[i];
+            }
+            return rv;
+          };
+          
+          var docs = #{@docs.to_json};
+          var keys = #{@keys.to_json};
+          var reduce = #{view_spec.reduce_function};
+          print(print_r({result: reduce(docs, keys, #{@rereduce})}));
+        JS
+        @actual_ruby = JSON.parse(run_js(js))['result']
+        @expected_ruby == @actual_ruby
+      end
+      
+      def failure_message_for_should
+        "Expected to reduce to #{@expected_ruby.inspect} but got #{@actual_ruby.inspect}."
+      end
+      
+      def failure_message_for_should_not
+        "Expected not to reduce to #{@actual_ruby.inspect} but did."
+      end
+      
+    end
+    
+  end
+end

data/lib/couch_potato/rspec/matchers/print_r.js

@@ -0,0 +1,60 @@
+// taken and adapted from http://scriptnode.com/article/javascript-print_r-or-var_dump-equivalent/
+
+/**
+ * Concatenates the values of a variable into an easily readable string
+ * by Matt Hackett [scriptnode.com]
+ * @param {Object} x The variable to debug
+ * @param {Number} max The maximum number of recursions allowed (keep low, around 5 for HTML elements to prevent errors) [default: 10]
+ * @param {String} sep The separator to use between [default: a single space ' ']
+ * @param {Number} l The current level deep (amount of recursion). Do not use this parameter: it's for the function's own use
+ */
+function print_r(x, max, sep, l) {
+
+	l = l || 0;
+	max = max || 10;
+	sep = sep || ' ';
+
+	if (l > max) {
+		throw("Too much recursion");
+	};
+
+	var r = '';
+
+	if (x === null) {
+		r += "null";
+	} else if (is_array(x)) {
+	  r += '[' + x.map(function(i) {
+	    return print_r(i, max, sep, (l + 1));
+	  }).join(', ') + ']';
+	} else if(is_object(x)) {
+    r += '{'
+    var pairs = [];
+    for (i in x) {
+			pairs.push('"' + i + '": ' + print_r(x[i], max, sep, (l + 1)));
+		}
+		r += pairs.join(', ');
+    r += '}';
+	} else if(is_string(x)) {
+	  r += '"' + x + "\"";
+  } else {
+    r += x;
+  };
+
+  return r;
+  
+  function is_string(a) {
+    return typeof a === 'string';
+  };
+	
+	function is_array(a) {
+    return (a &&
+      typeof a === 'object' &&
+      a.constructor === Array);
+  };
+  
+  function is_object(a) {
+    return a && typeof a == 'object'
+  };
+  
+};
+

data/lib/couch_potato/rspec/matchers/reduce_to_matcher.rb

@@ -0,0 +1,6 @@
+module CouchPotato
+  module RSpec
+    class ReduceToMatcher
+    end
+  end
+end

data/lib/couch_potato/rspec/matchers.rb

@@ -0,0 +1,2 @@
+require File.dirname(__FILE__) + '/matchers/map_to_matcher'
+require File.dirname(__FILE__) + '/matchers/reduce_to_matcher'

data/lib/couch_potato/view/custom_view_spec.rb

@@ -19,7 +19,11 @@ module CouchPotato
       
       def process_results(results)
         results['rows'].map do |row|
-          klass.json_create row['doc'] || row['value'].merge(:_id => row['id'] || row['key'])
+          if row['doc'].instance_of?(klass)
+            row['doc']
+          else
+            klass.json_create row['doc'] || row['value'].merge(:_id => row['id'] || row['key'])
+          end
         end
       end
     end

data/lib/couch_potato/view/custom_views.rb

@@ -15,12 +15,16 @@ module CouchPotato
 
       module ClassMethods
         # Declare a CouchDB view, for examples on how to use see the *ViewSpec classes in CouchPotato::View
-        def views
-          @views ||= {}
+        def views(view_name = nil)
+          if view_name
+            _find_view(view_name)
+          else
+            @views ||= {}
+          end
         end
 
         def execute_view(view_name, view_parameters)
-          view_spec_class(views[view_name][:type]).new(self, view_name, views[view_name], view_parameters)
+          view_spec_class(views(view_name)[:type]).new(self, view_name, views(view_name), view_parameters)
         end
 
         def view(view_name, options)
@@ -38,6 +42,11 @@ module CouchPotato
             CouchPotato::View.const_get("#{name}ViewSpec")
           end
         end
+        
+        def _find_view(view)
+          return @views[view] if @views && @views[view]
+          superclass._find_view(view) if superclass && superclass.respond_to?(:_find_view)
+        end
       end
     end
   end

data/lib/couch_potato/view/model_view_spec.rb

@@ -34,9 +34,7 @@ module CouchPotato
         if count?
           results['rows'].first.try(:[], 'value') || 0
         else
-          results['rows'].map do |row|
-            klass.json_create row['doc']
-          end
+          results['rows'].map { |row| row['doc'] }
         end
       end
       

data/lib/couch_potato/view/view_query.rb

@@ -23,7 +23,7 @@ module CouchPotato
 
       def create_view
         design_doc = @database.get "_design/#{@design_document_name}" rescue nil
-        design_doc ||= {'views' => {}, "_id" => "_design/#{@design_document_name}"}
+        design_doc ||= {'views' => {}, "_id" => "_design/#{@design_document_name}", "language" => "javascript"}
         design_doc['views'][@view_name.to_s] = {
           'map' => @map_function,
           'reduce' => @reduce_function

data/lib/couch_potato.rb

@@ -5,6 +5,7 @@ require 'json/add/rails'
 
 require 'ostruct'
 
+JSON.create_id = 'ruby_class'
 
 module CouchPotato
   Config = Struct.new(:database_name).new
@@ -23,7 +24,7 @@ module CouchPotato
 
   def self.full_url_to_database
     raise('No Database configured. Set CouchPotato::Config.database_name') unless CouchPotato::Config.database_name
-    if CouchPotato::Config.database_name[0,7] == 'http://'
+    if CouchPotato::Config.database_name.match(%r{https?://})
       CouchPotato::Config.database_name
     else
       "http://127.0.0.1:5984/#{CouchPotato::Config.database_name}"

data/spec/attachments_spec.rb

@@ -13,7 +13,7 @@ describe CouchPotato, 'attachments' do
     comment._attachments = {'body' => {'data' => 'a useful comment', 'content_type' => 'text/plain'}}
     CouchPotato.database.save! comment
     comment_reloaded = CouchPotato.database.load comment.id
-    comment_reloaded._attachments.should == {"body" => {"content_type" => "text/plain", "stub" => true, "length" => 16}}
+    comment_reloaded._attachments["body"].should include({"content_type" => "text/plain", "stub" => true, "length" => 16})
   end
   
   it "should have an empty array for a new object" do

data/spec/callbacks_spec.rb

@@ -268,4 +268,38 @@ describe "lambda callbacks" do
     recorder.run_callbacks :before_create
     recorder.lambda_works.should be_true
   end
+end
+
+describe "validation callbacks" do
+  class ValidatedUser
+    include CouchPotato::Persistence
+    
+    property :name
+    before_validation :check_name
+    validates_presence_of :name
+    
+    def check_name
+      errors.add(:name, 'should be Paul') unless name == "Paul"
+    end
+  end
+  
+  it "should keep error messages set in custom before_validation filters" do
+    user = ValidatedUser.new(:name => "john")
+    user.valid?.should == false
+    user.errors.on(:name).should == "should be Paul"
+  end
+  
+  it "should combine the errors from validations and callbacks" do
+    user = ValidatedUser.new(:name => nil)
+    user.valid?.should == false
+    user.errors.on(:name).should == ["can't be empty", "should be Paul"]
+  end
+  
+  it "should clear the errors on subsequent calls to valid?" do
+    user = ValidatedUser.new(:name => nil)
+    user.valid?.should == false
+    user.name = 'Paul'
+    user.valid?.should == true
+    user.errors.on(:name).should == nil
+  end
 end

data/spec/create_spec.rb

@@ -8,7 +8,7 @@ describe "create" do
     it "should store the class" do
       @comment = Comment.new :title => 'my_title'
       CouchPotato.database.save_document! @comment
-      CouchPotato.couchrest_database.get(@comment.id)['ruby_class'].should == 'Comment'
+      CouchPotato.couchrest_database.get(@comment.id).ruby_class.should == 'Comment'
     end
   end
   describe "fails" do

data/spec/custom_view_spec.rb

@@ -18,6 +18,9 @@ class Build
   view :with_view_options, :group => true, :key => :time
 end
 
+class CustomBuild < Build
+end
+
 describe 'view' do
   before(:each) do
     recreate_db
@@ -108,6 +111,13 @@ describe 'view' do
         CouchPotato.couchrest_database.save_doc({:state => 'success', :time => '2008-01-01'})
         CouchPotato.database.view(Build.custom_timeline_returns_docs).map(&:state).should == ['success']
       end
+      
+      it "should still return instance of class if document included 'ruby_class'" do
+        CouchPotato.couchrest_database.save_doc({:state => 'success', :time => '2008-01-01', :ruby_class => "Build"})
+        view_data = CouchPotato.database.view(Build.custom_timeline_returns_docs)
+        view_data.map(&:class).should == [Build]
+        view_data.map(&:state).should == ['success']
+      end
     end
     
     describe "additional reduce function given" do
@@ -146,4 +156,11 @@ describe 'view' do
     end
   end
 
+  describe "inherited views" do
+    it "should support parent views for objects of the subclass" do
+      CouchPotato.database.save_document CustomBuild.new(:state => 'success', :time => '2008-01-01')
+      CouchPotato.database.view(CustomBuild.timeline).should have(1).item
+      CouchPotato.database.view(CustomBuild.timeline).first.should be_kind_of(CustomBuild)
+    end
+  end
 end

data/spec/fixtures/person.rb

@@ -1,6 +1,6 @@
 class Person
   include CouchPotato::Persistence
   
-  property :name
-  property :ship_address, :type => Address
+  property :name, :type => Address
+  property :ship_address
 end

data/spec/property_spec.rb

@@ -18,6 +18,9 @@ class Watch
   end
 end
 
+class CuckooClock < Watch
+  property :cuckoo
+end
 
 describe 'properties' do
   before(:all) do
@@ -57,6 +60,45 @@ describe 'properties' do
     c.title.should == {'key' => 'value'}
   end
   
+  def it_should_persist value
+    c = Comment.new :title => value
+    CouchPotato.database.save_document! c
+    c = CouchPotato.database.load_document c.id
+    c.title.should == value
+  end
+
+  it "should persist a child class" do
+    it_should_persist Child.new('text' => 'some text')
+  end
+
+  it "should persist a hash with a child class" do
+    it_should_persist 'child' => Child.new('text' => 'some text')
+  end
+
+  it "should persist an array with a child class" do
+    it_should_persist [Child.new('text' => 'some text')]
+  end
+
+  it "should persist something very complex" do
+    something_very_complex = [
+      [
+        [
+          {
+            'what' => [
+              {
+                'ever' => Child.new('text' => 'some text')
+              }
+            ],
+            'number' => 3
+          },
+          "string"
+        ],
+        Child.new('text' => 'nothing')
+      ]
+    ]
+    it_should_persist something_very_complex
+  end
+
   it "should persist a Time object" do
     w = Watch.new :time => Time.now
     CouchPotato.database.save_document! w
@@ -98,4 +140,17 @@ describe 'properties' do
       Comment.new(:title => '').title?.should be_false
     end
   end
+  
+  describe "with subclasses" do
+    it "should include properties of superclasses" do
+      CuckooClock.properties.map(&:name).should include(:time)
+      CuckooClock.properties.map(&:name).should include(:cuckoo)
+    end
+    
+    it "should return attributes of superclasses" do
+      clock = CuckooClock.new(:time => Time.now, :cuckoo => 'bavarian')
+      clock.attributes[:time].should_not == nil
+      clock.attributes[:cuckoo].should == 'bavarian'
+    end
+  end
 end

data/spec/spec_helper.rb

@@ -7,6 +7,13 @@ require 'couch_potato'
 
 CouchPotato::Config.database_name = 'couch_potato_test'
 
+class Child
+  include CouchPotato::Persistence
+
+  property :text
+end
+
+
 
 class Comment
   include CouchPotato::Persistence

data/spec/unit/database_spec.rb

@@ -18,6 +18,32 @@ describe CouchPotato::Database, 'new' do
   end
 end
 
+describe CouchPotato::Database, 'full_url_to_database' do
+  before(:all) do
+    @database_url = CouchPotato::Config.database_name
+  end
+
+  after(:all) do
+    CouchPotato::Config.database_name = @database_url
+  end
+  
+  it "should return the full URL when it starts with https" do
+    CouchPotato::Config.database_name = "https://example.com/database"
+    CouchPotato.full_url_to_database.should == 'https://example.com/database'
+  end
+  
+  it "should return the full URL when it starts with http" do
+    CouchPotato::Config.database_name = "http://example.com/database"
+    CouchPotato.full_url_to_database.should == 'http://example.com/database'
+  end
+  
+  it "should use localhost when no protocol was specified" do
+    CouchPotato::Config.database_name = "database"
+    CouchPotato.full_url_to_database.should == 'http://127.0.0.1:5984/database'
+  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))
@@ -29,22 +55,153 @@ describe CouchPotato::Database, 'load' do
   it "should set itself on the model" do
     user = mock 'user'
     DbTestUser.stub!(:new).and_return(user)
-    db = CouchPotato::Database.new(stub('couchrest db', :info => nil, :get => {'ruby_class' => 'DbTestUser'}))
+    db = CouchPotato::Database.new(stub('couchrest db', :info => nil, :get => DbTestUser.json_create({'ruby_class' => 'DbTestUser'})))
     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 = CouchPotato::Database.new(stub('couchrest db', :info => nil, :get => Parent::Child.json_create({'ruby_class' => 'Parent::Child'})))
     db.load('1').class.should == Parent::Child
   end
 end
 
 describe CouchPotato::Database, 'save_document' do
+  before(:each) do
+    @db = CouchPotato::Database.new(stub('couchrest db').as_null_object)
+  end
+  
   it "should set itself on the model for a new object before doing anything else" do
-    db = CouchPotato::Database.new(stub('couchrest db', :info => nil))
-    user = stub('user', :new? => true, :valid? => false).as_null_object
-    user.should_receive(:database=).with(db)
-    db.save_document user
+    @db.stub(:valid_document?).and_return false
+    user = stub('user', :new? => true).as_null_object
+    user.should_receive(:database=).with(@db)
+    @db.save_document user
+  end
+
+  class Category
+    include CouchPotato::Persistence
+    property :name
+    validates_presence_of :name
+  end
+  
+  it "should return false when creating a new document and the validations failed" do
+    CouchPotato.database.save_document(Category.new).should == false
+  end
+  
+  it "should return false when saving an existing document and the validations failed" do
+    category = Category.new(:name => "pizza")
+    CouchPotato.database.save_document(category).should == true
+    category.name = nil
+    CouchPotato.database.save_document(category).should == false
+  end
+  
+  describe "when creating with validate options" do
+    it "should not run the validations when saved with false" do
+      category = Category.new
+      @db.save_document(category, false)
+      category.new?.should == false
+    end
+
+    it "should run the validations when saved with true" do
+      category = Category.new
+      @db.save_document(category, true)
+      category.new?.should == true
+    end
+
+    it "should run the validations when saved with default" do
+      category = Category.new
+      @db.save_document(category)
+      category.new?.should == true
+    end
   end
-end
+
+  describe "when updating with validate options" 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.name = nil
+      @db.save_document(category, false)
+      category.dirty?.should == false
+    end
+
+    it "should run the validations when saved with true" do
+      category = Category.new(:name => "food")
+      @db.save_document(category)
+      category.new?.should == false
+      category.name = nil
+      @db.save_document(category, true)
+      category.dirty?.should == true
+      category.valid?.should == false
+    end
+
+    it "should run the validations when saved with default" do
+      category = Category.new(:name => "food")
+      @db.save_document(category)
+      category.new?.should == false
+      category.name = nil
+      @db.save_document(category)
+      category.dirty?.should == true
+    end
+  end
+  
+  describe "when saving documents with errors set in callbacks" do
+    class Vulcan
+      include CouchPotato::Persistence
+      before_validation_on_create :set_errors
+      before_validation_on_update :set_errors
+      
+      property :name
+      validates_presence_of :name
+      
+      def set_errors
+        errors.add(:validation, "failed")
+      end
+    end
+    
+    it "should keep errors added in before_validation_on_* callbacks when creating a new object" do
+      spock = Vulcan.new(:name => 'spock')
+      @db.save_document(spock)
+      spock.errors.on(:validation).should == 'failed'
+    end
+    
+    it "should keep errors added in before_validation_on_* callbacks when creating a new object" do
+      spock = Vulcan.new(:name => 'spock')
+      @db.save_document(spock, false)
+      spock.new_record?.should == false
+      spock.name = "spock's father"
+      @db.save_document(spock)
+      spock.errors.on(:validation).should == 'failed'
+    end
+    
+    it "should keep errors generated from normal validations together with errors set in normal validations" do
+      spock = Vulcan.new
+      @db.save_document(spock)
+      spock.errors.on(:validation).should == 'failed'
+      spock.errors.on(:name).should == "can't be empty"
+    end
+    
+    it "should clear errors on subsequent, valid saves when creating" do
+      spock = Vulcan.new
+      @db.save_document(spock)
+      
+      spock.name = 'Spock'
+      @db.save_document(spock)
+      spock.errors.on(:name).should == nil
+    end
+    
+    it "should clear errors on subsequent, valid saves when updating" do
+      spock = Vulcan.new(:name => 'spock')
+      @db.save_document(spock, false)
+      
+      spock.name = nil
+      @db.save_document(spock)
+      spock.errors.on(:name).should == "can't be empty"
+      
+      spock.name = 'Spock'
+      @db.save_document(spock)
+      spock.errors.on(:name).should == nil
+    end
+    
+  end
+end

data/spec/unit/dirty_attributes_spec.rb

@@ -86,7 +86,7 @@ describe 'dirty attribute tracking' do
   
   describe "object loaded from database" do
     before(:each) do
-      couchrest_db = stub('database', :get => {'_id' => '1', '_rev' => '2', 'food' => 'sushi', 'ruby_class' => 'Plate'}, :info => nil)
+      couchrest_db = stub('database', :get => Plate.json_create({'_id' => '1', '_rev' => '2', 'food' => 'sushi', 'ruby_class' => 'Plate'}), :info => nil)
       @plate = CouchPotato::Database.new(couchrest_db).load_document '1'
     end
     
@@ -104,7 +104,7 @@ describe 'dirty attribute tracking' do
       end
       
       it "should return true if array attribute changed" do
-        couchrest_db = stub('database', :get => {'_id' => '1', '_rev' => '2', 'food' => ['sushi'], 'ruby_class' => 'Plate'}, :info => nil)
+        couchrest_db = stub('database', :get => Plate.json_create({'_id' => '1', '_rev' => '2', 'food' => ['sushi'], 'ruby_class' => 'Plate'}), :info => nil)
         plate = CouchPotato::Database.new(couchrest_db).load_document '1'
         plate.food << 'burger'
         plate.should be_food_changed
@@ -119,7 +119,7 @@ describe 'dirty attribute tracking' do
   
   describe "after save" do
     it "should reset all attributes to not dirty" do
-      couchrest_db = stub('database', :get => {'_id' => '1', '_rev' => '2', 'food' => 'sushi', 'ruby_class' => 'Plate'}, :info => nil, :save_doc => {})
+      couchrest_db = stub('database', :get => Plate.json_create({'_id' => '1', '_rev' => '2', 'food' => 'sushi', 'ruby_class' => 'Plate'}), :info => nil, :save_doc => {})
       db = CouchPotato::Database.new(couchrest_db)
       @plate = db.load_document '1'
       @plate.food = 'burger'

data/spec/unit/json_create_id_spec.rb

@@ -0,0 +1,14 @@
+require File.dirname(__FILE__) + '/../spec_helper'
+
+class Drink
+  include CouchPotato::Persistence
+  
+  property :alcohol
+end
+
+describe "json module" do
+  it "should inject JSON.create_id into hash representation of a persistence object" do
+    sake = Drink.new(:alcohol => "18%")
+    sake.to_hash[JSON.create_id].should eql("Drink")
+  end
+end

data/spec/unit/rspec_matchers_spec.rb

@@ -0,0 +1,97 @@
+require File.dirname(__FILE__) + '/../spec_helper'
+require 'couch_potato/rspec/matchers'
+require 'ostruct'
+
+describe CouchPotato::RSpec::MapToMatcher do
+  
+  describe "basic map function" do
+    before(:each) do
+      @view_spec = OpenStruct.new(:map_function => "function(doc) {emit(doc.name, doc.tags.length);}")
+    end
+
+    it "should pass if the given function emits the expected javascript" do
+      @view_spec.should map({:name => 'horst', :tags => ['person', 'male']}).to([['horst', 2]])
+    end
+
+    it "should not pass if the given function emits different javascript" do
+      @view_spec.should_not map({:name => 'horst', :tags => ['person', 'male']}).to([['horst', 3]])
+    end
+  end
+  
+  describe "functions emitting multiple times" do
+    before(:each) do
+      @view_spec = OpenStruct.new(:map_function => "function(doc) {emit(doc.name, doc.tags.length); emit(doc.tags[0], doc.tags[1])};")
+    end
+    
+    it "should pass if the given function emits the expected javascript" do
+      @view_spec.should map({:name => 'horst', :tags => ['person', 'male']}).to([['horst', 2], ['person', 'male']])
+    end
+  
+    it "should return false if the given function emits different javascript" do
+      @view_spec.should_not map({:name => 'horst', :tags => ['person', 'male']}).to([['horst', 2], ['male', 'person']])
+    end
+  end
+  
+  describe "failing specs" do
+    before(:each) do
+      @view_spec = OpenStruct.new(:map_function => "function(doc) {emit(doc.name, null)}")
+    end
+    
+    it "should have a nice error message for failing should" do
+      lambda {
+        @view_spec.should map({:name => 'bill'}).to([['linus', nil]])
+      }.should raise_error('Expected to map to [["linus", nil]] but got [["bill", nil]].')
+    end
+    
+    it "should have a nice error message for failing should not" do
+      lambda {
+        @view_spec.should_not map({:name => 'bill'}).to([['bill', nil]])
+      }.should raise_error('Expected not to map to [["bill", nil]] but did.')
+    end
+  end
+end
+
+describe CouchPotato::RSpec::ReduceToMatcher do
+  before(:each) do
+    @view_spec = OpenStruct.new(:reduce_function => "function(docs, keys, rereduce) {
+      if(rereduce) {
+        return(sum(keys) * 2);
+      } else {
+        return(sum(keys));
+      };
+    }")
+  end
+  
+  it "should pass if the given function return the expected javascript" do
+    @view_spec.should reduce([], [1, 2, 3]).to(6)
+  end
+  
+  it "should not pass if the given function returns different javascript" do
+    @view_spec.should_not reduce([], [1, 2, 3]).to(7)
+  end
+  
+  describe "rereduce" do
+    it "should pass if the given function return the expected javascript" do
+      @view_spec.should rereduce([], [1, 2, 3]).to(12)
+    end
+    
+    it "should not pass if the given function returns different javascript" do
+      @view_spec.should_not rereduce([], [1, 2, 3]).to(13)
+    end
+  end
+  
+  describe 'failing specs' do
+    
+    it "should have a nice error message for failing should" do
+      lambda {
+        @view_spec.should reduce([], [1, 2, 3]).to(7)
+      }.should raise_error('Expected to reduce to 7 but got 6.')
+    end
+    
+    it "should have a nice error message for failing should not" do
+      lambda {
+        @view_spec.should_not reduce([], [1, 2, 3]).to(6)
+      }.should raise_error('Expected not to reduce to 6 but did.')
+    end
+  end
+end

data/spec/update_spec.rb

@@ -35,6 +35,6 @@ describe "create" do
   it "should update the attributes" do
     @comment.title = 'new title'
     CouchPotato.database.save_document! @comment
-    CouchPotato.couchrest_database.get("#{@comment.id}")['title'].should == 'new title'
+    CouchPotato.couchrest_database.get("#{@comment.id}").title.should == 'new title'
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: couch_potato
 version: !ruby/object:Gem::Version 
-  version: 0.2.12
+  version: 0.2.13
 platform: ruby
 authors: 
 - Alexander Lang
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-09-20 00:00:00 +02:00
+date: 2009-10-30 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -73,6 +73,10 @@ files:
 - lib/couch_potato/persistence/properties.rb
 - lib/couch_potato/persistence/simple_property.rb
 - lib/couch_potato/persistence/validation.rb
+- lib/couch_potato/rspec/matchers.rb
+- lib/couch_potato/rspec/matchers/map_to_matcher.rb
+- lib/couch_potato/rspec/matchers/print_r.js
+- lib/couch_potato/rspec/matchers/reduce_to_matcher.rb
 - lib/couch_potato/view/base_view_spec.rb
 - lib/couch_potato/view/custom_view_spec.rb
 - lib/couch_potato/view/custom_views.rb
@@ -99,6 +103,8 @@ files:
 - spec/unit/customs_views_spec.rb
 - spec/unit/database_spec.rb
 - spec/unit/dirty_attributes_spec.rb
+- spec/unit/json_create_id_spec.rb
+- spec/unit/rspec_matchers_spec.rb
 - spec/unit/string_spec.rb
 - spec/unit/view_query_spec.rb
 - spec/update_spec.rb
@@ -148,6 +154,8 @@ test_files:
 - spec/unit/customs_views_spec.rb
 - spec/unit/database_spec.rb
 - spec/unit/dirty_attributes_spec.rb
+- spec/unit/json_create_id_spec.rb
+- spec/unit/rspec_matchers_spec.rb
 - spec/unit/string_spec.rb
 - spec/unit/view_query_spec.rb
 - spec/update_spec.rb