pio 0.2.1 → 0.2.2

data/spec/pio/arp/reply_spec.rb

@@ -1,4 +1,3 @@
-require File.join( File.dirname( __FILE__ ), "..", "..", "spec_helper" )
 require "pio/arp/reply"
 
 
@@ -121,8 +120,8 @@ module Pio
           let( :sender_protocol_address ) { nil }
           let( :target_protocol_address ) { "192.168.83.254" }
 
-          it "raises an invalid IP address error" do
-            expect { subject }.to raise_error( "Invalid IP address: nil" )
+          it "raises an invalid IPv4 address error" do
+            expect { subject }.to raise_error( "Invalid IPv4 address: nil" )
           end
         end
 
@@ -133,8 +132,8 @@ module Pio
           let( :sender_protocol_address ) { "192.168.83.3" }
           let( :target_protocol_address ) { nil }
 
-          it "raises an invalid IP address error" do
-            expect { subject }.to raise_error( "Invalid IP address: nil" )
+          it "raises an invalid IPv4 address error" do
+            expect { subject }.to raise_error( "Invalid IPv4 address: nil" )
           end
         end
       end

data/spec/pio/arp/request_spec.rb

@@ -1,4 +1,3 @@
-require File.join( File.dirname( __FILE__ ), "..", "..", "spec_helper" )
 require "pio/arp/request"
 
 
@@ -103,8 +102,8 @@ module Pio
           let( :sender_protocol_address ) { nil }
           let( :target_protocol_address ) { "192.168.83.254" }
 
-          it "raises an invalid IP address error" do
-            expect { subject }.to raise_error( "Invalid IP address: nil" )
+          it "raises an invalid IPv4 address error" do
+            expect { subject }.to raise_error( "Invalid IPv4 address: nil" )
           end
         end
 
@@ -113,9 +112,9 @@ module Pio
           let( :source_mac ) { 0x002682ebead1 }
           let( :sender_protocol_address ) { "192.168.83.254" }
           let( :target_protocol_address ) { nil }
-          
-          it "raises an invalid IP address error" do
-            expect { subject }.to raise_error( "Invalid IP address: nil" )
+
+          it "raises an invalid IPv4 address error" do
+            expect { subject }.to raise_error( "Invalid IPv4 address: nil" )
           end
         end
       end

data/spec/pio/arp_spec.rb

@@ -1,4 +1,3 @@
-require File.join( File.dirname( __FILE__ ), "..", "spec_helper" )
 require "pio"
 
 

data/spec/pio/ipv4_address_spec.rb

@@ -0,0 +1,99 @@
+require "pio/ipv4_address"
+
+
+module Pio
+  describe IPv4Address do
+    context ".new" do
+      subject( :ipv4 ) { IPv4Address.new( ip_address ) }
+
+
+      context "with 10.1.1.1" do
+        let( :ip_address ) { "10.1.1.1" }
+
+        its( :to_s ) { should eq "10.1.1.1" }
+        its( :to_i ) { should eq ( ( 10 * 256 + 1 ) * 256 + 1 ) * 256 + 1 }
+        its( :to_ary ) { should eq [ 0x0a, 0x01, 0x01, 0x01 ] }
+        its( :class_a? ) { should be_true }
+        its( :class_b? ) { should be_false }
+        its( :class_c? ) { should be_false }
+        its( :class_d? ) { should be_false }
+        its( :class_e? ) { should be_false }
+        its( :unicast? ) { should be_true }
+        its( :multicast? ) { should be_false }
+
+
+        context ".mask!" do
+          subject { ipv4.mask!( mask ) }
+
+          let( :mask ) { 8 }
+
+          its( :to_s ) { should eq "10.0.0.0" }
+          its( :to_i ) { should eq 10 * 256 * 256 * 256 }
+          its( :to_ary ) { should eq [ 0x0a, 0x00, 0x00, 0x00 ] }
+          its( :class_a? ) { should be_true }
+          its( :class_b? ) { should be_false }
+          its( :class_c? ) { should be_false }
+          its( :class_d? ) { should be_false }
+          its( :class_e? ) { should be_false }
+          its( :unicast? ) { should be_true }
+          its( :multicast? ) { should be_false }
+        end
+      end
+
+
+      context "with 172.20.1.1" do
+        let( :ip_address ) { "172.20.1.1" }
+
+        its( :to_s ) { should eq "172.20.1.1" }
+        its( :to_i ) { should eq ( ( 172 * 256 + 20 ) * 256 + 1 ) * 256 + 1 }
+        its( :to_ary ) { should eq [ 0xac, 0x14, 0x01, 0x01 ] }
+        its( :class_a? ) { should be_false }
+        its( :class_b? ) { should be_true }
+        its( :class_c? ) { should be_false }
+        its( :class_d? ) { should be_false }
+        its( :class_e? ) { should be_false }
+        its( :unicast? ) { should be_true }
+        its( :multicast? ) { should be_false }
+      end
+
+
+      context "with 192.168.1.1" do
+        let( :ip_address ) { "192.168.1.1" }
+
+        its( :to_s ) { should eq "192.168.1.1" }
+        its( :to_i ) { should eq 3232235777 }
+        its( :to_ary ) { should eq [ 0xc0, 0xa8, 0x01, 0x01 ] }
+        its( :class_a? ) { should be_false }
+        its( :class_b? ) { should be_false }
+        its( :class_c? ) { should be_true }
+        its( :class_d? ) { should be_false }
+        its( :class_e? ) { should be_false }
+        its( :unicast? ) { should be_true }
+        its( :multicast? ) { should be_false }
+      end
+
+
+      context "with 234.1.1.1" do
+        let( :ip_address ) { "234.1.1.1" }
+
+        its( :to_s ) { should eq "234.1.1.1" }
+        its( :to_i ) { should eq ( ( 234 * 256 + 1 ) * 256 + 1 ) * 256 + 1 }
+        its( :to_ary ) { should eq [ 0xea, 0x01, 0x01, 0x01 ] }
+        its( :class_a? ) { should be_false }
+        its( :class_b? ) { should be_false }
+        its( :class_c? ) { should be_false }
+        its( :class_d? ) { should be_true }
+        its( :class_e? ) { should be_false }
+        its( :unicast? ) { should be_false }
+        its( :multicast? ) { should be_true }
+      end
+    end
+  end
+end
+
+
+### Local variables:
+### mode: Ruby
+### coding: utf-8-unix
+### indent-tabs-mode: nil
+### End:

data/spec/pio/lldp_spec.rb

@@ -1,4 +1,3 @@
-require File.join( File.dirname( __FILE__ ), "..", "spec_helper" )
 require "pio"
 
 

data/spec/pio/mac_spec.rb

@@ -1,4 +1,3 @@
-require File.join( File.dirname( __FILE__ ), "..", "spec_helper" )
 require "pio/mac"
 
 
@@ -13,7 +12,7 @@ module Pio
         it { should eq Mac.new( "11:22:33:44:55:66" ) }
         its( :value ) { should eq 0x112233445566 }
         its( :to_s ) { should eq "11:22:33:44:55:66" }
-        its( :to_a ) { should eq [ 0x11, 0x22, 0x33, 0x44, 0x55, 0x66 ] }
+        its( :to_ary ) { should eq [ 0x11, 0x22, 0x33, 0x44, 0x55, 0x66 ] }
         its( :multicast? ){ should be_true }
         its( :broadcast? ){ should be_false }
       end
@@ -24,7 +23,7 @@ module Pio
         it { should eq Mac.new( 0 ) }
         its( :value ) { should eq 0 }
         its( :to_s ) { should eq "00:00:00:00:00:00" }
-        its( :to_a ) { should eq [ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 ] }
+        its( :to_ary ) { should eq [ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 ] }
         its( :multicast? ){ should be_false }
         its( :broadcast? ){ should be_false }
       end
@@ -35,7 +34,7 @@ module Pio
         it { should eq Mac.new( 0xffffffffffff ) }
         its( :value ) { should eq 0xffffffffffff }
         its( :to_s ) { should eq "ff:ff:ff:ff:ff:ff" }
-        its( :to_a ) { should eq [ 0xff, 0xff, 0xff, 0xff, 0xff, 0xff ] }
+        its( :to_ary ) { should eq [ 0xff, 0xff, 0xff, 0xff, 0xff, 0xff ] }
         its( :multicast? ){ should be_true }
         its( :broadcast? ){ should be_true }
       end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pio
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.2.2
 platform: ruby
 authors:
 - Yasuhito Takamiya
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-09-19 00:00:00.000000000 Z
+date: 2013-09-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bindata
@@ -46,24 +46,24 @@ files:
 - lib/pio/arp/message.rb
 - lib/pio/arp/reply.rb
 - lib/pio/arp/request.rb
-- lib/pio/ip.rb
+- lib/pio/ipv4_address.rb
 - lib/pio/lldp.rb
-- lib/pio/lldp/chassis-id-tlv.rb
-- lib/pio/lldp/end-of-lldpdu-value.rb
+- lib/pio/lldp/chassis_id_tlv.rb
+- lib/pio/lldp/end_of_lldpdu_value.rb
 - lib/pio/lldp/frame.rb
-- lib/pio/lldp/management-address-value.rb
-- lib/pio/lldp/optional-tlv.rb
-- lib/pio/lldp/organizationally-specific-value.rb
-- lib/pio/lldp/port-description-value.rb
-- lib/pio/lldp/port-id-tlv.rb
-- lib/pio/lldp/system-capabilities-value.rb
-- lib/pio/lldp/system-description-value.rb
-- lib/pio/lldp/system-name-value.rb
-- lib/pio/lldp/ttl-tlv.rb
+- lib/pio/lldp/management_address_value.rb
+- lib/pio/lldp/optional_tlv.rb
+- lib/pio/lldp/organizationally_specific_value.rb
+- lib/pio/lldp/port_description_value.rb
+- lib/pio/lldp/port_id_tlv.rb
+- lib/pio/lldp/system_capabilities_value.rb
+- lib/pio/lldp/system_description_value.rb
+- lib/pio/lldp/system_name_value.rb
+- lib/pio/lldp/ttl_tlv.rb
 - lib/pio/mac.rb
