ip-ranges 0.3.0 → 0.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 --- 
-SHA512: 
-  data.tar.gz: bfeb059f023c22d55817ad8cd86438de8c475921eca11f904f1a3bc5a3ce6126e93052698ee087bcd81ecb05ca7762471dbad11e9257947e6a044fff6323674a
-  metadata.gz: 6fb1bd68e97989cb3a11633cd504f58a5ae6b55e00149117d5b59fda3855c939528c3a0167b925fbdf449352d21a713a799f8d2a2a63930e8aaea3a151a90a84
 SHA1: 
-  data.tar.gz: feb4ac595ab5177d3ad824d375111c7d93bab982
-  metadata.gz: cf86626124601bd06170150e5b6ff1d26abca600
+  metadata.gz: 758de3bb2dd52b835b7fbfaebc9be527d5ea637b
+  data.tar.gz: 7cec73e1e6aed0dfc5205acfc760b6c9bdbb6434
+SHA512: 
+  metadata.gz: d868e062f491f696d7448e765e1b1722e3b844978594fcb0ff425650441a7b587bbafe08ab2b8a9af69bddd6eac8fb543500e7d9cfaedcb61897958ff0bcaa3d
+  data.tar.gz: 55a8d58e43c4658ae556fe2416867884e2c5577d9cb53a6018a229c56e2158e45ffd3e199192f211d3ecd2680480a0157e2d929431e0d48acec5aea1b8fdf788

data/Gemfile.lock

@@ -13,18 +13,19 @@ GEM
     rdoc (3.9.4)
     rdoc-data (3.12)
       rdoc (> 2.5, < 4.0)
-    rspec (3.1.0)
-      rspec-core (~> 3.1.0)
-      rspec-expectations (~> 3.1.0)
-      rspec-mocks (~> 3.1.0)
-    rspec-core (3.1.7)
-      rspec-support (~> 3.1.0)
-    rspec-expectations (3.1.2)
+    rspec (3.3.0)
+      rspec-core (~> 3.3.0)
+      rspec-expectations (~> 3.3.0)
+      rspec-mocks (~> 3.3.0)
+    rspec-core (3.3.1)
+      rspec-support (~> 3.3.0)
+    rspec-expectations (3.3.0)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.1.0)
-    rspec-mocks (3.1.3)
-      rspec-support (~> 3.1.0)
-    rspec-support (3.1.2)
+      rspec-support (~> 3.3.0)
+    rspec-mocks (3.3.1)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.3.0)
+    rspec-support (3.3.0)
     ruby-debug (0.10.4)
       columnize (>= 0.1)
       ruby-debug-base (~> 0.10.4.0)

data/Rakefile

@@ -36,7 +36,7 @@ spec = Gem::Specification.new do |s|
 
   # Change these as appropriate
   s.name              = "ip-ranges"
-  s.version           = "0.3.0"
+  s.version           = "0.3.1"
   s.summary           = "Compare and manipulate ranges of IP numbers"
   s.author            = "David Salgado"
   s.email             = "david@digitalronin.com"

data/lib/ip-ranges/ip.rb

@@ -4,7 +4,7 @@ module IpRanges
   # with other IP numbers, as well as a method to increment the IP number.
   class Ip
     # String representation of this Ip number
-    # 
+    #
     # Example:
     #
     #   ip = Ip.new :number => '1.2.3.4'
@@ -15,7 +15,7 @@ module IpRanges
     # Arguments:
     #
     # *  A hash containing a single key whose value is the IP number as a string
-    # 
+    #
     # Example:
     #
     #   Ip.new(:number => '1.2.3.4')
@@ -95,10 +95,45 @@ module IpRanges
       end
     end
 
+    # Changes the 'number' property of this Ip
+    # to the number before this one.
+    #
+    #   example:
+    #
+    #     ip = Ip.new(:number => '1.2.3.4')
+    #     ip.number => '1.2.3.4'
+    #     ip.decrement
+    #     ip.number => '1.2.3.3'
+    #
+    def decrement
+      a, b, c, d = tuples number
+      if d > 0
+        d -= 1
+      else
+        d = 255
+        if c > 0
+          c -= 1
+        else
+          c = 255
+          if b > 0
+            b -= 1
+          else
+            b = 255
+            if a > 0
+              a -= 1
+            else
+              raise "No more IPs"
+            end
+          end
+        end
+      end
+      @number = [a, b, c, d].join('.')
+    end
+
     # Changes the 'number' property of this Ip
     # to the next number after this one.
     #
-    #   example: 
+    #   example:
     #
     #     ip = Ip.new(:number => '1.2.3.4')
     #     ip.number => '1.2.3.4'

data/spec/ip-ranges/ip_spec.rb

@@ -1,94 +1,128 @@
 require 'spec/spec_helper'
 
 describe IpRanges::Ip do
-  before do
-    @ip = IpRanges::Ip.new
-  end
+  let(:number) { "1.200.3.4" }
+  subject(:ip) { described_class.new(:number => number) }
 
-  it "duplicates with a different object" do
-    @ip.number = "1.200.3.4"
-    ip2 = @ip.dup
-    expect(ip2.object_id).to_not eq(@ip.object_id)
-  end
+  context "duplicating" do
+    let(:dup) { ip.dup }
 
-  it "duplicates" do
-    @ip.number = "1.200.3.4"
-    ip2 = @ip.dup
-    expect(ip2).to eq(@ip)
-  end
-
-  it "is greater than or equal to" do
-    @ip.number = "1.200.3.4"
-    eq = IpRanges::Ip.new :number => "1.200.3.4"
-    lt = IpRanges::Ip.new :number => "1.200.3.3"
-    [eq, lt].each {|test| expect(@ip >= test).to be_truthy}
-  end
+    it "duplicates as a different object" do
+      expect(dup.object_id).to_not eq(ip.object_id)
+    end
 
-  it "is equivalent" do
-    @ip.number = "1.200.3.4"
-    ip2 = IpRanges::Ip.new :number => "1.200.3.4"
-    expect(@ip).to eq(ip2)
+    it "considers duplicate to be equivalent" do
+      expect(dup).to eq(ip)
+    end
   end
 
   it "renders to string" do
-    @ip.number = "1.200.3.4"
-    expect(@ip.to_s).to eq("1.200.3.4")
+    expect(ip.to_s).to eq(number)
   end
 
-  it "knows 1.2.3.255 < 1.2.4.0" do
-    @ip.number = '1.2.3.255'
-    ip2 = IpRanges::Ip.new :number => "1.2.4.0"
-    expect((@ip > ip2)).to be_falsey
-  end
+  context "comparing" do
+    let(:eql) { IpRanges::Ip.new :number => number      }
+    let(:lt)  { IpRanges::Ip.new :number => "1.200.3.3" }
 
-  it "knows 1.2.4.0 >= 1.2.3.255" do
-    @ip.number = "1.2.4.0"
-    ip2 = IpRanges::Ip.new :number => '1.2.3.255'
-    expect((@ip >= ip2)).to be_truthy
-  end
+    it "is greater than or equal to" do
+      [eql, lt].each {|test| expect(ip >= test).to be_truthy}
+    end
 
-  it "knows 1.200.3.4 > 1.199.3.4" do
-    @ip.number = "1.200.3.4"
-    ip2 = IpRanges::Ip.new :number => '1.199.3.4'
-    expect((@ip > ip2)).to be_truthy
-  end
+    it "is equivalent" do
+      expect(ip).to eq(eql)
+    end
 
-  it "knows 1.2.3.4 > 1.2.2.4" do
-    @ip.number = "1.2.3.4"
-    ip2 = IpRanges::Ip.new :number => '1.2.2.4'
-    expect((@ip > ip2)).to be_truthy
-  end
+    context "when last tuple rolls over" do
+      let(:number) { "1.2.3.255" }
+      let(:bigger) { described_class.new(:number => '1.2.4.0') }
 
-  it "knows 1.2.3.4 > 1.2.3.3" do
-    @ip.number = "1.2.3.4"
-    ip2 = IpRanges::Ip.new :number => '1.2.3.3'
-    expect((@ip > ip2)).to be_truthy
-  end
+      specify { expect((ip > bigger)).to be_falsey }
+      specify { expect((bigger >= ip)).to be_truthy }
+    end
 
