Various new features

.gitignore

@@ -1,4 +1,7 @@
+Gemfile.lock
 doc
 pkg
+vendor/bundle
+.bundle
 .rvmrc
-.bundle
+.kdev4

Gemfile

@@ -1,16 +1,25 @@
 # Use `bundle install` in order to install these gems
 source 'http://rubygems.org'
 
-gem "activesupport", "~>3.0.5"
-gem "activemodel", "~>3.0.5"
-gem "mongo", "~>1.2.4"
-gem "bson_ext", "~>1.2.4"
-gem "tzinfo", "~>0.3.24"
+gem 'activesupport'
+gem 'activemodel'
+gem 'mongo'
+gem 'bson_ext'
+gem 'tzinfo'
 
 group :development do
-  gem 'jeweler', '~>1.5.2'
-  gem 'yard', '~>0.6.5'
-  gem 'rcov', '~>0.9.9'
-  gem 'rspec', '~> 2.5.0'
-  gem 'watchr', '~>0.7'
-end
+  gem 'database_cleaner'
+  gem 'guard-rspec'
+  gem 'jeweler'
+  gem 'rcov'
+  gem 'rspec'
+  gem 'yard'
+  gem 'watchr'
+
+  gem 'ruby-debug', :platforms => :ruby_18
+  platforms :ruby_19 do
+    gem 'linecache19', :git => 'git://github.com/mark-moseley/linecache'
+    gem 'ruby-debug-base19x', '~> 0.11.30.pre4'
+    gem 'ruby-debug19', :require => 'ruby-debug'
+  end
+end

Gemfile.lock

@@ -1,48 +1,94 @@
+GIT
+  remote: git://github.com/mark-moseley/linecache
+  revision: 869c6a65155068415925067e480741bd0a71527e
+  specs:
+    linecache19 (0.5.12)
+      ruby_core_source (>= 0.1.4)
+
 GEM
   remote: http://rubygems.org/
   specs:
-    activemodel (3.0.5)
-      activesupport (= 3.0.5)
-      builder (~> 2.1.2)
-      i18n (~> 0.4)
-    activesupport (3.0.5)
-    bson (1.2.4)
-    bson_ext (1.2.4)
-    builder (2.1.2)
-    diff-lcs (1.1.2)
+    activemodel (3.1.3)
+      activesupport (= 3.1.3)
+      builder (~> 3.0.0)
+      i18n (~> 0.6)
+    activesupport (3.1.3)
+      multi_json (~> 1.0)
+    archive-tar-minitar (0.5.2)
+    bson (1.5.1)
+    bson_ext (1.5.1)
+    builder (3.0.0)
+    columnize (0.3.5)
+    database_cleaner (0.7.0)
+    diff-lcs (1.1.3)
     git (1.2.5)
-    i18n (0.5.0)
-    jeweler (1.5.2)
-      bundler (~> 1.0.0)
+    guard (0.8.8)
+      thor (~> 0.14.6)
+    guard-rspec (0.5.9)
+      guard (>= 0.8.4)
+    i18n (0.6.0)
+    jeweler (1.6.4)
+      bundler (~> 1.0)
       git (>= 1.2.5)
       rake
-    mongo (1.2.4)
-      bson (>= 1.2.4)
-    rake (0.8.7)
-    rcov (0.9.9)
-    rspec (2.5.0)
-      rspec-core (~> 2.5.0)
-      rspec-expectations (~> 2.5.0)
-      rspec-mocks (~> 2.5.0)
-    rspec-core (2.5.1)
-    rspec-expectations (2.5.0)
+    linecache (0.46)
+      rbx-require-relative (> 0.0.4)
+    mongo (1.5.1)
+      bson (= 1.5.1)
+    multi_json (1.0.4)
+    rake (0.9.2.2)
+    rbx-require-relative (0.0.5)
+    rcov (0.9.11)
+    rspec (2.7.0)
+      rspec-core (~> 2.7.0)
+      rspec-expectations (~> 2.7.0)
+      rspec-mocks (~> 2.7.0)
+    rspec-core (2.7.1)
+    rspec-expectations (2.7.0)
       diff-lcs (~> 1.1.2)
-    rspec-mocks (2.5.0)
-    tzinfo (0.3.24)
+    rspec-mocks (2.7.0)
+    ruby-debug (0.10.4)
+      columnize (>= 0.1)
+      ruby-debug-base (~> 0.10.4.0)
+    ruby-debug-base (0.10.4)
+      linecache (>= 0.3)
+    ruby-debug-base19 (0.11.25)
+      columnize (>= 0.3.1)
+      linecache19 (>= 0.5.11)
+      ruby_core_source (>= 0.1.4)
+    ruby-debug-base19x (0.11.30.pre4)
+      columnize (>= 0.3.1)
+      linecache19 (>= 0.5.11)
+      rake (>= 0.8.1)
+      ruby_core_source (>= 0.1.4)
+    ruby-debug19 (0.11.6)
+      columnize (>= 0.3.1)
+      linecache19 (>= 0.5.11)
+      ruby-debug-base19 (>= 0.11.19)
+    ruby_core_source (0.1.5)
+      archive-tar-minitar (>= 0.5.2)
+    thor (0.14.6)
+    tzinfo (0.3.31)
     watchr (0.7)
