extreml 1.0.0 → 2.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6c29a7f392a3738bfb30da390a0f5300a7eaf0a18b3a362b646ab714960d49bf
-  data.tar.gz: e9aeb041084b680b59cb59e6d3f027b85c187d50f38c51ed7009ec1fd8a69712
+  metadata.gz: e8ce77cbbe37518250fd8c88a7ac26541804fd4d6d01fdd647e7d9b839638966
+  data.tar.gz: 3fd36d023fd14a44ed7010e23c2335ee1eb3c3fe5109feb5f381d0c89af57f98
 SHA512:
-  metadata.gz: ecb15668d52e77309ea60a1e2151391e1b1e8a87ba67dd758e68e2d9ac04a62d4ac85fd000ebb9689e30cc8766e5fb8fc054b4ddab0ec4b6254d30ac860e9f70
-  data.tar.gz: 102ab70c8118fb6bf1d7e5a5012f02036d7a7c15ad5c2409390c63f5fa66f808677b18f12506289f10c1cdf2eb12f9989bdf0c8bdd949ebf2d26022db3850dca
+  metadata.gz: 191d4e328f54409ab5a0562cfab9b9f10180af318b8495bcc9e1e706bcf5fe85b8f50892e25be5fed24bb44c690e0ac858e8d3f5d8d7ff82f9e55b5da629d12f
+  data.tar.gz: 29982ef3e554190b4fc0cd1b48840740ab2264fda7130306704f4e1a9faab98dd212d7fedda9ba8bba018b62260b777c2d2519600f48b5985cdab09d7c2c12d0

data/lib/extreml.rb

@@ -27,42 +27,45 @@ class Extreml
 
     # Warnings flag
     @warnings = warnings
-    @header = xml_header
+    @header = XmlHeader.new xml_header
 
     if xml_file.nil?
-      raise 'Error: please specify an xml file. Nil was given.'
-    elsif !File.file? xml_file
-      raise "Error: file #{xml_file} not found."
+      @document = Array.new
     else
+      if !File.file? xml_file
+        raise "Error: file #{xml_file} not found."
+      else
 
-      # Read file
-      xml = File.read xml_file
+        # Read file
+        xml = File.read xml_file
 
-      @body = Hash.new
+        @body = Hash.new
 
-      # Get xml header informations
-      header = xml[/^\<\?xml (.*)\?\>/]
+        # Get xml header informations
+        header = xml[/^\<\?xml (.*)\?\>/]
 
