zenml 1.5.0 → 1.5.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e7e7d6578ba04c84444242c022ecd32c186d420aadb60f5de4e8a73ce687f7b1
-  data.tar.gz: e4f4c0388727e80cbced76e9fd31b674ea21958190a2ddbcdfc65d4018282782
+  metadata.gz: bc8d8a0fee635054ffabb1fc90ba5b8ed78e6225f7932e2aa777a79274a5d502
+  data.tar.gz: 37c86142fdae037d59d5a27b661fdd5c0689a9bd8a652b910bdc30e82e2d63f0
 SHA512:
-  metadata.gz: 45f627b12002854fd6c58e50d388e317fde41197da73a9de2934f36963c0b8672856031240c7212fdc278175c7e52f27139bbd565bc98e86cef3d580fa16776a
-  data.tar.gz: d526a1a9a75f6467cb75385285a5f2b7936174d034a0003f685b47f1a07eda8dcf8418c2a9f55103c0ad20ab0b2f7462eb1f3893e6b343c07f75448e1cb35b9d
+  metadata.gz: ecc6096ee7aca2992e8e3eb2f9d8d6dd703bca5d00a53c8d5b1eba2ccf256ac466c41ee97a795eb4afea9d55bdb576cc5d0133314e788a3ed8cf0d82aa8ea69b
+  data.tar.gz: e9aa413207a31753012f8e814fc63ac7ec7d7fdd4ea4a57312d2b4698d221fd3e0377556902367328dc4dd64ee4495d59461bcc01ebd077a8062cec90e80b120

data/source/zenml.rb

@@ -1,17 +1,19 @@
 # coding: utf-8
 
 
-require 'zenml/utility'
+module Zenithal
 
+  VERSION = "1.5.1"
+  VERSION_ARRAY = VERSION.split(/\./).map(&:to_i)
 
-module Zenithal
+end
 
-  VERSION = "1.5.0"
 
-  require 'zenml/error'
-  require 'zenml/reader'
-  require 'zenml/parser_utility'
-  require 'zenml/parser'
-  require 'zenml/converter'
+require 'rexml/document'
 
-end
+require 'zenml/error'
+require 'zenml/reader'
+require 'zenml/parser_utility'
+require 'zenml/parser'
+require 'zenml/converter'
+require 'zenml/utility'

data/source/zenml/converter.rb

@@ -1,12 +1,7 @@
 # coding: utf-8
 
 
-require 'pp'
-require 'rexml/document'
-include REXML
-
-
-class ZenithalConverter
+class Zenithal::ZenithalConverter
 
   SINGLETON_NAMES = ["br", "img", "hr", "meta", "input", "embed", "area", "base", "link"]
 
@@ -39,7 +34,7 @@ class ZenithalConverter
     if @type == :text
       document = convert_element(@document.root, initial_scope)
     else
-      document = Document.new
+      document = REXML::Document.new
       children = convert_element(@document.root, initial_scope)
       children.each do |child|
         document.add(child)
@@ -74,12 +69,12 @@ class ZenithalConverter
     nodes = empty_nodes
     element.children.each do |child|
       case child
-      when Element
+      when REXML::Element
         result_nodes = convert_element(child, scope, *args)
         if result_nodes
           nodes << result_nodes
         end
-      when Text
+      when REXML::Text
         result_nodes = convert_text(child, scope, *args)
         if result_nodes
           nodes << result_nodes
@@ -93,12 +88,12 @@ class ZenithalConverter
     nodes = empty_nodes
     element.each_xpath(xpath) do |child|
       case child
-      when Element
+      when REXML::Element
         result_nodes = convert_element(child, scope, *args)
         if result_nodes
           nodes << result_nodes
         end
-      when Text
+      when REXML::Text
         result_nodes = convert_text(child, scope, *args)
         if result_nodes
           nodes << result_nodes
@@ -136,7 +131,7 @@ class ZenithalConverter
   end
 
   def empty_nodes
