goldendocx 0.2.2 → 0.2.3

data/lib/goldendocx/xml_serializers/nokogiri.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require 'nokogiri'
+require 'extensions/nokogiri_extensions'
 
 module Goldendocx
   module XmlSerializers
@@ -11,19 +11,33 @@ module Goldendocx
           options.no_declaration
         end
 
-        def parse(xml, paths = [])
-          xml = ::Nokogiri::XML(xml)
-          # Should with namespaces
-          xml = xml.xpath(paths.map { |path| path.include?(':') || path == '*' ? path : ['xmlns', path].join(':') }.join('/')) unless paths.empty?
-          xml
+        # TODO: Nokogiri namespace is soooo strict....
+        # TODO: To read nokogiri source codes and try to understand how it works
+        def parse(xml)
+          document = ::Nokogiri::XML(xml)
+
+          missing_namespaces = document.errors.filter_map do |error|
+            error.str1 if error.message.match?('Namespace.*not defined')
+          end.uniq.compact
+          return document if missing_namespaces.blank?
+
+          wrap_document(document, missing_namespaces)
+        end
+
+        def search(node, paths)
+          return node if paths.blank?
+
+          search_paths = paths.map { |path| path.include?(':') || path == '*' ? path : ['xmlns', path].join(':') }
+          namespaces = node.namespaces.merge(node.document.namespaces)
+          node.xpath(search_paths.join('/'), namespaces)
         end
 
         def build_xml(tag, &block)
-          build_element(tag, &block).to_xml(indent: 0, save_with: DEFAULT_BUILD_OPTIONS).delete("\n")
+          CGI.unescapeHTML build_element(tag, &block).to_xml(indent: 0, save_with: DEFAULT_BUILD_OPTIONS).delete("\n")
         end
 
         def build_document_xml(tag, namespaces = [], ignore_namespaces = [], &block)
-          build_document(tag, namespaces, ignore_namespaces, &block).to_xml(indent: 0).delete("\n")
+          CGI.unescapeHTML build_document(tag, namespaces, ignore_namespaces, &block).to_xml(indent: 0).delete("\n")
         end
 
         def build_document(tag, namespaces = [], ignore_namespaces = [])
@@ -41,25 +55,19 @@ module Goldendocx
 
         def build_element(tag, parent: nil)
           parent ||= ::Nokogiri::XML('<?xml version="1.0"')
-          ::Nokogiri::XML::Node.new(tag, parent).tap do |element|
+          ::Nokogiri::XML::Node.new(tag.to_s, parent).tap do |element|
             yield(element) if block_given?
           end
         end
-      end
-    end
-  end
-end
 
-# FIXME: Temporarily here to provider syntactic sugar
-module Nokogiri
-  module XML
-    class Node
-      def <<(node_or_tags)
-        # FIXME: Add this line to transform element implicitly
-        node_or_tags = node_or_tags.public_send(:to_element, parent: self) if node_or_tags.respond_to?(:to_element)
+        private
 
-        add_child(node_or_tags)
-        self
+        def wrap_document(document, missing_namespaces)
+          missing_namespaces.each do |ns|
+            document.root.add_namespace ns, (Goldendocx::NAMESPACES[ns.to_sym] || "#{ns}:goldendocx")
+          end
+          ::Nokogiri::XML(document.to_xml(indent: 0).delete("\n"))
+        end
       end
     end
   end

data/lib/goldendocx/xml_serializers/ox.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require 'ox'
+require 'extensions/ox_extensions'
 
 module Goldendocx
   module XmlSerializers
@@ -8,13 +8,19 @@ module Goldendocx
       class << self
         def parse(xml, paths = [])
           xml = ::Ox.parse(xml)
-          xml = xml.locate(paths.join('/')) unless paths.empty?
-          xml
+          xml = ::Ox::Document.new.tap { |document| document << xml } unless xml.is_a?(::Ox::Document)
+          search(xml, paths)
+        end
+
+        def search(node, paths)
+          return node if paths.blank?
+
+          node.locate(paths.join('/'))
         end
 
         def build_xml(tag, &block)
           xml = build_element(tag, &block)
-          ::Ox.dump(xml, indent: -1, with_xml: true)
+          ::Ox.dump(xml, indent: -1, with_xml: true, encoding: 'UTF-8')
         end
 
         def build_document_xml(tag, namespaces = [], ignore_namespaces = [], &block)
@@ -45,19 +51,3 @@ module Goldendocx
     end
   end
 end
