mordor 0.2.19 → 0.2.20

data/lib/mordor/resource.rb

@@ -81,8 +81,10 @@ module Mordor
           end
           self_hash = ordered_self_hash
         end
-        insert_id = self.class.collection.insert(self_hash)
-        self._id = insert_id
+        with_collection do |collection|
+          insert_id = collection.insert(self_hash)
+          self._id = insert_id
+        end
       else
         insert_id = self.update
       end
@@ -91,8 +93,17 @@ module Mordor
 
     alias_method :save!, :save
 
+    def with_collection
+      self.class.with_collection do |collection|
+        yield collection
+      end
+    end
+
     def update
-      insert_id = self.class.collection.update({:_id => self._id}, self.to_hash)
+      insert_id = nil
+      with_collection do |collection|
+        insert_id = collection.update({:_id => self._id}, self.to_hash)
+      end
       insert_id
     end
 
@@ -136,7 +147,11 @@ module Mordor
       end
 
       def collection
-        database.collection(self.collection_name)
+        collection = nil
+        with_database do |database|
+          collection = database.collection(self.collection_name)
+        end
+        collection
       end
 
       def collection_name
@@ -171,6 +186,24 @@ module Mordor
         @db
       end
 
+      def with_database(max_retries=60)
+        retries = 0
+        begin
+          yield self.database
+        rescue Mongo::ConnectionFailure => ex
+          retries += 1
+          raise ex if retries > max_retries
+          sleep(0.5)
+          retry
+        end
+      end
+
+      def with_collection
+        with_database do |database|
+          yield database.collection(self.collection_name)
+        end
+      end
+
       def find_by_id(id)
         get(id)
       end
@@ -250,7 +283,9 @@ module Mordor
       end
 
       def ensure_index(attribute)
-        collection.ensure_index( [ [attribute.to_s, index_types[attribute] ]] )
+        with_collection do |collection|
+          collection.ensure_index( [ [attribute.to_s, index_types[attribute] ]] )
+        end
       end
 
       def indices

data/mordor.gemspec

@@ -2,8 +2,8 @@ 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.19"
-  s.date    = "2013-01-23"
+  s.version = "0.2.20"
+  s.date    = "2013-06-10"
 
   s.summary     = "mordor"
   s.description = <<-eos

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: mordor
 version: !ruby/object:Gem::Version 
-  hash: 49
+  hash: 63
   prerelease: 
   segments: 
   - 0
   - 2
-  - 19
-  version: 0.2.19
+  - 20
+  version: 0.2.20
 platform: ruby
 authors: 
 - Jan-Willem Koelewijn
@@ -16,12 +16,11 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2013-01-23 00:00:00 +01:00
+date: 2013-06-10 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  type: :development
-  prerelease: false
+  name: rake
   version_requirements: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -31,11 +30,11 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  name: rake
+  prerelease: false
+  type: :development
   requirement: *id001
 - !ruby/object:Gem::Dependency 
-  type: :development
-  prerelease: false
+  name: rspec
   version_requirements: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -46,11 +45,11 @@ dependencies:
         - 2
         - 0
         version: "2.0"
-  name: rspec
+  prerelease: false
+  type: :development
   requirement: *id002
 - !ruby/object:Gem::Dependency 
-  type: :development
-  prerelease: false
+  name: json
   version_requirements: &id003 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -60,11 +59,11 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  name: json
+  prerelease: false
+  type: :development
   requirement: *id003
 - !ruby/object:Gem::Dependency 
-  type: :development
-  prerelease: false
+  name: extlib
   version_requirements: &id004 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -74,11 +73,11 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  name: extlib
+  prerelease: false
+  type: :development
   requirement: *id004
 - !ruby/object:Gem::Dependency 
-  type: :development
-  prerelease: false
+  name: mongo
   version_requirements: &id005 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -88,11 +87,11 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  name: mongo
+  prerelease: false
+  type: :development
   requirement: *id005
 - !ruby/object:Gem::Dependency 
-  type: :runtime
-  prerelease: false
+  name: extlib
   version_requirements: &id006 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -102,11 +101,11 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  name: extlib
+  prerelease: false
+  type: :runtime
   requirement: *id006
 - !ruby/object:Gem::Dependency 
-  type: :runtime
-  prerelease: false
+  name: mongo
   version_requirements: &id007 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -116,11 +115,11 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  name: mongo
+  prerelease: false
+  type: :runtime
   requirement: *id007
 - !ruby/object:Gem::Dependency 
-  type: :runtime
-  prerelease: false
+  name: json
   version_requirements: &id008 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -130,7 +129,8 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  name: json
+  prerelease: false
+  type: :runtime
   requirement: *id008
 description: "    Small gem to add MongoDB Resources, resources have attributes that translate into document fields. When an attribute is declared, finders for the attribute are added to the Resource automatically\n"
 email: