mongomatic 0.0.9 → 0.1.0

data/README.rdoc

@@ -11,9 +11,9 @@ Mongomatic allows you to map your Ruby objects to Mongo documents. It is designe
   end
   
   # set the db settings for all models:
-  Mongomatic.settings = { :connection => ["localhost", 27017, {}], :db => "mongomatic_test" }
+  Mongomatic.db = Mongo::Connection.new.db("mongomatic_test")
   # or you can set it for a specific model:
-  User.settings = { :connection => ["localhost", 27017, {}], :db => "mongomatic_test_user" }
+  User.db = Mongo::Connection.new.db("mongomatic_test_user")
 
   u = User.new(:name => "Ben")
   => #<User:0x00000100d0cbf8 @doc={"name"=>"Ben"}, @removed=false> 

data/lib/mongomatic/base.rb

@@ -4,21 +4,14 @@ module Mongomatic
     include Mongomatic::Validatable
     
     class << self
-      def settings
-        @settings || Mongomatic.settings
-      end
-
-      def settings=(hash)
-        @settings = hash
-        reconnect!; hash
-      end
-      
-      def reconnect!
-        @db = @collection = nil; true
+      def db
+        @db || Mongomatic.db || raise(ArgumentError, "No db supplied")
       end
       
-      def db
-        @db ||= Mongo::Connection.new(*self.settings[:connection]).db(self.settings[:db])
+      def db=(obj)
+        unless obj.is_a?(Mongo::DB)
+          raise(ArgumentError, "Must supply a Mongo::DB object")
+        end; @db = obj
       end
 
       def collection_name

data/lib/mongomatic.rb

@@ -1,6 +1,6 @@
-gem "bson", ">= 1.0.3"
-gem "bson_ext", ">= 1.0.1"
-gem "mongo", ">= 1.0.3"
+gem "bson", ">= 1.0.4"
+gem "bson_ext", ">= 1.0.4"
+gem "mongo", ">= 1.0.7"
 gem "activesupport", ">= 2.3.5"
 
 require "bson"
@@ -15,14 +15,14 @@ end
 
 module Mongomatic
   class << self
-    def settings
-      @settings || { :connection => ["localhost", 27017, {}], :db => "main" }
+    def db
+      @db
     end
-
-    def settings=(hash)
-      @settings = hash
-      @db = @collection = nil
-      hash
+    
+    def db=(obj)
+      unless obj.is_a?(Mongo::DB)
+        raise(ArgumentError, "Must supply a Mongo::DB object")
+      end; @db = obj
     end
   end
 end

data/test/helper.rb

@@ -7,7 +7,7 @@ $LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
 $LOAD_PATH.unshift(File.dirname(__FILE__))
 require 'mongomatic'
 
-Mongomatic.settings = { :connection => ["localhost", 27017, {}], :db => "mongomatic_test" }
+Mongomatic.db = Mongo::Connection.new.db("mongomatic_test")
 
 class Person < Mongomatic::Base
   validates_presence_of :name

metadata

@@ -4,9 +4,9 @@ version: !ruby/object:Gem::Version
   prerelease: false
   segments: 
   - 0
+  - 1
   - 0
-  - 9
-  version: 0.0.9
+  version: 0.1.0
 platform: ruby
 authors: 
 - Ben Myles
@@ -14,13 +14,14 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-08-11 00:00:00 -07:00
+date: 2010-08-12 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: shoulda
   prerelease: false
   requirement: &id001 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
@@ -35,48 +36,52 @@ dependencies:
   name: bson
   prerelease: false
   requirement: &id002 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
         segments: 
         - 1
         - 0
-        - 3
-        version: 1.0.3
+        - 4
+        version: 1.0.4
   type: :runtime
   version_requirements: *id002
 - !ruby/object:Gem::Dependency 
   name: bson_ext
   prerelease: false
   requirement: &id003 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
         segments: 
         - 1
         - 0
-        - 1
-        version: 1.0.1
+        - 4
+        version: 1.0.4
   type: :runtime
   version_requirements: *id003
 - !ruby/object:Gem::Dependency 
   name: mongo
   prerelease: false
   requirement: &id004 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
         segments: 
         - 1
         - 0
-        - 3
-        version: 1.0.3
+        - 7
+        version: 1.0.7
   type: :runtime
   version_requirements: *id004
 - !ruby/object:Gem::Dependency 
   name: activesupport
   prerelease: false
   requirement: &id005 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
@@ -125,6 +130,8 @@ files:
 - lib/mongomatic/validatable/validations/validation_base.rb
 - LICENSE
 - README.rdoc
+- test/helper.rb
+- test/test_mongomatic.rb
 has_rdoc: true
 homepage: http://github.com/benmyles/mongomatic
 licenses: []
@@ -135,6 +142,7 @@ rdoc_options:
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
@@ -142,6 +150,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       - 0
       version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
@@ -151,7 +160,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.6
+rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
 summary: Mongomatic is a simple Ruby object mapper for Mongo