mongodb_model 0.0.5 → 0.0.6

data/lib/mongo/model/assignment.rb

@@ -53,6 +53,11 @@ module Mongo::Model::Assignment
     set attributes, options.merge(force: true)
   end
 
+  def initialize attributes = nil
+    super
+    set attributes if attributes
+  end
+
   module ClassMethods
     inheritable_accessor :_assign, nil
 

data/lib/mongo/model/crud.rb

@@ -6,7 +6,7 @@ module Mongo::Model::Crud
   end
 
   def save! *args
-    save(*args) || raise(Mongo::Error, "can't save #{self.inspect}!")
+    save(*args) || raise(Mongo::Error, "can't save invalid model (#{self.errors})!")
   end
 
   def destroy options = {}
@@ -16,7 +16,7 @@ module Mongo::Model::Crud
   end
 
   def destroy! *args
-    destroy(*args) || raise(Mongo::Error, "can't destroy #{self.inspect}!")
+    destroy(*args) || raise(Mongo::Error, "can't destroy invalid model #{self.errors}!")
   end
 
   module ClassMethods

data/lib/mongo/model/misc.rb

@@ -32,7 +32,7 @@ module Mongo::Model::Misc
     end
     nil
   end
-  
+
   def original
     @_original ||= _id? ? self.class.by_id(self._id) : nil
   end

data/lib/mongo/model/model.rb

@@ -6,6 +6,24 @@ module Mongo::Model
   def _id?; !!_id end
   def new_record?; !_id end
 
+  inherited do
+    alias_method :eql?, :model_eql?
+    alias_method :==, :model_eq?
+  end
+
+  def model_eql? o
+    return true if equal? o
+    self.class == o.class and self == o
+  end
+
+  def model_eq? o
+    return true if equal? o
+
+    variables = {}; ::Mongo::Object.each_object_instance_variable(self){|n, v| variables[n] = v}
+    o_variables = {}; ::Mongo::Object.each_object_instance_variable(o){|n, v| o_variables[n] = v}
+    variables == o_variables
+  end
+
   class << self
     attr_accessor :db, :connection
     attr_required :db, :connection

data/spec/assignment_spec.rb

@@ -27,7 +27,7 @@ describe 'Model callbacks' do
         name     String,  true
         has_mail Boolean, true
       end
-      
+
       assign do
         age      Integer, true
         position true
@@ -43,7 +43,7 @@ describe 'Model callbacks' do
     u.set! banned: '0'
     u.banned.should == false
   end
-  
+
   it "should inherit assignment rules" do
     class User
       inherit Mongo::Model

data/spec/equality_spec.rb

@@ -0,0 +1,32 @@
+require 'spec_helper'
+
+describe 'Model equality' do
+  with_mongo_model
+
+  after{remove_constants :Player}
+
+  it "integration smoke test" do
+    class Player
+      inherit Mongo::Model
+
+      attr_accessor :name, :mission
+
+      class Mission
+        inherit Mongo::Model
+
+        attr_accessor :name
+      end
+    end
+
+    player1 = Player.new name: 'Alex'
+    player1.mission = Player::Mission.new name: 'First Strike'
+
+    player2 = Player.new name: 'Alex'
+    player2.mission = Player::Mission.new name: 'First Strike'
+
+    player1.should == player2
+
+    player1.mission.name = 'Into the Flames'
+    player1.should_not == player2
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mongodb_model
 version: !ruby/object:Gem::Version
-  version: 0.0.5
+  version: 0.0.6
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-09-01 00:00:00.000000000Z
+date: 2011-09-02 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: i18n
-  requirement: &2780720 !ruby/object:Gem::Requirement
+  requirement: &2781050 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,10 +21,10 @@ dependencies:
         version: '0.5'
   type: :runtime
   prerelease: false
-  version_requirements: *2780720
+  version_requirements: *2781050
 - !ruby/object:Gem::Dependency
   name: mongodb
-  requirement: &2780430 !ruby/object:Gem::Requirement
+  requirement: &2780760 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2780430
+  version_requirements: *2780760
 - !ruby/object:Gem::Dependency
   name: file_model
-  requirement: &2780140 !ruby/object:Gem::Requirement
+  requirement: &2780460 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2780140
+  version_requirements: *2780460
 - !ruby/object:Gem::Dependency
   name: validatable2
-  requirement: &2779840 !ruby/object:Gem::Requirement
+  requirement: &2780160 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2779840
+  version_requirements: *2780160
 - !ruby/object:Gem::Dependency
   name: ruby_ext
-  requirement: &2779540 !ruby/object:Gem::Requirement
+  requirement: &2779870 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,7 +65,7 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2779540
+  version_requirements: *2779870
 description: 
 email: 
 executables: []
@@ -97,6 +97,7 @@ files:
 - spec/callbacks_spec.rb
 - spec/crud_spec.rb
 - spec/db_spec.rb
+- spec/equality_spec.rb
 - spec/file_model_spec.rb
 - spec/misc_spec.rb
 - spec/query_spec.rb