-    return (@type == :text) ? "" : Nodes[]
+    return (@type == :text) ? "" : REXML::Nodes[]
   end
 
   # Override this method to customise how to initialise the variable hash.
@@ -147,7 +142,7 @@ class ZenithalConverter
 
   # Returns a simple converter that converts an XML document to the equivalent HTML document.
   def self.simple_html(document)
-    converter = ZenithalConverter.new(document, :text)
+    converter = Zenithal::ZenithalConverter.new(document, :text)
     converter.add([//], [""]) do |element|
       close = !SINGLETON_NAMES.include?(element.name)
       html = "<#{element.name}"

data/source/zenml/error.rb

@@ -1,7 +1,7 @@
 # coding: utf-8
 
 
-class ZenithalParseError < StandardError
+class Zenithal::ZenithalParseError < StandardError
 
   def initialize(message = "")
     super(message)

data/source/zenml/parser.rb

@@ -1,12 +1,7 @@
 # coding: utf-8
 
 
-require 'pp'
-require 'rexml/document'
-include REXML
-
-
-module ZenithalParserMethod
+module Zenithal::ZenithalParserMethod
 
   ELEMENT_START = "\\"
   MACRO_START = "&"
@@ -23,7 +18,7 @@ module ZenithalParserMethod
   SPECIAL_ELEMENT_ENDS = {:brace => "}", :bracket => "]", :slash => "/"}
   COMMENT_DELIMITER = "#"
   SYSTEM_INSTRUCTION_NAME = "zml"
-  MARKS = {:instruction => "?", :trim => "*", :verbal => "~", :multiple => "+"}
+  MARK_CHARS = {:instruction => "?", :trim => "*", :verbal => "~", :multiple => "+"}
   ESCAPE_CHARS = ["&", "<", ">", "'", "\"", "{", "}", "[", "]", "/", "\\", "|", "`", "#"]
   SPACE_CHARS = [0x20, 0x9, 0xD, 0xA]
   VALID_FIRST_IDENTIFIER_CHARS = [
@@ -58,7 +53,7 @@ module ZenithalParserMethod
   private
 
   def parse_document
-    document = Document.new
+    document = REXML::Document.new
     children = parse_nodes({})
     if @exact
       parse_eof 
@@ -75,7 +70,7 @@ module ZenithalParserMethod
       nodes = options[:plugin].parse
     elsif options[:verbal]
       raw_nodes = many(->{parse_text(options)})
-      nodes = raw_nodes.inject(Nodes[], :<<)
+      nodes = raw_nodes.inject(REXML::Nodes[], :<<)
     else
       parsers = []
       parsers << ->{parse_element(options)}
@@ -93,7 +88,7 @@ module ZenithalParserMethod
       parsers << ->{parse_comment(options)}
       parsers << ->{parse_text(options)}
       raw_nodes = many(->{choose(*parsers)})
-      nodes = raw_nodes.inject(Nodes[], :<<)
+      nodes = raw_nodes.inject(REXML::Nodes[], :<<)
     end
     return nodes
   end
@@ -137,7 +132,7 @@ module ZenithalParserMethod
   end
   
   def parse_mark(options)
-    parsers = MARKS.map do |mark, query|
+    parsers = MARK_CHARS.map do |mark, query|
       next ->{parse_char(query).yield_self{|_| mark}}
     end
     mark = choose(*parsers)
@@ -208,7 +203,7 @@ module ZenithalParserMethod
 
   def parse_empty_children(options)
     parse_char(CONTENT_END)
-    children = Nodes[]
+    children = REXML::Nodes[]
     return children
   end
 
@@ -313,7 +308,7 @@ module ZenithalParserMethod
   end
 
   def create_element(name, marks, attributes, children_list, options)
-    nodes = Nodes[]
+    nodes = REXML::Nodes[]
     if marks.include?(:trim)
       children_list.each do |children|
         children.trim_indents
@@ -334,20 +329,20 @@ module ZenithalParserMethod
   end
 
   def create_instruction(target, attributes, children, options)
-    nodes = Nodes[]
+    nodes = REXML::Nodes[]
     if target == SYSTEM_INSTRUCTION_NAME
       @version = attributes["version"] if attributes["version"]
       @special_element_names[:brace] = attributes["brace"] if attributes["brace"]
       @special_element_names[:bracket] = attributes["bracket"] if attributes["bracket"]
       @special_element_names[:slash] = attributes["slash"] if attributes["slash"]
     elsif target == "xml"
-      instruction = XMLDecl.new
-      instruction.version = attributes["version"] || XMLDecl::DEFAULT_VERSION
+      instruction = REXML::XMLDecl.new
+      instruction.version = attributes["version"] || REXML::XMLDecl::DEFAULT_VERSION
       instruction.encoding = attributes["encoding"]
       instruction.standalone = attributes["standalone"]
       nodes << instruction
     else
-      instruction = Instruction.new(target)
+      instruction = REXML::Instruction.new(target)
       actual_contents = []
       attributes.each do |key, value|
         actual_contents << "#{key}=\"#{value}\""
@@ -362,9 +357,9 @@ module ZenithalParserMethod
   end
 
   def create_normal_element(name, attributes, children_list, options)
-    nodes = Nodes[]
+    nodes = REXML::Nodes[]
     children_list.each do |children|
-      element = Element.new(name)
+      element = REXML::Element.new(name)
       attributes.each do |key, value|
         element.add_attribute(key, value)
       end
@@ -387,12 +382,12 @@ module ZenithalParserMethod
   end
 
   def create_text(raw_text, options)
-    text = Text.new(raw_text, true, nil, false)
+    text = REXML::Text.new(raw_text, true, nil, false)
     return text
   end
 
   def create_comment(kind, content, options)
-    comment = Comment.new(" " + content.strip + " ")
+    comment = REXML::Comment.new(" " + content.strip + " ")
     return comment
   end
 
@@ -404,7 +399,7 @@ module ZenithalParserMethod
   end
 
   def process_macro(name, marks, attributes, children_list, options)
-    elements = Nodes[]
+    elements = REXML::Nodes[]
     if @macros.key?(name)
       raw_elements = @macros[name].call(attributes, children_list)
       raw_elements.each do |raw_element|
@@ -421,9 +416,9 @@ module ZenithalParserMethod
 end
 
 
-class ZenithalParser < Parser
+class Zenithal::ZenithalParser < Zenithal::Parser
 
-  include ZenithalParserMethod
+  include Zenithal::ZenithalParserMethod
 
   attr_accessor :exact
   attr_accessor :whole

data/source/zenml/parser_utility.rb

@@ -1,7 +1,7 @@
 # coding: utf-8
 
 
-class Parser
+class Zenithal::Parser
 
   ERROR_TAG = Object.new
 
@@ -9,24 +9,24 @@ class Parser
 
   def initialize(source)
     case source
-    when StringReader
+    when Zenithal::StringReader
       @source = source
     when File
-      @source = StringReader.new(source.read)
+      @source = Zenithal::StringReader.new(source.read)
     else
-      @source = StringReader.new(source.to_s)
+      @source = Zenithal::StringReader.new(source.to_s)
     end
     @inside_run = false
   end
 
   def update(source)
     case source
-    when StringReader
+    when Zenithal::StringReader
       @source = source
     when File
-      @source = StringReader.new(source.read)
+      @source = Zenithal::StringReader.new(source.read)
     else
-      @source = StringReader.new(source.to_s)
+      @source = Zenithal::StringReader.new(source.to_s)
     end
     @inside_run = false
   end
@@ -42,7 +42,7 @@ class Parser
       end
     end
     unless value
-      raise ZenithalParseError.new(message)
+      raise Zenithal::ZenithalParseError.new(message)
     end
     return value
   end

data/source/zenml/reader.rb

@@ -1,7 +1,7 @@
 # coding: utf-8
 
 
-class StringReader
+class Zenithal::StringReader
 
   attr_reader :lineno
   attr_reader :columnno

data/source/zenml/utility.rb

@@ -1,11 +1,7 @@
 # coding: utf-8
 
 
-require 'rexml/document'
-include REXML
-
-
-class Tag
+class Zenithal::Tag
 
   attr_accessor :name
   attr_accessor :content
@@ -71,7 +67,7 @@ class Tag
 end
 
 
-class Element
+class REXML::Element
 
   alias old_get_index []
   alias old_set_index []=
@@ -94,12 +90,12 @@ class Element
 
   def each_xpath(*args, &block)
     if block
-      XPath.each(self, *args) do |element|
+      REXML::XPath.each(self, *args) do |element|
         block.call(element)
       end
     else
       enumerator = Enumerator.new do |yielder|
-        XPath.each(self, *args) do |element|
+        REXML::XPath.each(self, *args) do |element|
           yielder << element
         end
       end
@@ -111,9 +107,9 @@ class Element
     texts = []
     self.children.each do |child|
       case child
-      when Text
+      when REXML::Text
         texts << child
-      when Element
+      when REXML::Element
         texts.concat(child.get_texts_recursive)
       end
     end
@@ -121,7 +117,7 @@ class Element
   end
 
   def inner_text(compress = false)
-    text = XPath.match(self, ".//text()").map{|s| s.value}.join("")
+    text = REXML::XPath.match(self, ".//text()").map{|s| s.value}.join("")
     if compress
       text.gsub!(/\r/, "")
       text.gsub!(/\n\s*/, " ")
@@ -132,7 +128,7 @@ class Element
   end
 
   def self.build(name, &block)
-    element = Element.new(name)
+    element = REXML::Element.new(name)
     block.call(element)
     return element
   end
@@ -140,12 +136,12 @@ class Element
 end
 
 
-class Parent
+class REXML::Parent
 
   alias old_push <<
 
   def <<(object)
-    if object.is_a?(Nodes)
+    if object.is_a?(REXML::Nodes)
       object.each do |child|
         old_push(child)
       end
@@ -157,12 +153,12 @@ class Parent
 end
 
 
-class Nodes < Array
+class REXML::Nodes < Array
 
   alias old_push <<
 
   def <<(object)
-    if object.is_a?(Nodes)
+    if object.is_a?(REXML::Nodes)
       object.each do |child|
         old_push(child)
       end
@@ -173,19 +169,19 @@ class Nodes < Array
   end
 
   def +(other)
-    return Nodes.new(super(other))
+    return REXML::Nodes.new(super(other))
   end
 
   def trim_indents
     texts = []
-    if self.last.is_a?(Text)
+    if self.last.is_a?(REXML::Text)
       self.last.value = self.last.value.rstrip
     end
     self.each do |child|
       case child
-      when Text
+      when REXML::Text
         texts << child
-      when Element
+      when REXML::Element
         texts.concat(child.get_texts_recursive)
       end
     end
@@ -198,7 +194,7 @@ class Nodes < Array
     texts.each do |text|
       text.value = text.value.gsub(/\n(\x20+)/){"\n" + " " * ($1.length - indent_length)}
     end
-    if self.first.is_a?(Text)
+    if self.first.is_a?(REXML::Text)
       self.first.value = self.first.value.lstrip
     end
   end
@@ -209,7 +205,7 @@ end
 class String
 
   def ~
-    return Text.new(self, true, nil, false)
+    return REXML::Text.new(self, true, nil, false)
   end
 
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: zenml
 version: !ruby/object:Gem::Version
-  version: 1.5.0
+  version: 1.5.1
 platform: ruby
 authors:
 - Ziphil
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-02-20 00:00:00.000000000 Z
+date: 2020-04-15 00:00:00.000000000 Z
 dependencies: []
 description: |
   This gem serves a tool for parsing a document written in ZenML, an alternative new syntax for XML, to an XML node tree.