junoser 0.3.3 → 0.3.4

data/lib/junoser/ruler.rb

@@ -12,6 +12,7 @@ module Junoser
 
     def rule
       str = @rule.read
+      str = remove_comments(str)
       str = process_reserved_element(str)
       str = str.split(/\n/).map {|l| format(process_line(l)) }.join("\n")
     end
@@ -19,6 +20,10 @@ module Junoser
 
     private
 
+    def remove_comments(str)
+      str.gsub(%r(\s*/\*.*\*/), '')
+    end
+
     def process_line(str)
       return str if str =~ /^(.* do|end)$/
 
@@ -26,12 +31,12 @@ module Junoser
 
       str.gsub!(/^(\s*)arg(\.as\(:\S+\))? \($/) { "#{$1}b(arg#$2," }  # arg ( -> b(arg,
       str.gsub!(/^(\s*)(str\(\S+\)) ([^ \t\n\r\f\(|,]+)(\.as\(:\S+\))?(,?)$/) { "#{$1}a(#$2, #$3)#$4#$5" }  # str("foo") bar -> a(str("foo"), bar)
-      str.gsub!(/^(\s*)(str\(\S+\)) \((.*)\)(,?)$/) { "#{$1}a(#$2, #$3)#$4" }  # str("foo") (a | b) -> a(str("foo"), a | b)
+      str.gsub!(/^(\s*)(str\(\S+\)) (enum)?\((.*)\)(,?)$/) { "#{$1}a(#$2, #$3#$4)#$5" }  # str("foo") (a | b) -> a(str("foo"), a | b)
 
       str.gsub!(/^(\s*)(str\(\S+\)) \($/) { "#{$1}b(#$2," }  # str("foo") ( -> b(str("foo"),
-      str.gsub!(/^(\s*)(\(.*\))(\.as\(:\S\))? \($/) { "#{$1}b(#$2#$3," }  # (a | b) ( -> b((a | b),
+      str.gsub!(/^(\s*)(enum)?(\(.*\))(\.as\(:\S\))? \($/) { "#{$1}b(#$2#$3#$4," }  # (a | b) ( -> b((a | b),
       str.gsub!(/^(\s*)(str\(\S+\)) ([^ \t\n\r\f\(|,]+) \($/) { "#{$1}b(a(#$2, #$3)," }  # str("foo") bar ( -> b(a(str("foo"), bar),
-      str.gsub!(/^(\s*)(str\(\S+\)) \((.*)\) \($/) { "#{$1}a(#$2, #$3," }  # str("foo") (a | b) ( -> a(str("foo"), a | b,
+      str.gsub!(/^(\s*)(str\(\S+\)) (enum)?\((.*)\) \($/) { "#{$1}a(#$2, #$3#$4," }  # str("foo") (a | b) ( -> a(str("foo"), a | b,
 
       str
     end
@@ -232,6 +237,10 @@ module Junoser
       (c(*objects, arg) >> space.maybe).repeat(0)
     end
 
+    def enum(object)
+      (object.as(:enum))
+    end
+
     rule(:arg)     { match('\\S').repeat(1) }
     rule(:space)   { match('\\s').repeat(1) }
     rule(:any)     { match('.').repeat(1) }

data/lib/junoser/squash.rb

@@ -42,6 +42,14 @@ module Junoser
     rule(oneline: sequence(:strs)) do
       strs.join(' ')
     end
+
+    rule(enum: simple(:str)) do
+      str
+    end
+
+    rule(enum: sequence(:strs)) do
+      strs.join(' ')
+    end
   end
 
   class Squash
@@ -87,4 +95,4 @@ module Junoser
       end
     end
   end
-end
+end

data/lib/junoser/transformer.rb

@@ -44,6 +44,14 @@ module Junoser
       strs.join(' ')
     end
 
+    rule(enum: simple(:str)) do
+      str.to_s.gsub("\n", ' ')
+    end
+
+    rule(enum: sequence(:strs)) do
+      strs.join(' ')
+    end
+
 
     def self.remove_slash_asterisk(array)
       open = array.index("arg(/*)\n")

data/lib/junoser/version.rb

@@ -1,3 +1,3 @@
 module Junoser
-  VERSION = "0.3.3"
+  VERSION = "0.3.4"
 end

data/lib/junoser/xsd/element.rb

@@ -86,6 +86,19 @@ module Junoser
           'arg'
         end
       end
+
+      def format(header, content = nil, footer = nil)
+        if documentation
+          header += "  /* #{documentation} */"
+        end
+
+        super(header, content, footer)
+      end
+
+      def documentation
+        @documentation ||= xml.xpath('./xsd:annotation/xsd:documentation').text
+        @documentation.empty? ? nil : @documentation
+      end
     end
   end
 end

data/lib/junoser/xsd/restriction.rb

@@ -30,9 +30,17 @@ module Junoser
       def to_s
         return format('arg') if config.empty?
 
-        str = '(' + config.map {|c| c.to_s.strip }.join(' | ') + ')'
+        str = enumeration? ? 'enum' : ''
+        str += '(' + config.map {|c| c.to_s.strip }.join(' | ') + ')'
         format(str)
       end
+
+
+      private
+
+      def enumeration?
+        children.reject {|c| c.name != 'enumeration'}.empty?
+      end
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: junoser
 version: !ruby/object:Gem::Version
-  version: 0.3.3
+  version: 0.3.4
 platform: ruby
 authors:
 - Shintaro Kojima
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-10-09 00:00:00.000000000 Z
+date: 2019-02-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: parslet
@@ -30,14 +30,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.9'
+        version: '2.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.9'
+        version: '2.0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -93,6 +93,7 @@ files:
 - ".travis.yml"
 - CHANGELOG.md
 - Gemfile
+- Gemfile.lock
 - LICENSE.txt
 - README.md
 - Rakefile
@@ -108,9 +109,11 @@ files:
 - lib/junoser/development.rb
 - lib/junoser/display.rb
 - lib/junoser/display/config_store.rb
+- lib/junoser/display/enumerable.rb
 - lib/junoser/display/set.rb
 - lib/junoser/display/structure.rb
 - lib/junoser/input.rb
+- lib/junoser/js_ruler.rb
 - lib/junoser/parser.rb
 - lib/junoser/ruler.rb
 - lib/junoser/squash.rb