rasn1 0.6.5 → 0.6.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ad6495f1a0862912c622a732113f53782db3a6cc99b49e3237284739080d357a
-  data.tar.gz: 0f09cb8869ed614a5d2bd4650ba0b2648c0eac4b66f87b177430344f0ad58c07
+  metadata.gz: 4acb42db867027d85bfd208aaaee5906af7fe4fdcd92327055f66187415e959f
+  data.tar.gz: 52cbb1f7306006fb0c03e3e00911d52a474a78c994e2a8e5618046356de43117
 SHA512:
-  metadata.gz: e3e731261cf98787035fe4cae7ac432f2feba2f804964e166bd30c17ea1ba246adcf8a32507978f03424ed05e3d9d83f2572d5c2670ae4451d9d2183ac2a13d9
-  data.tar.gz: 848d2e4b9b4aeb4dd97e66b31746f4ee836533a6bcd5490f96ed752e942f3df5d6ff4b69a655b669d5ebe4432b49bf97b94db3253ca9b00e5766ca256993a876
+  metadata.gz: ce57ddfbbed465bce5fefb9c7c8b91593e09e4a9cc3797e467e5eb0f482964f1f2bbed3a9053da1f590fddb18e846a1a608351594d667459f59a0f5218294480
+  data.tar.gz: 93943756f8b526d6467d834976eda477bacd777565d4d46723c050aab5e909b78c5e3f74539999d0cf3ab3c60f316582fc8060814003936df02c09e78b4d7308

data/.rubocop.yml

@@ -0,0 +1,29 @@
+TargetRubyVersion: 2.3
+Layout/SpaceAroundEqualsInParameterDefault:
+  EnforcedStyle: no_space
+Lint/EmptyWhen:
+  Enabled: false
+Lint/Void:
+  Enabled: false
+Metrics:
+  Enabled: false
+Style/AsciiComments:
+  Enabled: false
+Style/Encoding:
+  Enabled: false
+Style/EvalWithLocation:
+  Enabled: false
+Style/FormatString:
+  EnforcedStyle: percent
+Style/FormatStringToken:
+  EnforcedStyle: unannotated
+Style/PerlBackrefs:
+  Enabled: false
+Style/RedundantSelf:
+  Enabled: false
+Style/StructInheritance:
+  Enabled: false
+Style/TrailingCommaInArrayLiteral:
+  Enabled: false
+Style/TrailingCommaInHashLiteral:
+  Enabled: false

data/lib/rasn1/types/enumerated.rb

@@ -18,8 +18,8 @@ module RASN1
     # A {EnumeratedError} is raised when set value is not in enumeration.
     # @author Sylvain Daubert
     class Enumerated < Integer
+      # @!attribute enum
       # @return [Hash]
-      attr_reader :enum
 
       TAG = 0x0a
 
@@ -37,95 +37,13 @@ module RASN1
       # @see Base#initialize common options to all ASN.1 types
       def initialize(value_or_options={}, options={})
         super
-        opts = value_or_options.is_a?(Hash) ? value_or_options : options
-
-        raise EnumeratedError, 'no enumeration given' unless opts.has_key? :enum
-        @enum = opts[:enum]
-
-        case @default
-        when String,Symbol
-          unless @enum.has_key? @default
-            raise EnumeratedError, "TAG #@name: unknwon enumerated default value #@default"
-          end
-        when ::Integer
-          if @enum.has_value? @default
-            @default = @enum.key(@default)
-          else
-            raise EnumeratedError, "TAG #@name: default value #@defalt not in enumeration"
-          end
-        when nil
-        else
-          raise TypeError, "TAG #@name: #{@value.class} not handled as default value"
-        end
-      end
-
-      # @param [Integer,String,Symbol,nil] v
-      # @return [String,Symbol,nil]
-      def value=(v)
-        case v
-        when String,Symbol
-          unless @enum.has_key? v
-            raise EnumeratedError, "TAG #@name: unknwon enumerated value #{v}"
-          end
-          @value = v
-        when ::Integer
-          unless @enum.has_value? v
-            raise EnumeratedError, "TAG #@name: #{v} not in enumeration"
-          end
-          @value = @enum.key(v)
-        when nil
-          @value = nil
-        else
-          raise EnumeratedError, "TAG #@name: not in enumeration"
-        end
-      end
-
-      # @return [Integer]
-      def to_i
-        case @value
-        when String, Symbol
-            @enum[@value]
-        when ::Integer
-          super
-        when nil
-          if @default
-            @enum[@default]
-          else
-            0
-          end
-        else
-          raise TypeError, "TAG #@name: #{@value.class} not handled"
-        end
+        raise EnumeratedError, 'no enumeration given' if @enum.nil?
       end
 
       # @return [Hash]
       def to_h
         @enum
       end
-
-      private
-
-      def value_to_der
-        case @value
-        when String, Symbol
-          super @enum[@value]
-        when ::Integer
-          super
-        else
-          raise TypeError, "TAG #@name: #{@value.class} not handled"
-        end
-      end
-
-      def der_to_value(der, ber:false)
-        super
-        v = @value
-        @value = @enum.key(v)
-        raise EnumeratedError, "TAG #@name: value #{v} not in enumeration" if @value.nil?
-      end
-
-      def explicit_type
-        self.class.new(@name, enum: self.enum)
-      end
     end
   end
 end

data/lib/rasn1/types/integer.rb

@@ -4,16 +4,87 @@ module RASN1
     # ASN.1 Integer
     # @author Sylvain Daubert
     class Integer < Primitive
+      # @return [Hash,nil]
+      attr_reader :enum
+
       TAG = 0x02
 
+      # @overload initialize(options={})
+      #   @option options [Hash] :enum enumeration hash. Keys are names, and values
+      #     are integers.
+      #   @raise [EnumeratedError] +:default+ value is unknown when +:enum+ key is present
+      # @overload initialize(value, options={})
+      #   @param [Object] value value to set for this ASN.1 object
+      #   @option options [Hash] :enum enumeration hash. Keys are names, and values
+      #     are integers. This key is mandatory.
+      #   @raise [EnumeratedError] +:default+ value is unknown when +:enum+ key is present
+      # @see Base#initialize common options to all ASN.1 types
+      def initialize(value_or_options={}, options={})
+        super
+        opts = value_or_options.is_a?(Hash) ? value_or_options : options
+        @enum = opts[:enum]
+
+        return if @enum.nil?
+
+        # To ensure @value has the correct type
+        self.value = @value
+
+        case @default
+        when String,Symbol
+          unless @enum.has_key? @default
+            raise EnumeratedError, "TAG #@name: unknwon enumerated default value #@default"
+          end
+        when ::Integer
+          if @enum.has_value? @default
+            @default = @enum.key(@default)
+          else
+            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"
+        end
+      end
+
+      # @param [Integer,String,Symbol,nil] v
+      # @return [String,Symbol,nil]
+      def value=(v)
+        case v
+        when String,Symbol
+          raise EnumeratedError, 'TAG #@name has no :enum' if @enum.nil?
+
+          unless @enum.has_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
+            @value = @enum.key(v)
+          else
+            raise EnumeratedError, "TAG #@name: #{v} not in enumeration"
+          end
+        when nil
+          @value = nil
+        else
+          raise EnumeratedError, "TAG #@name: not in enumeration"
+        end
+      end
+
+      # Integer value
       # @return [Integer]
       def to_i
-        @value || @default || 0
+        if @enum.nil?
+          @value || @default || 0
+        else
+          @enum[@value || @default] || 0
+        end
       end
 
       private
 
-      def value_to_der(value=nil)
+      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
@@ -30,12 +101,36 @@ module RASN1
         ary.reverse.pack('C*')
       end
 
-      def der_to_value(der, ber: false)
+      def value_to_der
+        case @value
+        when String, Symbol
+          int_value_to_der @enum[@value]
+        when ::Integer
+          int_value_to_der
+        else
+          raise TypeError, "TAG #@name: #{@value.class} not handled"
+        end
+      end
+
+      def der_to_int_value(der, ber: false)
         ary = der.unpack('C*')
-        @value = ary.reduce(0) { |len, b| (len << 8) | b }
+        v = ary.reduce(0) { |len, b| (len << 8) | b }
         if ary[0] & 0x80 == 0x80
-          @value = -((~@value & ((1 << @value.bit_length) - 1)) + 1)
+          v = -((~v & ((1 << v.bit_length) - 1)) + 1)
         end
+        v
+      end
+
+      def der_to_value(der, ber: false)
+        @value = der_to_int_value(der, ber: ber)
+        return if @enum.nil?
+
+        @value = @enum.key(@value)
+        raise EnumeratedError, "TAG #@name: value #{v} not in enumeration" if @value.nil?
+      end
+
+      def explicit_type
+        @enum.nil? ? self.class.new(@name) : self.class.new(@name, enum: @enum)
       end
     end
   end

data/lib/rasn1/version.rb

@@ -1,3 +1,3 @@
 module RASN1
-  VERSION = '0.6.5'
+  VERSION = '0.6.6'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rasn1
 version: !ruby/object:Gem::Version
-  version: 0.6.5
+  version: 0.6.6
 platform: ruby
 authors:
 - Sylvain Daubert
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-10-16 00:00:00.000000000 Z
+date: 2018-10-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: yard
@@ -91,6 +91,7 @@ extensions: []
 extra_rdoc_files: []
 files:
 - ".gitignore"
+- ".rubocop.yml"
 - ".travis.yml"
 - Gemfile
 - LICENSE