em-whois 0.3.0 → 0.4.0

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: 296c06f91c3611d827936840716c2aec957e9583
+  data.tar.gz: 5b2e8942634183b97df58b1124653a6dd046369f
+SHA512:
+  metadata.gz: 7bc371df9f18f9b8ea7ebc3cfe048ecd588d99244c111c250ad869febf4478e8faac6fc2d8c7453949ebc7c403c37e642333c9fa5d693a8a12d56d5ddcd346d1
+  data.tar.gz: f40c7a6db917393b42a70aeb51fb393eee9717420bdba75adea005c11e1ec5f5f5a7caba0c94140c0c62bc85e38f4c53dc21b8c2e88687e58a6969ccfe25d5b9

data/Gemfile

@@ -1,9 +1,10 @@
-source :gemcutter
+source 'https://rubygems.org'
 
 gem 'em-synchrony'
-gem 'whois', '= 2.7.0'    # Locked to specific version as internals of whois gem are overridden
+gem 'whois', '= 4.0.6'    # Locked to specific version as internals of whois gem are overridden
 
-group :development do
+group :test do
   gem 'rake'
   gem 'rspec'
+  gem 'whois-parser', '= 1.1.0'
 end

data/README.md

@@ -10,9 +10,7 @@ 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.
+`em-whois` requires ruby 2.0+, with which it has been tested and used in production.
 
 
 ## Examples
@@ -21,16 +19,16 @@ Simple example to check domain availability via WHOIS within the EventMachine lo
 
 ```ruby
 require 'em-whois'
+require 'whois-parser'
 
-EM.synchrony do  
+EM.synchrony do
   whois = Whois.whois(ARGV[0] || "github.com")
-  puts whois.properties[:available?] ? "Domain Available" : "Domain Taken"
-
+  puts whois.parser.available? ? "Domain Available" : "Domain Taken"
   EM.stop
 end
 ```
 
-Also take a look at `examples/async_whois.rb`.
+Also take a look at the async examples in `examples/`.
 
 
 ## License & Notes

data/VERSION.yml

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

data/em-whois.gemspec

