rasn1 0.6.0 → 0.6.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 38f025ab48cabca987b7e0813332e9228ab1933a
-  data.tar.gz: 84ed306ccd84238b89ea1e02f2b73a9bf8558f41
+  metadata.gz: 8afb668f624fee248cce8fe52bd51b57dc42a88f
+  data.tar.gz: 041fe9c1bf42b220b616d4c751b7acef8e98afc8
 SHA512:
-  metadata.gz: a3b4edc322d49eb3e68ecccada5e5022c7f0d08e183a71b991faf62b488c6e70753e531e0a7b5d7bce6bf0a9f4a41da74162f476631097abfd42631962856529
-  data.tar.gz: 6144b8db2f536adc0f8d0f61727724b556058fadd14f02666d5f91df8dfd7f0b92a93a2e30c4a51526a61d6997f3b102e8a2b876d2fc74556190e8cf512854cf
+  metadata.gz: 32f94898893e828e3bc37569bde1cea6e72c577e64748aa87e6c30ffca7065eeb0365c2f10c2d26db89ff71ca2d03f2d9c8281175544d3af0b87b6f263fec24a
+  data.tar.gz: 5261798fa1336eb18234316d4224bfb12a55fe6a6583c36fe01cc2f40eeeb68cbcb839af83d5ccd3ec031c7eb72c2d50143568ce267ce03587dc28020e564f6f

data/lib/rasn1/model.rb

@@ -167,9 +167,26 @@ module RASN1
       #  @param [Symbol,String] name name of object in model
       #  @param [Hash] options
       #  @see Types::Utf8String#initialize
+      # @method numeric_string(name, options)
+      #  @param [Symbol,String] name name of object in model
+      #  @param [Hash] options
+      #  @see Types::NumericString#initialize
+      # @method printable_string(name, options)
+      #  @param [Symbol,String] name name of object in model
+      #  @param [Hash] options
+      #  @see Types::PrintableString#initialize
+      # @method visible_string(name, options)
+      #  @param [Symbol,String] name name of object in model
+      #  @param [Hash] options
+      #  @see Types::VisibleString#initialize
+      # @method ia5_string(name, options)
+      #  @param [Symbol,String] name name of object in model
+      #  @param [Hash] options
+      #  @see Types::IA5String#initialize
       Types.primitives.each do |prim|
         next if prim == Types::ObjectId
-        class_eval "def #{prim.type.downcase.gsub(/\s+/, '_')}(name, options={})\n" \
+        method_name = prim.type.gsub(/([a-z0-9])([A-Z])/, '\1_\2').downcase.gsub(/\s+/, '_')
+        class_eval "def #{method_name}(name, options={})\n" \
                    "  options.merge!(name: name)\n" \
                    "  proc = Proc.new do |opts|\n" \
                    "    #{prim.to_s}.new(options.merge(opts))\n" \

data/lib/rasn1/types/base.rb

@@ -74,6 +74,17 @@ module RASN1
         @type = self.to_s.gsub(/.*::/, '').gsub(/([a-z0-9])([A-Z])/, '\1 \2').upcase
       end
 
+      # Parse a DER or BER string
+      # @param [String] der_or_ber string to parse
+      # @param [Hash] options
+      # @option options [Boolean] :ber if +true+, parse a BER string, else a DER one
+      # @note More options are supported. See {Base#initialize}.
+      def self.parse(der_or_ber, options={})
+        obj = self.new(options)
+        obj.parse!(der_or_ber, ber: options[:ber])
+        obj
+      end
+
 
       # @overload initialize(options={})
       #   @param [Hash] options
@@ -113,12 +124,18 @@ module RASN1
 
       # Used by +#dup+ and +#clone+. Deep copy @value.
       def initialize_copy(other)
-        @value = @value.nil? ? nil : @value.dup
-        begin
-          @default = @default.dup
-        rescue TypeError => ex
-          raise unless ex.message =~ /can't (dup|clone)/
-        end
+        @value = case
+                 when NilClass, TrueClass, FalseClass, Integer
+                   @value
+                 else
+                   @value.dup
+                 end
+        @default = case
+                 when NilClass, TrueClass, FalseClass, Integer
+                   @default
+                 else
+                   @default.dup
+                 end
       end
 
       # Get value or default value
@@ -233,6 +250,9 @@ module RASN1
           end
         else
           str << "#{type}: #{value.inspect}"
+          str << " OPTIONAL" if optional?
+          str << " DEFAULT #{@default}" unless @default.nil?
+          str
         end
       end
 

data/lib/rasn1/types/choice.rb

@@ -5,10 +5,10 @@ module RASN1
     #
     # == Create a CHOICE
     # A CHOICE is defined this way:
-    #   choice = Choice.new(:a_choice)
-    #   choice.value = [Integer.new(:int1, implicit: 0, class: :context),
-    #                   Integer.new(:int2, implicit: 1, class: :context),
-    #                   OctetString.new(:os, implicit: 2, class: :context)]
+    #   choice = Choice.new
+    #   choice.value = [Integer.new(implicit: 0, class: :context),
+    #                   Integer.new(implicit: 1, class: :context),
+    #                   OctetString.new(implicit: 2, class: :context)]
     # The chosen type may be set this way:
     #   choice.chosen = 0   # choose :int1
     # The chosen value may be set these ways:

data/lib/rasn1/types/constructed.rb

@@ -23,7 +23,6 @@ module RASN1
             when Base, Model
               next if item.optional? and item.value.nil?
               str << '  ' * level
-              str << "#{item.name} " unless item.name.nil?
               str << "#{item.inspect(level)}\n"
             else
               str << item.inspect

data/lib/rasn1/types/enumerated.rb

@@ -5,8 +5,8 @@ module RASN1
     #
     # An enumerated type permits to assign names to integer values. It may be defined
     # different ways:
-    #  enum = RASN1::Types::Enumerated.new(:name, enum: { 'a' => 0, 'b' => 1, 'c' => 2 })
-    #  enum = RASN1::Types::Enumerated.new(:name, enum: { a: 0, b: 1, c: 2 })
+    #  enum = RASN1::Types::Enumerated.new(enum: { 'a' => 0, 'b' => 1, 'c' => 2 })
+    #  enum = RASN1::Types::Enumerated.new(enum: { a: 0, b: 1, c: 2 })
     # Its value should be setting as an Integer or a String/symbol:
     #  enum.value = :b
     #  enum.value = 1   # equivalent to :b

data/lib/rasn1/types/ia5string.rb

@@ -9,7 +9,7 @@ module RASN1
       # Get ASN.1 type
       # @return [String]
       def self.type
-        self.to_s.gsub(/.*::/, '')
+        'IA5String'
       end
 
       private

data/lib/rasn1/types/octet_string.rb

@@ -4,8 +4,8 @@ module RASN1
     # ASN.1 Octet String
     #
     # An OCTET STRINT may contain another primtive object:
-    #  os = OctetString.new(:os)
-    #  int = Integer.new(:int)
+    #  os = OctetString.new
+    #  int = Integer.new
     #  int.value = 12
     #  os.value = int
     #  os.to_der   # => DER string with INTEGER in OCTET STRING

data/lib/rasn1/types/sequence.rb

@@ -12,11 +12,11 @@ module RASN1
     #    house [1] IMPLICIT INTEGER DEFAULT 0
     #  }
     # do:
-    #  seq = RASN1::Types::Sequence.new(:record)
+    #  seq = RASN1::Types::Sequence.new
     #  seq.value = [
-    #               RASN1::Types::Integer.new(:id),
-    #               RASN1::Types::Integer.new(:room, explicit: 0, optional: true),
-    #               RASN1::Types::Integer.new(:house, implicit: 1, default: 0)
+    #               RASN1::Types::Integer.new
+    #               RASN1::Types::Integer.new(explicit: 0, optional: true),
+    #               RASN1::Types::Integer.new(implicit: 1, default: 0)
     #              ]
     #
     # A sequence may also be used without value to not parse sequence content:
@@ -35,7 +35,7 @@ module RASN1
 
       def initialize_copy(other)
         super
-        @value.map! { |v| v.dup }
+        @value = @value.map { |v| v.dup }
       end
 
       private

data/lib/rasn1/types/sequence_of.rb

@@ -10,16 +10,16 @@ module RASN1
     #  Integers ::= SEQUENCE OF INTEGER
     # do:
     #  # Create a SEQUENCE OF INTEGER
-    #  seqof = RASN1::Types::SequenceOf.new(:record, RASN1::Types::Integer)
+    #  seqof = RASN1::Types::SequenceOf.new(RASN1::Types::Integer)
     #  # Set integer values
-    #  seqof.value << [1, 2, 3, 4]
+    #  seqof.value = [1, 2, 3, 4]
     #
     # == Use with {Constructed} types
     # SEQUENCE OF may be used to create sequence of composed types. For example:
-    #  composed_type = RASN1::Sequence.new(:comp)
-    #  commposed_type.value = [RASN1::Types::Integer(:id),
-    #                          RASN1::Types::OctetString(:data)]
-    #  seqof = RASN1::SequenceOf.new(:comp, composed_type)
+    #  composed_type = RASN1::Types::Sequence.new
+    #  commposed_type.value = [RASN1::Types::Integer,
+    #                          RASN1::Types::OctetString]
+    #  seqof = RASN1::Types::SequenceOf.new(composed_type)
     #  seqof << [0, 'data0']
     #  seqof << [1, 'data1']
     #
@@ -62,7 +62,7 @@ module RASN1
       def initialize_copy(other)
         super
         @of_type = @of_type.dup
-        @value.map! { |v| v.dup }
+        @value = @value.map { |v| v.dup }
       end
 
       # Add an item to SEQUENCE OF
@@ -148,16 +148,8 @@ module RASN1
                    of_type_class.new(:t)
                  end
           nb_bytes += type.parse!(der[nb_bytes, der.length])
-          #value = if composed_of_type?
-          #          type.value.map { |obj| obj.value }
-          #        elsif of_type_class < Model
-          #          type.to_h[type.to_h.keys.first]
-          #        else
-          #          type.value
-          #        end
           @value << type
         end
-        #puts "#{name}: #{@value.inspect}"
       end
 
       def explicit_type

data/lib/rasn1/types/set.rb

@@ -12,11 +12,11 @@ module RASN1
     #    house [1] IMPLICIT INTEGER DEFAULT 0
     #  }
     # do:
-    #  set = RASN1::Types::Set.new(:record)
+    #  set = RASN1::Types::Set.new
     #  set.value = [
-    #               RASN1::Types::Integer(:id),
-    #               RASN1::Types::Integer(:id, explicit: 0, optional: true),
-    #               RASN1::Types::Integer(:id, implicit: 1, default: 0)
+    #               RASN1::Types::Integer
+    #               RASN1::Types::Integer(explicit: 0, optional: true),
+    #               RASN1::Types::Integer(implicit: 1, default: 0)
     #              ]
     # @author Sylvain Daubert
     class Set < Sequence

data/lib/rasn1/types/visible_string.rb

@@ -5,6 +5,13 @@ module RASN1
     # @author Sylvain Daubert
     class VisibleString < IA5String
       TAG = 26
+
+      # Get ASN.1 type
+      # @return [String]
+      def self.type
+        'VisibleString'
+      end
+
     end
   end
 end

data/lib/rasn1/version.rb

@@ -1,3 +1,3 @@
 module RASN1
-  VERSION = "0.6.0"
+  VERSION = "0.6.1"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rasn1
 version: !ruby/object:Gem::Version
-  version: 0.6.0
+  version: 0.6.1
 platform: ruby
 authors:
 - Sylvain Daubert
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-12-16 00:00:00.000000000 Z
+date: 2017-12-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: yard