mongodb_model 0.0.9 → 0.0.10

data/lib/mongo/model.rb

@@ -43,7 +43,6 @@ module Mongo
 end
 
 Mongo.defaults.merge! \
-  symbolize:                    true,
   convert_underscore_to_dollar: true,
   batch_size:                   50,
   multi:                        true,

data/lib/mongo/model/crud.rb

@@ -35,7 +35,7 @@ module Mongo::Model::Crud
 
     def create! attributes = {}, options = {}, &block
       model = build attributes, options, &block
-      model.save || raise(Mongo::Error, "can't create #{attributes.inspect}!")
+      model.save || raise(Mongo::Error, "can't create #{self} #{model.errors.inspect}!")
       model
     end
 

data/lib/mongo/model/misc.rb

@@ -1,4 +1,7 @@
 module Mongo::Model::Misc
+  def update_created_at; self.created_at = Time.now.utc end
+  def update_updated_at; self.updated_at = Time.now.utc end
+
   def update_timestamps
     now = Time.now.utc
     self.created_at ||= now
@@ -42,7 +45,8 @@ module Mongo::Model::Misc
 
     def timestamps!
       attr_accessor :created_at, :updated_at
-      before_save :update_timestamps
+      before_create :update_created_at
+      before_save :update_updated_at
     end
   end
 end

data/lib/mongo/model/query.rb

@@ -10,7 +10,11 @@ class Mongo::Model::Query < Object
   end
 
   def merge query
-    raise "can't merge queries with different models!" unless model_class == query.model_class
+    model_class == query.model_class or
+      model_class.is?(query.model_class) or
+      query.model_class.is?(model_class) or
+      raise("can't merge queries with different models!")
+
     self.class.new model_class, selector.merge(query.selector), options.merge(query.options)
   end
 

data/lib/mongo/model/query_mixin.rb

@@ -1,4 +1,9 @@
 module Mongo::Model::QueryMixin
+  def exists? options = {}
+    self.class.count({_id: _id}, options) > 0
+  end
+  alias :exist? :exists?
+
   module ClassMethods
     include Mongo::DynamicFinders
 

data/lib/mongo/model/scope.rb

@@ -1,7 +1,7 @@
 module Mongo::Model::Scope
   module ClassMethods
     def current_scope
-      scope, exclusive = Thread.current[:mongo_model_scope]
+      scope, exclusive = Thread.current[scope_identifier]
       current = if exclusive
         scope
       elsif scope
@@ -23,15 +23,15 @@ module Mongo::Model::Scope
       end
 
       scope = query *args
-      previous_scope, previous_exclusive = Thread.current[:mongo_model_scope]
+      previous_scope, previous_exclusive = Thread.current[scope_identifier]
       raise "exclusive scope already applied!" if previous_exclusive
 
       begin
         scope = previous_scope.merge scope if !exclusive and previous_scope
-        Thread.current[:mongo_model_scope] = [scope, exclusive]
+        Thread.current[scope_identifier] = [scope, exclusive]
         return block.call
       ensure
-        Thread.current[:mongo_model_scope] = [previous_scope, false]
+        Thread.current[scope_identifier] = [previous_scope, false]
       end
     end
 
@@ -80,5 +80,10 @@ module Mongo::Model::Scope
         super selector, options, &block
       end
     end
+
+    protected
+      def scope_identifier
+        @scope_identifier ||= :"mms_#{self.name}"
+      end
   end
 end

data/spec/crud_spec.rb

@@ -118,8 +118,8 @@ describe "Model CRUD" do
       @mission_class = Player::Mission
       @player = Player.new
       @player.missions = [
-        Player::Mission.build(name: 'Wasteland',         stats: {buildings: 5, units: 10}),
-        Player::Mission.build(name: 'Backwater Station', stats: {buildings: 8, units: 25}),
+        Player::Mission.build(name: 'Wasteland',         stats: {'buildings' => 5, 'units' => 10}),
+        Player::Mission.build(name: 'Backwater Station', stats: {'buildings' => 8, 'units' => 25}),
       ]
     end
 
@@ -136,8 +136,8 @@ describe "Model CRUD" do
       Player.first.object_id.should_not == @players.object_id
 
       # update
-      @player.missions.first.stats[:units] = 9
-      @player.missions << Player::Mission.build(name: 'Desperate Alliance', stats: {buildings: 11, units: 40})
+      @player.missions.first.stats['units'] = 9
+      @player.missions << Player::Mission.build(name: 'Desperate Alliance', stats: {'buildings' => 11, 'units' => 40})
       @player.save.should be_true
       Player.count.should == 1
       Player.first.should == @player

data/spec/query_spec.rb

@@ -65,6 +65,15 @@ describe "Model Query" do
     [u.name, u.age].should == ['Zeratul', 500]
   end
 
+  it 'exist?' do
+    u = Unit.new
+    u.exist?.should be_false
+    u.save!
+    u.exist?.should be_true
+    u.destroy!
+    u.exist?.should be_false
+  end
+
   it "build should assign protected attributes" do
     class SpecialUnit < Unit
       attr_accessor :age, :status

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mongodb_model
 version: !ruby/object:Gem::Version
-  version: 0.0.9
+  version: 0.0.10
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-09-03 00:00:00.000000000Z
+date: 2011-09-04 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: i18n