notare 0.0.5 → 0.0.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 959b59c2f2dc30ff265115057c1fd304f3b7747adfe16c9818e6de9e5c564fc1
-  data.tar.gz: 6c3da88bce319ed81fdb519308d6854c00f6a846343e37178e6bafab2b1fefbb
+  metadata.gz: 4e116d849dd9df432a85354eb49dffa27534f69396179a578f3b9a7a0e9dabc0
+  data.tar.gz: 8a17f5088b3353f1f5c7fc3883cd945af14b3f0b0e7ae530c8026692b0e359f3
 SHA512:
-  metadata.gz: '00558f142269e3927cdb5aab15271a92533a48ff5ff2cf19c349e8757ccd9da77af9d27a249bc1a2551c910b8578a8bc9a354622cea7c20424183b7230bc06b9'
-  data.tar.gz: 2f179ca2e773afe314151b61fb9de4e48a6b0037bba3ce50397636b9f2a26790f5e0399c11f5d807c4f3a3090f562e094d0e02da40b4a77719f1bd4c3ea7ee8a
+  metadata.gz: 5e95cfaa9f3259b6689c05615617fc1fdfeb38f664d9cf07b27dacc6107bf07c0f06461e2b2a13558b9f48b8aec277f44d6690958d36262f48ef2cda0a6be72f
+  data.tar.gz: 52ed371afa8c50a243e160d7903d616c43a5c2359b184a4c0e114c7fce99816554dfd1bdfa951eb8a7cdbcd77fc3fa1a501bbbb56b5959b9dc51140b7bd10040

data/lib/notare/document.rb

@@ -4,16 +4,21 @@ module Notare
   class Document
     include Builder
 
-    attr_reader :nodes, :styles, :table_styles, :hyperlinks
+    DEFAULT_FONT = "Arial"
+    DEFAULT_SIZE = 12
 
-    def self.create(path, &block)
-      doc = new
+    attr_reader :nodes, :styles, :table_styles, :hyperlinks, :default_font, :default_size
+
+    def self.create(path, default_font: DEFAULT_FONT, default_size: DEFAULT_SIZE, &block)
+      doc = new(default_font: default_font, default_size: default_size)
       block.call(doc)
       doc.save(path)
       doc
     end
 
-    def initialize
+    def initialize(default_font: DEFAULT_FONT, default_size: DEFAULT_SIZE)
+      @default_font = default_font
+      @default_size = default_size
       @nodes = []
       @format_stack = []
       @current_target = nil
@@ -51,7 +56,7 @@ module Notare
     end
 
     def lists
-      @nodes.select { |n| n.is_a?(Nodes::List) }
+      @nodes.grep(Nodes::List)
     end
 
     def uses_lists?
@@ -101,12 +106,12 @@ module Notare
 
     def register_built_in_styles
       # Headings (spacing_before ensures they're rendered as paragraph styles)
-      define_style :heading1, size: 24, bold: true, spacing_before: 240, spacing_after: 120
-      define_style :heading2, size: 18, bold: true, spacing_before: 200, spacing_after: 100
+      define_style :heading1, size: 20, bold: true, spacing_before: 240, spacing_after: 120
+      define_style :heading2, size: 16, bold: true, spacing_before: 200, spacing_after: 100
       define_style :heading3, size: 14, bold: true, spacing_before: 160, spacing_after: 80
       define_style :heading4, size: 12, bold: true, spacing_before: 120, spacing_after: 60
-      define_style :heading5, size: 11, bold: true, italic: true, spacing_before: 100, spacing_after: 40
-      define_style :heading6, size: 10, bold: true, italic: true, spacing_before: 80, spacing_after: 40
+      define_style :heading5, size: 12, bold: true, italic: true, spacing_before: 100, spacing_after: 40
+      define_style :heading6, size: 12, italic: true, spacing_before: 80, spacing_after: 40
 
       # Other built-in styles
       define_style :title, size: 26, bold: true, align: :center

data/lib/notare/nodes/run.rb

@@ -8,7 +8,7 @@ module Notare
       def initialize(text, bold: false, italic: false, underline: false,
                      strike: false, highlight: nil, color: nil, style: nil)
         super()
-        @text = text
+        @text = XmlSanitizer.sanitize(text)
         @bold = bold
         @italic = italic
         @underline = underline

