volt-mongo 0.1.2 → 0.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 43063074686dca2266c780c50fcbe0433b8e406e
-  data.tar.gz: c2ebd5819f1fbd43d7143c59c058ecd008681084
+  metadata.gz: 35999987c336d195411aff33270e830fbf129104
+  data.tar.gz: e5d7bf3eaa0e4006162b86df417bdea4f11e0518
 SHA512:
-  metadata.gz: 9b90bb5875a5693e6f9ad5009eff4d6456ef728c859690874c4a0c1219bcc07870772bf7933876bc3e2ef55b57eb43b2735d3c2bc3807bb1a1e19ad6cb042ed0
-  data.tar.gz: 9bee73448f9b6b923e880f0cc05fd93aa99a55d30e35e77ef80ca9fc250c4ef30a912268be161e9f2878d2043893220ebfb40f1529e6682ceca49dae97af0bf6
+  metadata.gz: 54f56cca889487743ac44c319a3ff67d1dbcbdfbe8c5bdf2381dcbd96de4425711ed1aad68137a40bf871a0eb8897c41ca62ed524df565baa9d04cca849fe128
+  data.tar.gz: b2dac7862c22a3f1aee4e6befff3234967a67622dc9cc495786c8b74f1c3df8a823510b3efc062378deb33366d5a4e4e98d73f426b55c70494a5cee0c61362ed

data/VERSION

@@ -1 +1 @@
-0.1.2
+0.1.3

data/app/mongo/lib/mongo_adaptor_server.rb

@@ -25,7 +25,7 @@ module Volt
           db
 
           true
-        rescue ::Mongo::ConnectionFailure => e
+        rescue ::Mongo::Error => e
           false
         end
       end
@@ -34,18 +34,18 @@ module Volt
         return @db if @db
 
         if Volt.config.db_uri.present?
-          @mongo_db ||= ::Mongo::MongoClient.from_uri(Volt.config.db_uri)
-          @db ||= @mongo_db.db(Volt.config.db_uri.split('/').last || Volt.config.db_name)
+          db_name = Volt.config.db_uri.split('/').last || Volt.config.db_name
+          @db ||= ::Mongo::Client.new(Volt.config.db_uri, database: db_name, :monitoring => false)
         else
-          @mongo_db ||= ::Mongo::MongoClient.new(Volt.config.db_host, Volt.config.db_port)
-          @db ||= @mongo_db.db(Volt.config.db_name)
+          db_name = Volt.config.db_name
+          @db ||= ::Mongo::Client.new("mongodb://#{Volt.config.db_host}:#{Volt.config.db_port}", database: db_name, :monitoring => false)
         end
 
         @db
       end
 
       def insert(collection, values)
-        db[collection].insert(values)
+        db[collection].insert_one(values)
       end
 
       def update(collection, values)
@@ -54,14 +54,14 @@ module Volt
         to_mongo_id!(values)
         # TODO: Seems mongo is dumb and doesn't let you upsert with custom id's
         begin
-          db[collection].insert(values)
-        rescue ::Mongo::OperationFailure => error
+          db[collection].insert_one(values)
+        rescue => error
           # Really mongo client?
-          if error.message[/^11000[:]/]
+          if error.message[/^E11000/] && error.message['$_id_']
             # Update because the id already exists
             update_values = values.dup
             id = update_values.delete('_id')
-            db[collection].update({ '_id' => id }, update_values)
+            db[collection].update_one({ '_id' => id }, update_values)
           else
             return { error: error.message }
           end
@@ -101,7 +101,7 @@ module Volt
           result = result.send(method_name, *args)
         end
 
-        if result.is_a?(::Mongo::Cursor)
+        if result.is_a?(::Mongo::Collection::View)
           result = result.to_a.map do |hash|
             # Return id instead of _id
             to_volt_id!(hash)
@@ -119,18 +119,21 @@ module Volt
           query['_id'] = query.delete('id')
         end
 
-        db[collection].remove(query)
+        db[collection].delete_one(query)
       end
 
       # remove the collection entirely
       def drop_collection(collection)
-        db.drop_collection(collection)
+        db[collection].drop
       end
 
       def drop_database
-        db.connection.drop_database(Volt.config.db_name)
+        db.database.drop
       end
 
+      def adapter_version
+        ::Mongo::VERSION
+      end
 
       private
       # Mutate a hash to use id instead of _id

data/volt-mongo.gemspec

@@ -19,6 +19,6 @@ Gem::Specification.new do |spec|
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ["lib"]
 
-  spec.add_dependency 'mongo', '~> 1.12.0'
+  spec.add_dependency 'mongo', '~> 2.1.2'
   spec.add_development_dependency "rake"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: volt-mongo
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.1.3
 platform: ruby
 authors:
 - Ryan Stout
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-10-16 00:00:00.000000000 Z
+date: 2015-10-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mongo
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.12.0
+        version: 2.1.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.12.0
+        version: 2.1.2
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement