iplogic 0.1.0 → 0.1.1

data/iplogic.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name = 'iplogic'
-  s.version = '0.1.0'
+  s.version = '0.1.1'
 
   s.authors = ["Jay Adkisson"]
   s.date = '2010-11-13'
@@ -9,10 +9,11 @@ Gem::Specification.new do |s|
   desc
 
   s.email = %q{jay@causes.com}
-  s.extra_rdoc_files = [
-    "LICENSE",
-     "README.md"
-  ]
+  s.extra_rdoc_files = %w(
+    LICENSE
+    README.md
+  )
+
   s.files = %w(
     Rakefile
     LICENSE
@@ -35,10 +36,11 @@ Gem::Specification.new do |s|
 
   s.test_files = %w(
     spec/ip_spec.rb
+    spec/cidr_spec.rb
     spec/spec_helper.rb
     spec/radix_spec.rb
   )
 
-  s.add_development_dependency('rspec')
+  s.add_development_dependency('rspec', '~> 1.0')
 end
 

data/lib/iplogic/cidr.rb

@@ -54,7 +54,7 @@ module IPLogic
     end
 
     def inspect
-      "#<CIDR [ #{ip}/#{bits} ]>"
+      "#<CIDR [ #{self} ]>"
     end
 
     def netmask
@@ -67,6 +67,10 @@ module IPLogic
       @size ||= (1 << inv_bits)
     end
 
+    def include?(ip)
+      IP.wrap(ip).min(bits) == min
+    end
+
     def min
       @min ||= IP.wrap(
         (ip.to_i >> inv_bits) << inv_bits
@@ -87,6 +91,11 @@ module IPLogic
     end
     alias rest rest_field
 
+    def to_s
+      "#{ip}/#{bits}"
+    end
+    alias to_str to_s
+
     def significant_octets
       4 - (bits / 8)
     end

data/lib/iplogic/ip.rb

@@ -91,6 +91,10 @@ module IPLogic
       "#<IP [ #{self} ]>"
     end
 
+    def hash
+      self.to_s.hash
+    end
+
     def eql?(other)
       self.int == IP(other).int
     end

data/spec/cidr_spec.rb

@@ -0,0 +1,126 @@
+require File.join(File.dirname(__FILE__), 'spec_helper')
+
+describe CIDR do
+  it "parses an IP-ish and netmask-ish" do
+    r = CIDR('4.33.222.111', '255.255.240.0')
+    r.should be_a CIDR
+    r.inspect.should include '4.33.222.111/20'
+
+    r = CIDR(IP('4.33.222.111'), 20)
+    r.should be_a CIDR
+    r.inspect.should include '4.33.222.111/20'
+
+    r = CIDR('4.33.222.111', IP('255.255.240.0'))
+    r.should be_a CIDR
+    r.inspect.should include '4.33.222.111/20'
+  end
+
+  it "parses slash notation" do
+    r = CIDR('11.22.33.44/8')
+    r.should be_a CIDR
+    r.inspect.should include '11.22.33.44/8'
+  end
+
+  it "knows its bits" do
+    i = rand(33)
+    CIDR("1.1.1.1/#{i}").bits.
+      should == i
+  end
+
+  it "knows its ip" do
+    CIDR('11.22.33.44/20').ip.
+      should == IP('11.22.33.44')
+  end
+
+  it "knows its netmask" do
+    CIDR('11.22.33.44/20').netmask.
+      should == IP('255.255.240.0')
+
+    CIDR('11.22.33.44/8').netmask.
+      should == IP('255.0.0.0')
+
+    CIDR('11.22.33.44/32').netmask.
+      should == IP('255.255.255.255')
+
+    CIDR('1.1.1.1/0').netmask.
+      should == IP('0.0.0.0')
+  end
+
+  it "knows its min" do
+    CIDR('11.22.33.44/20').min.
+      should == IP('11.22.32.0')
+
+    CIDR('11.22.33.44/8').min.
+      should == IP('11.0.0.0')
+
+    CIDR('11.22.33.44/32').min.
+      should == IP('11.22.33.44')
+
+    CIDR('11.22.33.44/0').min.
+      should == IP('0.0.0.0')
+  end
+
+  it "knows its max" do
+    CIDR('11.22.33.44/20').max.
+      should == IP('11.22.47.255')
+
+    CIDR('11.22.33.44/8').max.
+      should == IP('11.255.255.255')
+
+    CIDR('11.22.33.44/32').max.
+      should == IP('11.22.33.44')
+
+    CIDR('11.22.33.44/0').max.
+      should == IP('255.255.255.255')
+  end
+
+  it "knows its rest field" do
+    CIDR('11.22.33.44/20').rest_field.
+      should == IP('0.0.1.44')
+
+    CIDR('11.22.33.44/8').rest_field.
+      should == IP('0.22.33.44')
+
+    CIDR('11.22.33.44/32').rest_field.
+      should == IP('0.0.0.0')
+
+    CIDR('11.22.33.44/0').rest_field.
+      should == IP('11.22.33.44')
+  end
+
+  it "knows its size" do
+    CIDR('11.22.33.44/20').size.
+      should == 0x1000
+
+    CIDR('11.22.33.44/8').size.
+      should == 0x1000000
+
+    CIDR('11.22.33.44/32').size.
+      should == 1
+
+    CIDR('11.22.33.44/0').size.
+      should == 0x100000000
+  end
+
+  it "is enumerable" do
+    r = CIDR('11.22.33.44/24')
+    r.should respond_to :each
+    CIDR.included_modules.should include Enumerable
+
+    a = r.to_a
+
+    a.size.should == r.size
+    a.first.should == r.first
+    a.last.should == r.last
+  end
+
+  it "tests inclusion" do
+    r = CIDR('11.22.33.44/24')
+    r.should respond_to :include?
+    r.should include '11.22.33.0'
+    r.should include IP('11.22.33.255')
+    r.should_not include IP('11.22.32.44').to_i
+    r.should_not include '11.22.34.44'
+  end
+
+end

data/spec/ip_spec.rb

@@ -103,120 +103,4 @@ describe IP do
     IP('1.2.3.4').should_not be_netmask
     IP('0.255.0.0').should_not be_netmask
   end
-
-  describe CIDR do
-    it "parses an IP-ish and netmask-ish" do
-      r = CIDR('4.33.222.111', '255.255.240.0')
-      r.should be_a CIDR
-      r.inspect.should include '4.33.222.111/20'
-
-      r = CIDR(IP('4.33.222.111'), 20)
-      r.should be_a CIDR
-      r.inspect.should include '4.33.222.111/20'
-
-      r = CIDR('4.33.222.111', IP('255.255.240.0'))
-      r.should be_a CIDR
-      r.inspect.should include '4.33.222.111/20'
-    end
-
-    it "parses slash notation" do
-      r = CIDR('11.22.33.44/8')
-      r.should be_a CIDR
-      r.inspect.should include '11.22.33.44/8'
-    end
-
-    it "knows its bits" do
-      i = rand(33)
-      CIDR("1.1.1.1/#{i}").bits.
-        should == i
-    end
-
-    it "knows its ip" do
-      CIDR('11.22.33.44/20').ip.
-        should == IP('11.22.33.44')
-    end
-
-    it "knows its netmask" do
-      CIDR('11.22.33.44/20').netmask.
-        should == IP('255.255.240.0')
-
-      CIDR('11.22.33.44/8').netmask.
-        should == IP('255.0.0.0')
-
-      CIDR('11.22.33.44/32').netmask.
-        should == IP('255.255.255.255')
-
-      CIDR('1.1.1.1/0').netmask.
-        should == IP('0.0.0.0')
-    end
-
-    it "knows its min" do
-      CIDR('11.22.33.44/20').min.
-        should == IP('11.22.32.0')
-
-      CIDR('11.22.33.44/8').min.
-        should == IP('11.0.0.0')
-
-      CIDR('11.22.33.44/32').min.
-        should == IP('11.22.33.44')
-
-      CIDR('11.22.33.44/0').min.
-        should == IP('0.0.0.0')
-    end
-
-    it "knows its max" do
-      CIDR('11.22.33.44/20').max.
-        should == IP('11.22.47.255')
-
-      CIDR('11.22.33.44/8').max.
-        should == IP('11.255.255.255')
-
-      CIDR('11.22.33.44/32').max.
-        should == IP('11.22.33.44')
-
-      CIDR('11.22.33.44/0').max.
-        should == IP('255.255.255.255')
-    end
-
-    it "knows its rest field" do
-      CIDR('11.22.33.44/20').rest_field.
-        should == IP('0.0.1.44')
-
-      CIDR('11.22.33.44/8').rest_field.
-        should == IP('0.22.33.44')
-
-      CIDR('11.22.33.44/32').rest_field.
-        should == IP('0.0.0.0')
-
-      CIDR('11.22.33.44/0').rest_field.
-        should == IP('11.22.33.44')
-    end
-
-    it "knows its size" do
-      CIDR('11.22.33.44/20').size.
-        should == 0x1000
-
-      CIDR('11.22.33.44/8').size.
-        should == 0x1000000
-
-      CIDR('11.22.33.44/32').size.
-        should == 1
-
-      CIDR('11.22.33.44/0').size.
-        should == 0x100000000
-    end
-
-    it "is enumerable" do
-      r = CIDR('11.22.33.44/24')
-      r.should respond_to :each
-      CIDR.included_modules.should include Enumerable
-
-      a = r.to_a
-
-      a.size.should == r.size
-      a.first.should == r.first
-      a.last.should == r.last
-    end
-
-  end
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: iplogic
 version: !ruby/object:Gem::Version 
-  hash: 27
+  hash: 25
   prerelease: false
   segments: 
   - 0
   - 1
-  - 0
-  version: 0.1.0
+  - 1
+  version: 0.1.1
 platform: ruby
 authors: 
 - Jay Adkisson
@@ -24,12 +24,13 @@ dependencies:
   requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ">="
+    - - ~>
       - !ruby/object:Gem::Version 
-        hash: 3
+        hash: 15
         segments: 
+        - 1
         - 0
-        version: "0"
+        version: "1.0"
   type: :development
   version_requirements: *id001
 description: An IPv4 swiss-army chainsaw
@@ -52,6 +53,7 @@ files:
 - lib/iplogic/cidr.rb
 - lib/iplogic/ip.rb
 - spec/ip_spec.rb
+- spec/cidr_spec.rb
 - spec/spec_helper.rb
 - spec/radix_spec.rb
 has_rdoc: true
@@ -90,5 +92,6 @@ specification_version: 3
 summary: Because it's just a 32-bit integer.
 test_files: 
 - spec/ip_spec.rb
+- spec/cidr_spec.rb
 - spec/spec_helper.rb
 - spec/radix_spec.rb