resolver_replace 0.0.2 → 0.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: aaf2d6d3e1a9b1b8343440183c70d570a1d0a2c4
-  data.tar.gz: 5d1c057c384ddc95a09b62d08d323d5dec73a5e3
+  metadata.gz: 2d7be38119515d08fdb024771a094aebbe81ff6a
+  data.tar.gz: 37cb391072b4c8fa64485ae7f5ae0880fb86586f
 SHA512:
-  metadata.gz: c9dc86bdb74db1b6fbfff10336f4bb25a36a464153a0974a83e82678b2bddad989da5b9160ea3d64635e4f92938f12a81414aaefba9e23fcbb3b7f8e4b59d940
-  data.tar.gz: 7d4233e457e5448abb47aeec0f242e92c10aff38c0ad36fdf5bd3347641bea99d126a01543a80a43925c76e6b398cc86b8b74df1626ddeb53ccb52d647633488
+  metadata.gz: 8d9ba209c965612564954dba47a1048049c55cf7dac223c52018117660142b09dac52188d4dd1f39bf1cd7d7d5380b11d82d030b2bf7ae943fe5396aed6847f8
+  data.tar.gz: 7f57f57ad114affb76ab0868019058c84158fe44ce6b4454181e0b067c33def5570ed5b608e41d75f3846eea40fe719cdf4f2eef508479199e62db8c6c3df8df

data/CHANGELOG.md

@@ -1,3 +1,9 @@
+## 0.0.3 (2014/07/17)
+
+Changes:
+
+* Fix not to apply resolver_replace just by `require`. Calling `ResolverReplace.register!` is required to apply now.
+
 ## 0.0.2 (2014/06/27)
 
 Enhancements:

data/example/example.rb

@@ -1,11 +1,16 @@
-require 'resolve'
+require 'resolv'
+require 'resolver_replace'
 
 resolver = Resolv::DNS.new(:nameserver => ['210.251.121.21'],
                            :search => ['ruby-lang.org'],
                            :ndots => 1)
 
