volt-mongo 0.0.1 → 0.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0288ac598fb2d952f519ad219fc91c084dc4c5c9
-  data.tar.gz: 79ed1942819553e40fbebebfac6d600878e62d24
+  metadata.gz: 6de39d6ea21dd7173c966c2bd36951928819fd4f
+  data.tar.gz: 9c5b9b5185fa9c3dc6973e23a646f3b3fef9f692
 SHA512:
-  metadata.gz: 8f0a152b61ec012b0215684c784b3ca0e469f23a6859b3d3d569214cafbb725b054dc0f3d7f42d6300ff0a1d88e0c4868843cfde6cc636505be2cdea081e1ea7
-  data.tar.gz: 140e76564deef0b8210ddd44359050c003628ba30e620ac1b2483fd5d84e7b7328f19e8ec6503b67af2ce06599f174fd26af97067a9cea0d42f8e6826b7ba3fb
+  metadata.gz: 5fd5f4f6de16626eb700f0b429a1a8c05ae16196ed0023e134e7671c67386a793b7670cc4df9e7842221a6153a9d5b38ad4e1b2211ebbca5862b4b001602a04e
+  data.tar.gz: f852df5a6fd80cfcfeab530290c4f3e017c8d52ee80728f7429eb96d0ede45109e98776dbaf254799207899e90688176a5a4ca9b63a48b9a86fca550ee754e1d

data/VERSION

@@ -1 +1 @@
-0.0.1
+0.0.2

data/app/mongo/lib/mongo_adaptor_client.rb

@@ -1,7 +1,7 @@
 module Volt
   class DataStore
     class MongoAdaptorClient < BaseAdaptorClient
-      data_store_methods :find, :where, :skip, :order, :limit
+      data_store_methods :find, :where, :skip, :order, :limit#, :count
 
       module MongoArrayStore
         # Find takes a query object
@@ -22,7 +22,7 @@ module Volt
       Volt::Persistors::ArrayStore.send(:remove_method, :order)
 
       # include mongo's methods on ArrayStore
-      Volt::Persistors::ArrayStore.include(MongoArrayStore)
+      Volt::Persistors::ArrayStore.send(:include, MongoArrayStore)
 
       def self.normalize_query(query)
         query = merge_finds_and_move_to_front(query)

data/app/mongo/lib/mongo_adaptor_server.rb

@@ -20,6 +20,9 @@ module Volt
       end
 
       def update(collection, values)
+        values = values.stringify_keys
+
+        to_mongo_id!(values)
         # TODO: Seems mongo is dumb and doesn't let you upsert with custom id's
         begin
           @db[collection].insert(values)
@@ -28,8 +31,8 @@ module Volt
           if error.message[/^11000[:]/]
             # Update because the id already exists
             update_values = values.dup
-            id = update_values.delete(:_id)
-            @db[collection].update({ _id: id }, update_values)
+            id = update_values.delete('_id')
+            @db[collection].update({ '_id' => id }, update_values)
           else
             return { error: error.message }
           end
@@ -39,9 +42,9 @@ module Volt
       end
 
       def query(collection, query)
-        allowed_methods = %w(find skip limit)
+        allowed_methods = %w(find skip limit count)
 
-        cursor = @db[collection]
+        result = @db[collection]
 
         query.each do |query_part|
           method_name, *args = query_part
@@ -50,19 +53,63 @@ module Volt
             fail "`#{method_name}` is not part of a valid query"
           end
 
-          cursor = cursor.send(method_name, *args)
+          args = args.map do |arg|
+            if arg.is_a?(Hash)
+              arg = arg.stringify_keys
+            end
+            arg
+          end
+
+          if method_name == 'find' && args.size > 0
+            qry = args[0]
+            to_mongo_id!(qry)
+          end
+
+          result = result.send(method_name, *args)
         end
 
-        cursor.to_a
+        if result.is_a?(::Mongo::Cursor)
+          result = result.to_a.map do |hash|
+            # Return id instead of _id
+            to_volt_id!(hash)
+
+            # Volt expects symbol keys
+            hash.symbolize_keys
+          end#.tap {|v| puts "QUERY: " + v.inspect }
+        end
+
+        result
       end
 
       def delete(collection, query)
+        if query.key?('id')
+          query['_id'] = query.delete('id')
+        end
+
         @db[collection].remove(query)
       end
 
       def drop_database
         db.connection.drop_database(Volt.config.db_name)
       end
+
+
+      private
+      # Mutate a hash to use id instead of _id
+      def to_volt_id!(hash)
+        if hash.key?('_id')
+          # Run to_s to convert BSON::Id also
+          hash['id'] = hash.delete('_id').to_s
+        end
+      end
+
+      # Mutate a hash to use _id instead of id
+      def to_mongo_id!(hash)
+        if hash.key?('id')
+          hash['_id'] = hash.delete('id')
+        end
+      end
+
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: volt-mongo
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
 platform: ruby
 authors:
 - Ryan Stout
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-05-13 00:00:00.000000000 Z
+date: 2015-05-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mongo
@@ -93,7 +93,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.4.5
 signing_key: 
 specification_version: 4
 summary: Mongo database drivers for volt