rasn1 0.3.0 → 0.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0fc2ee81216604dd99cf1bd78ab08ddd732bf32f
-  data.tar.gz: 66c4bece600e0a18f447f596c467ed76f5e4bbbc
+  metadata.gz: b4242a3051584aaa4b2f6d2603e45b1d516da098
+  data.tar.gz: fe8a39c6b026c8d408cc97417ab470b2cd8c8c88
 SHA512:
-  metadata.gz: 93cc5dabca26821d3d9a44eab7099d9cd4f2011b250beb25ba97d44371db1eaa4b242b0b459a8bc4232fc0a5022bd762bcd1826edb6335688cae437738900601
-  data.tar.gz: dc6a6cb74e5b0bdb84c3fb3f6faff06a979d7221b0f8caa025a06a193c672ca7c1e2732d1a106f1b7f99ca8b60f7790089832fa5fa8ff845283ccb26ffc750f5
+  metadata.gz: 3ef413c1ce1070a8d0d647e66a8022ae38947a71cb8d2b2ce1947379162459fe94fe6d1e53f2b4656d336e48efc66db22b33027010273b22b517ee2994048009
+  data.tar.gz: 2998c9805c9e0f017b5e1cb994ddb26de41e393f670da34429de4104eaa319cb7fdeeefd60badd75c08aacb3b43be6f0cd9c915e3d2a59670987066be3986100

data/.travis.yml

@@ -0,0 +1,10 @@
+language: ruby
+rvm:
+  - 2.1
+  - 2.2.7
+  - 2.3.4
+  - 2.4.1
+install:
+  - bundler install --path vendor/bundle --jobs=3 --retry=3
+script:
+  - bundler exec rake

data/lib/rasn1/model.rb

@@ -68,6 +68,32 @@ module RASN1
         @root = [name, model_klass]
       end
 
+      # Update options of root element.
+      # May be used when subclassing.
+      #  class Model1 < RASN1::Model
+      #    sequence :seq, implicit: 0,
+      #             content: [bool(:bool), integer(:int)]
+      #  end
+      #
+      #  # same as Model1 but with implicit tag set to 1
+      #  class Model2 < Model1
+      #    root_options implicit: 1
+      #  end
+      # @param [Hash] options
+      # @return [void]
+      def root_options(options)
+        @options = options
+      end
+
+      # On inheritance, create +@root+ class variable
+      # @param [Class] klass
+      # @return [void]
+      def inherited(klass)
+        super
+        root = @root
+        klass.class_eval { @root = root }
+      end
+
       # @method sequence(name, options)
       #  @see Types::Sequence#initialize
       # @method set(name, options)
@@ -76,8 +102,8 @@ module RASN1
       #  @see Types::Choice#initialize
       %w(sequence set choice).each do |type|
         class_eval "def #{type}(name, options={})\n" \
-                   "  proc = Proc.new do\n" \
-                   "    Types::#{type.capitalize}.new(name, options)\n" \
+                   "  proc = Proc.new do |opts|\n" \
+                   "    Types::#{type.capitalize}.new(name, options.merge(opts))\n" \
                    "  end\n" \
                    "  @root = [name, proc]\n" \
                    "  @root << options[:content] unless options[:content].nil?\n" \
@@ -92,8 +118,8 @@ module RASN1
       %w(sequence set).each do |type|
         klass_name = "Types::#{type.capitalize}Of"
         class_eval "def #{type}_of(name, type, options={})\n" \
-                   "  proc = Proc.new do\n" \
-                   "    #{klass_name}.new(name, type, options)\n" \
+                   "  proc = Proc.new do |opts|\n" \
+                   "    #{klass_name}.new(name, type, options.merge(opts))\n" \
                    "  end\n" \
                    "  @root = [name, proc]\n" \
                    "end"
@@ -116,7 +142,9 @@ module RASN1
       Types.primitives.each do |prim|
         next if prim == Types::ObjectId
         class_eval "def #{prim.type.downcase.gsub(/\s+/, '_')}(name, options={})\n" \
-                   "  proc = Proc.new { #{prim.to_s}.new(name, options) }\n" \
+                   "  proc = Proc.new do |opts|\n" \
+                   "    #{prim.to_s}.new(name, options.merge(opts))\n" \
+                   "  end\n" \
                    "  @root = [name, proc]\n" \
                    "end"
       end
@@ -125,13 +153,13 @@ module RASN1
       #   +Object#object_id+.
       # @see Types::ObjectId#initialize
       def objectid(name, options={})
-        proc = Proc.new { Types::ObjectId.new(name, options) }
+        proc = Proc.new { |opts| Types::ObjectId.new(name, options.merge(opts)) }
         @root = [name, proc]
       end
 
       # @see Types::Any#initialize
       def any(name, options={})
-        proc = Proc.new { Types::Any.new(name, options) }
+        proc = Proc.new { |opts| Types::Any.new(name, options.merge(opts)) }
         @root = [name, proc]
       end
 
@@ -240,10 +268,10 @@ module RASN1
       [Types::SequenceOf, Types::SetOf].include? el.class
     end
 
-    def get_type(proc_or_class, name=nil)
+    def get_type(proc_or_class, options={})
       case proc_or_class
       when Proc
-        proc_or_class.call
+        proc_or_class.call(options)
       when Class
         proc_or_class.new
       end
@@ -253,14 +281,14 @@ module RASN1
       root = self.class.class_eval { @root }
       @root = root[0]
       @elements = {}
-      @elements[@root] = get_type(root[1])
+      @elements[@root] = get_type(root[1], self.class.class_eval { @options } || {})
       root
     end
 
     def set_elements(name, el, content=nil)
       if content.is_a? Array
         @elements[name].value = content.map do |name2, proc_or_class, content2|
-          subel = get_type(proc_or_class, name2)
+          subel = get_type(proc_or_class)
           @elements[name2] = subel
           if is_composed?(subel) and content2.is_a? Array
             set_elements(name2, proc_or_class, content2)

data/lib/rasn1/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rasn1
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.3.1
 platform: ruby
 authors:
 - Sylvain Daubert
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-08-10 00:00:00.000000000 Z
+date: 2017-08-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: yard
@@ -88,6 +88,7 @@ extensions: []
 extra_rdoc_files: []
 files:
 - ".gitignore"
+- ".travis.yml"
 - Gemfile
 - LICENSE
 - README.md