mongo_odm 0.2.4 → 0.2.5

data/CONTRIBUTORS

@@ -0,0 +1,4 @@
+Steve Sloan
+
+* Config class, railtie to load config from YAML file
+* Timestamps module

data/lib/mongo_odm.rb

@@ -10,33 +10,34 @@ module MongoODM
   extend ActiveSupport::Autoload
 
   autoload :VERSION
+  autoload :Config
   autoload :Criteria
   autoload :Cursor
   autoload :Collection
   autoload :Document
   autoload :Errors
-  
+
   def self.connection
-    Thread.current[:mongo_odm_connection] ||= Mongo::Connection.new(config[:host], config[:port], config)
+    Thread.current[:mongo_odm_connection] ||= config.connection
   end
-  
+
   def self.connection=(value)
     Thread.current[:mongo_odm_connection] = value
   end
-  
+
   def self.database
-    connection.db(config[:database] || 'test')
+    Thread.current[:mongo_odm_database] ||= self.connection.db( config.database )
   end
-  
+
   def self.config
-    @_config ||= {}
+    @_config ||= Config.new
   end
-  
+
   def self.config=(value)
     self.connection = nil
-    @_config = value
+    @_config = value.is_a?(Config) ? value : Config.new(value)
   end
-  
+
   def self.instanciate(value)
     return value if value.is_a?(MongoODM::Document)
     if value.is_a?(Hash)
@@ -46,4 +47,4 @@ module MongoODM
     value.class.type_cast(value.to_mongo)
   end
 
-end
+end

data/lib/mongo_odm/config.rb

@@ -0,0 +1,47 @@
+require 'uri'
+
+module MongoODM
+  class Config
+    attr_accessor :database, :host, :port, :username, :password
+    attr_accessor :logger, :pool_size
+
+    def initialize(opts = {})
+      from_hash opts
+      @database ||= 'test'
+      @host ||= 'localhost'
+      @port || 27017
+      @logger ||= Rails.logger  if defined?(Rails)
+      @pool_size ||= 1
+    end
+
+    def uri=(uri)
+      uri = URI.parse(uri)  unless URI === uri
+      @database = uri.path.to_s.sub('/', '')
+      @host, @port, @username, @password = uri.host, uri.port, uri.user, uri.password
+    end
+
+    def from_hash(opts)
+      opts = opts.dup.symbolize_keys!
+
+      if opts[:uri].present?
+        self.uri = opts[:uri]
+      else
+        @database, @host, @port, @username, @password = opts.values_at(:database, :host, :port, :username, :password)
+        @port &&= Integer(@port)
+      end
+
+      @logger ||= opts[:logger]
+      @pool_size ||= opts[:pool_size]
+    end
+
+    def connection
+      opts = { :logger => self.logger, :pool_size => self.pool_size }
+      Mongo::Connection.new(self.host, self.port, opts).tap do |conn|
+        if self.username || self.password
+          conn.add_auth(self.database, self.username, self.password)
+          conn.apply_saved_authentication
+        end
+      end
+    end
+  end
+end

data/lib/mongo_odm/document.rb

@@ -12,6 +12,7 @@ module MongoODM
     autoload :Fields
     autoload :Inspect
     autoload :Persistence
+    autoload :Timestamps
     autoload :Validations
     autoload :Equality
 

data/lib/mongo_odm/document/callbacks.rb

@@ -19,7 +19,7 @@ module MongoODM
       module InstanceMethods
         def initialize_with_callbacks(*args)
           initialize_without_callbacks(*args)
-          _run_initialize_callbacks
+          run_callbacks(:initialize)
           self
         end
       end

data/lib/mongo_odm/document/timestamps.rb

@@ -0,0 +1,25 @@
+module MongoODM
+  module Document
+    module Timestamps
+
+      extend ActiveSupport::Concern
+
+      included do
+        field :created_at, Time
+        field :updated_at, Time
+
+        before_save :set_timestamps
+      end
+
+      module InstanceMethods
+        def set_timestamps
+          now = Time.now.utc
+          self.created_at ||= now  if self.new_record?
+          self.updated_at = now
+        end
+      end
+
+    end
+  end
+end
+

data/lib/mongo_odm/document/validations.rb

@@ -34,9 +34,7 @@ module MongoODM
         # Runs all the specified validations and returns true if no errors were added otherwise false.
         def valid?
           errors.clear
-
-          _run_validate_callbacks
-
+          run_callbacks(:validate)
           errors.empty?
         end
       end

data/lib/mongo_odm/railtie.rb

@@ -0,0 +1,13 @@
+module Rails #:nodoc:
+  module MongoODM #:nodoc:
+    class Railtie < Rails::Railtie #:nodoc:
+      initializer 'configure database' do
+        config_file = Rails.root.join 'config', 'mongo.yml'
+        if config_file.file?
+          config = YAML.load( ERB.new( config_file.read ).result )[Rails.env]
+          ::MongoODM.config = config  if config.present?
+        end
+      end
+    end
+  end
+end

data/lib/mongo_odm/version.rb

@@ -2,6 +2,6 @@
 module MongoODM
   VERSION_MAJOR = "0"
   VERSION_MINOR = "2"
-  VERSION_BUILD = "4"
+  VERSION_BUILD = "5"
   VERSION = "#{VERSION_MAJOR}.#{VERSION_MINOR}.#{VERSION_BUILD}"
 end

data/spec/mongo_odm/config_spec.rb

@@ -0,0 +1,18 @@
+# encoding: utf-8
+require "spec_helper"
+
+describe MongoODM::Config do
+  before do
+    @config = { :host => 'localhost', :port => 9000 }
+    MongoODM.config = @config
+  end
+
+  after do
+    MongoODM.config = {}
+  end
+
+  it 'should set the configuration' do
+    MongoODM.config.host.should == @config[:host]
+    MongoODM.config.port.should == @config[:port]
+  end
+end

data/spec/mongo_odm/document/persistence_spec.rb

@@ -2,5 +2,5 @@
 require "spec_helper"
 
 describe MongoODM::Document::Persistence do
-    
+
 end

data/spec/mongo_odm/document/timestamps_spec.rb

@@ -0,0 +1,6 @@
+# encoding: utf-8
+require "spec_helper"
+
+describe MongoODM::Document::Timestamps do
+
+end

data/spec/mongo_odm/mongo_odm_spec.rb

@@ -2,39 +2,13 @@
 require "spec_helper"
 
 describe MongoODM do
-
-  describe "#config" do
-    
-    context "when no configuration was passed" do
-      it "returns an empty hash" do
-        MongoODM.config.should == {}
-      end
-      
-    end
-    
-    context "when a custom configuration was passed" do
-      
-      before do
-        MongoODM.config = {:host => "localhost", :port => 9000}
-      end
-      
-      after do
-        MongoODM.config = {}
-      end
-      
-      it "should return the configuration as a hash" do
-        MongoODM.config.should == {:host => "localhost", :port => 9000}
-      end
-      
-    end
-    
-  end
-  
   describe "#connection" do
 
     context "when connection does not exist" do
 
       before do
+        conn = Mongo::Connection.new( nil, nil, :connect => false )
+        Mongo::Connection.stub(:new).and_return(conn)
         MongoODM.connection = nil
       end
 
@@ -43,10 +17,11 @@ describe MongoODM do
       end
 
     end
-    
-    context "when connection already exists" do
 
+    context "when connection already exists" do
       before do
+        conn = Mongo::Connection.new( nil, nil, :connect => false )
+        Mongo::Connection.stub(:new).and_return(conn)
         @connection = MongoODM.connection
       end
 
@@ -61,7 +36,7 @@ describe MongoODM do
       
       it "returns a different Mongo::Connection when configuration changes" do
         MongoODM.config = {:port => 9000}
-        @connection.should_not == MongoODM.connection
+        MongoODM.connection.should_not == @connection
       end
 
     end
@@ -70,7 +45,7 @@ describe MongoODM do
 
   describe "#connection=" do
     it "accepts a Mongo::Connection instance to set the connection" do
-      connection = Mongo::Connection.new('localhost', 27017)
+      connection = Mongo::Connection.new('localhost', 27017, :connect => false)
       MongoODM.connection = connection
       connection.should == MongoODM.connection
     end

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 2
-  - 4
-  version: 0.2.4
+  - 5
+  version: 0.2.5
 platform: ruby
 authors: 
 - Carlos Paramio
@@ -325,6 +325,7 @@ extra_rdoc_files:
 - LICENSE
 - README.rdoc
 files: 
+- CONTRIBUTORS
 - Gemfile
 - Gemfile.lock
 - LICENSE
@@ -332,6 +333,7 @@ files:
 - Rakefile
 - lib/mongo_odm.rb
 - lib/mongo_odm/collection.rb
+- lib/mongo_odm/config.rb
 - lib/mongo_odm/core_ext/conversions.rb
 - lib/mongo_odm/criteria.rb
 - lib/mongo_odm/cursor.rb
@@ -348,14 +350,17 @@ files:
 - lib/mongo_odm/document/fields.rb
 - lib/mongo_odm/document/inspect.rb
 - lib/mongo_odm/document/persistence.rb
+- lib/mongo_odm/document/timestamps.rb
 - lib/mongo_odm/document/validations.rb
 - lib/mongo_odm/errors.rb
+- lib/mongo_odm/railtie.rb
 - lib/mongo_odm/version.rb
 - spec/models/00-blank_slate.rb
 - spec/models/01-shape.rb
 - spec/models/02-circle.rb
 - spec/models/03-big_red_circle.rb
 - spec/mongo_odm/collection_spec.rb
+- spec/mongo_odm/config_spec.rb
 - spec/mongo_odm/core_ext/conversions_spec.rb
 - spec/mongo_odm/cursor_spec.rb
 - spec/mongo_odm/document/attribute_methods/dirty_spec.rb
@@ -368,6 +373,7 @@ files:
 - spec/mongo_odm/document/fields_spec.rb
 - spec/mongo_odm/document/inspect_spec.rb
 - spec/mongo_odm/document/persistence_spec.rb
+- spec/mongo_odm/document/timestamps_spec.rb
 - spec/mongo_odm/document/validations_spec.rb
 - spec/mongo_odm/document_spec.rb
 - spec/mongo_odm/mongo_odm_spec.rb
@@ -410,6 +416,7 @@ test_files:
 - spec/models/02-circle.rb
 - spec/models/03-big_red_circle.rb
 - spec/mongo_odm/collection_spec.rb
+- spec/mongo_odm/config_spec.rb
 - spec/mongo_odm/core_ext/conversions_spec.rb
 - spec/mongo_odm/cursor_spec.rb
 - spec/mongo_odm/document/attribute_methods/dirty_spec.rb
@@ -422,6 +429,7 @@ test_files:
 - spec/mongo_odm/document/fields_spec.rb
 - spec/mongo_odm/document/inspect_spec.rb
 - spec/mongo_odm/document/persistence_spec.rb
+- spec/mongo_odm/document/timestamps_spec.rb
 - spec/mongo_odm/document/validations_spec.rb
 - spec/mongo_odm/document_spec.rb
 - spec/mongo_odm/mongo_odm_spec.rb