junoser 0.3.9 → 0.4.0

data/lib/junoser/xsd/restriction.rb

@@ -17,9 +17,9 @@ module Junoser
         @config ||= children.map {|child|
           case child.name
           when 'enumeration'
-            Junoser::Xsd::Enumeration.new(child, depth: @depth+1)
+            Junoser::Xsd::Enumeration.new(child, depth: @depth+1, parent: self)
           when 'simpleType'
-            Junoser::Xsd::SimpleType.new(child, depth: @depth+1)
+            Junoser::Xsd::SimpleType.new(child, depth: @depth+1, parent: self)
           when 'attribute'
           else
             raise "ERROR: unknown element: #{child.name}"

data/lib/junoser/xsd/sequence.rb

@@ -11,9 +11,9 @@ module Junoser
         @config ||= children.map {|child|
           case child.name
           when 'choice'
-            Junoser::Xsd::Choice.new(child, depth: @depth+1)
+            Junoser::Xsd::Choice.new(child, depth: @depth+1, parent: self)
           when 'element'
-            Junoser::Xsd::Element.new(child, depth: @depth+1)
+            Junoser::Xsd::Element.new(child, depth: @depth+1, parent: self)
           when 'any'
             'any'
           else
@@ -28,7 +28,15 @@ module Junoser
         when has_single_child_of?(Junoser::Xsd::Choice)
           child = config.first
           str = child.config.map(&:to_s).reject(&:empty?).join(",\n")
-          format('c(', str, ')') unless str.empty?
+
+          return if str.empty?
+
+          # Assuming that <xsd:sequence> always has <xsd:complexType> as the parent
+          if parent.parent&.oneliner? && config.first.unbounded?
+            format('sc(', str, ')')
+          else
+            format('c(', str, ')')
+          end
         else
           str = config.map {|c| c.is_a?(String) ? format(OFFSET + c) : c.to_s }.reject(&:empty?).join(",\n")
           format('s(', str, ')')

data/lib/junoser/xsd/simple_content.rb

@@ -10,7 +10,7 @@ module Junoser
         @config ||= children.map {|child|
           case child.name
           when 'restriction'
-            Junoser::Xsd::Restriction.new(child, depth: @depth+1)
+            Junoser::Xsd::Restriction.new(child, depth: @depth+1, parent: self)
           when 'extension'
             'arg'
           else

data/lib/junoser/xsd/simple_type.rb

@@ -11,9 +11,9 @@ module Junoser
         @config ||= children.map {|child|
           case child.name
           when 'restriction'
-            Junoser::Xsd::Restriction.new(child, depth: @depth+1)
+            Junoser::Xsd::Restriction.new(child, depth: @depth+1, parent: self)
           when 'union'
-            Junoser::Xsd::Union.new(child, depth: @depth+1)
+            Junoser::Xsd::Union.new(child, depth: @depth+1, parent: self)
           else
             raise "ERROR: unknown element: #{child.name}"
           end

data/lib/junoser/xsd/union.rb

@@ -9,7 +9,7 @@ module Junoser
         @config ||= children.map {|child|
           case child.name
           when 'simpleType'
-            Junoser::Xsd::SimpleType.new(child, depth: @depth+1)
+            Junoser::Xsd::SimpleType.new(child, depth: @depth+1, parent: self)
           else
             raise "ERROR: unknown element: #{child.name}"
           end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: junoser
 version: !ruby/object:Gem::Version
-  version: 0.3.9
+  version: 0.4.0
 platform: ruby
 authors:
 - Shintaro Kojima
-autorequire: 
+autorequire:
 bindir: exe
 cert_chain: []
-date: 2019-11-17 00:00:00.000000000 Z
+date: 2021-05-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: parslet
@@ -44,14 +44,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '13.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '13.0'
 - !ruby/object:Gem::Dependency
   name: nokogiri
   requirement: !ruby/object:Gem::Requirement
@@ -99,6 +99,9 @@ files:
 - Rakefile
 - bin/console
 - bin/setup
+- example/get-schema.xml
+- example/junos-18.1R3-S9.rb
+- example/mx-19.3R3-S1.3.rb
 - example/vmx-17.2R1.13.rb
 - example/vsrx-12.1.x47.rb
 - example/vsrx-18.3R1.9.rb
@@ -135,7 +138,7 @@ files:
 homepage: https://github.com/codeout/junoser
 licenses: []
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -150,8 +153,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.4
-signing_key: 
+rubygems_version: 3.2.15
+signing_key:
 specification_version: 4
 summary: PEG parser for JUNOS configuration.
 test_files: []