iplogic 0.1.3 → 0.1.4

data/iplogic.gemspec

@@ -10,6 +10,10 @@ Gem::Specification.new do |s|
     An IPv4 swiss-army chainsaw
   desc
 
+  s.summary = <<-sum
+    Because it's just a 32-bit integer.
+  sum
+
   s.email = %q{jay@causes.com}
   s.extra_rdoc_files = %w(
     LICENSE
@@ -32,10 +36,6 @@ Gem::Specification.new do |s|
   s.require_paths = ["lib"]
   s.rubygems_version = '1.3.7'
 
-  s.summary = <<-sum
-    Because it's just a 32-bit integer.
-  sum
-
   s.test_files = %w(
     spec/ip_spec.rb
     spec/cidr_spec.rb

data/lib/iplogic.rb

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

data/lib/iplogic/cidr.rb

@@ -2,6 +2,7 @@ module IPLogic
   class CIDR
     include Enumerable
 
+    SHORTENED_IP_REGEX = /^(\d{1,3}(\.\d{1,3}){1,3})\/(\d+)$/
     class << self
       def wrap(*args)
         return args.first if args.first.is_a? CIDR
@@ -11,10 +12,8 @@ module IPLogic
           bits = case bits
           when Integer
             bits
-          when String
+          when String, IP
             netmask_to_bits(IP.wrap(bits))
-          when IP
-            netmask_to_bits(bits)
           else
             if bits.respond_to? :to_i
               bits.to_i
@@ -23,18 +22,40 @@ module IPLogic
             end
           end
 
-          new(ip, bits)
+          ip = parse_shortened_ip(ip) if ip.is_a? String
+
+          return new(ip, bits)
+
         elsif args.size == 1
           arg = args.first
-          if arg =~ /(\d{1,3}\.\d{1,3}\.\d{1,3}\.\d{1,3})\/(\d+)/
-            new($1, $2)
+
+          return arg if arg.is_a? CIDR
+
+          # one argument means it's gotta be a string to parse
+          format_error(arg) unless arg.is_a? String
+
+          if arg =~ SHORTENED_IP_REGEX
+            new(parse_shortened_ip($1), $3)
+          elsif (parts = arg.split('/')).size == 2
+            ip = parse_shortened_ip(parts[0])
+            mask = IP.wrap(parts[1])
+            return new(ip, netmask_to_bits(mask))
           else
             format_error(arg)
           end
         end
       end
+
     private
+      # helper for formats like 11.22.33/24
+      # just adds some .0's to the end
+      def parse_shortened_ip(ip_str)
+        dots = ip_str.count('.')
+        IP.wrap(ip_str + '.0'*(3 - dots))
+      end
+
       def netmask_to_bits(netmask)
+        raise FormatError, "CIDR: #{netmask} is not a netmask" unless netmask.netmask?
         # TODO: there's probably a clever mathy way to do this,
         # but this works just fine.
         netmask.to_i.to_s(2) =~ /^(1*)0*$/

data/spec/cidr_spec.rb

@@ -21,6 +21,37 @@ describe CIDR do
     r.inspect.should include '11.22.33.44/8'
   end
 
+  it "parses slash notation with a netmask" do
+    r = CIDR('11.22.33.44/255.255.255.0')
+    r.ip.should be_a IP
+    r.ip.to_s.should == '11.22.33.44'
+    r.bits.should == 24
+    r.netmask.should == '255.255.255.0'
+  end
+
+  it "parses shortened slash notation" do
+    r = CIDR('11.22.33/24')
+    r.ip.should be_a IP
+    r.ip.to_s.should == '11.22.33.0'
+    r.bits.should == 24
+    r.netmask.should == '255.255.255.0'
+  end
+
+  it "parses shortened slash notation with a netmask" do
+    r = CIDR('11.22/255.255.0.0')
+    r.ip.should be_a IP
+    r.ip.to_s.should == '11.22.0.0'
+    r.bits.should == 16
+    r.netmask.should == '255.255.0.0'
+  end
+
+  it "supports wrapping" do
+    r = CIDR('11.22.33.44/24')
+    wrapped = CIDR(r)
+    wrapped.should be_a CIDR
+    r.object_id.should == wrapped.object_id
+  end
+
   it "knows its bits" do
     i = rand(33)
     CIDR("1.1.1.1/#{i}").bits.

metadata

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