rasn1 0.3.1 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b4242a3051584aaa4b2f6d2603e45b1d516da098
-  data.tar.gz: fe8a39c6b026c8d408cc97417ab470b2cd8c8c88
+  metadata.gz: 1db3f68204210c681a17f1d0a367d680906997b8
+  data.tar.gz: 8fec0011426f3b19dd61ef1ba57d904e0de14596
 SHA512:
-  metadata.gz: 3ef413c1ce1070a8d0d647e66a8022ae38947a71cb8d2b2ce1947379162459fe94fe6d1e53f2b4656d336e48efc66db22b33027010273b22b517ee2994048009
-  data.tar.gz: 2998c9805c9e0f017b5e1cb994ddb26de41e393f670da34429de4104eaa319cb7fdeeefd60badd75c08aacb3b43be6f0cd9c915e3d2a59670987066be3986100
+  metadata.gz: d1df79db814d23882b371fbe165c5966e19b75f17bacd9b97f2f9ad8b6dad967e060f01eff201389192562c54ad011ead484a1f0ce941dce33cdf081cc19978d
+  data.tar.gz: 7e4184159aee769387c5ecb62f6d1b02e48f477780597cc2dcd50d8bf6f1be93613e8319c90fdfdf4967e1f4f98ca9187c06911fa396fc229d40e4c461c12e3f

data/.gitignore

@@ -8,3 +8,4 @@
 /pkg/
 /spec/reports/
 /tmp/
+/vendor/

data/.travis.yml

@@ -1,6 +1,5 @@
 language: ruby
 rvm:
-  - 2.1
   - 2.2.7
   - 2.3.4
   - 2.4.1

data/README.md

@@ -1,4 +1,5 @@
 [![Gem Version](https://badge.fury.io/rb/rasn1.svg)](https://badge.fury.io/rb/rasn1)
+[![Build Status](https://travis-ci.org/sdaubert/rasn1.svg?branch=master)](https://travis-ci.org/sdaubert/rasn1)
 
 # Rasn1
 
@@ -29,9 +30,15 @@ Record ::= SEQUENCE {
   room  [0] INTEGER OPTIONAL,
   house [1] INTEGER DEFAULT 0
 }
+
+ComplexRecord ::= SEQUENCE {
+  bool      BOOLEAN,
+  data  [0] EXPLICIT OCTET STRING,
+  a_record  Record
+}
 ```
 
-## Create a ASN.1 model
+### Create a ASN.1 model
 
 ```ruby
 class Record < RASN1::Model
@@ -48,12 +55,12 @@ More comple classes may be designed by nesting simple classes. For example:
 class ComplexRecord < RASN1::Model
   sequence :cplx_record,
            content: [boolean(:bool),
-	             octet_string(:data, explicit: 0),
-		     model(:a_record, Record)]
+	                 octet_string(:data, explicit: 0),
+		             model(:a_record, Record)]
 end
 ```
 
-## Parse a DER-encoded string
+### Parse a DER-encoded string
 ```ruby
 record = Record.parse(der_string)
 record[:id]             # => RASN1::Types::Integer
@@ -66,9 +73,16 @@ record[:room].optional  # => true
 record[:house].default  # => 0
 
 record[:id].to_der      # => String
+
+cplx_record = ComplexRecord.parse(der_string)
+cplx_record[:bool]            # => RASN1::Types::Boolean
+cplx_record[:bool].value      # => TrueClass/FalseClass
+cplx_record[:data].value      # => String
+cplx_record[:data].explicit?  # => true
+cplx_record[:a_record]        # => Record
 ```
 
-## Generate a DER-encoded string
+### Generate a DER-encoded string
 ```ruby
 record = Record.new(id: 12)
 record[:id].to_i      # => 12
@@ -85,7 +99,10 @@ record.set id: 124, house: 155
 record.to_der         # => String
 ```
 
+### More information
+
+see https://github.com/sdaubert/rasn1/wiki
+
 ## Contributing
 
 Bug reports and pull requests are welcome on GitHub at https://github.com/sdaubert/rasn1.
-

data/lib/rasn1/model.rb

@@ -174,6 +174,7 @@ module RASN1
       # @param [String] str
       # @param [Boolean] ber accept BER encoding or not
       # @return [Model]
+      # @raise [ASN1Error] error on parsing
       def parse(str, ber: false)
         model = new
         model.parse! str, ber: ber
@@ -244,6 +245,7 @@ module RASN1
     # @param [String] str
     # @param [Boolean] ber accept BER encoding or not
     # @return [Integer] number of parsed bytes
+    # @raise [ASN1Error] error on parsing
     def parse!(str, ber: false)
       @elements[@root].parse!(str.dup.force_encoding('BINARY'), ber: ber)
     end
@@ -258,6 +260,10 @@ module RASN1
       end
     end
 
+    def inspect(level=0)
+      '  ' * level + "#{type} #{root.inspect(-level)}"
+    end
+
     private
 
     def is_composed?(el)

data/lib/rasn1/types/base.rb

@@ -200,6 +200,11 @@ module RASN1
         value_to_der.size
       end
 
+      def inspect(level=0)
+        str = ''
+        str << '  ' * level if level > 0
+        str << "#{name} #{type}: #{value}"
+      end
 
       private
 

data/lib/rasn1/types/constructed.rb

@@ -8,6 +8,30 @@ module RASN1
     class Constructed < Base
       # Constructed value
       ASN1_PC = 0x20
+
+      def inspect(level=0)
+        case @value
+        when Array
+          str = ''
+          str << '  ' * level if level > 0
+          level = level.abs
+          str << "#{type}:\n"
+          level += 1
+          @value.each do |item|
+            case item
+            when Base, Model
+              p item
+              next if item.optional? and item.value.nil?
+              str << '  ' * level + "#{item.inspect(level)}\n"
+            else
+              str << item.inspect
+            end
+          end
+          str
+        else
+          super
+        end
+      end
     end
   end
 end

data/lib/rasn1/types/octet_string.rb

@@ -13,6 +13,12 @@ module RASN1
     class OctetString < Primitive
       TAG = 0x04
 
+      def inspect(level=0)
+        str = ''
+        str << '  ' * level if level > 0
+        str << "#{name} #{type}: #{value.inspect}"
+      end
+
       private
 
       def value_to_der
@@ -30,4 +36,3 @@ module RASN1
     end
   end
 end
-

data/lib/rasn1/types/sequence_of.rb

@@ -54,6 +54,28 @@ module RASN1
         @value = []
       end
 
+      def inspect(level=0)
+        str = ''
+        str << '  ' * level if level > 0
+        level = level.abs
+        str << "#{type}:\n"
+        level += 1
+        @value.each do |item|
+          case item
+          when Base, Model
+            next if item.optional? and item.value.nil?
+            str << '  ' * level + "#{item.inspect(level)}"
+            str << "\n" unless item.is_a?(Model)
+          when Hash
+            type = of_type_class.new(item)
+            str << '  ' * level + "#{type.inspect(level)}"
+          else
+            str << '  ' * level + "#{item.inspect}\n"
+          end
+        end
+        str
+      end
+
       private
 
       def of_type_class
@@ -125,4 +147,3 @@ module RASN1
     end
   end
 end
-

data/lib/rasn1/version.rb

@@ -1,3 +1,3 @@
 module RASN1
-  VERSION = "0.3.1"
+  VERSION = "0.4.0"
 end

data/rasn1.gemspec

@@ -6,6 +6,7 @@ require 'rasn1/version'
 Gem::Specification.new do |spec|
   spec.name          = 'rasn1'
   spec.version       = RASN1::VERSION
+  spec.license       = 'MIT'
   spec.authors       = ['Sylvain Daubert']
   spec.email         = ['sylvain.daubert@laposte.net']
 
@@ -16,8 +17,6 @@ Gem::Specification.new do |spec|
   spec.files         = `git ls-files -z`.split("\x0").reject do |f|
     f.match(%r{^(test|spec|features)/})
   end
-  #spec.bindir        = 'exe'
-  #spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ['lib']
 
   spec.required_ruby_version = '>= 2.1.0'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rasn1
 version: !ruby/object:Gem::Version
-  version: 0.3.1
+  version: 0.4.0
 platform: ruby
 authors:
 - Sylvain Daubert
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-08-11 00:00:00.000000000 Z
+date: 2017-12-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: yard
@@ -115,13 +115,13 @@ files:
 - lib/rasn1/types/sequence_of.rb
 - lib/rasn1/types/set.rb
 - lib/rasn1/types/set_of.rb
-- lib/rasn1/types/set_spec.rb
 - lib/rasn1/types/utf8_string.rb
 - lib/rasn1/types/visible_string.rb
 - lib/rasn1/version.rb
 - rasn1.gemspec
 homepage: https://github.com/sdaubert/rasn1
-licenses: []
+licenses:
+- MIT
 metadata: {}
 post_install_message: 
 rdoc_options: []
@@ -139,7 +139,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.2
+rubygems_version: 2.6.13
 signing_key: 
 specification_version: 4
 summary: Ruby ASN.1 library

data/lib/rasn1/types/set_spec.rb

@@ -1,61 +0,0 @@
-module RASN1
-  module Types
-
-    describe Set do
-        before(:each) do
-          @set = Set.new(:set)
-          @bool = Boolean.new(:bool, default: true)
-          @int = Integer.new(:int)
-          @bs = BitString.new(:bs)
-          @set.value = [@bool, @int, @bs]
-
-          @no_bool_der = binary("\x30\x09\x02\x01\x2A\x03\x04\x01\x01\x04\x06")
-          @der = binary("\x30\x0c\x01\x01\x00\x02\x01\x2A\x03\x04\x01\x01\x04\x06")
-        end
-        
-      describe '.type' do
-        it 'gets ASN.1 type' do
-          expect(Set.type).to eq('SET')
-        end
-      end
-
-      describe '#initialize' do
-        it 'creates an Set with default values' do
-          set = Set.new(:set)
-          expect(set).to be_constructed
-          expect(set).to_not be_optional
-          expect(set.asn1_class).to eq(:universal)
-          expect(set.default).to eq(nil)
-        end
-      end
-
-      describe '#to_der' do
-        it 'generates a DER string' do
-          @int.value = 42
-          @bs.value = [1,4,6].pack('C3')
-          @bs.bit_length = 23
-          expect(@set.to_der).to eq(@no_bool_der)
-
-          @bool.value = false
-          expect(@set.to_der).to eq(@der)
-        end
-      end
-
-      describe '#parse!' do
-        it 'parses DER string' do
-          @set.parse!(@der)
-          expect(@bool.value).to be(false)
-          expect(@int.value).to eq(42)
-          expect(@bs.value).to eq([1,4,6].pack('C3'))
-          expect(@bs.bit_length).to eq(23)
-
-          @set.parse!(@no_bool_der)
-          expect(@bool.value).to be(true)
-          expect(@int.value).to eq(42)
-          expect(@bs.value).to eq([1,4,6].pack('C3'))
-          expect(@bs.bit_length).to eq(23)
-        end
-      end
-    end
-  end
-end