mordor 0.2.16 → 0.2.17

data/lib/mordor/resource.rb

@@ -157,7 +157,13 @@ module Mordor
 
       def database
         unless @db
-          connection = Mongo::Connection.new(Mordor::Config[:hostname], Mordor::Config[:port])
+          if (hosts = Mordor::Config[:hostname].split(",").map{|h| h.strip}).size > 1
+            options = {:refresh_mode => true}
+            options[:rs_name] = Mordor::Config[:replica_set] if Mordor::Config[:replica_set]
+            connection = Mongo::MongoReplicaSetClient.new(hosts, options)
+          else
+            connection = Mongo::Connection.new(Mordor::Config[:hostname], Mordor::Config[:port])
+          end
           @db = connection.db(Mordor::Config[:database])
           @db.authenticate(Mordor::Config[:username], Mordor::Config[:password]) if Mordor::Config[:username]
         end

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.16"
-  s.date    = "2012-12-17"
+  s.version = "0.2.17"
+  s.date    = "2013-01-22"
 
   s.summary     = "mordor"
   s.description = <<-eos

data/spec/mordor/connection_spec.rb

@@ -60,4 +60,37 @@ describe "connecting to mongo" do
       TestResource.database
     end
   end
+
+  describe "replica sets" do
+    before :each do
+      @mock_connection = mock("connection", :db => mock("db"))
+    end
+
+    it "creates a mongo replica set client when multiple hosts are provided" do
+      hosts = "localhost:27017, localhost:27018  "
+      hosts_array = hosts.split(",").map{ |h| h.strip }
+
+      Mordor::Config.use { |config| config[:hostname] = hosts }
+
+      Mongo::MongoReplicaSetClient.should_receive(:new).with(hosts_array, anything).and_return(@mock_connection)
+
+      TestResource.database
+    end
+
+    it "creates a mongo replica set client with the correct replica set name if given" do
+      hosts = "localhost:27017, localhost:27018  "
+      replica_set = "sample replica set"
+
+      Mordor::Config.use do |config|
+        config[:hostname] = hosts
+        config[:replica_set] = replica_set
+      end
+
+      options = {:rs_name => replica_set, :refresh_mode => true}
+
+      Mongo::MongoReplicaSetClient.should_receive(:new).with(anything, options).and_return(@mock_connection)
+
+      TestResource.database
+    end
+  end
 end

metadata

@@ -1,157 +1,148 @@
---- !ruby/object:Gem::Specification
+--- !ruby/object:Gem::Specification 
 name: mordor
-version: !ruby/object:Gem::Version
-  version: 0.2.16
+version: !ruby/object:Gem::Version 
+  hash: 53
   prerelease: 
+  segments: 
+  - 0
+  - 2
+  - 17
+  version: 0.2.17
 platform: ruby
-authors:
+authors: 
 - Jan-Willem Koelewijn
 - Dirkjan Bussink
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-12-17 00:00:00.000000000 Z
-dependencies:
-- !ruby/object:Gem::Dependency
+
+date: 2013-01-22 00:00:00 +01:00
+default_executable: 
+dependencies: 
+- !ruby/object:Gem::Dependency 
+  type: :development
+  prerelease: false
+  version_requirements: &id001 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
   name: rake
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+  requirement: *id001
+- !ruby/object:Gem::Dependency 
   type: :development
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
+  version_requirements: &id002 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: rspec
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
+    requirements: 
     - - ~>
-      - !ruby/object:Gem::Version
-        version: '2.0'
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 2
+        - 0
+        version: "2.0"
+  name: rspec
+  requirement: *id002
+- !ruby/object:Gem::Dependency 
   type: :development
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '2.0'
-- !ruby/object:Gem::Dependency
+  version_requirements: &id003 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
   name: json
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+  requirement: *id003
+- !ruby/object:Gem::Dependency 
   type: :development
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
+  version_requirements: &id004 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
   name: extlib
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+  requirement: *id004
+- !ruby/object:Gem::Dependency 
   type: :development
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
+  version_requirements: &id005 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
   name: mongo
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
+  requirement: *id005
+- !ruby/object:Gem::Dependency 
+  type: :runtime
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
+  version_requirements: &id006 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
   name: extlib
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+  requirement: *id006
+- !ruby/object:Gem::Dependency 
   type: :runtime
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
+  version_requirements: &id007 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
   name: mongo
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+  requirement: *id007
+- !ruby/object:Gem::Dependency 
   type: :runtime
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
+  version_requirements: &id008 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
   name: json
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-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
-
-'
-email:
+  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: 
 - janwillem.koelewijn@nedap.com
 - dirkjan.bussink@nedap.com
 executables: []
+
 extensions: []
+
 extra_rdoc_files: []
-files:
+
+files: 
 - .gitignore
 - .travis.yml
 - Gemfile
@@ -171,31 +162,39 @@ files:
 - spec/spec.opts
 - spec/spec_helper.rb
 - tasks/github-gem.rake
+has_rdoc: true
 homepage: http://www.nedap.com
 licenses: []
+
 post_install_message: 
 rdoc_options: []
-require_paths:
+
+require_paths: 
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement
+required_ruby_version: !ruby/object:Gem::Requirement 
   none: false
-  requirements:
-  - - ! '>='
-    - !ruby/object:Gem::Version
-      version: '0'
-      segments:
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
       - 0
-      hash: 3720048276768169463
-required_rubygems_version: !ruby/object:Gem::Requirement
+      version: "0"
+required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
-  requirements:
-  - - ! '>='
-    - !ruby/object:Gem::Version
-      version: '0'
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
+      version: "0"
 requirements: []
+
 rubyforge_project: 
-rubygems_version: 1.8.24
+rubygems_version: 1.5.2
 signing_key: 
 specification_version: 3
 summary: mordor
 test_files: []
+