mongodb 0.0.8 → 0.0.9

data/lib/mongo/driver.rb

@@ -18,6 +18,7 @@ Mongo.class_eval do
     attr_writer :defaults
   end
 end
+Mongo.defaults[:convert_id_to_string] = true
 
 # database
 Mongo::DB.send :include, Mongo::DBExt

data/lib/mongo/driver/collection.rb

@@ -12,6 +12,14 @@ module Mongo::CollectionExt
   def insert_with_ext args, options = {}
     result = insert_without_ext args, reverse_merge_defaults(options, :safe)
 
+    # for some strange reason MongoDB Ruby driver
+    # uses Strings for all keys but _id.
+    # It's inconvinient, fixing it.
+    if Mongo.defaults[:convert_id_to_string]
+      list = args.is_a?(Array) ? args : [args]
+      list.each{|h| h['_id'] = h.delete :_id}
+    end
+
     # fix for mongodriver, it will return single result if we supply [doc] as args
     (args.is_a?(Array) and !result.is_a?(Array)) ? [result] : result
   end
@@ -48,9 +56,7 @@ module Mongo::CollectionExt
   #
   def first selector = {}, options = {}
     selector = convert_underscore_to_dollar_in_selector selector if selector.is_a? Hash
-
-    h = find_one selector, options
-    symbolize_doc h
+    find_one selector, options
   end
 
   def first! selector = {}, options = {}
@@ -74,7 +80,6 @@ module Mongo::CollectionExt
     begin
       cursor = find selector, reverse_merge_defaults(options, :batch_size)
       cursor.each do |doc|
-        doc = symbolize_doc doc
         block.call doc
       end
       nil
@@ -108,15 +113,15 @@ module Mongo::CollectionExt
       h
     end
 
-    # symbolizing hashes
-    def symbolize_doc doc
-      return doc unless Mongo.defaults[:symbolize]
-
-      Mongo::CollectionExt.convert_doc doc do |k, v, result|
-        k = k.to_sym if k.is_a? String
-        result[k] = v
-      end
-    end
+    # # symbolizing hashes
+    # def symbolize_doc doc
+    #   return doc unless Mongo.defaults[:symbolize]
+    #
+    #   Mongo::CollectionExt.convert_doc doc do |k, v, result|
+    #     k = k.to_sym if k.is_a? String
+    #     result[k] = v
+    #   end
+    # end
 
     # replaces :_lt to :$lt in query
     def convert_underscore_to_dollar_in_selector selector

data/lib/mongo/object/object.rb

@@ -29,7 +29,7 @@ module Mongo::Object
     with_object_callbacks :create, options do |options|
       doc = ::Mongo::Object.to_mongo self
       collection.create(doc, options)
-      self._id = doc[:_id] || doc['_id']
+      self._id = doc['_id']
     end
   end
 
@@ -88,7 +88,6 @@ module Mongo::Object
     # converts object to document (also works with nested & arrays)
     def to_mongo obj
       return obj.to_mongo if obj.respond_to? :to_mongo
-      symbolize = ::Mongo.defaults[:symbolize]
 
       if obj.is_a? Hash
         doc = {}
@@ -104,15 +103,13 @@ module Mongo::Object
         # copying instance variables
         each_object_instance_variable obj do |iv_name, v|
           k = iv_name.to_s[1..-1]
-          k = k.to_sym if symbolize
           doc[k] = to_mongo v
         end
 
         # adding _id & _class
-        id_key, class_key = symbolize ? [:_id, :_class] : ['_id', '_class']
         id = instance_variable_get('@_id')
-        doc[id_key]    = id if id
-        doc[class_key] = obj.class.name
+        doc['_id']    = id if id
+        doc['_class'] = obj.class.name
 
         doc
       else # simple type

data/lib/mongo/object/spec/crud_shared.rb

@@ -39,10 +39,10 @@ shared_examples_for 'embedded object CRUD' do
     db.players.first.object_id.should_not == @players.object_id
 
     # update
-    @player.missions.first.stats[:units] = 9
+    @player.missions.first.stats['units'] = 9
     mission = @mission_class.new.tap do |m|
       m.name = 'Desperate Alliance'
-      m.stats = {buildings: 11, units: 40}
+      m.stats = {'buildings' => 11, 'units' => 40}
     end
     @player.missions << mission
     db.players.save @player

data/readme.md

@@ -20,7 +20,7 @@ These enhancements alter the driver's API and made it more simple and intuitive.
 require 'mongo/driver'
 
 # Changing some defaults.
-Mongo.defaults.merge! symbolize: true, multi: true, safe: true
+Mongo.defaults.merge! multi: true, safe: true
 
 # Connection & db.
 connection = Mongo::Connection.new
@@ -124,7 +124,7 @@ Note: the :initialize method should allow to create object without arguments.
 ``` ruby
 # Connecting to MongoDB.
 require 'mongo/object'
-Mongo.defaults.merge! symbolize: true, multi: true, safe: true
+Mongo.defaults.merge! multi: true, safe: true
 connection = Mongo::Connection.new
 db = connection.db 'default_test'
 db.units.drop

data/spec/driver/collection_spec.rb

@@ -9,47 +9,48 @@ describe "Collection" do
 
     # update
     db.units.update({race: 'Protoss'}, :$set => {status: 'dead'})
-    db.units.all.collect{|u| u[:status]}.should == %w(dead dead)
+    db.units.all.collect{|u| u['status']}.should == %w(dead dead)
 
     # destroy
     db.units.destroy race: 'Protoss'
     db.units.count.should == 0
   end
 
-  describe "symbolize" do
-    it 'should always return symbolized hashes' do
-      zeratul = {name: 'Zeratul'}
-      db.units.save(zeratul).should be_mongo_id
-      r = db.units.first(name: 'Zeratul')
-      r[:_id].should be_mongo_id
-      r['_id'].should be_nil
-      r[:name].should == 'Zeratul'
-      r['name'].should be_nil
-    end
-
-    it "should be able to disable symbolization" do
-      old = Mongo.defaults[:symbolize]
-      begin
-        Mongo.defaults[:symbolize] = false
-
-        zeratul = {name: 'Zeratul'}
-        db.units.save(zeratul).should be_mongo_id
-        r = db.units.first(name: 'Zeratul')
-        r[:_id].should be_nil
-        r['_id'].should be_mongo_id
-        r[:name].should be_nil
-        r['name'].should == 'Zeratul'
-      ensure
-        Mongo.defaults[:symbolize] = old
-      end
-    end
-  end
+  # Discarded
+  # describe "symbolize" do
+  #   it 'should always return symbolized hashes' do
+  #     zeratul = {name: 'Zeratul'}
+  #     db.units.save(zeratul).should be_mongo_id
+  #     r = db.units.first(name: 'Zeratul')
+  #     r[:_id].should be_mongo_id
+  #     r['_id'].should be_nil
+  #     r[:name].should == 'Zeratul'
+  #     r['name'].should be_nil
+  #   end
+  #
+  #   it "should be able to disable symbolization" do
+  #     old = Mongo.defaults[:symbolize]
+  #     begin
+  #       Mongo.defaults[:symbolize] = false
+  #
+  #       zeratul = {name: 'Zeratul'}
+  #       db.units.save(zeratul).should be_mongo_id
+  #       r = db.units.first(name: 'Zeratul')
+  #       r[:_id].should be_nil
+  #       r['_id'].should be_mongo_id
+  #       r[:name].should be_nil
+  #       r['name'].should == 'Zeratul'
+  #     ensure
+  #       Mongo.defaults[:symbolize] = old
+  #     end
+  #   end
+  # end
 
   it "first" do
     db.units.first.should be_nil
     zeratul = {name: 'Zeratul'}
     db.units.save(zeratul).should be_mongo_id
-    db.units.first(name: 'Zeratul')[:name].should == 'Zeratul'
+    db.units.first(name: 'Zeratul')['name'].should == 'Zeratul'
   end
 
   it 'all' do
@@ -60,12 +61,12 @@ describe "Collection" do
 
     list = db.units.all(name: 'Zeratul')
     list.size.should == 1
-    list.first[:name].should == 'Zeratul'
+    list.first['name'].should == 'Zeratul'
 
     # with block
     list = []; db.units.all{|o| list << o}
     list.size.should == 1
-    list.first[:name].should == 'Zeratul'
+    list.first['name'].should == 'Zeratul'
   end
 
   it 'count' do

data/spec/driver/crud_spec.rb

@@ -5,7 +5,7 @@ describe "Hash CRUD" do
 
   describe 'simple' do
     before do
-      @zeratul = {name: 'Zeratul', info: 'Dark Templar'}
+      @zeratul = {'name' => 'Zeratul', 'info' => 'Dark Templar'}
     end
 
     it 'crud' do
@@ -16,7 +16,7 @@ describe "Hash CRUD" do
 
       # create
       db.units.save(@zeratul).should be_mongo_id
-      @zeratul[:_id].should be_mongo_id
+      @zeratul['_id'].should be_mongo_id
 
       # read
       db.units.all.should == [@zeratul]
@@ -24,10 +24,10 @@ describe "Hash CRUD" do
       db.units.first.should == @zeratul
 
       # update
-      @zeratul[:info] = 'Killer of Cerebrates'
+      @zeratul['info'] = 'Killer of Cerebrates'
       db.units.save @zeratul
       db.units.count.should == 1
-      db.units.first(name: 'Zeratul')[:info].should == 'Killer of Cerebrates'
+      db.units.first(name: 'Zeratul')['info'].should == 'Killer of Cerebrates'
 
       # destroy
       db.units.destroy @zeratul
@@ -38,10 +38,10 @@ describe "Hash CRUD" do
   describe 'embedded' do
     before do
       @player = {
-        name: 'Alex',
-        missions: [
-          {name: 'Wasteland',         stats: {buildings: 5, units: 10}},
-          {name: 'Backwater Station', stats: {buildings: 8, units: 25}}
+        'name' => 'Alex',
+        'missions' => [
+          {'name' => 'Wasteland',         'stats' => {'buildings' => 5, 'units' => 10}},
+          {'name' => 'Backwater Station', 'stats' => {'buildings' => 8, 'units' => 25}}
         ]
       }
     end
@@ -55,8 +55,8 @@ describe "Hash CRUD" do
       db.players.first.should == @player
 
       # update
-      @player[:missions].first[:stats][:units] = 9
-      @player[:missions].push name: 'Desperate Alliance', stats: {buildings: 11, units: 40}
+      @player['missions'].first['stats']['units'] = 9
+      @player['missions'].push 'name' => 'Desperate Alliance', 'stats' => {'buildings' => 11, 'units' => 40}
       db.players.save(@player).should_not be_nil
       db.players.count.should == 1
       db.players.first.should == @player

data/spec/driver/dynamic_finders_spec.rb

@@ -45,6 +45,6 @@ describe "Dynamic Finders" do
   it 'integration with collection' do
     db.units.first_by_name('Jim').should be_nil
     db.units.save name: 'Jim'
-    db.units.first_by_name('Jim')[:name].should == 'Jim'
+    db.units.first_by_name('Jim')['name'].should == 'Jim'
   end
 end

data/spec/driver/hash_helper_spec.rb

@@ -6,19 +6,20 @@ describe "Collection" do
     @helper.send :extend, Mongo::CollectionExt
   end
 
-  it "symbolize" do
-    @helper.send(:symbolize_doc, {
-      'a' => 1,
-      'b' => {
-        'c' => 2,
-        'd' => [{'e' => 3}]
-      }
-    }).should == {
-      a: 1,
-      b: {
-        c: 2,
-        d: [{e: 3}]
-      }
-    }
-  end
+  # Discarded
+  # it "symbolize" do
+  #   @helper.send(:symbolize_doc, {
+  #     'a' => 1,
+  #     'b' => {
+  #       'c' => 2,
+  #       'd' => [{'e' => 3}]
+  #     }
+  #   }).should == {
+  #     a: 1,
+  #     b: {
+  #       c: 2,
+  #       d: [{e: 3}]
+  #     }
+  #   }
+  # end
 end

data/spec/driver/spec_helper.rb

@@ -1,7 +1,6 @@
 require 'mongo/driver'
 
 Mongo.defaults.merge! \
-  symbolize:                    true,
   convert_underscore_to_dollar: true,
   batch_size:                   50,
   multi:                        true,

data/spec/object/crud_spec.rb

@@ -24,7 +24,7 @@ describe "Object CRUD" do
 
     it "should allow to read object as hash" do
       db.units.save! @zeratul
-      db.units.first({}, object: false).class.should == Hash
+      db.units.first({}, object: false).is_a?(Hash).should be_true
     end
   end
 
@@ -51,8 +51,8 @@ describe "Object CRUD" do
       @mission_class = Player2::Mission
       @player = Player2.new
       @player.missions = [
-        Player2::Mission.new('Wasteland',         {buildings: 5, units: 10}),
-        Player2::Mission.new('Backwater Station', {buildings: 8, units: 25}),
+        Player2::Mission.new('Wasteland',         {'buildings' => 5, 'units' => 10}),
+        Player2::Mission.new('Backwater Station', {'buildings' => 8, 'units' => 25}),
       ]
     end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mongodb
 version: !ruby/object:Gem::Version
-  version: 0.0.8
+  version: 0.0.9
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-09-02 00:00:00.000000000Z
+date: 2011-09-04 00:00:00.000000000Z
 dependencies: []
 description: 
 email: