rasn1 0.15.0 → 0.16.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 44b823b6a8e75b419ef38d27be1a31464667f4a2729ce514702b83a34210e7cb
-  data.tar.gz: 4e8f19d517834432999dac059bd175bc53330b224ffb554017efd6ebdca83e34
+  metadata.gz: f4b0dda0fa6e06b6371e74782ecc5b5cc5f9d30dab886a759aa5b9345bd80908
+  data.tar.gz: cfad20040d45598fffda3132bb9c417cdf4fca9dd78dda9616a4b7a0a6a98b97
 SHA512:
-  metadata.gz: a44cdcea86cd6a7687cc0bb56475ee9325a5135acdd3b3408d5c1be936511279ed344d3811afa44a0eb658f01cd71a73fa49ea4c825e3d81d6c5746684e04076
-  data.tar.gz: fadc12bb059a416ae8716857ef91a402969ef78d80ca767bfefe09237794e7accffc4a6876ab90400047efb63442b065508ef3ff5768d4df1f18f8d6890f0334
+  metadata.gz: a99c4ee238423b561470182c3ac415d9a9ff8f11d626af843d203d5c6aedff6969ec0e4b47f68844e4c62153dd238ba4d852f3855e63a091e8c2cf0643d39d89
+  data.tar.gz: 9614d3434f7b05fe01e80bb36cbd82914b565a6e5087e48bc5e44aa7f47d70076ac3b1f542062bf9bc203d8101f4afd21f2ad5b9865011cdff1359e8178c8b19

data/lib/rasn1/model.rb

@@ -381,15 +381,24 @@ module RASN1
       lazy_initialize(args) unless args.empty?
     end
 
-    # Access an element of the model by its name
-    # @param [Symbol] name
-    # @return [Model, Types::Base, Wrapper]
-    def [](name)
-      elt = @elements[name]
-      return elt unless elt.is_a?(Proc)
-
-      # Lazy element -> generate it
-      @elements[name] = elt.call
+    # @overload [](name)
+    #  Access an element of the model by its name
+    #  @param [Symbol] name
+    #  @return [Model, Types::Base, Wrapper]
+    # @overload [](idx)
+    #  Access an element of root element by its index. Root element must be a {Sequence} or {SequenceOf}.
+    #  @param [Integer] idx
+    #  @return [Model, Types::Base, Wrapper]
+    def [](name_or_idx)
+      case name_or_idx
+      when Symbol
+        elt = @elements[name_or_idx]
+        return elt unless elt.is_a?(Proc)
+
+        @elements[name_or_idx] = elt.call
+      when Integer
+        root[name_or_idx]
+      end
     end
 
     # Set value of element +name+. Element should be a {Types::Base}.
@@ -582,13 +591,13 @@ module RASN1
     private
 
     def generate_root(args)
-      opts = args.slice(:explicit, :implicit, :optional, :class, :default, :constructed, :tag_value)
+      opts = args.slice(:name, :explicit, :implicit, :optional, :class, :default, :constructed, :tag_value)
       root = self.class.class_eval { @root }
       root_options = self.class.options || {}
       root_options.merge!(opts)
+      @root_name = args[:name] || root.name
       @root = generate_element(root, root_options)
-      @root_name = root.name
-      @elements[root.name] = @root
+      @elements[@root_name] = @root
     end
 
     def generate_element(elt, opts={})
@@ -596,15 +605,23 @@ module RASN1
       when BaseElem
         generate_base_element(elt, opts)
       when ModelElem
+        opts[:name] ||= elt.name
         elt.klass.new(opts)
       when WrapElem
-        wrapped = elt.element.is_a?(ModelElem) ? elt.element.klass : generate_element(elt.element)
-        wrapper = Wrapper.new(wrapped, elt.options.merge(opts))
-        @elements[elt.element.name] = proc { wrapper.element }
-        wrapper
+        generate_wrapper_element(elt, opts)
       end
     end
 
+    def generate_wrapper_element(elt, opts)
+      wrapped = elt.element.is_a?(ModelElem) ? elt.element.klass : generate_element(elt.element)
+      options = elt.options.merge(opts)
+      options[:name] = elt.element.name if elt.element.is_a?(ModelElem)
+      wrapper = Wrapper.new(wrapped, options)
+      # Use a proc as wrapper may be lazy
+      @elements[elt.element.name] = proc { wrapper.element }
+      wrapper
+    end
+
     def generate_base_element(elt, opts)
       element = elt.proc.call(opts)
       return element if elt.content.nil?
@@ -616,19 +633,20 @@ module RASN1
       element
     end
 
