mongo_adaptor 0.0.4 → 0.0.5

data/lib/mongo_adaptor.rb

@@ -17,6 +17,9 @@ class MongoAdaptor
   def insert(model)
     @collection.insert( process(model), { :safe => true } )
   end
+  def upsert(model, query = { "_id" => model.id })
+    @collection.update( query, { "$set" => process(model) }, { :safe => true, :upsert => true } )
+  end
   def update(model)
     @collection.update( { "_id" => model.id }, { "$set" => process(model) }, { :safe => true, :upsert => false } )
   end

data/lib/mongo_adaptor/version.rb

@@ -1,3 +1,3 @@
 class MongoAdaptor
-  VERSION = "0.0.4"
+  VERSION = "0.0.5"
 end

data/spec/mongo_adaptor_spec.rb

@@ -19,24 +19,33 @@ describe 'adapting structs into mongo' do
     let(:adaptor)    { MongoAdaptor.new 'test_collection', klass }
     let(:collection) { Mongo::Configure.current.load.collection 'test_collection' }
 
-    describe 'to insert a blank model' do
+    describe 'with a new model' do
       let(:model) { klass.new 'Test Model','Some Data','fake key'  }
       let(:data)  { collection.find({}).to_a[-1] }
 
-      subject { adaptor.insert model }
-
-      it 'changes the number of items in the collection' do
-        expect { subject }.to change { collection.size }.by(1)
+      shared_examples_for 'new model' do
+        it 'changes the number of items in the collection' do
+          expect { subject }.to change { collection.size }.by(1)
+        end
+        it 'generates an _id, ignoring any set key' do
+          subject
+          data['_id'].should be_a BSON::ObjectId
+          data['id'].should be_nil
+        end
+        it 'sets my fields and values' do
+          subject
+          data['name'].should  == 'Test Model'
+          data['other'].should == 'Some Data'
+        end
       end
-      it 'generates an _id, ignoring any set key' do
-        subject
-        data['_id'].should be_a BSON::ObjectId
-        data['id'].should be_nil
+
+      context 'inserting' do
+        subject { adaptor.insert model }
+        it_should_behave_like 'new model'
       end
-      it 'sets my fields and values' do
-        subject
-        data['name'].should  == 'Test Model'
-        data['other'].should == 'Some Data'
+      context 'upserting' do
+        subject { adaptor.upsert model, {} }
+        it_should_behave_like 'new model'
       end
     end
 
@@ -48,11 +57,9 @@ describe 'adapting structs into mongo' do
         model.id = id
       end
 
-      describe 'to update it' do
+      shared_examples_for 'modifying an existing model' do
         let(:data)  { collection.find({}).to_a[-1] }
 
-        subject { adaptor.update model }
-
         it 'doesnt change the number of items in the collection' do
           expect { subject }.to change { collection.size }.by(0)
         end
@@ -67,6 +74,16 @@ describe 'adapting structs into mongo' do
         end
       end
 
+      describe 'to update it' do
+        subject { adaptor.update model }
+        it_should_behave_like 'modifying an existing model'
+      end
+
+      describe 'to upsert it' do
+        subject { adaptor.upsert model, { name: 'My Model' } }
+        it_should_behave_like 'modifying an existing model'
+      end
+
       describe 'to fetch it' do
         subject { adaptor.fetch({ :_id => id }) }
         it          { should be_a klass }

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mongo_adaptor
 version: !ruby/object:Gem::Version
-  version: 0.0.4
+  version: 0.0.5
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-10-04 00:00:00.000000000 Z
+date: 2012-10-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mongo
@@ -122,7 +122,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 18310851812254504
+      hash: 3301762641973492072
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -131,7 +131,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 18310851812254504
+      hash: 3301762641973492072
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.24