junoser 0.7.2 → 0.7.3

data/lib/junoser/xsd/base.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Junoser
   module Xsd
     module Base
@@ -5,18 +7,18 @@ module Junoser
 
       OFFSET = '  '
 
-      def initialize(xml, options={})
+      def initialize(xml, options = {})
         @xml = xml
         @depth = options[:depth] || 0
         @parent = options[:parent]
       end
 
       def config
-        raise "ERROR: no implementation"
+        raise 'ERROR: no implementation'
       end
 
       def children
-        @children||= xml.xpath('./*[not(self::xsd:annotation)]')
+        @children ||= xml.xpath('./*[not(self::xsd:annotation)]')
       end
 
       def root?
@@ -25,12 +27,12 @@ module Junoser
 
       def inspect
         ["#<#{self.class}:0x#{object_id}",
-         "xml=#{xml.namespace.prefix}:#{xml.name}" <<
-         " attributes=" << Hash[xml.attributes.map {|k, v| [k, v.value] }].to_s <<
-         (respond_to?(:label) ? " label=#{label}" : ''),
-         "config=[",
-         *config.map {|c| c.inspect },
-         ']>'].join("\n#{OFFSET*(@depth+1)}")
+         "xml=#{xml.namespace.prefix}:#{xml.name} " \
+         "attributes=#{xml.attributes.transform_values(&:value)}" <<
+           (respond_to?(:label) ? " label=#{label}" : ''),
+         'config=[',
+         *config.map(&:inspect),
+         ']>'].join("\n#{OFFSET * (@depth + 1)}")
       end
 
       def oneliner?
@@ -38,7 +40,6 @@ module Junoser
         @oneliner ||= !xml.xpath('./xsd:annotation/xsd:appinfo/*[local-name()="flag" and text()="oneliner"]').empty?
       end
 
-
       private
 
       def nokeyword?
@@ -46,14 +47,14 @@ module Junoser
         @nokeyword ||= !xml.xpath('./xsd:annotation/xsd:appinfo/*[local-name()="flag" and text()="nokeyword"]').empty?
       end
 
-      def has_single_child_of?(klass)
+      def has_single_child_of?(klass) # rubocop:disable Naming/PredicatePrefix
         config.size == 1 && config.first.is_a?(klass)
       end
 
-      def format(header, content=nil, footer=nil)
-        str = OFFSET*@depth << header.to_s
+      def fmt(header, content = nil, footer = nil)
+        str = (OFFSET * @depth) << header.to_s
         str << "\n" << content if content
-        str << "\n" << OFFSET*@depth << footer if footer
+        str << "\n" << (OFFSET * @depth) << footer if footer
         str
       end
     end

data/lib/junoser/xsd/choice.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'junoser/xsd/base'
 require 'junoser/xsd/element'
 
@@ -7,26 +9,25 @@ module Junoser
       include Base
 
       def config
-        @config ||= children.map {|child|
+        @config ||= children.map do |child|
           case child.name
           when 'element'
-            Junoser::Xsd::Element.new(child, depth: @depth+1, parent: self)
+            Junoser::Xsd::Element.new(child, depth: @depth + 1, parent: self)
           when 'choice'
-            Junoser::Xsd::Choice.new(child, depth: @depth+1, parent: self)
+            Junoser::Xsd::Choice.new(child, depth: @depth + 1, parent: self)
           else
             raise "ERROR: unknown element: #{child.name}"
           end
-        }
+        end
       end
 
       def to_s
-        case
-        when config.empty?
+        if config.empty?
           ''
-        when has_single_child_of?(Junoser::Xsd::Choice)
-          format('c(', config.first.config.map(&:to_s).join(",\n"), ')')
+        elsif has_single_child_of?(Junoser::Xsd::Choice)
+          fmt('c(', config.first.config.map(&:to_s).join(",\n"), ')')
         else
-          format('c(', config.map(&:to_s).join(",\n"), ')')
+          fmt('c(', config.map(&:to_s).join(",\n"), ')')
         end
       end
 

data/lib/junoser/xsd/complex_type.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'junoser/xsd/base'
 require 'junoser/xsd/element'
 require 'junoser/xsd/sequence'
@@ -8,35 +10,36 @@ module Junoser
     class ComplexType
       include Base
 
-      def initialize(xml, options={})
+      def initialize(xml, options = {})
         super
         raise "ERROR: #{xml.name} shouldn't have name '#{xml['name']}'" if xml['name'] && !root?
+
         @argument = find_name_element
       end
 
       def config
-        @config ||= children.map {|child|
+        @config ||= children.map do |child|
           case child.name
           when 'sequence'
-            Junoser::Xsd::Sequence.new(child, depth: @depth+1, parent: self)
+            Junoser::Xsd::Sequence.new(child, depth: @depth + 1, parent: self)
           when 'simpleContent'
-            Junoser::Xsd::SimpleContent.new(child, depth: @depth+1, parent: self)
+            Junoser::Xsd::SimpleContent.new(child, depth: @depth + 1, parent: self)
           when 'attribute'
             'arg'
           else
             raise "ERROR: unknown element: #{child.name}"
           end
-        }
+        end
       end
 
       def to_s
-        str = config.map {|c| c.is_a?(String) ? format(OFFSET + c) : c.to_s }.join("\n")
+        str = config.map { |c| c.is_a?(String) ? fmt(OFFSET + c) : c.to_s }.join("\n")
 
         str = case [!argument.nil?, !str.empty?]
               when [true, true]
-                format("#{argument} (", str, ')')
+                fmt("#{argument} (", str, ')')
               when [true, false]
-                format(argument)
+                fmt(argument)
               when [false, true]
                 simple_argument?(str) ? "#{str}.as(:arg)" : str
               else
@@ -46,17 +49,16 @@ module Junoser
         oneliner? ? "#{str}.as(:oneline)" : str
       end
 
-
       private
 
       def argument
         return unless @argument
 
-        arg = Junoser::Xsd::Element.new(@argument, depth: @depth+1, parent: self).config
+        arg = Junoser::Xsd::Element.new(@argument, depth: @depth + 1, parent: self).config
         raise "ERROR: argument shouldn't consist of multiple elements" if arg.size > 1
 
         if root?
-          arg.first.to_s.strip + ".as(:arg)"
+          "#{arg.first.to_s.strip}.as(:arg)"
         else
           arg.first.to_s.strip
         end

data/lib/junoser/xsd/element.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'junoser/xsd/base'
 require 'junoser/xsd/complex_type'
 require 'junoser/xsd/simple_type'
@@ -7,38 +9,37 @@ module Junoser
     class Element
       include Base
 
-      def initialize(xml, options={})
+      def initialize(xml, options = {})
         super
         @argument = find_name_element || find_type_attribute
       end
 
       def config
-        @config ||= children.map {|child|
+        @config ||= children.map do |child|
           case child.name
           when 'complexType'
-            Junoser::Xsd::ComplexType.new(child, depth: @depth+1, parent: self)
+            Junoser::Xsd::ComplexType.new(child, depth: @depth + 1, parent: self)
           when 'simpleType'
-            Junoser::Xsd::SimpleType.new(child, depth: @depth+1, parent: self)
+            Junoser::Xsd::SimpleType.new(child, depth: @depth + 1, parent: self)
           else
             raise "ERROR: unknown element: #{child.name}"
           end
-        }
+        end
       end
 
       def to_s
-        str = case
-              when nokeyword? && content.empty?
-                format('arg')
-              when nokeyword?
+        str = if nokeyword? && content.empty?
+                fmt(+'arg')
+              elsif nokeyword?
                 content
-              when content.empty?
-                format(label)
-              when content =~ /\A *arg\z/
-                format("#{label} arg")
-              when label
-                format("#{label} (", content, ')')
+              elsif content.empty?
+                fmt(label)
+              elsif content =~ /\A *arg\z/
+                fmt("#{label} arg")
+              elsif label
+                fmt("#{label} (", content, ')')
               else
-                format('(', content, ')')
+                fmt('(', content, ')')
               end
 
         oneliner? ? "#{str}.as(:oneline)" : str
@@ -46,32 +47,31 @@ module Junoser
 
       def content
         @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
+                       xml['type'] ? fmt(OFFSET + xml['type'].underscore) : ''
+                     else
+                       config.map { |c| c.is_a?(String) ? fmt(OFFSET + c) : c.to_s }.join("\n")
+                     end
       end
 
-
       private
 
       def label
         return unless xml['name']
 
