rasn1 0.6.8 → 0.7.0

data/lib/rasn1/types/sequence.rb

@@ -1,6 +1,7 @@
+# frozen_string_literal: true
+
 module RASN1
   module Types
-
     # ASN.1 sequence
     #
     # A sequence is a collection of another ASN.1 types.
@@ -25,6 +26,7 @@ module RASN1
     #  seq.value    # => String
     # @author Sylvain Daubert
     class Sequence < Constructed
+      # Sequence tag value
       TAG = 0x10
 
       # @see Base#initialize
@@ -35,7 +37,19 @@ module RASN1
 
       def initialize_copy(other)
         super
-        @value = @value.map { |v| v.dup }
+        @value = @value.map(&:dup)
+      end
+
+      # Get element at index +idx+, or element of name +name+
+      # @param [Integer, String, Symbol] idx_or_name
+      # @return [Object]
+      def [](idx_or_name)
+        case idx_or_name
+        when Integer
+          @value[idx]
+        when String, Symbol
+          @value.find { |elt| elt.name == idx_or_name }
+        end
       end
 
       private
@@ -43,14 +57,14 @@ module RASN1
       def value_to_der
         case @value
         when Array
-          @value.map { |element| element.to_der }.join
+          @value.map(&:to_der).join
         else
           @value.to_s
         end
       end
 
-      def der_to_value(der, ber:false)
-        if @value.is_a?(Array) and !@value.empty?
+      def der_to_value(der, ber: false)
+        if @value.is_a?(Array) && !@value.empty?
           nb_bytes = 0
           @value.each do |element|
             nb_bytes += element.parse!(der[nb_bytes..-1])
@@ -58,7 +72,7 @@ module RASN1
         else
           @value = der
           der.length
-        end 
+        end
       end
     end
   end

data/lib/rasn1/types/sequence_of.rb

@@ -1,6 +1,7 @@
+# frozen_string_literal: true
+
 module RASN1
   module Types
-
     # ASN.1 SEQUENCE OF
     #
     # A SEQUENCE OF is an array of one ASN.1 type.
@@ -45,6 +46,7 @@ module RASN1
     #  seqof[0][:int].value    # => 12
     # @author Sylvain Daubert
     class SequenceOf < Constructed
+      # SequenceOf tag value
       TAG = Sequence::TAG
 
       # @return [Class, Base]
@@ -68,7 +70,7 @@ module RASN1
       def initialize_copy(other)
         super
         @of_type = @of_type.dup
-        @value = @value.map { |v| v.dup }
+        @value = @value.map(&:dup)
       end
 
       # Add an item to SEQUENCE OF
@@ -76,9 +78,11 @@ module RASN1
       def <<(obj)
         if of_type_class < Primitive
           raise ASN1Error, 'object to add should be an Array' unless obj.is_a?(Array)
+
           @value += obj.map { |item| @of_type.new(item) }
         elsif composed_of_type?
           raise ASN1Error, 'object to add should be an Array' unless obj.is_a?(Array)
+
           new_value = of_type_class.new
           @of_type.value.each_with_index do |type, i|
             type2 = type.dup
@@ -112,17 +116,15 @@ module RASN1
       end
 
       def inspect(level=0)
-        str = ''
-        str << '  ' * level if level > 0
-        str << "#{@name} " unless @name.nil?
-        level = level.abs
-        str << "#{type}:\n"
-        level += 1
+        str = common_inspect(level)
+        str << "\n"
+        level = level.abs + 1
         @value.each do |item|
           case item
           when Base, Model
-            next if item.optional? and item.value.nil?
-            str << "#{item.inspect(level)}"
+            next if item.optional? && item.value.nil?
+
+            str << item.inspect(level)
             str << "\n" unless str.end_with?("\n")
           else
             str << '  ' * level + "#{item.inspect}\n"
@@ -142,7 +144,7 @@ module RASN1
       end
 
       def value_to_der
-        @value.map { |v| v.to_der }.join
+        @value.map(&:to_der).join
       end
 
       def der_to_value(der, ber:false)

data/lib/rasn1/types/set.rb

@@ -1,6 +1,7 @@
+# frozen_string_literal: true
+
 module RASN1
   module Types
-
     # ASN.1 set
     #
     # A set is a collection of another ASN.1 types.
@@ -20,6 +21,7 @@ module RASN1
     #              ]
     # @author Sylvain Daubert
     class Set < Sequence
+      # Set tag value
       TAG = 0x11
     end
   end

data/lib/rasn1/types/set_of.rb

@@ -1,9 +1,11 @@
+# frozen_string_literal: true
+
 module RASN1
   module Types
-
     # ASN.1 SET OF
     # @author Sylvain Daubert
     class SetOf < SequenceOf
+      # SetOf tag value
       TAG = Set::TAG
 
       # A SET OF is encoded as a SET.
@@ -14,4 +16,3 @@ module RASN1
     end
   end
 end
-

data/lib/rasn1/types/utc_time.rb

@@ -1,8 +1,9 @@
+# frozen_string_literal: true
+
 require 'date'
 
 module RASN1
   module Types
-
     # ASN.1 UTCTime
     #
     # +{#value} of a +UtcTime+ should be a ruby Time.
@@ -17,6 +18,7 @@ module RASN1
     # not.
     # @author Sylvain Daubert
     class UtcTime < Primitive
+      # UtcTime tag value
       TAG = 23
 
       # Get ASN.1 type
@@ -26,11 +28,11 @@ module RASN1
       end
 
       private
-      
+
       def value_to_der
         @value.getutc.strftime('%y%m%d%H%M%SZ')
       end
-      
+
       def der_to_value(der, ber: false)
         format = case der.size
                  when 11

data/lib/rasn1/types/utf8_string.rb

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

data/lib/rasn1/types/visible_string.rb

@@ -1,9 +1,11 @@
+# frozen_string_literal: true
+
 module RASN1
   module Types
-
     # ASN.1 Visible String
     # @author Sylvain Daubert
     class VisibleString < IA5String
+      # VisibleString tag value
       TAG = 26
 
       # Get ASN.1 type
@@ -11,7 +13,6 @@ module RASN1
       def self.type
         'VisibleString'
       end
-
     end
   end
 end

data/lib/rasn1/version.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module RASN1
-  VERSION = '0.6.8'
+  VERSION = '0.7.0'
 end

data/rasn1.gemspec

@@ -25,7 +25,7 @@ Gem::Specification.new do |spec|
   spec.required_ruby_version = '>= 2.3.0'
 
   spec.add_development_dependency 'yard', '~>0.9'
-  spec.add_development_dependency 'bundler', '~> 1.13'
+  spec.add_development_dependency 'bundler', '~> 1.17.3'
   spec.add_development_dependency 'rake', '~> 10.0'
   spec.add_development_dependency 'rspec', '~> 3.0'
   spec.add_development_dependency 'simplecov', '~> 0.14'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rasn1
 version: !ruby/object:Gem::Version
-  version: 0.6.8
+  version: 0.7.0
 platform: ruby
 authors:
 - Sylvain Daubert
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-11-11 00:00:00.000000000 Z
+date: 2019-11-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: yard
@@ -30,14 +30,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.13'
+        version: 1.17.3
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.13'
+        version: 1.17.3
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -93,6 +93,7 @@ files:
 - ".gitignore"
 - ".rubocop.yml"
 - ".travis.yml"
+- Changelog.md
 - Gemfile
 - LICENSE
 - README.md
@@ -145,7 +146,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.7.6
+rubygems_version: 2.7.6.2
 signing_key: 
 specification_version: 4
 summary: Ruby ASN.1 library