-
-# FIXME: Temporarily here to provider syntactic sugar
-module Ox
-  class Element
-    def <<(node)
-      # FIXME: Add this line to transform element implicitly
-      node = node.public_send(:to_element) if node.respond_to?(:to_element)
-
-      raise 'argument to << must be a String or Ox::Node.' unless node.is_a?(String) || node.is_a?(Node)
-
-      @nodes = [] if !instance_variable_defined?(:@nodes) || @nodes.nil?
-      @nodes << node
-      self
-    end
-  end
-end

data/lib/goldendocx.rb

@@ -1,9 +1,10 @@
 # frozen_string_literal: true
 
 require 'zip'
+require 'extensions/active_support_extensions'
+require 'extensions/xml_serialize_extensions'
 
 require 'goldendocx/version'
-require 'goldendocx/docx'
 
 module Goldendocx
   autoload :Configuration, 'goldendocx/configuration'
@@ -13,6 +14,7 @@ module Goldendocx
     a14: 'http://schemas.microsoft.com/office/drawing/2010/main',
     c: 'http://schemas.openxmlformats.org/drawingml/2006/chart',
     c14: 'http://schemas.microsoft.com/office/drawing/2007/8/2/chart',
+    cp: 'http://schemas.openxmlformats.org/package/2006/metadata/core-properties',
     cx: 'http://schemas.microsoft.com/office/drawing/2014/chartex',
     cx1: 'http://schemas.microsoft.com/office/drawing/2015/9/8/chartex',
     cx2: 'http://schemas.microsoft.com/office/drawing/2015/10/21/chartex',
@@ -22,6 +24,9 @@ module Goldendocx
     cx6: 'http://schemas.microsoft.com/office/drawing/2016/5/12/chartex',
     cx7: 'http://schemas.microsoft.com/office/drawing/2016/5/13/chartex',
     cx8: 'http://schemas.microsoft.com/office/drawing/2016/5/14/chartex',
+    dc: 'http://purl.org/dc/elements/1.1/',
+    dcmitype: 'http://purl.org/dc/dcmitype/',
+    dcterms: 'http://purl.org/dc/terms/',
     m: 'http://schemas.openxmlformats.org/officeDocument/2006/math',
     mc: 'http://schemas.openxmlformats.org/markup-compatibility/2006',
     mo: 'http://schemas.microsoft.com/office/mac/office/2008/main',
@@ -43,7 +48,8 @@ module Goldendocx
     wpc: 'http://schemas.microsoft.com/office/word/2010/wordprocessingCanvas',
     wpg: 'http://schemas.microsoft.com/office/word/2010/wordprocessingGroup',
     wpi: 'http://schemas.microsoft.com/office/word/2010/wordprocessingInk',
-    wps: 'http://schemas.microsoft.com/office/word/2010/wordprocessingShape'
+    wps: 'http://schemas.microsoft.com/office/word/2010/wordprocessingShape',
+    xsi: 'http://www.w3.org/2001/XMLSchema-instance'
   }.freeze
 
   class << self
@@ -70,3 +76,9 @@ module Goldendocx
     end
   end
 end
+
+require 'goldendocx/units'
+require 'goldendocx/element'
+require 'goldendocx/document'
+require 'goldendocx/has_associations'
+require 'goldendocx/docx'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: goldendocx
 version: !ruby/object:Gem::Version
-  version: 0.2.2
+  version: 0.2.3
 platform: ruby
 authors:
 - WangYuechen
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2023-03-29 00:00:00.000000000 Z
+date: 2023-04-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -164,6 +164,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 0.8.0
+- !ruby/object:Gem::Dependency
+  name: timecop
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.9.6
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.9.6
 description: Ruby APIs for manipulating Microsoft Word based upon OOXML standards.
 email:
 - 291943739@qq.com
@@ -190,13 +204,20 @@ files:
 - demo/tables/create_styled_table.rb
 - demo/templates/bg.png
 - demo/templates/blankDocument.docx
+- demo/templates/generate_codes.rb
 - demo/templates/image_base64
 - demo/templates/styles/reportLabel
 - demo/templates/styles/reportSubTitle
 - demo/templates/styles/reportTable
 - demo/templates/styles/reportTitle
+- demo/templates/xml_to_class.rb
 - demo/texts/append_plain_text.rb
 - demo/texts/append_styled_text.rb
+- demo/texts/create_text.rb
+- lib/extensions/active_support_extensions.rb
+- lib/extensions/nokogiri_extensions.rb
+- lib/extensions/ox_extensions.rb
+- lib/extensions/xml_serialize_extensions.rb
 - lib/goldendocx.rb
 - lib/goldendocx/charts.rb
 - lib/goldendocx/charts/category_axis.rb
