mongodb_model 0.2.7 → 0.2.8

data/lib/mongo/model/conversion.rb

@@ -28,7 +28,7 @@ module Mongo::Model::Conversion
       profile_options = self.class.profiles[profile] || raise("profile :#{profile} not defined for #{self.class}!")
       to_rson profile_options.merge(_profile: profile)
     else
-      options.validate_options! :only, :except, :methods, :_profile
+      options.validate_options! :only, :except, :methods, :errors, :_profile
       child_options = options[:_profile] ? {profile: options[:_profile]} : {}
 
       instance_variables = Mongo::Object.instance_variables(self)
@@ -47,13 +47,19 @@ module Mongo::Model::Conversion
       end
 
       methods = options[:methods] ? Array(options[:methods]) : []
-
       methods.each do |method|
         value = send method
         value = Mongo::Object.convert value, :to_rson, child_options
         result[method.to_s] = value
       end
 
+      with_errors = options.include?(:errors) ? options[:errors] : true
+      if with_errors and !(errors = self.errors).empty?
+        stringified_errors = {}
+        errors.each{|k, v| stringified_errors[k.to_s] = v}
+        result['errors'] = stringified_errors
+      end
+      
       result
     end
   end

data/lib/mongo/model/model.rb

@@ -4,7 +4,8 @@ module Mongo::Model
   attr_accessor :_id, :_class
 
   def _id?; !!_id end
-  def new_record?; !_id end
+  def new?; !_id end
+  alias_method :new_record?, :new?
 
   inherited do
     unless is?(Array) or is?(Hash)

data/spec/conversion_spec.rb

@@ -82,6 +82,24 @@ describe 'Model callbacks' do
       ]
     }
   end
+  
+  it "should include errors" do
+    Post.class_eval do
+      validates_presence_of :token
+    end
+
+    post = Post.new text: 'StarCraft releasing soon!'
+    post.valid?.should be_false
+    
+    post.to_rson.should == {
+      'text' => 'StarCraft releasing soon!',
+      'errors' => {"token" => ["can't be empty"]}
+    }
+    
+    post.to_rson(errors: false).should == {
+      'text' => 'StarCraft releasing soon!'
+    }
+  end
 
   it "to_json" do
     post = build_post_with_comment

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mongodb_model
 version: !ruby/object:Gem::Version
-  version: 0.2.7
+  version: 0.2.8
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-09-22 00:00:00.000000000Z
+date: 2011-10-11 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mongodb
-  requirement: &2832660 !ruby/object:Gem::Requirement
+  requirement: &2829180 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2832660
+  version_requirements: *2829180
 - !ruby/object:Gem::Dependency
   name: validatable2
-  requirement: &2832420 !ruby/object:Gem::Requirement
+  requirement: &2828940 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2832420
+  version_requirements: *2828940
 - !ruby/object:Gem::Dependency
   name: ruby_ext
-  requirement: &2832180 !ruby/object:Gem::Requirement
+  requirement: &2828700 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,7 +43,7 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2832180
+  version_requirements: *2828700
 description: 
 email: 
 executables: []