-ResolverReplace.configure(
-  getaddress_proc: Proc.new {|host| resolver.getaddress(host) },
-  getaddresses_proc: Proc.new {|host| resolver.getaddresses(host) },
+addr = IPSocket.getaddress('ruby-lang.org') # Should not use ResolverReplace yet
+
+ResolverReplace.register!(
+  getaddress: Proc.new {|host| resolver.getaddress(host) },
+  getaddresses: Proc.new {|host| resolver.getaddresses(host) },
   error_class: Resolv::ResolvError,
 )
+
+addr = IPSocket.getaddress('ruby-lang.org') # Should use ResolverReplace

data/lib/resolver_replace/replace.rb

@@ -0,0 +1,75 @@
+# reference: ruby/lib/resolv-replace.rb
+require 'socket'
+require 'resolver_replace'
+
+class << IPSocket
+  # :stopdoc:
+  alias original_resolver_getaddress getaddress
+  # :startdoc:
+  def getaddress(host)
+    begin
+      return ResolverReplace.getaddress(host).to_s
+    rescue ResolverReplace.error_class => e
+      raise SocketError, "#{e.class} #{e.message}"
+    end
+  end
+end
+
+class TCPSocket < IPSocket
+  # :stopdoc:
+  alias original_resolver_initialize initialize
+  # :startdoc:
+  def initialize(host, serv, *rest)
+    rest[0] = IPSocket.getaddress(rest[0]) unless rest.empty?
+    original_resolver_initialize(IPSocket.getaddress(host), serv, *rest)
+  end
+end
+
+class UDPSocket < IPSocket
+  # :stopdoc:
+  alias original_resolver_bind bind
+  # :startdoc:
+  def bind(host, port)
+    host = IPSocket.getaddress(host) if host != ""
+    original_resolver_bind(host, port)
+  end
+
+  # :stopdoc:
+  alias original_resolver_connect connect
+  # :startdoc:
+  def connect(host, port)
+    original_resolver_connect(IPSocket.getaddress(host), port)
+  end
+
+  # :stopdoc:
+  alias original_resolver_send send
+  # :startdoc:
+  def send(mesg, flags, *rest)
+    if rest.length == 2
+      host, port = rest
+      begin
+        addrs = ResolverReplace.getaddresses(host)
+      rescue ResolverReplace.error_class => e
+        raise SocketError, "#{e.class} #{e.message}"
+      end
+      addrs[0...-1].each {|addr|
+        begin
+          return original_resolver_send(mesg, flags, addr, port)
+        rescue SystemCallError
+        end
+      }
+      original_resolver_send(mesg, flags, addrs[-1], port)
+    else
+      original_resolver_send(mesg, flags, *rest)
+    end
+  end
+end
+
+class SOCKSSocket < TCPSocket
+  # :stopdoc:
+  alias original_resolver_initialize initialize
+  # :startdoc:
+  def initialize(host, serv)
+    original_resolver_initialize(IPSocket.getaddress(host), port)
+  end
+end if defined? SOCKSSocket

data/lib/resolver_replace.rb

@@ -9,6 +9,7 @@ class ResolverReplace
       raise ArgumentError, 'getaddresses is required'
     end
     @error_class = params[:error_class] || StandardError
+    require 'resolver_replace/replace.rb'
   end
 
   def self.getaddress(host)
@@ -28,77 +29,3 @@ class ResolverReplace
   end
 end
 
-# reference: ruby/lib/resolv-replace.rb
-require 'socket'
-
-class << IPSocket
-  # :stopdoc:
-  alias original_resolver_getaddress getaddress
-  # :startdoc:
-  def getaddress(host)
-    begin
-      return ResolverReplace.getaddress(host).to_s
-    rescue ResolverReplace.error_class => e
-      raise SocketError, "#{e.class} #{e.message}"
-    end
-  end
-end
- 
-class TCPSocket < IPSocket
-  # :stopdoc:
-  alias original_resolver_initialize initialize
-  # :startdoc:
-  def initialize(host, serv, *rest)
-    rest[0] = IPSocket.getaddress(rest[0]) unless rest.empty?
-    original_resolver_initialize(IPSocket.getaddress(host), serv, *rest)
-  end
-end
- 
-class UDPSocket < IPSocket
-  # :stopdoc:
-  alias original_resolver_bind bind
-  # :startdoc:
-  def bind(host, port)
-    host = IPSocket.getaddress(host) if host != ""
-    original_resolver_bind(host, port)
-  end
- 
-  # :stopdoc:
-  alias original_resolver_connect connect
-  # :startdoc:
-  def connect(host, port)
-    original_resolver_connect(IPSocket.getaddress(host), port)
-  end
- 
-  # :stopdoc:
-  alias original_resolver_send send
-  # :startdoc:
-  def send(mesg, flags, *rest)
-    if rest.length == 2
-      host, port = rest
-      begin
-        addrs = ResolverReplace.getaddresses(host)
-      rescue ResolverReplace.error_class => e
-        raise SocketError, "#{e.class} #{e.message}"
-      end
-      addrs[0...-1].each {|addr|
-        begin
-          return original_resolver_send(mesg, flags, addr, port)
-        rescue SystemCallError
-        end
-      }
-      original_resolver_send(mesg, flags, addrs[-1], port)
-    else
-      original_resolver_send(mesg, flags, *rest)
-    end
-  end
-end
- 
-class SOCKSSocket < TCPSocket
-  # :stopdoc:
-  alias original_resolver_initialize initialize
-  # :startdoc:
-  def initialize(host, serv)
-    original_resolver_initialize(IPSocket.getaddress(host), port)
-  end
-end if defined? SOCKSSocket

data/resolver_replace.gemspec

@@ -4,7 +4,7 @@ $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 
 Gem::Specification.new do |spec|
   spec.name          = "resolver_replace"
-  spec.version       = "0.0.2"
+  spec.version       = "0.0.3"
   spec.authors       = ["Naotoshi Seo"]
   spec.email         = ["sonots@gmail.com"]
   spec.summary       = %q{Replace the DNS resolver}
@@ -17,7 +17,7 @@ Gem::Specification.new do |spec|
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ["lib"]
 
-  spec.add_development_dependency "bundler", "~> 1.6"
+  spec.add_development_dependency "bundler"
   spec.add_development_dependency "rake"
   spec.add_development_dependency "rspec"
   spec.add_development_dependency "pry"

metadata

@@ -1,29 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: resolver_replace
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
 platform: ruby
 authors:
 - Naotoshi Seo
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-06-27 00:00:00.000000000 Z
+date: 2014-07-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.6'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.6'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -90,7 +90,6 @@ files:
 - ".gitignore"
 - CHANGELOG.md
 - Gemfile
-- Gemfile.lock
 - LICENSE.txt
 - README.md
 - Rakefile
@@ -98,6 +97,7 @@ files:
 - lib/resolver_replace.rb
 - lib/resolver_replace/error.rb
 - lib/resolver_replace/plugins/mysql2.rb
+- lib/resolver_replace/replace.rb
 - resolver_replace.gemspec
 - spec/resolver_replace_spec.rb
 - spec/spec_helper.rb
@@ -121,7 +121,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.2.0
 signing_key: 
 specification_version: 4
 summary: Replace the DNS resolver

data/Gemfile.lock

@@ -1,44 +0,0 @@
-PATH
-  remote: .
-  specs:
-    resolver_replace (0.0.2)
-
-GEM
-  remote: https://rubygems.org/
-  specs:
-    coderay (1.1.0)
-    diff-lcs (1.2.5)
-    method_source (0.8.2)
-    mysql2 (0.3.16)
-    pry (0.9.12.6)
-      coderay (~> 1.0)
-      method_source (~> 0.8)
-      slop (~> 3.4)
-    pry-nav (0.2.3)
-      pry (~> 0.9.10)
-    rake (10.3.2)
-    rspec (3.0.0)
-      rspec-core (~> 3.0.0)
-      rspec-expectations (~> 3.0.0)
-      rspec-mocks (~> 3.0.0)
-    rspec-core (3.0.2)
-      rspec-support (~> 3.0.0)
-    rspec-expectations (3.0.2)
-      diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.0.0)
-    rspec-mocks (3.0.2)
-      rspec-support (~> 3.0.0)
-    rspec-support (3.0.2)
-    slop (3.5.0)
-
-PLATFORMS
-  ruby
-
-DEPENDENCIES
-  bundler (~> 1.6)
-  mysql2
-  pry
-  pry-nav
-  rake
-  resolver_replace!
-  rspec