cisco_acl_intp 0.0.3 → 0.0.4

data/lib/cisco_acl_intp/acespec_base.rb

@@ -0,0 +1,15 @@
+# -*- coding: utf-8 -*-
+
+require 'cisco_acl_intp/acc'
+
+module CiscoAclIntp
+  # AceSpec: Component element of a ACE.
+  class AceSpecBase < AccessControlContainer
+  end
+end
+
+### Local variables:
+### mode: Ruby
+### coding: utf-8-unix
+### indent-tabs-mode: nil
+### End:

data/lib/cisco_acl_intp/{ace_ip.rb → acespec_ip.rb}

@@ -1,11 +1,11 @@
 # -*- coding: utf-8 -*-
 require 'forwardable'
 require 'netaddr'
-require 'cisco_acl_intp/acl_base'
+require 'cisco_acl_intp/acespec_base'
 
 module CiscoAclIntp
   # IP Address and Wildcard mask container
-  class AceIpSpec < AclContainerBase
+  class AceIpSpec < AceSpecBase
     extend Forwardable
 
     # @param [NetAddr::CIDR] value IP address
@@ -41,7 +41,7 @@ module CiscoAclIntp
         @options = opts
         define_addrinfo
       else
-        fail AclArgumentError, 'Not specified IP address'
+        raise AclArgumentError, 'Not specified IP address'
       end
     end
 
@@ -58,13 +58,11 @@ module CiscoAclIntp
       if to_wmasked_ip_s == '0.0.0.0'
         # ip = '0.0.0.0' or wildcard = '255.255.255.255'
         tag_ip('any')
+      elsif @wildcard == '0.0.0.0'
+        # /32 mask
+        format '%s %s', tag_mask('host'), tag_ip(@ipaddr.ip)
       else
-        if @wildcard == '0.0.0.0'
-          # /32 mask
-          format '%s %s', tag_mask('host'), tag_ip(@ipaddr.ip)
-        else
-          format '%s %s', tag_ip(to_wmasked_ip_s), tag_mask(@wildcard)
-        end
+        format '%s %s', tag_ip(to_wmasked_ip_s), tag_mask(@wildcard)
       end
     end
 
@@ -93,7 +91,7 @@ module CiscoAclIntp
     OCTET_BIT_LENGTH = {
       '255' => 0, '127' => 1, '63' => 2, '31' => 3,
       '15' => 4, '7' => 5, '3' => 6, '1' => 7, '0' => 8
-    }
+    }.freeze
 
     # Covnet IPv4 bit-flapped wildcard to netmask length
     # @return [Fixnum] netmask length
@@ -102,11 +100,8 @@ module CiscoAclIntp
     #   e.g. '0.0.0.1.255' #=> 31
     def wildcard_bitlength
       @wildcard.split(/\./).reduce(0) do |len, octet|
-        if len && OCTET_BIT_LENGTH.key?(octet)
-          len + OCTET_BIT_LENGTH[octet]
-        else
-          nil
-        end
+        break unless len && OCTET_BIT_LENGTH.key?(octet)
+        len + OCTET_BIT_LENGTH[octet]
       end
     end
 
@@ -145,12 +140,9 @@ module CiscoAclIntp
     # Set instance variables. Secondary prioritize option is netmask,
     #   and third(last) one is default-mask
     def define_addrinfo_by_netmask_or_default
-      if @options.key?(:netmask)
-        define_addrinfo_with_netmask
-      else
-        @options[:netmask] = 32 # default ('host' mask)
-        define_addrinfo_with_netmask
-      end
+      # default ('host' mask)
+      @options[:netmask] = 32 unless @options.key?(:netmask)
+      define_addrinfo_with_netmask
     end
 
     # Set instance variables with ip/wildcard
@@ -166,7 +158,7 @@ module CiscoAclIntp
     def define_addrinfo_with_netmask
       @netmask = @options[:netmask]
       @ipaddr = NetAddr::CIDR.create(
-        format '%s/%s', @options[:ipaddr], @netmask
+        format('%s/%s', @options[:ipaddr], @netmask)
       )
       @wildcard = @ipaddr.wildcard_mask(true)
     end

