em-whois 0.1.1 → 0.2.0

data/Gemfile

@@ -4,5 +4,6 @@ gem 'em-synchrony'
 gem 'whois', '= 2.5.0'    # Locked to specific version as internals of whois gem are overridden
 
 group :development do
+  gem 'rake'
   gem 'rspec'
 end

data/Gemfile.lock

@@ -5,12 +5,13 @@ GEM
     em-synchrony (1.0.0)
       eventmachine (>= 1.0.0.beta.1)
     eventmachine (1.0.0.beta.4)
+    rake (0.9.2.2)
     rspec (2.9.0)
       rspec-core (~> 2.9.0)
       rspec-expectations (~> 2.9.0)
       rspec-mocks (~> 2.9.0)
     rspec-core (2.9.0)
-    rspec-expectations (2.9.0)
+    rspec-expectations (2.9.1)
       diff-lcs (~> 1.1.3)
     rspec-mocks (2.9.0)
     whois (2.5.0)
@@ -20,5 +21,6 @@ PLATFORMS
 
 DEPENDENCIES
   em-synchrony
+  rake
   rspec
   whois (= 2.5.0)

data/README.md

@@ -1,4 +1,4 @@
-# em-whois
+# em-whois [![Build Status](https://secure.travis-ci.org/mikejarema/em-whois.png)](http://travis-ci.org/mikejarema/em-whois)
 
 This is a container for the synchronous WHOIS gem which replaces socket communications
 with the EventMachine equivalent.  The result is a gem permitting asynchronous WHOIS
@@ -8,14 +8,21 @@ lookups.
 inside the reactor, and fallback to original sockets outside the reactor context.
 
 
+## Supported Ruby Versions
+
+Tested and used in production with MRI 1.9+.
+
+`em-whois` relies on Ruby Fibers and `em-synchrony`, imposing a 1.9+ requirement.
+
+
 ## Examples
 
-Simple example to grab whois info within the EventMachine loop:
+Simple example to check domain availability via WHOIS within the EventMachine loop:
 
 ```ruby
+require 'em-whois'
+
 EM.synchrony do  
-  
-  # Async domain availability lookup via WHOIS info
   whois = Whois.whois(ARGV[0] || "github.com")
   puts whois.properties[:available?] ? "Domain Available" : "Domain Taken"
 
@@ -23,10 +30,12 @@ EM.synchrony do
 end
 ```
 
+Also take a look at `examples/async_whois.rb`.
+
 
 ## TODO
 
-* More elegant approach to reading from the EM::Synchrony::TcpSocket in Whois::Server::Adapters::Base#ask_the_socket
+* Support for ruby 1.8 (remove em-synchrony/Fiber requirement)
 
 
 ## License & Notes

data/VERSION.yml

@@ -1,4 +1,4 @@
 --- 
-:patch: 1
+:patch: 0
 :major: 0
-:minor: 1
+:minor: 2

data/lib/em-whois.rb

@@ -4,15 +4,17 @@ require 'em-synchrony'
 module Whois
   class Server
     module Adapters
+
       class Base
+
         private
 
-          # This method handles the lowest connection
-          # to the WHOIS server.
           #
-          # This is for internal use only!
+          # Overwrite Whois::Server::Adapters::Base#ask_the_socket to 
+          # be EventMachine-aware, and send calls offs asynchronously
+          # if the EM reactor is running, otherwise fallback to the
+          # synchronous connection.
           #
-          # @api internal
           
           alias :orig_ask_the_socket :ask_the_socket
 
@@ -21,32 +23,35 @@ module Whois
           end # ask_the_socket
 
           def em_ask_the_socket(query, *args)
-            client = EventMachine::Synchrony::TCPSocket.new(*args)
-            client.write("#{query}\r\n")    # I could use put(foo) and forget the \n
-                                            # but write/read is more symmetric than puts/read
-                                            # and I really want to use read instead of gets.
-
-            response = ""
-
-            # Synchrony TCPSocket behaves a little differently, seems to require
-            # polling until an IO exception is thrown.
-            # TODO: There's gotta be a more elegant way to achieve this.
-            while true do
-              begin
-                response += client.read
-              rescue IOError => e
-                break
-              end
-            end
-
-            response
-
-          ensure
-            client.close if client          # If != client something went wrong.
-          
+            fiber = Fiber.current
+            EM::connect args[0], args[1], AsyncClient, query, fiber
+            Fiber.yield
           end # em_ask_the_socket
 
-      end
+      end # Base
+
+      class AsyncClient < EventMachine::Connection
+
+        def initialize *args
+          @query, @fiber = args[0..1]
+          @data = ""
+          super
+        end
+
+        def post_init
+          send_data "#{@query}\r\n"
+        end
+
+        def receive_data(data)
+          @data << data
+        end
+
+        def unbind
+          @fiber.resume @data
+        end
+
+      end # AsyncClient
+
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: em-whois
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.2.0
   prerelease: 
 platform: ruby
 authors:
@@ -12,8 +12,8 @@ cert_chain: []
 date: 2012-04-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: eventmachine
-  requirement: &70096718694400 !ruby/object:Gem::Requirement
+  name: em-synchrony
+  requirement: &70340966931840 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70096718694400
+  version_requirements: *70340966931840
 - !ruby/object:Gem::Dependency
   name: whois
-  requirement: &70096718692400 !ruby/object:Gem::Requirement
+  requirement: &70340966931120 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - =
@@ -32,18 +32,7 @@ dependencies:
         version: 2.5.0
   type: :runtime
   prerelease: false
-  version_requirements: *70096718692400
-- !ruby/object:Gem::Dependency
-  name: em-synchrony
-  requirement: &70096718675440 !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: *70096718675440
+  version_requirements: *70340966931120
 description: Wrapper around whois gem providing asynchronous WHOIS queries via EventMachine
 email: mike@jarema.com
 executables: []