iplogic 0.1.2 → 0.1.3

data/iplogic.gemspec

@@ -1,6 +1,8 @@
+require 'lib/iplogic'
+
 Gem::Specification.new do |s|
   s.name = 'iplogic'
-  s.version = '0.1.2'
+  s.version = IPLogic::VERSION
 
   s.authors = ["Jay Adkisson"]
   s.date = '2010-11-13'

data/lib/iplogic.rb

@@ -1,5 +1,5 @@
 module IPLogic
-  VERSION = '0.1.2'
+  VERSION = '0.1.3'
 
   LIB = File.expand_path(File.dirname(__FILE__))
 end

data/lib/iplogic/cidr.rb

@@ -16,7 +16,11 @@ module IPLogic
           when IP
             netmask_to_bits(bits)
           else
-            bits.to_i
+            if bits.respond_to? :to_i
+              bits.to_i
+            else
+              format_error(args, bits)
+            end
           end
 
           new(ip, bits)
@@ -24,6 +28,8 @@ module IPLogic
           arg = args.first
           if arg =~ /(\d{1,3}\.\d{1,3}\.\d{1,3}\.\d{1,3})\/(\d+)/
             new($1, $2)
+          else
+            format_error(arg)
           end
         end
       end
@@ -34,6 +40,12 @@ module IPLogic
         netmask.to_i.to_s(2) =~ /^(1*)0*$/
         $1.length
       end
+
+      FormatError = Class.new(ArgumentError)
+      def format_error(*args)
+        args = args.map { |a| a.inspect }.join(', ')
+        raise FormatError, "CIDR: unable to parse #{args}"
+      end
     end
 
     attr_reader :ip, :bits

data/lib/iplogic/ip.rb

@@ -42,14 +42,14 @@ module IPLogic
         when nil
           0
         else
-          raise ArgumentError, <<-msg.strip
-            Couldn't parse #{arg.inspect} to an IP.
-          msg
+          raise FormatError, "IP: Unable to parse #{arg.inspect}"
         end
 
         return new(int)
       end
 
+      FormatError = Class.new(ArgumentError)
+
     private
       def parts_to_int(parts)
         r = 0

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: iplogic
 version: !ruby/object:Gem::Version 
-  hash: 31
+  hash: 29
   prerelease: 
   segments: 
   - 0
   - 1
-  - 2
-  version: 0.1.2
+  - 3
+  version: 0.1.3
 platform: ruby
 authors: 
 - Jay Adkisson