-- lib/pio/type/ethernet-header.rb
-- lib/pio/type/ip-address.rb
-- lib/pio/type/mac-address.rb
+- lib/pio/type/ethernet_header.rb
+- lib/pio/type/ip_address.rb
+- lib/pio/type/mac_address.rb
 - lib/pio/version.rb
 - pio.gemspec
 - pio.org
@@ -71,7 +71,7 @@ files:
 - spec/pio/arp/reply_spec.rb
 - spec/pio/arp/request_spec.rb
 - spec/pio/arp_spec.rb
-- spec/pio/ip_spec.rb
+- spec/pio/ipv4_address_spec.rb
 - spec/pio/lldp_spec.rb
 - spec/pio/mac_spec.rb
 - spec/spec_helper.rb
@@ -103,7 +103,7 @@ test_files:
 - spec/pio/arp/reply_spec.rb
 - spec/pio/arp/request_spec.rb
 - spec/pio/arp_spec.rb
-- spec/pio/ip_spec.rb
+- spec/pio/ipv4_address_spec.rb
 - spec/pio/lldp_spec.rb
 - spec/pio/mac_spec.rb
 - spec/spec_helper.rb

data/lib/pio/ip.rb

@@ -1,90 +0,0 @@
-module Pio
-  #
-  # A wrapper class to IPAddr
-  #
-  class IP
-    require "ipaddr"
-
-
-    #
-    # @return [IPAddr] value object instance of proxied IPAddr.
-    #
-    attr_reader :value
-
-
-    attr_reader :prefixlen
-
-
-    #
-    # Creates a {IP} instance object as a proxy to IPAddr class.
-    #
-    # @overload initialize(addr)
-    #
-    # @param [String, Number] addr
-    #   an IPv4 address specified either as a String or Number.
-    #
-    # @param [Number] prefixlen
-    #   masking IPv4 address with given prefixlen.
-    #
-    # @raise [ArgumentError] invalid address if supplied argument is invalid
-    #   IPv4 address.
-    #
-    # @return [IP] self
-    #   a proxy to IPAddr.
-    #
-    def initialize addr, prefixlen = 32
-      @prefixlen = prefixlen
-      case addr
-      when Integer
-        @value = IPAddr.new( addr, Socket::AF_INET )
-      when String
-        @value = IPAddr.new( addr )
-      else
-        raise TypeError, "Invalid IP address: #{ addr.inspect }"
-      end
-      if prefixlen < 32
-        @value = @value.mask( prefixlen )
-      end
-    end
-
-
-    #
-    # @return [String] the IPv4 address in its text representation.
-    #
-    def to_s
-      @value.to_s
-    end
-
-
-    #
-    # @return [Number] the IPv4 address in its numeric representation.
-    #
-    def to_i
-      @value.to_i
-    end
-
-
-    def == other
-      to_s == other.to_s
-    end
-
-
-    #
-    # @return [Array]
-    #    an array of decimal numbers converted from IP address.
-    #
-    def to_a
-      to_s.split( "." ).collect do | each |
-        each.to_i
-      end
-    end
-    alias :to_array :to_a
-  end
-end
-
-
-### Local variables:
-### mode: Ruby
-### coding: utf-8-unix
-### indent-tabs-mode: nil
-### End:

data/spec/pio/ip_spec.rb

@@ -1,38 +0,0 @@
-require File.join( File.dirname( __FILE__ ), "..", "spec_helper" )
-require "pio/ip"
-
-
-module Pio
-  describe IP do
-    context ".new" do
-      subject { IP.new( ip_address, prefixlen ) }
-
-
-      context %{with "192.168.1.1", 32} do
-        let( :ip_address ) { "192.168.1.1" }
-        let( :prefixlen ) { 32 }
-
-        its( :to_s ) { should eq "192.168.1.1" }
-        its( :to_i ) { should eq 3232235777 }
-        its( :to_a ) { should eq [ 0xc0, 0xa8, 0x01, 0x01 ] }
-      end
-
-
-      context %{with "10.1.1.1", 8} do
-        let( :ip_address ) { "10.1.1.1" }
-        let( :prefixlen ) { 8 }
-
-        its( :to_s ) { should eq "10.0.0.0" }
-        its( :to_i ) { should eq 10 * 256 * 256 * 256 }
-        its( :to_a ) { should eq [ 0x0a, 0x00, 0x00, 0x00 ] }
-      end
-    end
-  end
-end
-
-
-### Local variables:
-### mode: Ruby
-### coding: utf-8-unix
-### indent-tabs-mode: nil
-### End: