mordor 0.2.7 → 0.2.8

data/lib/mordor.rb

@@ -81,12 +81,3 @@ class Time
     end
   end
 end
-
-module Mordor
-  def connection
-    @connection ||= Mongo::Connection.new(Mordor::Config[:hostname], Mordor::Config[:port])
-    @connection.autenticate(Mordor::Config[:username], Mordor::Config[:password]) if Mordor::Config[:username]
-    @connection.db(Mordor::Config[:database])
-  end
-  module_function :connection
-end

data/lib/mordor/resource.rb

@@ -142,10 +142,13 @@ module Mordor
       end
 
       def connection
-        @connection ||= Mordor.connection
+        unless @connection
+          @connection = Mongo::Connection.new(Mordor::Config[:hostname], Mordor::Config[:port])
+          @connection.autenticate(Mordor::Config[:username], Mordor::Config[:password]) if Mordor::Config[:username]
+        end
+        @connection.db(Mordor::Config[:database])
       end
 
-
       def find_by_id(id)
         get(id)
       end

data/mordor.gemspec

@@ -2,7 +2,7 @@ Gem::Specification.new do |s|
   s.name    = "mordor"
   
   # Do not set the version and date field manually, this is done by the release script
-  s.version = "0.2.7"
+  s.version = "0.2.8"
   s.date    = "2012-01-04"
 
   s.summary     = "mordor"

data/spec/mordor/connection_spec.rb

@@ -13,4 +13,14 @@ describe "connecting to mongo" do
   it "should select the correct database" do
     @db.name.should == Mordor::Config[:database]
   end
+
+  it "should be possible to change the configuration" do
+    old_db = Mordor::Config[:database]
+    Mordor::Config.use do |c|
+      c[:database] = 'some_other'
+    end
+
+    Mordor::Config[:database].should == 'some_other'
+    Mordor::Config[:database] = old_db
+  end
 end

data/spec/mordor/resource_spec.rb

@@ -146,19 +146,15 @@ describe "with respect to resources" do
           end
 
           private
-          def self.do_ensure_indices
-            indices.each do |index|
-              do_ensure_index(index)
-            end
-          end
 
           def self.do_ensure_index(attribute)
             collection.ensure_index( [ [attribute.to_s, index_types[attribute]] ] )
           end
 
           def self.ensure_indices
-            self.ensure_count = self.ensure_count + 1
-            self.do_ensure_indices
+            indices.each do |index|
+              ensure_index(index)
+            end
           end
 
           def self.ensure_index(attribute)
@@ -173,7 +169,7 @@ describe "with respect to resources" do
       TestResource.create({:first => 'first', :second => 'second', :third => 'third'})
       TestResource.reset_ensure_count
       TestResource.all()
-      TestResource.ensure_count.should == 1
+      TestResource.ensure_count.should == 2  # For each index
     end
 
     it "should call ensure index for each index attribute on creation" do

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: mordor
 version: !ruby/object:Gem::Version 
-  hash: 25
+  hash: 7
   prerelease: false
   segments: 
   - 0
   - 2
-  - 7
-  version: 0.2.7
+  - 8
+  version: 0.2.8
 platform: ruby
 authors: 
 - Jan-Willem Koelewijn