ipaccess 0.0.2 → 0.0.3

data/lib/ipaccess/ip_access.rb

@@ -296,6 +296,7 @@ class IPAccess
   
   def check_fd(list, exc, fd)
     check_socket(list, exc, Socket.for_fd(fd))
+    return fd
   end
   private :check_fd
   

data/lib/ipaccess/ip_access_list.rb

@@ -20,7 +20,6 @@
 #
 #++
 
-require 'ipaddr'
 require 'socket'
 require 'resolv'
 require 'netaddr'
@@ -255,9 +254,6 @@ class IPAccessList < NetAddr::Tree
     # number - immediate generation
     return [NetAddr::CIDR.create(obj)] if obj.is_a?(Numeric)
 
-    # IPAddr - fetch IP/mask string
-    obj = obj.native.inspect.split[1].chomp('>')[5..-1] if obj.is_a?(IPAddr)
-
     # object containing socket member (e.g. Net::HTTP) - fetch socket
     if obj.respond_to?(:socket)
       obj = obj.socket 
@@ -345,7 +341,7 @@ class IPAccessList < NetAddr::Tree
                            :reserved,
                            :multicast)
       else
-        raise ArgumentError, "Provided symbol is unknown: #{obj.to_s}"
+        raise ArgumentError, "provided symbol is unknown: #{obj.to_s}"
       end
       return obj.map { |addr| NetAddr::CIDR.create(addr) } if obj.is_a?(Array)
     end
@@ -353,8 +349,13 @@ class IPAccessList < NetAddr::Tree
     # URI or something that responds to host method - fetch string
     obj = obj.host if obj.respond_to?(:host)
     
-    # IPAddrList - immediate generation
-    return obj.to_a if obj.class.name.to_sym == :IPAddrList
+    # objects of external classes 
+    case obj.class.name.to_sym
+    when :IPAddr                                          # IPAddr - fetch IP/mask string
+      obj = obj.native.inspect.split[1].chomp('>')[5..-1]
+    when :IPAddrList                                      # IPAddrList - pass array to parse
+      return obj_to_cidr(obj.to_a)
+    end
     
     # string or similar - immediate generation
     if obj.respond_to?(:to_s)

data/lib/ipaccess/socket.rb

@@ -0,0 +1,2 @@
+require 'ipaccess/sockets.rb'
+

data/spec/ip_access_list_spec.rb

@@ -3,7 +3,14 @@ $:.unshift File.join(File.dirname(__FILE__), "..", "lib")
 require 'uri'
 require 'socket'
 require 'rubygems'
+require 'ipaddr'
 require 'ipaccess'
+require 'ipaccess/socket'
+
+begin
+  require 'ipaddr_list'
+rescue LoadError
+end
 
 describe IPAccessList do
  
@@ -41,6 +48,12 @@ describe IPAccessList do
         lambda { IPAccessList.new [IPAddr.new("127.0.0.1"), IPAddr.new("192.168.1.1")] }.should_not raise_error
       end
 
+      if Kernel.const_defined?(:IPAddrList)
+        it "should take an IPAddrList object as parameter" do
+          lambda { IPAccessList.new IPAddrList.new(["127.0.0.1", "192.168.1.1"]) }.should_not raise_error
+        end
+      end
+
       it "should take an array of numbers as parameter" do
         lambda { IPAccessList.new [2130706433,2130706434] }.should_not raise_error
       end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: ipaccess
 version: !ruby/object:Gem::Version 
-  version: 0.0.2
+  version: 0.0.3
 platform: ruby
 authors: 
 - "Pawe\xC5\x82 Wilk"
@@ -39,6 +39,7 @@ files:
 - lib/ipaccess/ip_access_patches.rb
 - lib/ipaccess/netaddr_patch.rb
 - lib/ipaccess/sockets.rb
+- lib/ipaccess/socket.rb
 - lib/ipaccess/ghost_doc.rb
 - lib/ipaccess/ghost_doc_acl.rb
 - docs/LGPL-LICENSE