-    yard (0.6.5)
+    yard (0.7.4)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
-  activemodel (~> 3.0.5)
-  activesupport (~> 3.0.5)
-  bson_ext (~> 1.2.4)
-  jeweler (~> 1.5.2)
-  mongo (~> 1.2.4)
-  rcov (~> 0.9.9)
-  rspec (~> 2.5.0)
-  tzinfo (~> 0.3.24)
-  watchr (~> 0.7)
-  yard (~> 0.6.5)
+  activemodel
+  activesupport
+  bson_ext
+  database_cleaner
+  guard-rspec
+  jeweler
+  linecache19!
+  mongo
+  rcov
+  rspec
+  ruby-debug
+  ruby-debug-base19x (~> 0.11.30.pre4)
+  ruby-debug19
+  tzinfo
+  watchr
+  yard

Guardfile

@@ -0,0 +1,7 @@
+group 'specs' do
+  guard 'rspec', all_after_pass: false, cli: '--color --format nested' do  # --fail-fast --drb
+    watch(%r{(^|/)\.'}) {}          # ignore dot files
+    watch('spec/spec_helper.rb')    { 'spec' }
+    watch(%r{^spec/(.+)_spec\.rb})
+  end
+end

README.rdoc

@@ -113,7 +113,7 @@ By default, mongo_odm stores data on a collection with the same name than the cl
 Alternatively, you can pass a MongoODM::Collection instance to set_collection, to indicate not only a collection name, but also a different connection and/or database:
 
   class Shape
-    set_collection MongoODM::Collection.new(MongoODM.connection.db('another_database'), 'my_shapes')
+    set_collection MongoODM::Collection.new('my_shapes', MongoODM.connection.db('another_database'))
   end
 
 = References
@@ -457,4 +457,4 @@ See CONTRIBUTORS file for a list of contributions.
 
 = License
 
-See LICENSE file for details.
+See LICENSE file for details.

Rakefile

@@ -34,14 +34,14 @@ if Gem.available? 'rspec'
   require "rspec"
   require "rspec/core/rake_task"
   desc "Run all specs"
-  Rspec::Core::RakeTask.new(:spec) do |spec|
+  RSpec::Core::RakeTask.new(:spec) do |spec|
     spec.pattern = "spec/**/*_spec.rb"
   end
 
   ## rcov task
   if Gem.available? 'rcov'
     require 'rcov/rcovtask'
-    Rspec::Core::RakeTask.new(:rcov) do |spec|
+    RSpec::Core::RakeTask.new(:rcov) do |spec|
       spec.pattern = "spec/**/*_spec.rb"
       spec.rcov = true
     end
@@ -70,4 +70,4 @@ task :release => :build do
 end
 
 ## default task
-task :default => :spec
+task :default => :spec

lib/mongo_odm.rb

@@ -27,7 +27,7 @@ def self.connection=(value)
   end
 
   def self.database
-    Thread.current[:mongo_odm_database] ||= self.connection.db( config.database )
+    Thread.current[:mongo_odm_database] ||= self.connection.db(config.database)
   end
 
   def self.config
@@ -40,12 +40,13 @@ def self.config=(value)
   end
 
   def self.instanciate(value)
-    return value if value.is_a?(MongoODM::Document)
-    if value.is_a?(Hash)
-      klass = value["_class"] || value[:_class]
-      return klass.constantize.new(value) if klass
+    if value.is_a?(MongoODM::Document) || value.is_a?(MongoODM::Reference)
+      value
+    elsif value.is_a?(Hash) && (klass = value["_class"] || value[:_class])
+      klass.constantize.new(value)
+    else
+      value.class.type_cast(value.to_mongo)
     end
-    value.class.type_cast(value.to_mongo)
   end
 
   def self.dereference(value)
@@ -65,3 +66,8 @@ def self.add_index_class(klass)
   end
 
 end
+
+if defined?(Rails)
+  require 'mongo_odm/railtie'
+end
+

lib/mongo_odm/config.rb

@@ -1,3 +1,5 @@
+require 'active_support/core_ext/hash/indifferent_access'
+require 'active_support/core_ext/object/blank'
 require 'uri'
 
 module MongoODM
@@ -10,7 +12,7 @@ def initialize(opts = {})
       @database ||= 'test'
       @host ||= 'localhost'
       @port || 27017
-      @logger ||= Rails.logger  if defined?(Rails)
+      @logger ||= Rails.logger if defined?(Rails)
       @pool_size ||= 1
     end
 
@@ -21,7 +23,7 @@ def uri=(uri)
     end
 
     def from_hash(opts)
-      opts = opts.dup.symbolize_keys!
+      opts = opts.with_indifferent_access
 
       if opts[:uri].present?
         self.uri = opts[:uri]
@@ -34,6 +36,15 @@ def from_hash(opts)
       @pool_size ||= opts[:pool_size]
     end
 
+    def to_hash
+      conf = %w(database host port username password pool_size).map  do |k|
+        [ k.to_sym, self.send(k.to_sym) ]
+      end
+      conf = Hash[conf]
+      conf.reject! { |k, v|  v.nil? }
+      conf
+    end
+
     def connection
       opts = { :logger => self.logger, :pool_size => self.pool_size }
       Mongo::Connection.new(self.host, self.port, opts).tap do |conn|