-      if header.nil?
-        puts "Warning: #{xml_file}: xml header missing." if @warnings
-        define_singleton_method :header do
-          return nil
-        end
-      else
-        h = header.scan /([\w\?\<]*)=["|']([^'"]*)["|']/
+        if header.nil?
+          puts "Warning: #{xml_file}: xml header missing." if @warnings
+          define_singleton_method :header do
+            return nil
+          end
+        else
+          h = header.scan /([\w\?\<]*)=["|']([^'"]*)["|']/
 
-        @xml_header = XmlHeader.new header
+          @xml_header = XmlHeader.new header
 
-        define_singleton_method :header do
-          return @xml_header
+          define_singleton_method :header do
+            return @xml_header
+          end
         end
+
       end
 
-    end
+      # Read document
+      doc = xml.match /(?:\<\?xml .*?(?: ?\?\>))?[\t\n\r\f ]*(.*)/m
+      @document = unpack doc[1]
 
-    # Read document
-    doc = xml.match /(?:\<\?xml .*?(?: ?\?\>))?[\t\n\r\f ]*(.*)/m
-    @document = unpack doc[1]
+    end
 
   end
 
@@ -90,12 +93,42 @@ class Extreml
 
   # Expose the entire document
   def document
-    return TypeElement.new({name: 'document', content: @document})
+    return TypeElement.new({name: 'document', content: @document}, main_element: self)
+  end
+
+  # update content from a subsequent element
+  def update_content key, content
+    # byebug
+    # @document = content.to_hash
+    # upd = false
+    # @document.each do |e|
+    #   byebug
+    #   if e[:name] == key
+    #     upd = true
+    #     content.each do |k,v|
+    #       e[k] = v
+    #     end
+    #     break
+    #   end
+    # end
+    #
+    # unless upd
+    #   @document << content
+    # end
+    # if @document[key].nil?
+    #   @document[key] = content
+    # else
+    #   unless @document[key].class = Array
+    #     @document[key] = [@document[key]]
+    #   end
+    #   @document[key] << content.to_hash
+    # end
+
   end
 
   # Print the entire document tree. For debug purposes
   def tree attributes: false
-    self.document.__tree attributes
+    self.document.__tree attributes: attributes
   end
 
   private

data/lib/extreml/type_element.rb

@@ -25,7 +25,7 @@ require 'json'
 
 class Extreml::TypeElement
 
-  def initialize document
+  def initialize document = nil, main_element: nil
 
     # document model:
     #
@@ -50,6 +50,7 @@ class Extreml::TypeElement
     @attributes = document[:attributes]
     @content = document[:content]
     @types = Array.new
+    @main_element = main_element
 
     # Add a type for every element in content
     unless @content.nil?
@@ -102,14 +103,33 @@ class Extreml::TypeElement
     if self.__types.any? name.to_sym
       array = self.send name.to_sym
       define_singleton_method name.to_sym do
-        return [array].flatten + [(content.class == Hash ? (Extreml::TypeElement.new content) : content)]
+        content = [array].flatten + [(content.class == Hash ? (Extreml::TypeElement.new content, main_element: self) : content)]
+        case content.length
+        when 0
+          return nil
+        when 1
+          return content[0]
+        else
+          return content
+        end
       end
     else
       define_singleton_method name.to_sym do
         if content.class == Hash
-          return Extreml::TypeElement.new content
+          return Extreml::TypeElement.new content, main_element: self
         else
-          return content
+          if content.class == Array
+            case content.length
+            when 0
+              return nil
+            when 1
+              return content[0]
+            else
+              return content
+            end
+          else
+            return content
+          end
         end
       end
       @types << name.to_sym
@@ -118,6 +138,27 @@ class Extreml::TypeElement
   end
   alias __add_type add_type
 
+  def add_new_type name, content
+
+    self.__add_type name, {name: name, namespace: nil, attributes: [], content: [content].flatten}
+    self.__update_content name, content
+    
+  end
+  alias __add_new_type add_new_type
+
+  # update content from a subsequent element
+  # recursively call update on main_element
+  def update_content name, content
+
+    @content << {name: name, namespace: nil, attributes: [], content: [content].flatten}
+
+    unless @main_element.nil?
+      @main_element.update_content @name, self
+    end
+
+  end
+  alias __update_content update_content
+
   # Override to_s to use in strings (useful for the last nesting level)
   def to_s
     return self.__content
@@ -181,7 +222,11 @@ class Extreml::TypeElement
             hash[t] << o.to_hash
           end
         else
-          hash[t] = obj.to_hash
+          if obj.class == Extreml::TypeElement
+            hash[t] = obj.to_hash
+          else
+            hash[t] = obj
+          end
         end
       end
     end

data/lib/extreml/xml_header.rb

@@ -27,9 +27,15 @@ class Extreml::XmlHeader
   #
   # @param header [Hash|String] the header.
   # @return [XmlHeader] the object.
-  def initialize header
-
-    h = header.scan /([\w\?\<]*)=["|']([^'"]*)["|']/
+  def initialize header = nil
+    if header.nil?
+      h = [
+        ["version",1.0],
+        ["encoding","UTF-8"]
+      ]
+    else
+      h = header.scan /([\w\?\<]*)=["|']([^'"]*)["|']/
+    end
     if h.empty?
       @attributes = nil
     else

metadata

@@ -1,17 +1,18 @@
 --- !ruby/object:Gem::Specification
 name: extreml
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 2.0.0
 platform: ruby
 authors:
 - Fabio Boccacini
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-05-19 00:00:00.000000000 Z
+date: 2020-06-19 00:00:00.000000000 Z
 dependencies: []
 description: |-
-  This gem allows to read an XML file and access its elements using methods named after the tags.
+  This gem allows to read an XML/Json file or string and access its elements using methods named after the tags.
+      Also there are methods to return the object as an Hash or XML/Json string.
       See https://github.com/fboccacini/extreml for reference and usage.
 email: fboccacini@gmail.com
 executables: []