genghis 1.0.3 → 1.0.4

data/README.rdoc

@@ -32,22 +32,17 @@ If you are using replica pairs, the configuration varies somewhat.
 
     development:
         servers:
-            left:  left_host:27017
-            right: right_host:27017
+            -_host:27017
+            - right_host:27017
         databases:
             paperclip : 'paperclip_files'
             ...
-        authorization:
-            paperclip:
-                username: pc
-                password: secretpassword
-            ...
         connection_options:
             max_retries: 7
             pool_size: 5
             ...
 
-The left and right servers are specified in a hash, and most importantly for resilience the max_retries
+The servers are specified in an array, and most importantly for resilience the max_retries
 entry is specified in connection options. This specifies how many times Genghis will try to establish
 a connection to one of the servers if it detects a connection error.
 

data/lib/genghis.rb

@@ -10,12 +10,9 @@ class Genghis
 
   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
@@ -26,7 +23,7 @@ class Genghis
   end
 
   def self.database(db_alias)
-    connection.db(self.databases[db_alias])
+    connection.db(self.databases[db_alias.to_s])
   end
 
   def self.reconnect
@@ -65,9 +62,10 @@ class Genghis
 
   def self.safe_create_connection
     opts = connection_options
-    if self.servers.is_a? Hash
-      servers = self.servers
-      servers = [parse_host(servers['left']), parse_host(servers['right'])]
+    if self.servers.is_a? Array
+      servers = self.servers.collect{|x| parse_host(x)}
+      puts "Multi called with #{servers.inspect} #{opts.inspect}"
+
       connection = Connection.multi(servers, opts)
     else
       host, port = parse_host(self.servers)
@@ -79,11 +77,11 @@ class Genghis
   def self.parse_host(host)
     a = host.split(':')
     a << 27017 if a.size == 1
-    a
+    [a.first, a.last.to_i]
   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
 
 
@@ -107,9 +105,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
 
@@ -121,7 +119,7 @@ class Genghis
         true
       end
 
-      def protect_from_exception(& block)
+      def protect_from_exception(&block)
         success = false
         max_retries = Genghis.max_retries
         retries = 0
@@ -150,41 +148,14 @@ 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?
@@ -225,10 +196,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
 
@@ -242,5 +213,4 @@ class Genghis
     end
   end
 
-
-end
+end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: genghis
 version: !ruby/object:Gem::Version 
-  hash: 17
+  hash: 31
   prerelease: false
   segments: 
   - 1
   - 0
-  - 3
-  version: 1.0.3
+  - 4
+  version: 1.0.4
 platform: ruby
 authors: 
 - Steve Cohen