resolve-hostname 0.0.3 → 0.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 22db4fda8e23d989ad1c6aaf1597f6a5e9675aa4
-  data.tar.gz: 527f73d5200a67c927ffa288578cd65e0d01c050
+  metadata.gz: 7b834934e1e6464dff4bed92852f583042b35431
+  data.tar.gz: 0bd6fab1ad72007220577e477c42bbba6ddcc7ec
 SHA512:
-  metadata.gz: c6657496ca8bc1e67a8266e28a3a655bf49e265ab9f5956696d0fb4663e339bb790def23f759e480498f71495cfb50abcc4a7009ed1241f99e3fd2d7f47d3bfa
-  data.tar.gz: 4b9b1cca197f5832e44a66054240d83c97d552c29afd17645ae504f9f4e7c9a138414fef9b4e12f4e60548e2c058f60f35f44425f2aed49d1d68fb18617bae4b
+  metadata.gz: ac3ad9dc7199a0803698f64cc0e63c41585351ddc051aed35cfdfed3ea8a37a7725ec30eed752309fa6b2b058f2813f7ff9e87dbe3ecaa0dbd13fc53b0f84361
+  data.tar.gz: 8983a8199bb1e4649dd2e9027fd80444ffcee72ed348fb470a188ce26102a46182455afc5a77ba7bc0833c78b704b5a4dca07bee0afeebe1da0f273b440d7e29

data/lib/resolve/hostname.rb

@@ -50,6 +50,12 @@ module Resolve
 
       @resolver = nil
       @resolver_expires = nil
+
+      @invalid_address_error = if IPAddr.const_defined?('InvalidAddressError')
+                                 IPAddr::InvalidAddressError
+                               else
+                                 ArgumentError
+                               end
     end
 
     def getaddress(name)
@@ -84,7 +90,7 @@ module Resolve
       begin
         IPAddr.new(name)
         is_address = true
-      rescue IPAddr::InvalidAddressError
+      rescue @invalid_address_error => e
         # ignore
       end
       return name if is_address

data/lib/resolve/hostname/version.rb

@@ -1,5 +1,5 @@
 module Resolve
   class Hostname
-    VERSION = "0.0.3"
+    VERSION = "0.0.4"
   end
 end

data/spec/resolve_hostname_spec.rb

@@ -26,12 +26,27 @@ describe Resolve::Hostname do
       end
 
       context 'with invalid IPv4 address' do
-        it 'returns false' do
-          expect{ r.primary_version_address?('256.256.256.256') }.to raise_error(IPAddr::InvalidAddressError)
-          expect{ r.primary_version_address?('256.256.256.0')   }.to raise_error(IPAddr::InvalidAddressError)
-          expect{ r.primary_version_address?('256.256.0.0')     }.to raise_error(IPAddr::InvalidAddressError)
-          expect{ r.primary_version_address?('256.0.0.0')       }.to raise_error(IPAddr::InvalidAddressError)
-          expect{ r.primary_version_address?('0.0.0.0') }.not_to raise_error()
+        context 'in ruby 2.0.0 or later' do
+          if IPAddr.const_defined?('InvalidAddressError')
+            it 'raises IPAddr::InvalidAddressError' do
+              expect{ r.primary_version_address?('256.256.256.256') }.to raise_error(IPAddr::InvalidAddressError)
+              expect{ r.primary_version_address?('256.256.256.0')   }.to raise_error(IPAddr::InvalidAddressError)
+              expect{ r.primary_version_address?('256.256.0.0')     }.to raise_error(IPAddr::InvalidAddressError)
+              expect{ r.primary_version_address?('256.0.0.0')       }.to raise_error(IPAddr::InvalidAddressError)
+              expect{ r.primary_version_address?('0.0.0.0') }.not_to raise_error()
+            end
+          end
+        end
+        context 'in ruby 1.9.3 or earlier' do
+          unless IPAddr.const_defined?('InvalidAddressError')
+            it 'raises ArgumentError' do
+              expect{ r.primary_version_address?('256.256.256.256') }.to raise_error(ArgumentError)
+              expect{ r.primary_version_address?('256.256.256.0')   }.to raise_error(ArgumentError)
+              expect{ r.primary_version_address?('256.256.0.0')     }.to raise_error(ArgumentError)
+              expect{ r.primary_version_address?('256.0.0.0')       }.to raise_error(ArgumentError)
+              expect{ r.primary_version_address?('0.0.0.0') }.not_to raise_error()
+            end
+          end
         end
       end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: resolve-hostname
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.4
 platform: ruby
 authors:
 - TAGOMORI Satoshi
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-07-12 00:00:00.000000000 Z
+date: 2013-07-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler