rasn1 0.6.8 → 0.7.0

data/lib/rasn1/types/enumerated.rb

@@ -1,6 +1,7 @@
+# frozen_string_literal: true
+
 module RASN1
   module Types
-
     # ASN.1 Enumerated
     #
     # An enumerated type permits to assign names to integer values. It may be defined
@@ -21,6 +22,7 @@ module RASN1
       # @!attribute enum
       # @return [Hash]
 
+      # Enumerated tag value
       TAG = 0x0a
 
       # @overload initialize(options={})

data/lib/rasn1/types/generalized_time.rb

@@ -1,6 +1,7 @@
+# frozen_string_literal: true
+
 module RASN1
   module Types
-
     # ASN.1 GeneralizedTime
     #
     # +{#value} of a {GeneralizedTime} should be a ruby Time.
@@ -20,6 +21,7 @@ module RASN1
     # second are supported.
     # @author Sylvain Daubert
     class GeneralizedTime < Primitive
+      # GeneralizedTime tag value
       TAG = 24
 
       # Get ASN.1 type
@@ -29,50 +31,48 @@ module RASN1
       end
 
       private
-      
+
       def value_to_der
-        if @value.nsec > 0
+        if @value.nsec.positive?
           der = @value.getutc.strftime('%Y%m%d%H%M%S.%9NZ')
           der.sub(/0+Z/, 'Z')
         else
           @value.getutc.strftime('%Y%m%d%H%M%SZ')
         end
       end
-      
+
       def der_to_value(der, ber: false)
         date_hour, fraction = der.split('.')
         utc_offset_forced = false
         if fraction.nil?
-          if date_hour[-1] != 'Z' and date_hour !~ /[+-]\d+$/
+          if (date_hour[-1] != 'Z') && (date_hour !~ /[+-]\d+$/)
             # If not UTC, have to add offset with UTC to force
             # DateTime#strptime to generate a local time. But this difference
             # may be errored because of DST.
             date_hour << Time.now.strftime('%z')
             utc_offset_forced = true
           end
+        elsif fraction[-1] == 'Z'
+          fraction = fraction[0...-1]
+          date_hour << 'Z'
         else
-          if fraction[-1] == 'Z'
-            fraction = fraction[0...-1]
-            date_hour << 'Z'
+          match = fraction.match(/(\d+)([+-]\d+)/)
+          if match
+            # fraction contains fraction and timezone info. Split them
+            fraction = match[1]
+            date_hour << match[2]
           else
-            match = fraction.match(/(\d+)([+-]\d+)/)
-            if match
-              # fraction contains fraction and timezone info. Split them
-              fraction = match[1]
-              date_hour << match[2]
-            else
-              # fraction only contains fraction.
-              # Have to add offset with UTC to force DateTime#strptime to
-              # generate a local time. But this difference may be errored
-              # because of DST.
-              date_hour << Time.now.strftime('%z')
-              utc_offset_forced = true
-            end
+            # fraction only contains fraction.
+            # Have to add offset with UTC to force DateTime#strptime to
+            # generate a local time. But this difference may be errored
+            # because of DST.
+            date_hour << Time.now.strftime('%z')
+            utc_offset_forced = true
           end
         end
         format = case date_hour.size
                  when 11
-                   frac_base = 60*60
+                   frac_base = 60 * 60
                    '%Y%m%d%HZ'
                  when 13
                    frac_base = 60
@@ -100,9 +100,7 @@ module RASN1
         # Check DST. There may be a shift of one hour...
         if utc_offset_forced
           compare_time = Time.new(*@value.to_a[0..5].reverse)
-          if compare_time.utc_offset != @value.utc_offset
-            @value = compare_time
-          end
+          @value = compare_time if compare_time.utc_offset != @value.utc_offset
         end
         @value += ".#{fraction}".to_r * frac_base unless fraction.nil?
       end

data/lib/rasn1/types/ia5string.rb

@@ -1,9 +1,11 @@
+# frozen_string_literal: true
+
 module RASN1
   module Types
-
     # ASN.1 IA5 String
     # @author Sylvain Daubert
     class IA5String < OctetString
+      # IA5String tag value
       TAG = 22
 
       # Get ASN.1 type
@@ -13,15 +15,15 @@ module RASN1
       end
 
       private
-      
+
       def value_to_der
         @value.to_s.force_encoding('US-ASCII').force_encoding('BINARY')
       end
 
-      def der_to_value(der, ber:false)
+      def der_to_value(der, ber: false)
         super
         @value.force_encoding('US-ASCII')
       end
-     end
+    end
   end
 end

data/lib/rasn1/types/integer.rb

@@ -1,12 +1,14 @@
+# frozen_string_literal: true
+
 module RASN1
   module Types
-
     # ASN.1 Integer
     # @author Sylvain Daubert
     class Integer < Primitive
       # @return [Hash,nil]
       attr_reader :enum
 
+      # Integer tag value
       TAG = 0x02
 
       # @overload initialize(options={})
@@ -30,19 +32,19 @@ module RASN1
         self.value = @value
 
         case @default
-        when String,Symbol
-          unless @enum.has_key? @default
-            raise EnumeratedError, "TAG #@name: unknwon enumerated default value #@default"
+        when String, Symbol
+          unless @enum.key? @default
+            raise EnumeratedError, "TAG #{@name}: unknwon enumerated default value #@{default}"
           end
         when ::Integer
-          if @enum.has_value? @default
+          if @enum.value? @default
             @default = @enum.key(@default)
           else
-            raise EnumeratedError, "TAG #@name: default value #@default not in enumeration"
+            raise EnumeratedError, "TAG #{@name}: default value #@{default} not in enumeration"
           end
         when nil
         else
-          raise TypeError, "TAG #@name: #{@default.class} not handled as default value"
+          raise TypeError, "TAG #{@name}: #{@default.class} not handled as default value"
         end
       end
 
@@ -51,24 +53,24 @@ module RASN1
       def value=(v)
         case v
         when String,Symbol
-          raise EnumeratedError, 'TAG #@name has no :enum' if @enum.nil?
+          raise EnumeratedError, "TAG #{@name} has no :enum" if @enum.nil?
 
-          unless @enum.has_key? v
-            raise EnumeratedError, "TAG #@name: unknwon enumerated value #{v}"
+          unless @enum.key? v
+            raise EnumeratedError, "TAG #{@name}: unknwon enumerated value #{v}"
           end
           @value = v
         when ::Integer
           if @enum.nil?
             @value = v
-          elsif @enum.has_value? v
+          elsif @enum.value? v
             @value = @enum.key(v)
           else
-            raise EnumeratedError, "TAG #@name: #{v} not in enumeration"
+            raise EnumeratedError, "TAG #{@name}: #{v} not in enumeration"
           end
         when nil
           @value = nil
         else
-          raise EnumeratedError, "TAG #@name: not in enumeration"
+          raise EnumeratedError, "TAG #{@name}: not in enumeration"
         end
       end
 
@@ -86,15 +88,15 @@ module RASN1
 
       def int_value_to_der(value=nil)
         v = value || @value
-        size = v.bit_length / 8 + (v.bit_length % 8 > 0 ? 1 : 0)
-        size = 1 if size == 0
-        comp_value = if v > 0
+        size = v.bit_length / 8 + ((v.bit_length % 8).positive? ? 1 : 0)
+        size = 1 if size.zero?
+        comp_value = if v.positive?
                        # If MSB is 1, increment size to set initial octet
                        # to 0 to amrk it as a positive integer
                        size += 1 if v >> (size * 8 - 1) == 1
                        v
                      else
-                       ~(v.abs) + 1
+                       ~v.abs + 1
                      end
         ary = []
         size.times { ary << (comp_value & 0xff); comp_value >>= 8 }
@@ -108,7 +110,7 @@ module RASN1
         when ::Integer
           int_value_to_der
         else
-          raise TypeError, "TAG #@name: #{@value.class} not handled"
+          raise TypeError, "TAG #{@name}: #{@value.class} not handled"
         end
       end
 
@@ -126,7 +128,7 @@ module RASN1
         return if @enum.nil?
 
         @value = @enum.key(@value)
-        raise EnumeratedError, "TAG #@name: value #{v} not in enumeration" if @value.nil?
+        raise EnumeratedError, "TAG #{@name}: value #{v} not in enumeration" if @value.nil?
       end
 
       def explicit_type

data/lib/rasn1/types/null.rb

@@ -1,18 +1,17 @@
+# frozen_string_literal: true
+
 module RASN1
   module Types
-
     # ASN.1 Null
     # @author Sylvain Daubert
     class Null < Primitive
+      # Null tag value
       TAG = 0x05
 
       # @return [String]
       def inspect(level=0)
-        str = ''
-        str << '  ' * level if level > 0
-        str << "#{@name} " unless @name.nil?
-        str << "#{type}"
-        str << " OPTIONAL" if optional?
+        str = common_inspect(level)[0..-2] # remove terminal ':'
+        str << ' OPTIONAL' if optional?
         str
       end
 
@@ -23,7 +22,8 @@ module RASN1
       end
 
       def der_to_value(der, ber: false)
-        raise ASN1Error, "NULL TAG should not have content!" if der.length > 0
+        raise ASN1Error, 'NULL TAG should not have content!' if der.length.positive?
+
         @value = nil
       end
     end

data/lib/rasn1/types/numeric_string.rb

@@ -1,9 +1,11 @@
+# frozen_string_literal: true
+
 module RASN1
   module Types
-
     # ASN.1 Numeric String
     # @author Sylvain Daubert
     class NumericString < OctetString
+      # NumericString tag value
       TAG = 18
 
       # Get ASN.1 type
@@ -13,7 +15,7 @@ module RASN1
       end
 
       private
-      
+
       def value_to_der
         check_characters
         @value.to_s.force_encoding('BINARY')
@@ -26,7 +28,7 @@ module RASN1
 
       def check_characters
         if @value.to_s =~ /([^0-9 ])/
-          raise ASN1Error, "NUMERIC STRING #@name: invalid character: '#{$1}'"
+          raise ASN1Error, "NUMERIC STRING #{@name}: invalid character: '#{$1}'"
         end
       end
     end

data/lib/rasn1/types/object_id.rb

@@ -1,20 +1,23 @@
+# frozen_string_literal: true
+
 module RASN1
   module Types
 
     # ASN.1 Object ID
     # @author Sylvain Daubert
     class ObjectId < Primitive
+      # ObjectId tag value
       TAG = 6
 
       private
 
       def value_to_der
-        ids = @value.split('.').map! { |str| str.to_i }
+        ids = @value.split('.').map!(&:to_i)
 
         if ids[0] > 2
           raise ASN1Error, 'OBJECT ID #@name: first subidentifier should be less than 3'
         end
-        if ids[0] < 2 and ids[1] > 39
+        if (ids[0] < 2) && (ids[1] > 39)
           raise ASN1Error, 'OBJECT ID #@name: second subidentifier should be less than 40'
         end
 
@@ -23,8 +26,8 @@ module RASN1
           next v if v < 128
 
           ary = []
-          while v > 0
-            ary.unshift (v & 0x7f) | 0x80
+          while v.positive?
+            ary.unshift((v & 0x7f) | 0x80)
             v >>= 7
           end
           ary[-1] &= 0x7f
@@ -35,17 +38,15 @@ module RASN1
 
       def der_to_value(der, ber: false)
         bytes = der.unpack('C*')
+        nr_bytes_to_remove = 1
         ids = if bytes[0] < 80
-                remove = 1
-                [ bytes[0] / 40, bytes[0] % 40]
+                [bytes[0] / 40, bytes[0] % 40]
               elsif bytes[0] < 128
-                remove = 1
                 [2, bytes[0] - 80]
               else
-                remove = 1
                 second_id = bytes[0] & 0x7f
                 bytes[1..-1].each do |byte|
-                  remove += 1
+                  nr_bytes_to_remove += 1
                   second_id <<= 7
                   if byte < 128
                     second_id |= byte
@@ -58,10 +59,10 @@ module RASN1
               end
 
         id = 0
-        bytes.shift(remove)
+        bytes.shift(nr_bytes_to_remove)
         bytes.each do |byte|
           if byte < 128
-            if id == 0
+            if id.zero?
               ids << byte
             else
               ids << ((id << 7) | byte)

data/lib/rasn1/types/octet_string.rb

@@ -1,6 +1,7 @@
+# frozen_string_literal: true
+
 module RASN1
   module Types
-
     # ASN.1 Octet String
     #
     # An OCTET STRINT may contain another primtive object:
@@ -11,13 +12,12 @@ module RASN1
     #  os.to_der   # => DER string with INTEGER in OCTET STRING
     # @author Sylvain Daubert
     class OctetString < Primitive
+      # OctetString tag value
       TAG = 0x04
 
       def inspect(level=0)
-        str = ''
-        str << '  ' * level if level > 0
-        str << "#{@name} " unless @name.nil?
-        str << "#{type}: #{value.inspect}"
+        str = common_inspect(level)
+        str << " #{value.inspect}"
       end
     end
   end

data/lib/rasn1/types/primitive.rb

@@ -1,6 +1,7 @@
+# frozen_string_literal: true
+
 module RASN1
   module Types
-
     # @abstract This class SHOULD be used as base class for all ASN.1 primitive
     #  types.
     # @author Sylvain Daubert

data/lib/rasn1/types/printable_string.rb

@@ -1,9 +1,11 @@
+# frozen_string_literal: true
+
 module RASN1
   module Types
-
     # ASN.1 Printable String
     # @author Sylvain Daubert
     class PrintableString < OctetString
+      # PrintableString tag value
       TAG = 19
 
       # Get ASN.1 type
@@ -13,7 +15,7 @@ module RASN1
       end
 
       private
-      
+
       def value_to_der
         check_characters
         @value.to_s.force_encoding('BINARY')
@@ -26,7 +28,7 @@ module RASN1
 
       def check_characters
         if @value.to_s =~ /([^a-zA-Z0-9 '=\(\)\+,\-\.\/:\?])/
-          raise ASN1Error, "PRINTABLE STRING #@name: invalid character: '#{$1}'"
+          raise ASN1Error, "PRINTABLE STRING #{@name}: invalid character: '#{$1}'"
         end
       end
     end