genghis 1.0.2 → 1.0.3

data/README.rdoc

@@ -37,6 +37,11 @@ If you are using replica pairs, the configuration varies somewhat.
         databases:
             paperclip : 'paperclip_files'
             ...
+        authorization:
+            paperclip:
+                username: pc
+                password: secretpassword
+            ...
         connection_options:
             max_retries: 7
             pool_size: 5

data/lib/genghis.rb

@@ -5,15 +5,17 @@ class Genghis
   include Mongo
 
   def self.config=(path)
-    puts "Setting config to #{path}"
     @@config_file = path
   end
 
   def self.environment=(environment = :development)
     yaml = YAML.load_file(config_file)
+    puts "YAML: #{yaml.inspect}"
     @@config = yaml[environment.to_s]
     @@config.each do |k, v|
+
       self.class.instance_eval do
+        v = HashWithConsistentAccess.new(v) if v.is_a?(::Hash)
         define_method(k.to_sym){v}
       end
     end
@@ -66,7 +68,7 @@ class Genghis
     if self.servers.is_a? Hash
       servers = self.servers
       servers = [parse_host(servers['left']), parse_host(servers['right'])]
-      connection = Connection.paired(servers, opts)
+      connection = Connection.multi(servers, opts)
     else
       host, port = parse_host(self.servers)
       connection = Connection.new(host, port, opts)
@@ -81,7 +83,7 @@ class Genghis
   end
 
   def self.symbolize_keys(hash)
-    hash.inject({}){|memo, (k, v)| memo[k.to_sym] = v; memo}
+    hash.inject({}) { |memo, (k, v)| memo[k.to_sym] = v; memo }
   end
 
 
@@ -105,9 +107,9 @@ class Genghis
         @@protected_classes.include? clazz
       end
 
-      def method_missing(method, *args, &block)
+      def method_missing(method, * args, & block)
         protect_from_exception do
-          Guardian.make_safe(@protected_class.__send__(method, *args, &block))
+          Guardian.make_safe(@protected_class.__send__(method, * args, & block))
         end
       end
 
@@ -119,7 +121,7 @@ class Genghis
         true
       end
 
-      def protect_from_exception(&block)
+      def protect_from_exception(& block)
         success = false
         max_retries = Genghis.max_retries
         retries = 0
@@ -148,14 +150,41 @@ class Genghis
     end
   end
 
+  class HashWithConsistentAccess
+
+    def initialize(proxied={})
+      @proxied = proxied.inject({}) do |memo, (k, v)|
+        memo[k.to_s] = v
+        memo
+      end
+    end
+
+
+    def []=(key, value)
+      @proxied[key.to_s] = value
+    end
+
+    def [](key)
+      @proxied[key.to_s]
+    end
+
+    def key?(key)
+      @proxied.key?(key.to_s)
+    end
+
+    def inspect
+      @proxied.inspect
+    end
+  end
+
 
   class Guardian
     alias_method :old_class, :class
-    instance_methods.each { |m| undef_method m unless m =~ /^__|^old/}
+    instance_methods.each { |m| undef_method m unless m =~ /^__|^old/ }
 
     include ProxyMethods
 
-    def initialize(*args)
+    def initialize(* args)
 
       opts = args.extract_options!
       if opts.empty?
@@ -196,10 +225,10 @@ class Genghis
     end
 
 
-    def method_missing(method, *args, &block)
+    def method_missing(method, * args, & block)
       return true if method == :safe?
       self.old_class.protect_from_exception do
-        Guardian.make_safe(@protected.__send__(method, *args, &block))
+        Guardian.make_safe(@protected.__send__(method, * args, & block))
       end
     end
 
@@ -213,4 +242,5 @@ class Genghis
     end
   end
 
-end
+
+end

metadata

@@ -1,12 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: genghis
 version: !ruby/object:Gem::Version 
+  hash: 17
   prerelease: false
   segments: 
   - 1
   - 0
-  - 2
-  version: 1.0.2
+  - 3
+  version: 1.0.3
 platform: ruby
 authors: 
 - Steve Cohen
@@ -14,16 +15,18 @@ autorequire: genghis
 bindir: bin
 cert_chain: []
 
-date: 2010-03-18 00:00:00 -07:00
+date: 2010-08-31 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: mongo
   prerelease: false
   requirement: &id001 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 45
         segments: 
         - 0
         - 19
@@ -51,23 +54,27 @@ rdoc_options: []
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
       segments: 
       - 0
       version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
       segments: 
       - 0
       version: "0"
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.6
+rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
 summary: Genghis is a mongoDB configuration and resilience framework