junoser 0.2.2 → 0.2.3

data/lib/junoser/ruler.rb

@@ -54,7 +54,7 @@ module Junoser
       str.gsub! '"as-path-prepend" arg', '"as-path-prepend" (quote | arg)'
       str.gsub! '"path-list" arg (', 'b(ipaddr,'
 
-      str.gsub!(/(s\(\s*)"address" \(\s*arg\s*\)/) { "#{$1}arg" }
+      str.gsub!(/(s\(\s*)"address" arg/) { "#{$1}arg" }
       str.gsub!(/^(\s*"idle-timeout" \(\s*c\(\s*c\(\s*"forever",\s*)"timeout" arg/) { "#{$1}arg" }
 
       str = omit_label(str, 'contents', 'syslog_object')
@@ -87,7 +87,7 @@ module Junoser
         str.gsub!(/^(\s*"#{key}" \(\s*)c\(\s*arg,/) { "#{$1}sca(" }
       end
       %w[exact longer orlonger].each do |key|
-        str.gsub!(/^(\s*"#{key}") \(\s*arg\s*\)/) { "#{$1}" }
+        str.gsub!(/^(\s*"#{key}") arg/) { "#{$1}" }
       end
 
       str.gsub!(/^(\s*)"inline-services"/) do

data/lib/junoser/version.rb

@@ -1,3 +1,3 @@
 module Junoser
-  VERSION = "0.2.2"
+  VERSION = "0.2.3"
 end

data/lib/junoser/xsd/choice.rb

@@ -16,16 +16,17 @@ module Junoser
           else
             raise "ERROR: unknown element: #{child.name}"
           end
-        }.compact
+        }
       end
 
       def to_s
         case
         when config.empty?
+          ''
         when has_single_child_of?(Junoser::Xsd::Choice)
-          format('c(', config.first.config.map(&:to_s).compact.join(",\n"), ')')
+          format('c(', config.first.config.map(&:to_s).join(",\n"), ')')
         else
-          format('c(', config.map(&:to_s).compact.join(",\n"), ')')
+          format('c(', config.map(&:to_s).join(",\n"), ')')
         end
       end
     end

data/lib/junoser/xsd/complex_type.rb

@@ -26,11 +26,11 @@ module Junoser
           else
             raise "ERROR: unknown element: #{child.name}"
           end
-        }.compact
+        }
       end
 
       def to_s
-        str = config.map {|c| c.is_a?(String) ? format(OFFSET + c) : c.to_s }.compact.join("\n")
+        str = config.map {|c| c.is_a?(String) ? format(OFFSET + c) : c.to_s }.join("\n")
 
         str = case [!argument.nil?, !str.empty?]
               when [true, true]

data/lib/junoser/xsd/element.rb

@@ -9,7 +9,7 @@ module Junoser
 
       def initialize(xml, options={})
         super
-        @argument = find_name_element || find_single_simple_type || find_simple_type_attribute
+        @argument = find_name_element || find_type_attribute
       end
 
       def config
@@ -22,37 +22,30 @@ module Junoser
           else
             raise "ERROR: unknown element: #{child.name}"
           end
-        }.compact
+        }
       end
 
       def to_s
-        str = config.map {|c| c.is_a?(String) ? format(OFFSET + c) : c.to_s }.compact.join("\n")
-
         str = case
-              when str.empty? && xml['type']
-                l = label ? "#{label} (" : '('
-                format(l, format(OFFSET + xml['type'].underscore), ')')
-              when str.empty?
+              when content.empty?
                 format(label)
+              when content =~ /^ *arg$/
+                format("#{label} arg")
+              when label
+                format("#{label} (", content, ')')
               else
-                l = label ? "#{label} (" : '('
-                format(l, str, ')')
+                format('(', content, ')')
               end
 
         oneliner? ? "#{str}.as(:oneline)" : str
       end
 
       def content
-        str = config.map {|c| c.is_a?(String) ? format(OFFSET + c) : c.to_s }.compact.join("\n")
-
-        case
-        when str.empty? && xml['type']
-          format(OFFSET + xml['type'].underscore)
-        when str.empty?
-          ''
-        else
-          str
-        end
+        @content ||= if config.empty?
+                     xml['type'] ? format(OFFSET + xml['type'].underscore) : ''
+                   else
+                     config.map {|c| c.is_a?(String) ? format(OFFSET + c) : c.to_s }.join("\n")
+                   end
       end
 
 
@@ -83,13 +76,7 @@ module Junoser
         xml.xpath('./xsd:complexType/xsd:sequence/xsd:element[@name="name"]').remove.first
       end
 
-      def find_single_simple_type
-        simples = xml.xpath('./xsd:simpleType').remove
-        raise "ERROR: Element shouldn't have simpleType child and another" if simples.size > 1
-        simples.first
-      end
-
-      def find_simple_type_attribute
+      def find_type_attribute
         if xml['type'] =~ /^xsd:.*/
           xml.remove_attribute 'type'
           'arg'

data/lib/junoser/xsd/enumeration.rb

@@ -12,11 +12,11 @@ module Junoser
       def config
         raise "ERROR: unknown Enumeration format" if children.size > 1
 
-        has_match? ? 'arg' : %["#{xml['value']}"]
+        has_match? ? ['arg'] : [%["#{xml['value']}"]]
       end
 
       def to_s
-        format(OFFSET + config)
+        format(OFFSET + config.first)
       end
 
 

data/lib/junoser/xsd/restriction.rb

@@ -20,13 +20,13 @@ module Junoser
           else
             raise "ERROR: unknown element: #{child.name}"
           end
-        }.compact
+        }
       end
 
       def to_s
         return format('arg') if config.empty?
 
-        str = '(' + config.map {|c| c.to_s.strip }.compact.join(' | ') + ')'
+        str = '(' + config.map {|c| c.to_s.strip }.join(' | ') + ')'
         format(str)
       end
     end

data/lib/junoser/xsd/sequence.rb

@@ -19,7 +19,7 @@ module Junoser
           else
             raise "ERROR: unknown element: #{child.name}"
           end
-        }.compact
+        }
       end
 
       def to_s
@@ -27,10 +27,10 @@ module Junoser
         when config.empty?
         when has_single_child_of?(Junoser::Xsd::Choice)
           child = config.first
-          str = child.config.map(&:to_s).compact.join(",\n")
+          str = child.config.map(&:to_s).reject(&:empty?).join(",\n")
           format('c(', str, ')') unless str.empty?
         else
-          str = config.map {|c| c.is_a?(String) ? format(OFFSET + c) : c.to_s }.compact.join(",\n")
+          str = config.map {|c| c.is_a?(String) ? format(OFFSET + c) : c.to_s }.reject(&:empty?).join(",\n")
           format('s(', str, ')')
         end
       end

data/lib/junoser/xsd/simple_content.rb

@@ -16,7 +16,7 @@ module Junoser
           else
             raise "ERROR: unknown element: #{child.name}"
           end
-        }.compact
+        }
       end
 
       def to_s

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: junoser
 version: !ruby/object:Gem::Version
-  version: 0.2.2
+  version: 0.2.3
 platform: ruby
 authors:
 - Shintaro Kojima
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-02-25 00:00:00.000000000 Z
+date: 2016-08-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: parslet