data/lib/cisco_acl_intp/{ace_other_qualifiers.rb → acespec_other_qualifiers.rb}

@@ -1,11 +1,11 @@
 # -*- coding: utf-8 -*-
 
 require 'forwardable'
-require 'cisco_acl_intp/acl_base'
+require 'cisco_acl_intp/acespec_base'
 
 module CiscoAclIntp
   # List of other-qualifiers for extended ace
-  class AceOtherQualifierList < AclContainerBase
+  class AceOtherQualifierList < AceSpecBase
     extend Forwardable
 
     # @param [Array] value List of {AceOtherQualifierList} object
@@ -23,7 +23,7 @@ module CiscoAclIntp
     # Generate string for Cisco IOS access list
     # @return [String]
     def to_s
-      tag_other_qualifier(@list.map { |each| each.to_s }.join(' '))
+      tag_other_qualifier(@list.map(&:to_s).join(' '))
     end
 
     # @param [AceOtherQualifierList] other RHS Object
@@ -36,7 +36,7 @@ module CiscoAclIntp
   end
 
   # Access list entry qualifier base
-  class AceOtherQualifierBase < AclContainerBase
+  class AceOtherQualifierBase < AceSpecBase
   end
 
   # Log spec container
@@ -51,7 +51,7 @@ module CiscoAclIntp
 
     # alias as boolean method
     # @return [Boolean]
-    alias_method(:input?, :input)
+    alias input? input
 
     # Constructor
     # @param [String] cookie Log cookie
@@ -90,10 +90,10 @@ module CiscoAclIntp
     # Constructor
     # @param [String] name Recursive name
     def initialize(name)
-      if name && (!name.empty?)
+      if name && !name.empty?
         @recursive_name = name
       else
-        fail AclArgumentError, 'Not specified recursive name'
+        raise AclArgumentError, 'Not specified recursive name'
       end
     end
 

data/lib/cisco_acl_intp/{ace_port.rb → acespec_port.rb}

@@ -1,11 +1,11 @@
 # -*- coding: utf-8 -*-
 require 'forwardable'
-require 'cisco_acl_intp/ace_proto'
-require 'cisco_acl_intp/ace_port_opr'
+require 'cisco_acl_intp/acespec_proto'
+require 'cisco_acl_intp/acespec_port_opr'
 
 module CiscoAclIntp
   # IP(TCP/UDP) port number and operator container
-  class AcePortSpec < AclContainerBase
+  class AcePortSpec < AceSpecBase
     extend Forwardable
 
     # @return [AcePortOperatorBase] value Port-set operator
@@ -32,7 +32,7 @@ module CiscoAclIntp
         @options = opts
         define_operator_and_ports
       else
-        fail AclArgumentError, 'Not specified port operator'
+        raise AclArgumentError, 'Not specified port operator'
       end
     end
 
@@ -61,21 +61,18 @@ module CiscoAclIntp
       lt: AcePortOpLt,
       gt: AcePortOpGt,
       range: AcePortOpRange
-    }
+    }.freeze
 
     # Set instance variables
     # @raise [AclArgumentError]
     # @return [AcePortOperatorBase] Port set operator object.
     def define_operator_and_ports
       opr = @options.key?(:operator) ? @options[:operator].intern : :any
-      if OPERATOR_CLASS.key?(opr)
-        @operator = OPERATOR_CLASS[opr].new(
-          (@options[:port] || @options[:begin_port]),
-          @options[:end_port]
-        )
-      else
-        fail AclArgumentError, 'Unknown operator'
-      end
+      raise AclArgumentError, 'Unknown operator' unless OPERATOR_CLASS.key?(opr)
+      @operator = OPERATOR_CLASS[opr].new(
+        (@options[:port] || @options[:begin_port]),
+        @options[:end_port]
+      )
     end
   end
 end # module

data/lib/cisco_acl_intp/{ace_port_opr.rb → acespec_port_opr.rb}

@@ -1,21 +1,21 @@
 # -*- coding: utf-8 -*-
-require 'cisco_acl_intp/ace_port_opr_base'
+require 'cisco_acl_intp/acespec_port_opr_base'
 
 module CiscoAclIntp
   # ANY operator class
   class AcePortOpAny < AceUnaryOpBase
     # Constructor
