em-synchrony-moped 0.9.0 → 0.9.1

data/README.md

@@ -1,6 +1,6 @@
 # EM-Synchrony-Moped
 
-EM-Synchrony-Moped is a [Moped](https://github.com/mongoid/mongoid) driver patch for [EM-Synchrony](http://github.com/igrigorik/em-synchrony).  Moped is the MongoDB driver for the [Mongoid](http://github.com/mongoid/mongoid).
+EM-Synchrony-Moped is a [Moped](https://github.com/mongoid/mongoid) driver patch for [EM-Synchrony](http://github.com/igrigorik/em-synchrony).  Moped is the MongoDB driver for the [Mongoid](http://github.com/mongoid/mongoid) ORM.
 
  * Supports SSL connections
 
@@ -11,12 +11,35 @@ In order to use this driver in an EM-Synchrony environment, simply include the d
 ```ruby
 require "em-synchrony/moped"
 
+EventMachine.synchrony do
+  node = Moped::Node.new("localhost:27017")
+  puts node.primary?
+  EM.stop
+end
+
 ```
 
-To use SSL:
+To use SSL, just pass an SSL config section to the options.
+ 
 ```ruby
 require "em-synchrony/moped"
 
+EventMachine.synchrony do
+  options = {
+    :ssl => {
+        :verify_peer => true,                      # false to skip peer verification
+        :verify_cert => "../path-to/ca_cert.pem",  # specify a CA certificate to verify against
+                                                   # or...
+        :cert_store => OpenSSL::X509::Store.new,   # to specify a cached cert store.
+        :verify_host => "localhost"                # Hostname to verify against, if you wish
+                                                   # to verify the hostname in the certificate.
+      }
+  }
+  node = Moped::Node.new("localhost:27017", options)
+  puts node.primary?
+  EM.stop
+end
+
 ```
 
 

data/em-synchrony-moped.gemspec

@@ -2,7 +2,7 @@
 
 Gem::Specification.new do |s|
   s.name = 'em-synchrony-moped'
-  s.version = "0.9.0"
+  s.version = "0.9.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Adam Lebsack"]
@@ -19,9 +19,10 @@ Gem::Specification.new do |s|
   s.require_paths = ["lib"]
 
   s.add_runtime_dependency 'eventmachine'
-  s.add_runtime_dependency 'em-synchrony', '~> 1.0'
-  s.add_runtime_dependency 'moped',        '~> 1.4.5'
+  s.add_runtime_dependency 'em-synchrony',      '~> 1.0'
+  s.add_runtime_dependency 'moped',             '~> 1.4.5'
+  s.add_runtime_dependency 'em-resolv-replace', '~> 1.1.3'
 
-  s.add_development_dependency 'rspec',    '~> 2.12.0'
+  s.add_development_dependency 'rspec',         '~> 2.12.0'
 
 end

data/lib/em-synchrony/moped.rb

@@ -1,4 +1,6 @@
 require "moped/connection"
+require "moped/node"
+require 'em-resolv-replace'
 
 silence_warnings {
   
@@ -9,6 +11,27 @@ silence_warnings {
       end
     end
     
+    class Node
+      # Override to support non-blocking DNS requests
+      def parse_address
+        host, port = address.split(":")
+        @port = (port || 27017).to_i
+      
+        @resolver ||= Resolv.new([Resolv::Hosts.new, Resolv::DNS.new])
+
+        # For now, limit the IPs only to IPv4 hosts.  In order to support IPv6,
+        # the node should be able to handle fallback connections.
+        @resolver.getaddresses(host).each do |ip|
+          if ip =~ Resolv::IPv4::Regex
+            @ip_address = ip
+            break
+          end
+        end
+        @resolved_address = "#{@ip_address}:#{@port}"
+      end
+    end
+
+    
     class Connection
       def connect
         @sock = if !!options[:ssl]
@@ -89,7 +112,7 @@ silence_warnings {
                 end
               end
               
-              host = @options[:ssl][:verify_host] || @options[:host]
+              host = @options[:ssl][:verify_host]
               if OpenSSL::SSL.verify_certificate_identity(cert, host)
                 @verified = true
                 return true

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: em-synchrony-moped
 version: !ruby/object:Gem::Version
-  version: 0.9.0
+  version: 0.9.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-04-29 00:00:00.000000000 Z
+date: 2013-05-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: eventmachine
@@ -59,6 +59,22 @@ dependencies:
     - - ~>
       - !ruby/object:Gem::Version
         version: 1.4.5
+- !ruby/object:Gem::Dependency
+  name: em-resolv-replace
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 1.1.3
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 1.1.3
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement