ip-ranges 0.3.1 → 0.3.2

checksums.yaml

@@ -1,7 +1,7 @@
 --- 
 SHA1: 
-  metadata.gz: 758de3bb2dd52b835b7fbfaebc9be527d5ea637b
-  data.tar.gz: 7cec73e1e6aed0dfc5205acfc760b6c9bdbb6434
+  metadata.gz: 4114f152858982ac9340a1bbfccd71920bef9287
+  data.tar.gz: 0c836cc2bf31e3e252cd1f26b3c7d8bbd0aaa13d
 SHA512: 
-  metadata.gz: d868e062f491f696d7448e765e1b1722e3b844978594fcb0ff425650441a7b587bbafe08ab2b8a9af69bddd6eac8fb543500e7d9cfaedcb61897958ff0bcaa3d
-  data.tar.gz: 55a8d58e43c4658ae556fe2416867884e2c5577d9cb53a6018a229c56e2158e45ffd3e199192f211d3ecd2680480a0157e2d929431e0d48acec5aea1b8fdf788
+  metadata.gz: 9373cda93264ff8f9f8f9d2c8aa556399cced3e68bd6a4a7e1d399a526beb816e863833a6fc96cb27d5020bc7d7b74022275d786b396219b34090d41e542145b
+  data.tar.gz: 03596811b9ebc59e4b0eccd21726d224ecc481fe3ac9565e784e149cca4ce7c2121a7ba8c0b21cb6e379bac8a4782a0f5938a65638764a8471ccb7492b412d04

data/Rakefile

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

data/lib/ip-ranges/range.rb

@@ -73,12 +73,10 @@ module IpRanges
 
     # Arguments
     # * An +Ip+ object
-    # Extend the range if the pushed IP is the next, contiguous ip in the range. Otherwise return false and do nothing.
+    # Extend the range if the supplied IP is the next, contiguous ip in the range. Otherwise return false and do nothing.
     def push(ip)
       if empty?
-        @first = ip
-        @last  = ip
-        true
+        set_single_value(ip)
       elsif ip.to_s == @last.dup.increment
         @last = ip
         true
@@ -87,6 +85,20 @@ module IpRanges
       end
     end
 
+    # Arguments
+    # * An +Ip+ object
+    # Extend the range at the start if the supplied IP is the previous, contiguous ip in the range. Otherwise return false and do nothing.
+    def unshift(ip)
+      if empty?
+        set_single_value(ip)
+      elsif ip.to_s == @first.dup.decrement
+        @first = ip
+        true
+      else
+        false
+      end
+    end
+
     # Returns the last Ip object in this range.
     def last
       @last
@@ -137,6 +149,12 @@ module IpRanges
 
     private
 
+    def set_single_value(ip)
+      @first = ip
+      @last  = ip
+      true
+    end
+
     def empty?
       @first.nil? && @last.nil?
     end

data/spec/ip-ranges/range_spec.rb

@@ -50,83 +50,171 @@ describe IpRanges::Range do
 
   end
 
-  context "pushing" do
+  context "extending" do
     let(:ip1) { IpRanges::Ip.new(:number => '1.1.1.1') }
     let(:ip2) { IpRanges::Ip.new(:number => '1.1.1.2') }
     let(:ip3) { IpRanges::Ip.new(:number => '1.1.1.3') }
     let(:ip4) { IpRanges::Ip.new(:number => '1.1.1.4') }
 
-    context "empty range" do
-      let(:empty) { described_class.new(:range => '') }
+    context "unshifting" do
+      context "when range is empty" do
+        let(:empty) { described_class.new(:range => '') }
 
-      it "pushes" do
-        res = empty.push(ip1)
-        expect(res).to be_truthy
-      end
+        it "unshifts" do
+          res = empty.unshift(ip1)
+          expect(res).to be_truthy
+        end
 
-      it "sets first ip" do
-        empty.push(ip1)
-        expect(empty.first).to eq(ip1)
-      end
+        it "sets first ip" do
+          expect {
+            empty.unshift(ip1)
+          }.to change(empty, :first).from(nil).to(ip1)
+        end
 
-      it "sets last ip" do
-        empty.push(ip1)
-        expect(empty.last).to eq(ip1)
+        it "sets last ip" do
+          expect {
+            empty.unshift(ip1)
+          }.to change(empty, :last).from(nil).to(ip1)
+        end
       end
-    end
 
-    context "range with start" do
-      let(:r1) { described_class.new(:range => ip1.to_s) }
+      context "when range has a start" do
+        let(:r1) { described_class.new(:range => ip2.to_s) }
 
-      context "pushing next ip" do
-        it "pushes" do
-          res = r1.push(ip2)
-          expect(res).to be_truthy
+        context "unshifting previous ip" do
+          it "unshifts" do
+            res = r1.unshift(ip1)
+            expect(res).to be_truthy
+          end
+
+          it "doesn't affect last ip" do
+            expect {
+              r1.unshift(ip1)
+            }.to_not change(r1, :last).from(ip2)
+          end
         end
 
-        it "sets last ip" do
-          r1.push(ip2)
-          expect(r1.last).to eq(ip2)
+        context "unshifting non-contiguous ip" do
+          it "doesn't unshift" do
+            res = r1.unshift(ip4)
+            expect(res).to be_falsey
+          end
+
+          it "doesn't set first ip" do
+            expect {
+              r1.unshift(ip4)
+            }.to_not change(r1, :first).from(ip2)
+          end
         end
       end
 
-      context "pushing non-contiguous ip" do
-        it "doesn't push" do
-          res = r1.push(ip3)
-          expect(res).to be_falsey
+      context "when range has start and end" do
+        let(:range) { described_class.new(:range => [ip2.to_s, ip3.to_s].join('..')) }
+
+        context "unshifting previous ip" do
+          it "unshifts" do
+            expect(range.unshift(ip1)).to be_truthy
+          end
+
+          it "sets first ip" do
+            expect {
+              range.unshift(ip1)
+            }.to change(range, :first).from(ip2).to(ip1)
+          end
         end
 
-        it "doesn't set last ip" do
-          r1.push(ip3)
-          expect(r1.last).to eq(r1.first)
+        context "unshifting non-contiguous ip" do
+          it "doesn't unshift" do
+            expect(range.unshift(ip4)).to be_falsey
+          end
+
+          it "doesn't set first ip" do
+            expect {
+              range.unshift(ip4)
+            }.to_not change(range, :first).from(ip2)
+          end
         end
       end
     end
 
-    context "range with start and end" do
-      let(:range) { described_class.new(:range => [ip1.to_s, ip2.to_s].join('..')) }
 
-      context "pushing next ip" do
+    context "pushing" do
+      context "when range is empty" do
+        let(:empty) { described_class.new(:range => '') }
+
         it "pushes" do
-          res = range.push(ip3)
+          res = empty.push(ip1)
           expect(res).to be_truthy
         end
 
+        it "sets first ip" do
+          expect {
+            empty.push(ip1)
+          }.to change(empty, :first).from(nil).to(ip1)
+        end
+
         it "sets last ip" do
-          range.push(ip3)
-          expect(range.last).to eq(ip3)
+          expect {
+            empty.push(ip1)
+          }.to change(empty, :last).from(nil).to(ip1)
+        end
+      end
+
+      context "when range has a start" do
+        let(:r1) { described_class.new(:range => ip1.to_s) }
+
+        context "pushing next ip" do
+          it "pushes" do
+            res = r1.push(ip2)
+            expect(res).to be_truthy
+          end
+
+          it "sets last ip" do
+            expect {
+              r1.push(ip2)
+            }.to change(r1, :last).from(ip1).to(ip2)
+          end
+        end
+
+        context "pushing non-contiguous ip" do
+          it "doesn't push" do
+            res = r1.push(ip3)
+            expect(res).to be_falsey
+          end
+
+          it "doesn't set last ip" do
+            expect {
+              r1.push(ip3)
+            }.to_not change(r1, :last).from(ip1)
+          end
         end
       end
 
-      context "pushing non-contiguous ip" do
-        it "doesn't push" do
-          res = range.push(ip4)
-          expect(res).to be_falsey
+      context "when range has start and end" do
+        let(:range) { described_class.new(:range => [ip1.to_s, ip2.to_s].join('..')) }
+
+        context "pushing next ip" do
+          it "pushes" do
+            expect(range.push(ip3)).to be_truthy
+          end
+
+          it "sets last ip" do
+            expect {
+              range.push(ip3)
+            }.to change(range, :last).from(ip2).to(ip3)
+          end
         end
 
-        it "doesn't set last ip" do
-          range.push(ip4)
-          expect(range.last).to eq(ip2)
+        context "pushing non-contiguous ip" do
+          it "doesn't push" do
+            expect(range.push(ip4)).to be_falsey
+          end
+
+          it "doesn't set last ip" do
+            expect {
+              range.push(ip4)
+            }.to_not change(range, :last).from(ip2)
+          end
         end
       end
     end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: ip-ranges
 version: !ruby/object:Gem::Version 
-  version: 0.3.1
+  version: 0.3.2
 platform: ruby
 authors: 
 - David Salgado