Refactoring

trema · Jul 13, 2016 · 9905ad0 · 9905ad0
1 parent 3575305
commit 9905ad0
Show file tree

Hide file tree

Showing 6 changed files with 10 additions and 14 deletions.
diff --git a/features/icmp_reply.feature b/features/icmp_reply.feature
@@ -61,5 +61,5 @@ Feature: Icmp::Reply
       """
     Then the result of eval should be:
       """
-      Icmp::Reply(destination_mac: mac_address, source_mac: mac_address, ether_type: uint16, vlan_pcp: bit3, vlan_cfi: bit1, vlan_vid: bit12, ip_version: bit4, ip_header_length: bit4, ip_type_of_service: uint8, ip_total_length: uint16, ip_identifier: uint16, ip_flag: bit3, ip_fragment: bit13, ip_ttl: uint8, ip_protocol: uint8, ip_header_checksum: uint16, source_ip_address: ip_address, destination_ip_address: ip_address, ip_option: string, icmp_type: uint8, icmp_code: uint8, icmp_checksum: uint16, icmp_identifier: uint16, icmp_sequence_number: uint16, echo_data: string)
+      Pio::Icmp::Reply(destination_mac: mac_address, source_mac: mac_address, ether_type: ether_type, vlan_pcp: bit3, vlan_cfi: bit1, vlan_vid: bit12, ether_type_vlan: uint16, ip_version: bit4, ip_header_length: bit4, ip_type_of_service: uint8, ip_total_length: uint16, ip_identifier: uint16, ip_flag: bit3, ip_fragment: bit13, ip_ttl: uint8, ip_protocol: uint8, ip_header_checksum: uint16, source_ip_address: ip_address, destination_ip_address: ip_address, ip_option: string, icmp_type: uint8, icmp_code: uint8, icmp_checksum: uint16, icmp_identifier: uint16, icmp_sequence_number: uint16, echo_data: string)
       """
diff --git a/features/icmp_request.feature b/features/icmp_request.feature
@@ -57,5 +57,5 @@ Feature: Icmp::Request
       """
     Then the result of eval should be:
       """
-      Icmp::Request(destination_mac: mac_address, source_mac: mac_address, ether_type: uint16, vlan_pcp: bit3, vlan_cfi: bit1, vlan_vid: bit12, ip_version: bit4, ip_header_length: bit4, ip_type_of_service: uint8, ip_total_length: uint16, ip_identifier: uint16, ip_flag: bit3, ip_fragment: bit13, ip_ttl: uint8, ip_protocol: uint8, ip_header_checksum: uint16, source_ip_address: ip_address, destination_ip_address: ip_address, ip_option: string, icmp_type: uint8, icmp_code: uint8, icmp_checksum: uint16, icmp_identifier: uint16, icmp_sequence_number: uint16, echo_data: string)
+      Pio::Icmp::Request(destination_mac: mac_address, source_mac: mac_address, ether_type: ether_type, vlan_pcp: bit3, vlan_cfi: bit1, vlan_vid: bit12, ether_type_vlan: uint16, ip_version: bit4, ip_header_length: bit4, ip_type_of_service: uint8, ip_total_length: uint16, ip_identifier: uint16, ip_flag: bit3, ip_fragment: bit13, ip_ttl: uint8, ip_protocol: uint8, ip_header_checksum: uint16, source_ip_address: ip_address, destination_ip_address: ip_address, ip_option: string, icmp_type: uint8, icmp_code: uint8, icmp_checksum: uint16, icmp_identifier: uint16, icmp_sequence_number: uint16, echo_data: string)
       """
diff --git a/lib/pio/class_inspector.rb b/lib/pio/class_inspector.rb
@@ -6,6 +6,7 @@ module ClassInspector
     # rubocop:disable LineLength
     def inspect
       field_and_type = fields.each_with_object([]) do |each, result|
+        next if each.name == :padding
         result << [each.name,
                    each.prototype.instance_variable_get(:@obj_class).name.demodulize.sub(/be$/, '').underscore]
       end

diff --git a/lib/pio/icmp/message.rb b/lib/pio/icmp/message.rb
@@ -1,3 +1,4 @@
+require 'pio/class_inspector'
 require 'pio/icmp/format'
 require 'pio/message'
 require 'pio/ruby_dumper'
@@ -6,6 +7,12 @@ module Pio
   class Icmp
     # Base class of Icmp::Request and Icmp::Reply.
     class Message < Pio::Message
+      extend ClassInspector
+
+      def self.fields
+        Icmp::Format.fields
+      end
+
       def self.create(format)
         allocate.tap do |message|
           message.instance_variable_set :@format, format

diff --git a/lib/pio/icmp/reply.rb b/lib/pio/icmp/reply.rb
@@ -9,12 +9,6 @@ class Icmp
     class Reply < Message
       include InstanceInspector
 
-      # rubocop:disable LineLength
-      def self.inspect
-        'Icmp::Reply(destination_mac: mac_address, source_mac: mac_address, ether_type: uint16, vlan_pcp: bit3, vlan_cfi: bit1, vlan_vid: bit12, ip_version: bit4, ip_header_length: bit4, ip_type_of_service: uint8, ip_total_length: uint16, ip_identifier: uint16, ip_flag: bit3, ip_fragment: bit13, ip_ttl: uint8, ip_protocol: uint8, ip_header_checksum: uint16, source_ip_address: ip_address, destination_ip_address: ip_address, ip_option: string, icmp_type: uint8, icmp_code: uint8, icmp_checksum: uint16, icmp_identifier: uint16, icmp_sequence_number: uint16, echo_data: string)'
-      end
-      # rubocop:enable LineLength
-
       option :icmp_type, value: 0
       option :source_mac
       option :destination_mac

diff --git a/lib/pio/icmp/request.rb b/lib/pio/icmp/request.rb
@@ -9,12 +9,6 @@ class Icmp
     class Request < Message
       include InstanceInspector
 
-      # rubocop:disable LineLength
-      def self.inspect
-        'Icmp::Request(destination_mac: mac_address, source_mac: mac_address, ether_type: uint16, vlan_pcp: bit3, vlan_cfi: bit1, vlan_vid: bit12, ip_version: bit4, ip_header_length: bit4, ip_type_of_service: uint8, ip_total_length: uint16, ip_identifier: uint16, ip_flag: bit3, ip_fragment: bit13, ip_ttl: uint8, ip_protocol: uint8, ip_header_checksum: uint16, source_ip_address: ip_address, destination_ip_address: ip_address, ip_option: string, icmp_type: uint8, icmp_code: uint8, icmp_checksum: uint16, icmp_identifier: uint16, icmp_sequence_number: uint16, echo_data: string)'
-      end
-      # rubocop:enable LineLength
-
       option :icmp_type, value: 8
       option :source_mac
       option :destination_mac