mongo_doc 0.6.0 → 0.6.1

data/README.textile

@@ -1,6 +1,6 @@
 h1. MongoDoc
 
-Version: Hurricane (0.6.0) 2010/05/14
+Version: Hurricane (0.6.1) 2010/05/16
 
 h2. Notes
 
@@ -115,7 +115,7 @@ h2. Installation
 
 MongoDoc *requires* mongoDB v1.4.0 or later.
 
-bc. sudo gem install mongo_doc
+bc. % gem install mongo_doc
 
 h2. Connecting
 

data/VERSION

@@ -1 +1 @@
-0.6.0
+0.6.1

data/lib/mongo_doc/connection.rb

@@ -6,10 +6,10 @@ module MongoDoc
 
     extend self
 
-    attr_writer :config_path, :env, :host, :name, :options, :port, :strict
+    attr_writer :config_path, :default_name, :env, :host, :name, :options, :port, :strict
 
     def config_path
-      @config_path || default_path
+      @config_path || './mongodb.yml'
     end
 
     def configuration
@@ -24,12 +24,12 @@ module MongoDoc
       @database ||= connection.db(name, :strict => strict)
     end
 
+    def default_name
+      @default_name ||= "mongo_doc"
+    end
+
     def env
-      if rails?
-        Rails.env
-      else
-        @env ||= 'development'
-      end
+      @env ||= 'development'
     end
 
     def host
@@ -61,26 +61,6 @@ module MongoDoc
       connection
     end
 
-    def default_name
-      if rails?
-        "#{Rails.root.basename}_#{Rails.env}"
-      else
-        "mongo_doc"
-      end
-    end
-
-    def default_path
-      if rails?
-        Rails.root + 'config/mongodb.yml'
-      else
-        './mongodb.yml'
-      end
-    end
-
-    def rails?
-      Object.const_defined?("Rails")
-    end
-
     def verify_server_version(connection)
       raise UnsupportedServerVersionError.new('MongoDoc requires at least mongoDB version 1.4.0') unless connection.server_version >= "1.4.0"
     end

data/lib/mongo_doc/railtie.rb

@@ -0,0 +1,11 @@
+require 'mongo_doc'
+require 'rails'
+require 'mongo_doc/railties/config'
+
+module MongoDoc
+  class Railtie < Rails::Railtie
+    initializer "mongo_doc db configuration" do |app|
+      MongoDoc::Railties::Config.config(app)
+    end
+  end
+end

data/lib/mongo_doc/railties/config.rb

@@ -0,0 +1,13 @@
+module MongoDoc
+  module Railties
+    module Config
+      extend self
+
+      def config(app)
+        MongoDoc::Connection.config_path = app.root + 'config/mongodb.yml'
+        MongoDoc::Connection.default_name = "#{app.root.basename}_#{Rails.env}"
+        MongoDoc::Connection.env = Rails.env
+      end
+    end
+  end
+end

data/lib/mongo_doc.rb

@@ -4,9 +4,11 @@ require 'active_support/core_ext'
 require 'will_paginate/collection'
 
 module MongoDoc
-  VERSION = '0.6.0'
+  VERSION = '0.6.1'
 end
 
 require 'mongo_doc/connection'
 require 'mongo_doc/collection'
 require 'mongo_doc/document'
+
+require 'mongo_doc/railtie' if defined?(Rails)

data/mongo_doc.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{mongo_doc}
-  s.version = "0.6.0"
+  s.version = "0.6.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Les Hill"]
-  s.date = %q{2010-05-14}
+  s.date = %q{2010-05-16}
   s.description = %q{ODM for MongoDB}
   s.email = %q{leshill@gmail.com}
   s.extra_rdoc_files = [
@@ -96,6 +96,8 @@ Gem::Specification.new do |s|
      "lib/mongo_doc/finders.rb",
      "lib/mongo_doc/index.rb",
      "lib/mongo_doc/matchers.rb",
+     "lib/mongo_doc/railtie.rb",
+     "lib/mongo_doc/railties/config.rb",
      "lib/mongo_doc/root.rb",
      "lib/mongo_doc/scope.rb",
      "lib/mongo_doc/validations.rb",

data/spec/connection_spec.rb

@@ -53,23 +53,30 @@ describe "MongoDoc::Connection.Connections" do
 
   context "Rails environment" do
 
+    class FauxApp
+      def root
+        Pathname.new('faux_app')
+      end
+    end
+
     module FauxRails
       extend self
 
       def env
-        'development'
+        'staging'
       end
+    end
 
-      def root
-        Pathname.new('rails_root')
-      end
+    before(:all) do
+      Object.const_set('Rails', FauxRails)
+      require 'mongo_doc/railties/config'
     end
 
     before do
-      Object.const_set('Rails', FauxRails)
+      MongoDoc::Railties::Config.config(FauxApp.new)
     end
 
-    after do
+    after(:all) do
       Object.send(:remove_const, 'Rails')
     end
 
@@ -78,7 +85,7 @@ describe "MongoDoc::Connection.Connections" do
     end
 
     it "default the configuration location to Rails.root + '/config/mongodb.yml'" do
-      MongoDoc::Connection.config_path.should == FauxRails.root + 'config/mongodb.yml'
+      MongoDoc::Connection.config_path.to_s.should == 'faux_app/config/mongodb.yml'
     end
 
     context "without a configuration" do
@@ -95,7 +102,7 @@ describe "MongoDoc::Connection.Connections" do
       end
 
       it "creates a default database with strict false" do
-        connection.should_receive(:db).with("rails_root_development", :strict => false)
+        connection.should_receive(:db).with("faux_app_staging", :strict => false)
         MongoDoc::Connection.database
       end
     end

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 6
-  - 0
-  version: 0.6.0
+  - 1
+  version: 0.6.1
 platform: ruby
 authors: 
 - Les Hill
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-05-14 00:00:00 -04:00
+date: 2010-05-16 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -220,6 +220,8 @@ files:
 - lib/mongo_doc/finders.rb
 - lib/mongo_doc/index.rb
 - lib/mongo_doc/matchers.rb
+- lib/mongo_doc/railtie.rb
+- lib/mongo_doc/railties/config.rb
 - lib/mongo_doc/root.rb
 - lib/mongo_doc/scope.rb
 - lib/mongo_doc/validations.rb