mordor 0.2.6 → 0.2.7

data/lib/mordor.rb

@@ -3,6 +3,7 @@ require 'mongo'
 require 'extlib'
 require 'json'
 require 'mordor/version'
+require 'mordor/config'
 require 'mordor/collection'
 require 'mordor/resource'
 
@@ -82,17 +83,10 @@ class Time
 end
 
 module Mordor
-  CONFIG = {
-    :hostname => 'localhost',
-    :port     => 27017,
-    :database => 'development'
-  }
-
   def connection
-    @connection ||= Mongo::Connection.new(CONFIG[:hostname], CONFIG[:port])
-    @connection.autenticate(CONFIG[:username], CONFIG[:password]) if CONFIG[:username]
-    @connection.db(CONFIG[:database])
+    @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/config.rb

@@ -0,0 +1,82 @@
+module Mordor
+  class Config
+    class << self
+
+      # Yields the configuration.
+      #
+      # ==== Block parameters
+      # c<Hash>:: The configuration parameters.
+      #
+      # ==== Examples
+      #   Merb::Config.use do |config|
+      #     config[:exception_details] = false
+      #     config[:log_stream]        = STDOUT
+      #   end
+      #
+      # ==== Returns
+      # nil
+      #
+      # :api: publicdef use
+      def use
+        @configuration ||= {}
+        yield @configuration
+        nil
+      end
+
+      # Retrieve the value of a config entry.
+      #
+      # ==== Parameters
+      # key<Object>:: The key to retrieve the parameter for.
+      #
+      # ==== Returns
+      # Object:: The value of the configuration parameter.
+      #
+      # :api: public
+      def [](key)
+        (@configuration ||= setup)[key]
+      end
+
+      # Set the value of a config entry.
+      #
+      # ==== Parameters
+      # key<Object>:: The key to set the parameter for.
+      # val<Object>:: The value of the parameter.
+      #
+      # :api: public
+      def []=(key, val)
+        (@configuration ||= setup)[key] = val
+      end
+
+      private
+
+      # Returns the hash of default config values for Merb.
+      #
+      # ==== Returns
+      # Hash:: The defaults for the config.
+      #
+      # :api: private
+      def defaults
+        @defaults ||= {
+          :hostname => 'localhost',
+          :port     => 27017,
+          :database => 'development'
+        }
+      end
+
+      # Sets up the configuration by storing the given settings.
+      #
+      # ==== Parameters
+      # settings<Hash>::
+      #   Configuration settings to use. These are merged with the defaults.
+      #
+      # ==== Returns
+      # The configuration as a hash.
+      #
+      # :api: private
+      def setup(settings = {})
+        @configuration = defaults.merge(settings)
+      end
+    end
+
+  end
+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.6"
+  s.version = "0.2.7"
   s.date    = "2012-01-04"
 
   s.summary     = "mordor"
@@ -29,6 +29,6 @@ Gem::Specification.new do |s|
 
   # The files and test_files directives are set automatically by the release script.
   # Do not change them by hand, but make sure to add the files to the git repository.
-  s.files = %w(.gitignore Gemfile Gemfile.lock README.md Rakefile lib/mordor.rb lib/mordor/collection.rb lib/mordor/resource.rb lib/mordor/version.rb mordor.gemspec spec/mordor/collection_spec.rb spec/mordor/connection_spec.rb spec/mordor/resource_spec.rb spec/spec.opts spec/spec_helper.rb tasks/github-gem.rake)
+  s.files = %w(.gitignore Gemfile Gemfile.lock README.md Rakefile lib/mordor.rb lib/mordor/collection.rb lib/mordor/config.rb lib/mordor/resource.rb lib/mordor/version.rb mordor.gemspec spec/mordor/collection_spec.rb spec/mordor/connection_spec.rb spec/mordor/resource_spec.rb spec/spec.opts spec/spec_helper.rb tasks/github-gem.rake)
 end
 

data/spec/mordor/connection_spec.rb

@@ -11,6 +11,6 @@ describe "connecting to mongo" do
   end
 
   it "should select the correct database" do
-    @db.name.should == Mordor::CONFIG[:database]
+    @db.name.should == Mordor::Config[:database]
   end
 end

data/spec/spec_helper.rb

@@ -4,17 +4,11 @@ require 'mongo'
 $LOAD_PATH.unshift File.join(File.dirname(__FILE__), '..', 'lib')
 require 'mordor'
 
-module Mordor
-CONFIG = {
-  :hostname => 'localhost',
-  :port     =>  27017,
-  :database => 'test'
-}
-end
+Mordor::Config[:database] = 'test'
 
 def clean_sheet
-  @connection ||= Mongo::Connection.new(Mordor::CONFIG[:hostname], Mordor::CONFIG[:port])
-  @db ||= @connection[Mordor::CONFIG[:database]]
+  @connection ||= Mongo::Connection.new(Mordor::Config[:hostname], Mordor::Config[:port])
+  @db ||= @connection[Mordor::Config[:database]]
 
   ['TestResource', 'TestTimedResource'].each do |resource|
     if Object.const_defined?(resource)

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: mordor
 version: !ruby/object:Gem::Version 
-  hash: 27
+  hash: 25
   prerelease: false
   segments: 
   - 0
   - 2
-  - 6
-  version: 0.2.6
+  - 7
+  version: 0.2.7
 platform: ruby
 authors: 
 - Jan-Willem Koelewijn
@@ -178,6 +178,7 @@ files:
 - Rakefile
 - lib/mordor.rb
 - lib/mordor/collection.rb
+- lib/mordor/config.rb
 - lib/mordor/resource.rb
 - lib/mordor/version.rb
 - mordor.gemspec