-        %["#{xml['name']}" #{argument}].strip
+        %("#{xml['name']}" #{argument}).strip
       end
 
       def argument
         return unless @argument
 
-        case
-        when @argument.is_a?(String)
+        if @argument.is_a?(String)
           @argument
-        when @argument.name == 'simpleType'
+        elsif @argument.name == 'simpleType'
           'arg'
         else
-          arg = Junoser::Xsd::Element.new(@argument, depth: @depth+1, parent: self).config
+          arg = Junoser::Xsd::Element.new(@argument, depth: @depth + 1, parent: self).config
           raise "ERROR: argument shouldn't consist of multiple elements" if arg.size > 1
+
           arg.first.to_s.strip
         end
       end
@@ -81,25 +81,23 @@ module Junoser
       end
 
       def find_type_attribute
-        if xml['type'] =~ /^xsd:.*/
-          xml.remove_attribute 'type'
-          'arg'
-        end
+        return unless xml['type'] =~ /^xsd:.*/
+
+        xml.remove_attribute 'type'
+        'arg'
       end
 
-      def format(header, content = nil, footer = nil)
-        if documentation
-          header += "  /* #{documentation} */"
-        end
+      def fmt(header, content = nil, footer = nil)
+        header << "  /* #{documentation} */" if documentation
 
-        super(header, content, footer)
+        super
       end
 
       def documentation
         @documentation ||= xml.xpath('./xsd:annotation/xsd:documentation').text
 
         # Translate multiline documentation into a single line to make it parsable in further processes
-        @documentation.gsub! /\n\s*/, ' '
+        @documentation.gsub!(/\n\s*/, ' ')
 
         @documentation.empty? ? nil : @documentation
       end

data/lib/junoser/xsd/enumeration.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'junoser/xsd/base'
 
 module Junoser
@@ -5,29 +7,28 @@ module Junoser
     class Enumeration
       include Base
 
-      def initialize(xml, options={})
+      def initialize(xml, options = {})
         super
       end
 
       def config
-        raise "ERROR: unknown Enumeration format" if children.size > 1
+        raise 'ERROR: unknown Enumeration format' if children.size > 1
 
-        has_match? ? ['arg'] : [%["#{xml['value']}"]]
+        has_match? ? ['arg'] : [%("#{xml['value']}")]
       end
 
       def to_s
         if nokeyword?
-          format(OFFSET + 'arg')
+          fmt("#{OFFSET}arg")
         else
-          format(OFFSET + config.first)
+          fmt(OFFSET + config.first)
         end
       end
 
-
       private
 
-      def has_match?
-        return true unless xml.xpath('.//match').empty?
+      def has_match? # rubocop:disable Naming/PredicatePrefix
+        true unless xml.xpath('.//match').empty?
       end
     end
   end

data/lib/junoser/xsd/parsable.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'junoser/xsd/complex_type'
 require 'junoser/xsd/element'
 require 'nokogiri'

data/lib/junoser/xsd/restriction.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'junoser/xsd/base'
 require 'junoser/xsd/enumeration'
 require 'junoser/xsd/simple_type'
@@ -8,38 +10,38 @@ module Junoser
       include Base
 
       def children
-        @children||= xml.xpath('./*[not(self::xsd:annotation or ' +
-                               'self::xsd:minInclusive or self::xsd:maxInclusive or ' +
-                               'self::xsd:minLength or self::xsd:maxLength)]')
+        @children ||= xml.xpath('./*[not(self::xsd:annotation or ' \
+                                'self::xsd:minInclusive or self::xsd:maxInclusive or ' \
+                                'self::xsd:minLength or self::xsd:maxLength)]')
       end
 
       def config
-        @config ||= children.map {|child|
+        @config ||= children.map do |child|
           case child.name
           when 'enumeration'
-            Junoser::Xsd::Enumeration.new(child, depth: @depth+1, parent: self)
+            Junoser::Xsd::Enumeration.new(child, depth: @depth + 1, parent: self)
           when 'simpleType'
-            Junoser::Xsd::SimpleType.new(child, depth: @depth+1, parent: self)
+            Junoser::Xsd::SimpleType.new(child, depth: @depth + 1, parent: self)
           when 'attribute'
+            nil
           else
             raise "ERROR: unknown element: #{child.name}"
           end
-        }.compact
+        end.compact
       end
 
       def to_s
-        return format('arg') if config.empty?
+        return fmt('arg') if config.empty?
 
-        str = enumeration? ? 'enum' : ''
-        str += '(' + config.map {|c| c.to_s.strip }.join(' | ') + ')'
-        format(str)
+        str = enumeration? ? +'enum' : +''
+        str << "(#{config.map { |c| c.to_s.strip }.join(' | ')})"
+        fmt(str)
       end
 
-
       private
 
       def enumeration?
-        children.reject {|c| c.name != 'enumeration'}.empty?
+        children.none? { |c| c.name == 'enumeration' }
       end
     end
   end

data/lib/junoser/xsd/sequence.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'junoser/xsd/base'
 require 'junoser/xsd/choice'
 require 'junoser/xsd/element'
@@ -8,23 +10,24 @@ module Junoser
       include Base
 
       def config
-        @config ||= children.map {|child|
+        @config ||= children.map do |child|
           case child.name
           when 'choice'
-            Junoser::Xsd::Choice.new(child, depth: @depth+1, parent: self)
+            Junoser::Xsd::Choice.new(child, depth: @depth + 1, parent: self)
           when 'element'
-            Junoser::Xsd::Element.new(child, depth: @depth+1, parent: self)
+            Junoser::Xsd::Element.new(child, depth: @depth + 1, parent: self)
           when 'any'
             'any'
           else
             raise "ERROR: unknown element: #{child.name}"
           end
-        }
+        end
       end
 
       def to_s
         case
         when config.empty?
+          ''
         when has_single_child_of?(Junoser::Xsd::Choice)
           child = config.first
           str = child.config.map(&:to_s).reject(&:empty?).join(",\n")
@@ -33,13 +36,13 @@ module Junoser
 
           # Assuming that <xsd:sequence> always has <xsd:complexType> as the parent
           if parent.parent&.oneliner? && config.first.unbounded?
-            format('sc(', str, ')')
+            fmt('sc(', str, ')')
           else
-            format('c(', str, ')')
+            fmt('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, ')')
+          str = config.map { |c| c.is_a?(String) ? fmt(OFFSET + c) : c.to_s }.reject(&:empty?).join(",\n")
+          fmt('s(', str, ')')
         end
       end
     end

data/lib/junoser/xsd/simple_content.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'junoser/xsd/base'
 require 'junoser/xsd/restriction'
 
@@ -7,16 +9,16 @@ module Junoser
       include Base
 
       def config
-        @config ||= children.map {|child|
+        @config ||= children.map do |child|
           case child.name
           when 'restriction'
-            Junoser::Xsd::Restriction.new(child, depth: @depth+1, parent: self)
+            Junoser::Xsd::Restriction.new(child, depth: @depth + 1, parent: self)
           when 'extension'
             'arg'
           else
             raise "ERROR: unknown element: #{child.name}"
           end
-        }
+        end
       end
 
       def to_s
@@ -24,7 +26,7 @@ module Junoser
         raise "ERROR: simpleContent shouldn't have multiple children" if config.size > 1
 
         child = config.first
-        child.is_a?(String) ? format(OFFSET + child) : child.to_s
+        child.is_a?(String) ? fmt(OFFSET + child) : child.to_s
       end
     end
   end

data/lib/junoser/xsd/simple_type.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'junoser/xsd/base'
 require 'junoser/xsd/restriction'
 require 'junoser/xsd/union'
@@ -8,20 +10,20 @@ module Junoser
       include Base
 
       def config
-        @config ||= children.map {|child|
+        @config ||= children.map do |child|
           case child.name
           when 'restriction'
-            Junoser::Xsd::Restriction.new(child, depth: @depth+1, parent: self)
+            Junoser::Xsd::Restriction.new(child, depth: @depth + 1, parent: self)
           when 'union'
-            Junoser::Xsd::Union.new(child, depth: @depth+1, parent: self)
+            Junoser::Xsd::Union.new(child, depth: @depth + 1, parent: self)
           else
             raise "ERROR: unknown element: #{child.name}"
           end
-        }
+        end
       end
 
       def to_s
-        format(config.first.to_s.strip)
+        fmt(config.first.to_s.strip)
       end
     end
   end

data/lib/junoser/xsd/union.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'junoser/xsd/base'
 
 module Junoser
@@ -6,18 +8,18 @@ module Junoser
       include Base
 
       def config
-        @config ||= children.map {|child|
+        @config ||= children.map do |child|
           case child.name
           when 'simpleType'
-            Junoser::Xsd::SimpleType.new(child, depth: @depth+1, parent: self)
+            Junoser::Xsd::SimpleType.new(child, depth: @depth + 1, parent: self)
           else
             raise "ERROR: unknown element: #{child.name}"
           end
-        }
+        end
       end
 
       def to_s
-        format(config.first.to_s.strip)
+        fmt(config.first.to_s.strip)
       end
     end
   end

data/lib/junoser.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'junoser/cli'
 require 'junoser/display'
 require 'junoser/parser'

data/lib/underscorable.rb

@@ -1,12 +1,17 @@
+# frozen_string_literal: true
+
 module Underscorable
   # Port from activesupport-4.2.7.1/lib/active_support/inflector/methods.rb
   def underscore
     return self unless self =~ /[A-Z-]|::/
-    word = self.to_s.gsub(/::/, '/')
-    word.gsub!(/(?:(?<=([A-Za-z\d]))|\b)((?=a)b)(?=\b|[^a-z])/) { "#{$1 && '_'}#{$2.downcase}" }
-    word.gsub!(/([A-Z\d]+)([A-Z][a-z])/,'\1_\2')
-    word.gsub!(/([a-z\d])([A-Z])/,'\1_\2')
-    word.tr!("-", "_")
+
+    word = to_s.gsub('::', '/')
+    word.gsub!(/(?:(?<=([A-Za-z\d]))|\b)((?=a)b)(?=\b|[^a-z])/) do
+      "#{::Regexp.last_match(1) && '_'}#{::Regexp.last_match(2).downcase}"
+    end
+    word.gsub!(/([A-Z\d]+)([A-Z][a-z])/, '\1_\2')
+    word.gsub!(/([a-z\d])([A-Z])/, '\1_\2')
+    word.tr!('-', '_')
     word.downcase!
     word
   end