@@ -0,0 +1,53 @@
+# -*- encoding: utf-8 -*-
+
+Gem::Specification.new do |s|
+  s.name = %q{em-whois}
+  s.version = "0.4.0"
+
+  s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
+  s.authors = ["Mike Jarema"]
+  s.date = %q{2018-06-25}
+  s.description = %q{Asynchronous WHOIS queries via EventMachine (based on synchronous whois gem)}
+  s.email = %q{mike@jarema.com}
+  s.files = [
+    "Gemfile",
+    "README.md",
+    "Rakefile",
+    "VERSION.yml",
+    "em-whois.gemspec",
+    "examples",
+    "lib",
+    "spec",
+
+    "VERSION.yml",
+    "README.md",
+    ".rspec",
+    "Gemfile",
+    "Rakefile",
+    "examples/async_whois.rb",
+    "examples/async_parallel_whois.rb",
+    "examples/sync_whois.rb",
+    "lib/em-whois.rb",
+    "spec/em-whois_spec.rb",
+    "spec/helper/all.rb",
+  ]
+  s.has_rdoc = true
+  s.homepage = %q{http://github.com/mikejarema/em-whois}
+  s.rdoc_options = ["--charset=UTF-8"]
+  s.require_paths = ["lib"]
+  s.rubygems_version = %q{1.3.2}
+  s.summary = %q{Query WHOIS servers using native EventMachine connection classes.}
+  s.test_files = [
+    "spec/em-whois_spec.rb",
+    "spec/helper/all.rb",
+  ]
+  s.required_ruby_version = Gem::Requirement.new(">= 2.0.0".freeze)
+
+  s.add_runtime_dependency('em-synchrony')
+  s.add_runtime_dependency('whois', '= 4.0.6')
+
+  s.add_development_dependency('rake')
+  s.add_development_dependency('rspec')
+  s.add_development_dependency('whois-parser', '= 1.1.0')
+
+end

data/examples/async_parallel_whois.rb

@@ -1,13 +1,13 @@
 $: << File.dirname(__FILE__) + '/../lib'
 require 'em-whois'
-require 'atomic'
+require 'whois-parser'
 
 # Asynchronous, parallel multi-domain WHOIS lookup
 domains = ARGV.empty? ? ["github.com", "google.com", "bing.com", "yahoo.com", "mikejarema.com"] : ARGV
 whois   = {}
 
-EM.synchrony do  
-  
+EM.synchrony do
+
   # Progress indicator
   EM.add_periodic_timer(0.1) do
     STDERR.print "."
@@ -18,10 +18,10 @@ EM.synchrony do
     if domains.size == whois.keys.size
       puts ""
       whois.each do |k,v|
-        if v.properties[:available?]
+        if v.parser.available?
           puts "#{k}: available"
         else
-          puts "#{k}: taken, expires #{v.properties[:expires_on]}"
+          puts "#{k}: taken, expires #{v.parser.expires_on}"
         end
       end
 

data/examples/async_whois.rb

@@ -1,10 +1,11 @@
 $: << File.dirname(__FILE__) + '/../lib'
 require 'em-whois'
+require 'whois-parser'
 
 # Asynchronous WHOIS lookup -- em-whois should opt to use EM-based TcpSocket
 
-EM.synchrony do  
-  
+EM.synchrony do
+
   # EM pulse
   EM.add_periodic_timer(0.1) do
     STDERR.print "."
@@ -12,12 +13,12 @@ EM.synchrony do
 
   # Async WHOIS lookup
   domain = ARGV[0] || "github.com"
-  
+
   r = Whois.whois(domain)
-  
+
   puts "\r#{domain}\n#{"-" * domain.length}"
   [:available?, :status, :expires_on].each do |k|
-    puts "#{k}: #{r.properties[k]}"
+    puts "#{k}: #{r.parser.send(k)}"
   end
 
   EM.stop

data/examples/sync_whois.rb

@@ -1,5 +1,6 @@
 $: << File.dirname(__FILE__) + '/../lib'
 require 'em-whois'
+require 'whois-parser'
 
 # Synchronous WHOIS lookup -- em-whois should opt to use original TcpSocket
 
@@ -9,5 +10,5 @@ r = Whois.whois(domain)
 
 puts "\r#{domain}\n#{"-" * domain.length}"
 [:available?, :status, :expires_on].each do |k|
-  puts "#{k}: #{r.properties[k]}"
+  puts "#{k}: #{r.parser.send(k)}"
 end

data/lib/em-whois.rb

@@ -3,55 +3,50 @@ require 'em-synchrony'
 
 module Whois
   class Server
-    module Adapters
+    class SocketHandler
 
-      class Base
+      #
+      # Overwrite Whois::Server::SocketHandler#call to
+      # be EventMachine-aware, and send calls offs asynchronously
+      # if the EM reactor is running, otherwise fallback to the
+      # synchronous connection.
+      #
 
-        private
+      alias :orig_call :call
 
-          #
-          # 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.
-          #
-          
-          alias :orig_ask_the_socket :ask_the_socket
+      def call(*args)
+        defined?(EM) && EM.reactor_running? ? em_call(*args) : orig_call(*args)
+      end
 
-          def ask_the_socket(*args)
-            defined?(EM) && EM.reactor_running? ? em_ask_the_socket(*args) : orig_ask_the_socket(*args)
-          end # ask_the_socket
+      def em_call(query, *args)
+        fiber = Fiber.current
+        EM::connect args[0], args[1], AsyncClient, query, fiber
+        Fiber.yield
+      end
 
-          def em_ask_the_socket(query, *args)
-            fiber = Fiber.current
-            EM::connect args[0], args[1], AsyncClient, query, fiber
-            Fiber.yield
-          end # em_ask_the_socket
-
-      end # Base
-
-      class AsyncClient < EventMachine::Connection
+    end
 
-        def initialize *args
-          @query, @fiber = args[0..1]
-          @data = ""
-          super
-        end
+    class AsyncClient < EventMachine::Connection
 
-        def post_init
-          send_data "#{@query}\r\n"
-        end
+      def initialize *args
+        @query, @fiber = args[0..1]
+        @data = ""
+        super
+      end
 
-        def receive_data(data)
-          @data << data
-        end
+      def post_init
+        send_data "#{@query}\r\n"
+      end
 
-        def unbind
-          @fiber.resume @data
-        end
+      def receive_data(data)
+        @data << data
+      end
 
-      end # AsyncClient
+      def unbind
+        @fiber.resume @data
+      end
 
     end
+
   end
 end

data/spec/em-whois_spec.rb

@@ -1,17 +1,31 @@
 require "spec/helper/all"
+require 'whois-parser'
+
+def throttle
+  sleep 5
+  yield
+end
+
+def properties_for(whois_record)
+  hash = {}
+  Whois::Parser::PROPERTIES.each do |p|
+    hash[p] = whois_record.parser.send(p)
+  end
+  hash
+end
 
 describe "Asynchronous WHOIS" do
 
   it "should not use synchronous socket methods" do
-    
+
     EM.synchrony do
-      Whois::Server::Adapters::Base.any_instance.should_not_receive(:orig_ask_the_socket)
+      expect_any_instance_of(Whois::Server::SocketHandler).to_not receive(:orig_call)
 
-      whois = Whois.whois("google.com")
-      whois.should_not be_available # Sanity check
+      whois = throttle { Whois.whois("google.com") }
+      expect(whois.parser).to_not be_available # Sanity check
 
-      whois = Whois.whois("#{rand(Time.now.to_i)}-alskdjflkasjd.com")
-      whois.should be_available # Sanity check
+      whois = throttle { Whois.whois("#{rand(Time.now.to_i)}-alskdjflkasjd.com") }
+      expect(whois.parser).to be_available # Sanity check
 
       EM.stop
     end
@@ -23,13 +37,13 @@ describe "Asynchronous WHOIS" do
     sync_whois = nil
 
     EM.synchrony do
-      async_whois = Whois.whois("github.com")
+      async_whois = throttle { Whois.whois("github.com") }
       EM.stop
     end
 
-    sync_whois = Whois.whois("github.com")
+    sync_whois = throttle { Whois.whois("github.com") }
 
-    async_whois.properties.should == sync_whois.properties
+    expect(properties_for(async_whois)).to eq(properties_for(sync_whois))
   end
 
 end
@@ -37,13 +51,13 @@ end
 describe "Synchronous WHOIS" do
 
   it "should not use asynchronous socket methods" do
-    Whois::Server::Adapters::Base.any_instance.should_not_receive(:em_ask_the_socket)
+    expect_any_instance_of(Whois::Server::SocketHandler).to_not receive(:em_call)
 
-    whois = Whois.whois("google.com")
-    whois.should_not be_available # Sanity check
+    whois = throttle { Whois.whois("google.com") }
+    expect(whois.parser).to_not be_available # Sanity check
 
-    whois = Whois.whois("#{rand(Time.now.to_i)}-alskdjflkasjd.com")
-    whois.should be_available # Sanity check
+    whois = throttle { Whois.whois("#{rand(Time.now.to_i)}-alskdjflkasjd.com") }
+    expect(whois.parser).to be_available # Sanity check
   end
 
 end

metadata

@@ -1,38 +1,85 @@
 --- !ruby/object:Gem::Specification
 name: em-whois
 version: !ruby/object:Gem::Version
-  version: 0.3.0
-  prerelease: 
+  version: 0.4.0
 platform: ruby
 authors:
 - Mike Jarema
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-09-27 00:00:00.000000000 Z
+date: 2018-06-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: em-synchrony
-  requirement: &70358519233500 !ruby/object:Gem::Requirement
-    none: false
+  requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70358519233500
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: whois
-  requirement: &70358519246440 !ruby/object:Gem::Requirement
-    none: false
+  requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - =
+    - - '='
       - !ruby/object:Gem::Version
-        version: 2.7.0
+        version: 4.0.6
   type: :runtime
   prerelease: false
-  version_requirements: *70358519246440
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 4.0.6
+- !ruby/object:Gem::Dependency
+  name: rake
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: rspec
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: whois-parser
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 1.1.0
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 1.1.0
 description: Asynchronous WHOIS queries via EventMachine (based on synchronous whois
   gem)
 email: mike@jarema.com
@@ -40,42 +87,41 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- VERSION.yml
-- README.md
-- .rspec
+- ".rspec"
 - Gemfile
-- Gemfile.lock
+- README.md
 - Rakefile
-- examples/async_whois.rb
+- VERSION.yml
+- em-whois.gemspec
 - examples/async_parallel_whois.rb
+- examples/async_whois.rb
 - examples/sync_whois.rb
 - lib/em-whois.rb
 - spec/em-whois_spec.rb
 - spec/helper/all.rb
 homepage: http://github.com/mikejarema/em-whois
 licenses: []
+metadata: {}
 post_install_message: 
 rdoc_options:
-- --charset=UTF-8
+- "--charset=UTF-8"
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 2.0.0
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.11
+rubygems_version: 2.6.13
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Query WHOIS servers using native EventMachine connection classes.
 test_files:
 - spec/em-whois_spec.rb

data/Gemfile.lock

@@ -1,26 +0,0 @@
-GEM
-  remote: http://rubygems.org/
-  specs:
-    diff-lcs (1.1.3)
-    em-synchrony (1.0.2)
-      eventmachine (>= 1.0.0.beta.1)
-    eventmachine (1.0.0)
-    rake (0.9.2.2)
-    rspec (2.11.0)
-      rspec-core (~> 2.11.0)
-      rspec-expectations (~> 2.11.0)
-      rspec-mocks (~> 2.11.0)
-    rspec-core (2.11.1)
-    rspec-expectations (2.11.3)
-      diff-lcs (~> 1.1.3)
-    rspec-mocks (2.11.3)
-    whois (2.7.0)
-
-PLATFORMS
-  ruby
-
-DEPENDENCIES
-  em-synchrony
-  rake
-  rspec
-  whois (= 2.7.0)