+    # @author sdaubert
+    # @author lemontree55
+    # @author adfoster-r7
     def private_to_h(element=nil) # rubocop:disable Metrics/CyclomaticComplexity
       my_element = element || root
-      my_element = my_element.root if my_element.is_a?(Model)
       value = case my_element
+              when Model
+                model_to_h(my_element)
               when Types::SequenceOf
                 sequence_of_to_h(my_element)
               when Types::Sequence
                 sequence_to_h(my_element)
-              # @author adfoster-r7
               when Types::Choice
-                raise ChoiceError.new(my_element) if my_element.chosen.nil?
-
-                private_to_h(my_element.value[my_element.chosen])
+                choice_to_h(my_element)
               when Wrapper
                 wrapper_to_h(my_element)
               else
@@ -641,6 +659,15 @@ module RASN1
       end
     end
 
+    def model_to_h(elt)
+      hsh = elt.to_h
+      if root.is_a?(Types::Choice)
+        hsh[hsh.keys.first]
+      else
+        { @elements.key(elt) => hsh[hsh.keys.first] }
+      end
+    end
+
     def sequence_of_to_h(elt)
       if elt.of_type < Model
         elt.value&.map { |el| el.to_h.values.first }
@@ -655,8 +682,7 @@ module RASN1
 
         case el
         when Model
-          hsh = el.to_h
-          [@elements.key(el), hsh[hsh.keys.first]]
+          model_to_h(el).to_a[0]
         when Wrapper
           [unwrap_keyname(@elements.key(el)), wrapper_to_h(el)]
         else
@@ -666,6 +692,13 @@ module RASN1
       ary.compact.to_h
     end
 
+    def choice_to_h(elt)
+      raise ChoiceError.new(elt) if elt.chosen.nil?
+
+      chosen = elt.value[elt.chosen]
+      { chosen.name => private_to_h(chosen) }
+    end
+
     def unwrap_keyname(key)
       key.to_s.delete_suffix('_wrapper').to_sym
     end

data/lib/rasn1/types/base.rb

@@ -359,7 +359,7 @@ module RASN1
             lines << str
           end
           str[compute_trace_index(byte_count, 3), 2] = '%02x' % byte
-          str[compute_trace_index(byte_count, 1, 49)] = byte >= 32 && byte <= 126 ? byte.chr : '.'
+          str[compute_trace_index(byte_count, 1, 49)] = byte.between?(32, 126) ? byte.chr : '.'
           byte_count += 1
         end
         lines.map(&:rstrip).join << "\n"
@@ -546,7 +546,11 @@ module RASN1
         end
       end
 
-      def check_id(der)
+      # Check ID from +der+ is the one expected
+      # @return [Boolean] +true+ is ID is expected, +false+ if it is not but +self+ is {#optional?}
+      #   or has a {#default} value.
+      # @raise [ASN1Error] ID was not expected, is not optional and has no default value
+      def check_id(der) # rubocop:disable Naming/PredicateMethod
         expected_id = encode_identifier_octets
         real_id = der[0, expected_id.size]
         return true if real_id == expected_id

data/lib/rasn1/types/boolean.rb

@@ -14,7 +14,7 @@ module RASN1
       DER_FALSE = 0
 
       # @return [false]
-      def void_value
+      def void_value # rubocop:disable Naming/PredicateMethod
         false
       end
 

data/lib/rasn1/types/visible_string.rb

@@ -4,7 +4,7 @@ module RASN1
   module Types
     # Create VisibleString as a Constrained subclass of IA5String
     Types.define_type(:VisibleString, from: IA5String) do |value|
-      value.nil? || value.chars.all? { |c| c.ord >= 32 && c.ord <= 126 }
+      value.nil? || value.chars.all? { |c| c.ord.between?(32, 126) }
     end
 
     # ASN.1 Visible String

data/lib/rasn1/version.rb

@@ -2,5 +2,5 @@
 
 module RASN1
   # RASN1 version number
-  VERSION = '0.15.0'
+  VERSION = '0.16.0'
 end

data/lib/rasn1.rb

@@ -26,7 +26,7 @@ module RASN1
   # @param [String] der binary string to parse
   # @param [Boolean] ber if +true+, decode a BER string, else a DER one
   # @return [Types::Base]
-  def self.parse(der, ber: false) # rubocop:disable Metrics:AbcSize
+  def self.parse(der, ber: false) # rubocop:disable Metrics/AbcSize
     type = Types.id2type(der)
     type.parse!(der, ber: ber)
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rasn1
 version: !ruby/object:Gem::Version
-  version: 0.15.0
+  version: 0.16.0
 platform: ruby
 authors:
 - LemonTree55
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2025-01-03 00:00:00.000000000 Z
+date: 2025-06-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: strptime