@@ -247,11 +268,13 @@ files:
 - lib/goldendocx/components/properties/color_property.rb
 - lib/goldendocx/components/properties/drawing.rb
 - lib/goldendocx/components/properties/extents_property.rb
+- lib/goldendocx/components/properties/font_property.rb
 - lib/goldendocx/components/properties/graphic_data_property.rb
 - lib/goldendocx/components/properties/graphic_frame_locks_property.rb
 - lib/goldendocx/components/properties/graphic_frame_property.rb
 - lib/goldendocx/components/properties/graphic_property.rb
 - lib/goldendocx/components/properties/inline.rb
+- lib/goldendocx/components/properties/language_property.rb
 - lib/goldendocx/components/properties/non_visual_property.rb
 - lib/goldendocx/components/properties/padding_property.rb
 - lib/goldendocx/components/properties/property.rb
@@ -268,14 +291,23 @@ files:
 - lib/goldendocx/documents.rb
 - lib/goldendocx/documents/body.rb
 - lib/goldendocx/documents/document.rb
-- lib/goldendocx/documents/element.rb
-- lib/goldendocx/documents/relationship.rb
-- lib/goldendocx/documents/relationships.rb
+- lib/goldendocx/documents/latent_styles.rb
+- lib/goldendocx/documents/properties.rb
+- lib/goldendocx/documents/properties/default_style_property.rb
+- lib/goldendocx/documents/properties/page_margin_property.rb
+- lib/goldendocx/documents/properties/page_size_property.rb
+- lib/goldendocx/documents/properties/paragraph_default_style_property.rb
+- lib/goldendocx/documents/properties/run_default_style_property.rb
+- lib/goldendocx/documents/properties/section_property.rb
+- lib/goldendocx/documents/properties/style_name_property.rb
+- lib/goldendocx/documents/settings.rb
 - lib/goldendocx/documents/style.rb
 - lib/goldendocx/documents/styles.rb
-- lib/goldendocx/documents/unparsed_style.rb
 - lib/goldendocx/docx.rb
 - lib/goldendocx/element.rb
+- lib/goldendocx/has_associations.rb
+- lib/goldendocx/has_attributes.rb
+- lib/goldendocx/has_children.rb
 - lib/goldendocx/images.rb
 - lib/goldendocx/images/picture.rb
 - lib/goldendocx/images/properties.rb
@@ -292,10 +324,21 @@ files:
 - lib/goldendocx/images/properties/stretch_property.rb
 - lib/goldendocx/images/properties/transform_property.rb
 - lib/goldendocx/images/shape.rb
+- lib/goldendocx/models.rb
+- lib/goldendocx/models/relationship.rb
+- lib/goldendocx/models/relationships.rb
 - lib/goldendocx/parts.rb
+- lib/goldendocx/parts/app.rb
 - lib/goldendocx/parts/content_types.rb
+- lib/goldendocx/parts/core.rb
 - lib/goldendocx/parts/documents.rb
 - lib/goldendocx/parts/media.rb
+- lib/goldendocx/parts/properties.rb
+- lib/goldendocx/parts/properties/created_at_property.rb
+- lib/goldendocx/parts/properties/creator_property.rb
+- lib/goldendocx/parts/properties/revision_property.rb
+- lib/goldendocx/parts/properties/updated_at_property.rb
+- lib/goldendocx/parts/properties/updater_property.rb
 - lib/goldendocx/tables.rb
 - lib/goldendocx/tables/cell.rb
 - lib/goldendocx/tables/header_cell.rb
@@ -324,7 +367,8 @@ files:
 homepage: https://github.com/SheldonLeo/goldendocx
 licenses:
 - Nonstandard
-metadata: {}
+metadata:
+  rubygems_mfa_required: 'true'
 post_install_message:
 rdoc_options: []
 require_paths:

data/lib/goldendocx/documents/element.rb

@@ -1,23 +0,0 @@
-# frozen_string_literal: true
-
-module Goldendocx
-  module Documents
-    class Element
-      def initialize(node)
-        @node = node
-      end
-
-      def component?
-        %w[w:p w:tbl].include?(@node.name)
-      end
-
-      def properties?
-        @node.name == 'w:sectPr'
-      end
-
-      def to_element(**_context)
-        @node
-      end
-    end
-  end
-end

data/lib/goldendocx/documents/unparsed_style.rb

@@ -1,17 +0,0 @@
-# frozen_string_literal: true
-
-module Goldendocx
-  module Documents
-    class UnparsedStyle
-      attr_reader :node
-
-      def initialize(node)
-        @node = node
-      end
-
-      def to_element(**_context)
-        @node
-      end
-    end
-  end
-end