-  it "knows 1.2.3.3 <= 1.2.3.4" do
-    @ip.number = "1.2.3.3"
-    ip2 = IpRanges::Ip.new :number => '1.2.3.4'
-    expect((@ip > ip2)).to be_falsey
-  end
+    context "when 2nd tuple is bigger" do
+      let(:number) { '1.199.3.4'                                 }
+      let(:bigger) { described_class.new(:number => '1.200.3.4') }
 
-  it "increments when 2nd tuple hits 255" do
-    @ip.number = "1.255.255.255"
-    expect(@ip.increment).to eq("2.0.0.0")
-  end
+      specify { expect((ip > bigger)).to be_falsey }
+      specify { expect((bigger >= ip)).to be_truthy }
+    end
 
-  it "increments when 3rd tuple hits 255" do
-    @ip.number = "1.2.255.255"
-    expect(@ip.increment).to eq("1.3.0.0")
-  end
+    context "when 3rd tuple is bigger" do
+      let(:number) { '1.2.2.4'                                 }
+      let(:bigger) { described_class.new(:number => '1.2.3.4') }
 
-  it "increments when last tuple hits 255" do
-    @ip.number = "1.2.3.255"
-    expect(@ip.increment).to eq("1.2.4.0")
+      specify { expect((ip > bigger)).to be_falsey }
+      specify { expect((bigger >= ip)).to be_truthy }
+    end
+
+    context "when last tuple is bigger" do
+      let(:number) { '1.2.3.3'                                 }
+      let(:bigger) { described_class.new(:number => '1.2.3.4') }
+
+      specify { expect((ip > bigger)).to be_falsey }
+      specify { expect((bigger >= ip)).to be_truthy }
+    end
   end
 
-  it "increments last tuple" do
-    @ip.number = '1.2.3.4'
-    expect(@ip.increment).to eq("1.2.3.5")
+  context "incrementing" do
+    context "when there are no more numbers" do
+      let(:number) { '255.255.255.255' }
+
+      it "barfs" do
+        expect { ip.increment }.to raise_error(RuntimeError)
+      end
+    end
+
+    context "when 2nd tuple hits 255" do
+      let(:number) { '1.255.255.255' }
+
+      specify { expect(ip.increment).to eq("2.0.0.0") }
+    end
+
+    context "when 3rd tuple hits 255" do
+      let(:number) { '1.2.255.255' }
+
+      specify { expect(ip.increment).to eq("1.3.0.0") }
+    end
+
+    context "when last tuple hits 255" do
+      let(:number) { '1.2.3.255' }
+
+      specify { expect(ip.increment).to eq("1.2.4.0") }
+    end
+
+    specify { expect(ip.increment).to eq("1.200.3.5") }
   end
 
+
+  context "decrementing" do
+    context "when there are no more numbers" do
+      let(:number) { '0.0.0.0' }
+
+      it "barfs" do
+        expect { ip.decrement }.to raise_error(RuntimeError)
+      end
+    end
+
+    context "when 2nd tuple hits 0" do
+      let(:number) { '2.0.0.0' }
+
+      specify { expect(ip.decrement).to eq("1.255.255.255") }
+    end
+
+    context "when 3rd tuple hits 0" do
+      let(:number) { '1.2.0.0' }
+
+      specify { expect(ip.decrement).to eq("1.1.255.255") }
+    end
+
+    context "when last tuple hits 0" do
+      let(:number) { '1.2.3.0' }
+
+      specify { expect(ip.decrement).to eq("1.2.2.255") }
+    end
+
+    specify { expect(ip.decrement).to eq("1.200.3.3") }
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: ip-ranges
 version: !ruby/object:Gem::Version 
-  version: 0.3.0
+  version: 0.3.1
 platform: ruby
 authors: 
 - David Salgado
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2014-12-19 00:00:00 Z
+date: 2015-06-26 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   requirement: &id001 !ruby/object:Gem::Requirement 
@@ -88,7 +88,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 2.0.14
+rubygems_version: 2.0.15
 signing_key: 
 specification_version: 4
 summary: Compare and manipulate ranges of IP numbers