data/lib/notare/package.rb

@@ -59,7 +59,12 @@ module Notare
     end
 
     def styles_xml
-      Xml::StylesXml.new(@document.styles, @document.table_styles).to_xml
+      Xml::StylesXml.new(
+        @document.styles,
+        @document.table_styles,
+        default_font: @document.default_font,
+        default_size: @document.default_size
+      ).to_xml
     end
 
     def numbering_xml

data/lib/notare/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Notare
-  VERSION = "0.0.5"
+  VERSION = "0.0.7"
 end

data/lib/notare/xml/styles_xml.rb

@@ -18,9 +18,11 @@ module Notare
         right: "right"
       }.freeze
 
-      def initialize(styles, table_styles = {})
+      def initialize(styles, table_styles = {}, default_font: nil, default_size: nil)
         @styles = styles
         @table_styles = table_styles
+        @default_font = default_font
+        @default_size = default_size
       end
 
       def to_xml
@@ -28,6 +30,8 @@ module Notare
           xml.styles("xmlns:w" => NAMESPACE) do
             xml.parent.namespace = xml.parent.namespace_definitions.find { |ns| ns.prefix == "w" }
 
+            render_doc_defaults(xml) if @default_font || @default_size
+
             @styles.each_value do |style|
               render_style(xml, style)
             end
@@ -44,6 +48,28 @@ module Notare
 
       private
 
+      def render_doc_defaults(xml)
+        xml["w"].docDefaults do
+          xml["w"].rPrDefault do
+            xml["w"].rPr do
+              if @default_font
+                xml["w"].rFonts(
+                  "w:ascii" => @default_font,
+                  "w:hAnsi" => @default_font,
+                  "w:eastAsia" => @default_font,
+                  "w:cs" => @default_font
+                )
+              end
+              if @default_size
+                half_points = (@default_size * 2).to_i
+                xml["w"].sz("w:val" => half_points.to_s)
+                xml["w"].szCs("w:val" => half_points.to_s)
+              end
+            end
+          end
+        end
+      end
+
       def render_style(xml, style)
         style_type = style.paragraph_properties? ? "paragraph" : "character"
 

data/lib/notare/xml_sanitizer.rb

@@ -0,0 +1,15 @@
+# frozen_string_literal: true
+
+module Notare
+  module XmlSanitizer
+    # Invalid XML 1.0 characters: 0x00, 0x01-0x08, 0x0B-0x0C, 0x0E-0x1F
+    # Valid whitespace preserved: 0x09 (tab), 0x0A (LF), 0x0D (CR)
+    INVALID_XML_CHARS = /[\x00-\x08\x0B\x0C\x0E-\x1F]/
+
+    def self.sanitize(text)
+      return text unless text.is_a?(String)
+
+      text.gsub(INVALID_XML_CHARS, "")
+    end
+  end
+end

data/lib/notare.rb

@@ -3,6 +3,7 @@
 require "nokogiri"
 
 require_relative "notare/version"
+require_relative "notare/xml_sanitizer"
 require_relative "notare/nodes/base"
 require_relative "notare/nodes/break"
 require_relative "notare/nodes/hyperlink"

metadata

@@ -1,14 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: notare
 version: !ruby/object:Gem::Version
-  version: 0.0.5
+  version: 0.0.7
 platform: ruby
 authors:
 - Mathias
-autorequire:
 bindir: bin
 cert_chain: []
-date: 2025-12-03 00:00:00.000000000 Z
+date: 1980-01-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fastimage
@@ -109,7 +108,6 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '1.69'
 description: Notare provides a clean DSL for creating Word documents in Ruby
-email:
 executables: []
 extensions: []
 extra_rdoc_files: []
@@ -141,12 +139,12 @@ files:
 - lib/notare/xml/numbering.rb
 - lib/notare/xml/relationships.rb
 - lib/notare/xml/styles_xml.rb
+- lib/notare/xml_sanitizer.rb
 homepage: https://git.kaukus.no/Kaukus/Notare
 licenses:
 - MIT
 metadata:
   rubygems_mfa_required: 'true'
-post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -161,8 +159,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.4.13
-signing_key:
+rubygems_version: 4.0.3
 specification_version: 4
 summary: A Ruby gem for creating docx files with a simple DSL
 test_files: []