-    def initialize(*args)
+    def initialize(*_args)
       @begin_port = nil
       @end_port = nil
       @operator = :any
     end
 
-    # Specified port-set is contained or not?
-    # @param [AcePortOperator] other Another operator
+    # ANY contains other_port? (always true)
+    # @param [AcePortOperatorBase] _other Another operator
     # @return [Boolean]
-    def contains?(other)
-      other.kind_of?(AcePortOperatorBase) # match any conditions
+    def contains?(_other)
+      true
     end
 
     # Generate string for Cisco IOS access list
@@ -26,7 +26,7 @@ module CiscoAclIntp
     end
   end
 
-  # SSTRICT-ANY operator class
+  # STRICT-ANY operator class
   class AcePortOpStrictAny < AcePortOpAny
     # Constructor
     def initialize(*args)
@@ -34,8 +34,8 @@ module CiscoAclIntp
       @operator = :strict_any
     end
 
-    # Specified port-set is contained or not?
-    # @param [AcePortOperator] other Another operator
+    # STRICT_ANY contains other_port?
+    # @param [AcePortOperatorBase] other Another operator
     # @return [Boolean]
     def contains?(other)
       case other
@@ -55,16 +55,11 @@ module CiscoAclIntp
       @operator = :eq
     end
 
-    # Specified port-set is contained or not?
-    # @param [AcePortOperator] other Another operator
+    # EQ contains EQ?
+    # @param [AcePortOpEq] other Another operator
     # @return [Boolean]
-    def contains?(other)
-      case other
-      when AcePortOpEq
-        other.port == @begin_port
-      else
-        contains_default(other)
-      end
+    def contains_eq?(other)
+      other.port == @begin_port
     end
   end
 
@@ -78,38 +73,38 @@ module CiscoAclIntp
 
     private
 
-    # Operate EQUAL containing check
-    # @param [AcePortOperator] other Another operator
+    # NEQ contains EQ?
+    # @param [AcePortOpEq] other Another operator
     # @return [Boolean]
-    def compare_eq(other)
+    def contains_eq?(other)
       other.port != @begin_port
     end
 
-    # Operate NOT_EQUAL containing check
-    # @param [AcePortOperator] other Another operator
+    # NEQ contains NEQ?
+    # @param [AcePortOpNeq] other Another operator
     # @return [Boolean]
-    def compare_neq(other)
+    def contains_neq?(other)
       other.port == @begin_port
     end
 
-    # Operate LOWER_THAN containing check
-    # @param [AcePortOperator] other Another operator
+    # NEQ contains LT?
+    # @param [AcePortOpLt] other Another operator
     # @return [Boolean]
-    def compare_lt(other)
+    def contains_lt?(other)
       other.port <= @begin_port
     end
 
-    # Operate GREATER_THAN containing check
-    # @param [AcePortOperator] other Another operator
+    # NEQ contains GT?
+    # @param [AcePortOpGt] other Another operator
     # @return [Boolean]
-    def compare_gt(other)
+    def contains_gt?(other)
       @begin_port <= other.port
     end
 
-    # Operate RANGE containing check
-    # @param [AcePortOperator] other Another operator
+    # NEQ contains RANGE?
+    # @param [AcePortOpRange] other Another operator
     # @return [Boolean]
-    def compare_range(other)
+    def contains_range?(other)
       other.end_port < @begin_port || @begin_port < other.begin_port
     end
   end
@@ -124,31 +119,31 @@ module CiscoAclIntp
 
     private
 
-    # Operate EQUAL containing check
-    # @param [AcePortOperator] other Another operator
+    # LT contains EQ?
+    # @param [AcePortOpEq] other Another operator
     # @return [Boolean]
-    def compare_eq(other)
+    def contains_eq?(other)
       other.port < @begin_port
     end
 
-    # Operate NOT_EQUAL containing check
-    # @param [AcePortOperator] other Another operator
+    # LT contains NEQ?
+    # @param [AcePortOpNeq] other Another operator
     # @return [Boolean]
-    def compare_neq(other)
+    def contains_neq?(other)
       other.port.max? && @begin_port.max?
     end
 
-    # Operate LOWER_THAN containing check
-    # @param [AcePortOperator] other Another operator
+    # LT contains LT?
+    # @param [AcePortOpLt] other Another operator
     # @return [Boolean]
-    def compare_lt(other)
+    def contains_lt?(other)
       other.port <= @begin_port
     end
 
-    # Operate RANGE containing check
-    # @param [AcePortOperator] other Another operator
+    # LT contains RANGE?
+    # @param [AcePortOpRange] other Another operator
     # @return [Boolean]
-    def compare_range(other)
+    def contains_range?(other)
       other.end_port < @begin_port
     end
   end
@@ -163,31 +158,31 @@ module CiscoAclIntp
 
     private
 
-    # Operate EQUAL containing check
-    # @param [AcePortOperator] other Another operator
+    # GT contains EQ?
+    # @param [AcePortOpEq] other Another operator
     # @return [Boolean]
-    def compare_eq(other)
+    def contains_eq?(other)
       @begin_port < other.port
     end
 
-    # Operate NOT_EQUAL containing check
-    # @param [AcePortOperator] other Another operator
+    # GT contains NEQ?
+    # @param [AcePortOpNeq] other Another operator
     # @return [Boolean]
-    def compare_neq(other)
+    def contains_neq?(other)
       @begin_port.min? && other.port.min?
     end
 
-    # Operate GREATER_THAN containing check
-    # @param [AcePortOperator] other Another operator
+    # GT contains GT?
+    # @param [AcePortOpGt] other Another operator
     # @return [Boolean]
-    def compare_gt(other)
+    def contains_gt?(other)
       @begin_port <= other.port
     end
 
-    # Operate RANGE containing check
-    # @param [AcePortOperator] other Another operator
+    # GT contains RANGE?
+    # @param [AcePortOperatorBase] other Another operator
     # @return [Boolean]
-    def compare_range(other)
+    def contains_range?(other)
       @begin_port < other.begin_port
     end
   end
@@ -198,46 +193,53 @@ module CiscoAclIntp
     def initialize(*args)
       super
       unless @begin_port < @end_port
-        fail AclArgumentError, 'Invalid port sequence'
+        raise AclArgumentError, 'Invalid port sequence'
       end
       @operator = :range
     end
 
     private
 
-    # Operate EQUAL containing check
-    # @param [AcePortOperator] other Another operator
+    # RANGE contains ANY?
+    # @param [AcePortOpAny] _other Another operator
+    # @return [Boolean]
+    def contains_any?(_other)
+      @begin_port.min? && @end_port.max?
+    end
+
+    # RANGE contains EQ?
+    # @param [AcePortOpEq] other Another operator
     # @return [Boolean]
-    def compare_eq(other)
+    def contains_eq?(other)
       @begin_port <= other.port && other.port <= @end_port
     end
 
-    # Operate NOT_EQUAL containing check
-    # @param [AcePortOperator] other Another operator
+    # RANGE contains NEQ?
+    # @param [AcePortOpNeq] other Another operator
     # @return [Boolean]
-    def compare_neq(other)
+    def contains_neq?(other)
       @begin_port.min? && @end_port.max? &&
         (other.port.min? || other.port.max?)
     end
 
-    # Operate LOWER_THAN containing check
-    # @param [AcePortOperator] other Another operator
+    # RANGE contains LT?
+    # @param [AcePortOpLt] other Another operator
     # @return [Boolean]
-    def compare_lt(other)
+    def contains_lt?(other)
       @begin_port.min? && other.port < @end_port
     end
 
-    # Operate GREATER_THAN containing check
-    # @param [AcePortOperator] other Another operator
+    # RANGE contains GT?
+    # @param [AcePortOpGt] other Another operator
     # @return [Boolean]
-    def compare_gt(other)
+    def contains_gt?(other)
       @begin_port < other.port && @end_port.max?
     end
 
-    # Operate RANGE containing check
-    # @param [AcePortOperator] other Another operator
+    # RANGE contains RANGE?
+    # @param [AcePortOpRange] other Another operator
     # @return [Boolean]
-    def compare_range(other)
+    def contains_range?(other)
       @begin_port <= other.begin_port &&
         other.end_port <= @end_port
     end