mongo_adaptor 0.0.13 → 0.0.14

data/lib/mongo_adaptor.rb

@@ -26,13 +26,13 @@ class MongoAdaptor
     @collection.update query, set(process(model)), safe_mode.merge(upsert_mode false)
   end
 
-  def execute query_or_model, command
+  def execute query_or_model, command, options = {}
     if query_or_model.is_a? Hash
       query = query_or_model
     else
       query = { "_id" => query_or_model.id }
     end
-    @collection.update query, command, safe_mode.merge(upsert_mode false)
+    @collection.update query, command, safe_mode.merge(upsert_mode false).merge(options)
   end
 
   def fetch selector = {}, opts = { :fields => fields }

data/lib/mongo_adaptor/version.rb

@@ -1,3 +1,3 @@
 class MongoAdaptor
-  VERSION = "0.0.13"
+  VERSION = "0.0.14"
 end

data/spec/mongo_adaptor_spec.rb

@@ -23,7 +23,7 @@ describe 'adapting structs into mongo' do
       let(:model) { klass.new 'Test Model','Some Data','Some Members','fake key'  }
       let(:data)  { collection.find({}).to_a[-1] }
 
-      shared_examples_for 'new model' do
+      shared_examples_for 'creates a document' do
         it 'changes the number of items in the collection' do
           expect { subject }.to change { collection.size }.by(1)
         end
@@ -32,6 +32,9 @@ describe 'adapting structs into mongo' do
           data['_id'].should be_a BSON::ObjectId
           data['id'].should be_nil
         end
+      end
+      shared_examples_for 'new model' do
+        it_should_behave_like 'creates a document'
         it 'sets my fields and values' do
           subject
           data['name'].should  == 'Test Model'
@@ -48,11 +51,19 @@ describe 'adapting structs into mongo' do
         subject { adaptor.upsert model, {} }
         it_should_behave_like 'new model'
       end
+      describe 'upserting with a custom operation' do
+        subject { adaptor.execute({ name: 'value' }, { '$push' => { "key" => "value" } }, { :upsert => true }) }
+        it_should_behave_like 'creates a document'
+        it 'will execute my command' do
+          subject
+          data['key'].should eq ['value']
+        end
+      end
     end
 
     describe 'with an existing model' do
       let(:model) { klass.new 'Test Model','Some Data',['Some Other Members'] }
-      let(:id)    { collection.insert({ :name => 'My Model', :other => 'Some Value', :members => ['Some Members'] },{ :safe => true }) }
+      let(:id)    { collection.insert({ :name => 'My Model', :other => 'Some Value', :members => ['Some Members'] },{ :w => 1 }) }
 
       before do
         model.id = id

metadata

@@ -1,102 +1,103 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: mongo_adaptor
-version: !ruby/object:Gem::Version 
-  hash: 5
+version: !ruby/object:Gem::Version
+  version: 0.0.14
   prerelease: 
-  segments: 
-  - 0
-  - 0
-  - 13
-  version: 0.0.13
 platform: ruby
-authors: 
+authors:
 - Jon Rowe
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2013-05-09 00:00:00 Z
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2013-05-09 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: mongo
-  version_requirements: &id001 !ruby/object:Gem::Requirement 
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
-  prerelease: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :runtime
-  requirement: *id001
-- !ruby/object:Gem::Dependency 
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
   name: bson
-  version_requirements: &id002 !ruby/object:Gem::Requirement 
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
-  prerelease: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :runtime
-  requirement: *id002
-- !ruby/object:Gem::Dependency 
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
   name: mongo-configure
-  version_requirements: &id003 !ruby/object:Gem::Requirement 
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
-  prerelease: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :runtime
-  requirement: *id003
-- !ruby/object:Gem::Dependency 
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
   name: rake
-  version_requirements: &id004 !ruby/object:Gem::Requirement 
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
-  prerelease: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  requirement: *id004
-- !ruby/object:Gem::Dependency 
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
   name: rspec
-  version_requirements: &id005 !ruby/object:Gem::Requirement 
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
-  prerelease: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  requirement: *id005
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: A simple mongo handler. Translates Structs into Mongo and back.
-email: 
+email:
 - hello@jonrowe.co.uk
 executables: []
-
 extensions: []
-
 extra_rdoc_files: []
-
-files: 
+files:
 - .gitignore
 - .travis.yml
 - Gemfile
@@ -109,36 +110,33 @@ files:
 - spec/mongo_adaptor_spec.rb
 homepage: https://github.com/JonRowe/MongoAdaptor
 licenses: []
-
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+      segments:
       - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+      hash: 309314115556500517
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+      segments:
       - 0
-      version: "0"
+      hash: 309314115556500517
 requirements: []
-
 rubyforge_project: 
 rubygems_version: 1.8.25
 signing_key: 
 specification_version: 3
 summary: A simple mongo handler. Translates Structs into Mongo and back.
-test_files: 
+test_files:
 - spec/mongo_adaptor_spec.rb