mongomodel 0.2.1 → 0.2.2

data/lib/mongomodel.rb

@@ -28,6 +28,7 @@ module MongoModel
   autoload :AbstractClass,    'mongomodel/concerns/abstract_class'
   autoload :ActiveModelCompatibility, 'mongomodel/concerns/activemodel'
   
+  autoload :Reference,        'mongomodel/support/reference'
   autoload :MongoOptions,     'mongomodel/support/mongo_options'
   autoload :MongoOrder,       'mongomodel/support/mongo_order'
   autoload :MongoOperator,    'mongomodel/support/mongo_operator'

data/lib/mongomodel/concerns/associations/belongs_to.rb

@@ -10,8 +10,8 @@ module MongoModel
       end
       
       properties do |association|
-        property association.foreign_key, String, :internal => true
-        property association.type_key, String, :internal => true if association.polymorphic?
+        property association.foreign_key, Reference, :internal => true
+        property association.type_key, Reference, :internal => true if association.polymorphic?
       end
       
       methods do |association|

data/lib/mongomodel/concerns/associations/has_many_by_ids.rb

@@ -6,7 +6,7 @@ module MongoModel
       end
       
       properties do |association|
-        property association.property_name, Collection[String], :internal => true, :default => []
+        property association.property_name, Collection[Reference], :internal => true, :default => []
       end
       
       methods do |association|

data/lib/mongomodel/document/persistence.rb

@@ -5,7 +5,7 @@ module MongoModel
       
       included do
         undef_method :id if method_defined?(:id)
-        property :id, String, :as => '_id', :default => lambda { |doc| doc.generate_id }
+        property :id, Reference, :as => '_id', :default => lambda { |doc| doc.generate_id }
         
         class_inheritable_writer :collection_name
       end

data/lib/mongomodel/support/configuration.rb

@@ -1,4 +1,5 @@
 require 'active_support/core_ext/hash/keys'
+require 'active_support/core_ext/hash/except'
 
 module MongoModel
   class Configuration
@@ -19,13 +20,25 @@ module MongoModel
     end
     
     def establish_connection
-      Mongo::Connection.new(host, port).db(database)
+      @connection ||= Mongo::Connection.new(host, port, connection_options)
+      @database = @connection.db(database)
+    end
+    
+    def use_database(database)
+      @options['database'] = database
+      establish_connection
+    end
+    
+    def connection_options
+      @options.except('host', 'port', 'database').symbolize_keys
     end
     
     DEFAULTS = {
-      'host'     => 'localhost',
-      'port'     => 27017,
-      'database' => 'mongomodel-default'
+      'host'      => 'localhost',
+      'port'      => 27017,
+      'database'  => 'mongomodel-default',
+      'pool_size' => 5,
+      'timeout'   => 5
     }
     
     def self.defaults

data/lib/mongomodel/support/reference.rb

@@ -0,0 +1,14 @@
+module MongoModel
+  class Reference < String
+    def self.cast(value)
+      value = value.to_s if value.respond_to?(:to_s)
+      
+      case value
+      when "", nil
+        nil
+      else
+        new(value)
+      end
+    end
+  end
+end

data/lib/mongomodel/version.rb

@@ -1,3 +1,3 @@
 module MongoModel
-  VERSION = "0.2.1"
+  VERSION = "0.2.2"
 end

data/mongomodel.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{mongomodel}
-  s.version = "0.2.1"
+  s.version = "0.2.2"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Sam Pohlenz"]
-  s.date = %q{2010-04-21}
+  s.date = %q{2010-04-26}
   s.default_executable = %q{console}
   s.description = %q{MongoModel is a MongoDB ORM for Ruby/Rails similar to ActiveRecord and DataMapper.}
   s.email = %q{sam@sampohlenz.com}
@@ -75,6 +75,7 @@ Gem::Specification.new do |s|
      "lib/mongomodel/support/mongo_operator.rb",
      "lib/mongomodel/support/mongo_options.rb",
      "lib/mongomodel/support/mongo_order.rb",
+     "lib/mongomodel/support/reference.rb",
      "lib/mongomodel/support/scope.rb",
      "lib/mongomodel/support/scope/dynamic_finders.rb",
      "lib/mongomodel/support/scope/finder_methods.rb",

data/spec/spec_helper.rb

@@ -21,7 +21,7 @@ Spec::Runner.configure do |config|
   include DefineClass
   
   config.before(:all) do
-    MongoModel.configuration = { 'database' => 'mongomodel-specs' }
+    MongoModel.configuration.use_database('mongomodel-specs')
   end
   
   config.before(:each) do

data/spec/support/helpers/document_finder_stubs.rb

@@ -32,6 +32,10 @@ module DocumentFinderStubs
     yield if block_given?
   end
   
+  def stub_delete
+    collection.stub!(:remove)
+  end
+  
   def should_delete(conditions={})
     selector, options = MongoModel::MongoOptions.new(self, :conditions => conditions).to_a
     collection.should_receive(:remove).once.with(selector)

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 2
-  - 1
-  version: 0.2.1
+  - 2
+  version: 0.2.2
 platform: ruby
 authors: 
 - Sam Pohlenz
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-04-21 00:00:00 +09:30
+date: 2010-04-26 00:00:00 +09:30
 default_executable: console
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -141,6 +141,7 @@ files:
 - lib/mongomodel/support/mongo_operator.rb
 - lib/mongomodel/support/mongo_options.rb
 - lib/mongomodel/support/mongo_order.rb
+- lib/mongomodel/support/reference.rb
 - lib/mongomodel/support/scope.rb
 - lib/mongomodel/support/scope/dynamic_finders.rb
 - lib/mongomodel/support/scope/finder_methods.rb