openxml-docx 0.11.0.rc → 0.11.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 5237f91a84828cf674cdc2ba93b7f3ccca7500db
-  data.tar.gz: 0507dab47e9edbb7648fb994909d68bb24e3599a
+SHA256:
+  metadata.gz: aef7247561ac85ebf59ce97f8a4c3de2b74e03d29881cb00257d44462adb395e
+  data.tar.gz: 71d28458c33a4f75f61231e235d9cc956c8b6f70e1cd7473ca7b3ea1bbfeb1b5
 SHA512:
-  metadata.gz: 3a1a8423874b848f4173c4ca1f02208b403c2e25cc53d3570d3b3313dc55cf8daea7890549c7f9228528356d8b63059b73ca57efb1f48d1724e97573a9df84de
-  data.tar.gz: 22f6bc385345e85ef2229b3166f14e282128fe972e0503f32fb0a0c29dc2dca6252b5a26d694c1724987cc6015b94014ccd0c3ce3b859647631f8c25bbcd07b4
+  metadata.gz: ceb9ea15cc3af14d25fbfd44aed3146701f8914f7b17ccb82303b32dbba2837d02de3e14326533ba0b92183c365e35b767ef7a681efd3de234f1f24aa721f540
+  data.tar.gz: d2458309c0b8f36154ab0e8a6992d90b58a5d8bd66438db45081a8f385337808fa0de0e8c5adfe98254127d6fe4685b066cb056835ea9ebed81500df5b384d72

data/.github/workflows/ci.yml

@@ -0,0 +1,21 @@
+name: Tests
+on: [push]
+
+jobs:
+  ruby:
+    name: Ruby Tests
+    runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        ruby-version: [ "2.6", "2.7" ]
+
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v2
+      - name: Setup Ruby
+        uses: ruby/setup-ruby@v1
+        with:
+          bundler-cache: true
+          ruby-version: ${{ matrix.ruby-version }}
+      - name: Run Tests
+        run: bundle exec rake spec

data/Gemfile.lock

@@ -1,58 +1,56 @@
 PATH
   remote: .
   specs:
-    openxml-docx (0.11.0.rc)
+    openxml-docx (0.11.3)
       nokogiri
       openxml-drawingml
       openxml-package (>= 0.2.2)
-      ox (~> 2.4.3, < 2.4.10)
+      ox (~> 2.9)
 
 GEM
   remote: https://rubygems.org/
   specs:
-    coderay (1.1.1)
+    coderay (1.1.2)
     diff-lcs (1.3)
-    docile (1.1.5)
-    json (2.1.0)
-    method_source (0.8.2)
-    mini_portile2 (2.2.0)
-    nokogiri (1.8.0)
-      mini_portile2 (~> 2.2.0)
-    openxml-drawingml (0.1.0)
+    docile (1.3.2)
+    method_source (1.0.0)
+    mini_portile2 (2.6.1)
+    nokogiri (1.12.5)
+      mini_portile2 (~> 2.6.1)
+      racc (~> 1.4)
+    openxml-drawingml (0.2.0)
       nokogiri
-      openxml-package (~> 0.2.9)
-    openxml-package (0.2.9)
+      openxml-package (~> 0.3.2)
+    openxml-package (0.3.4)
       nokogiri
       ox
-      rubyzip (~> 1.2.1)
-    ox (2.4.9)
-    pry (0.10.4)
-      coderay (~> 1.1.0)
-      method_source (~> 0.8.1)
-      slop (~> 3.4)
-    rake (12.0.0)
-    rr (1.2.0)
-    rspec (3.6.0)
-      rspec-core (~> 3.6.0)
-      rspec-expectations (~> 3.6.0)
-      rspec-mocks (~> 3.6.0)
-    rspec-core (3.6.0)
-      rspec-support (~> 3.6.0)
-    rspec-expectations (3.6.0)
+      rubyzip
+    ox (2.14.5)
+    pry (0.13.1)
+      coderay (~> 1.1)
+      method_source (~> 1.0)
+    racc (1.6.0)
+    rake (13.0.1)
+    rr (1.2.1)
+    rspec (3.9.0)
+      rspec-core (~> 3.9.0)
+      rspec-expectations (~> 3.9.0)
+      rspec-mocks (~> 3.9.0)
+    rspec-core (3.9.2)
+      rspec-support (~> 3.9.3)
+    rspec-expectations (3.9.2)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.6.0)
-    rspec-mocks (3.6.0)
+      rspec-support (~> 3.9.0)
+    rspec-mocks (3.9.1)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.6.0)
-    rspec-support (3.6.0)
-    rubyzip (1.2.1)
-    simplecov (0.14.1)
-      docile (~> 1.1.0)
-      json (>= 1.8, < 3)
-      simplecov-html (~> 0.10.0)
-    simplecov-html (0.10.1)
-    slop (3.6.0)
-    timecop (0.8.1)
+      rspec-support (~> 3.9.0)
+    rspec-support (3.9.3)
+    rubyzip (2.3.2)
+    simplecov (0.18.5)
+      docile (~> 1.1)
+      simplecov-html (~> 0.11)
+    simplecov-html (0.12.2)
+    timecop (0.9.1)
 
 PLATFORMS
   ruby
@@ -67,4 +65,4 @@ DEPENDENCIES
   timecop
 
 BUNDLED WITH
-   1.14.6
+   2.1.4

data/examples/numbering

@@ -0,0 +1,125 @@
+#!/usr/bin/env ruby
+
+# This example shows how to use the "numbering" system to describe how a list
+# should be numbered within a document.
+
+# require "rails" # workaround: openxml-package uses `extract_options!`
+$:.push Dir.pwd + "/lib"
+require "openxml/docx"
+
+package = OpenXml::Docx::Package.new
+
+include OpenXml::Docx::Elements
+
+# Each list item is a paragraph. A helper function to create paragraphs in the
+# final document:
+def create_paragraph(content)
+  text = Text.new(content)
+  run = Run.new
+  run << text
+  paragraph = Paragraph.new
+  paragraph << run
+  paragraph
+end
+
+# First up, create a style for the list paragraph
+list_style = OpenXml::Docx::Style.new :paragraph
+list_style.id = 'ListParagraph'
+list_style.style_name = 'List Paragraph'
+list_style.paragraph.indentation.left = 720
+list_style.paragraph.contextual_spacing = true
+
+package.styles << list_style
+
+# Each list needs a numbering within the numbering part of the document.
+
+# Create an abstract numbering that describes a bulleted list:
+abstract_numbering = AbstractNumbering.new(0)
+
+# Each numbering can have multiple levels. Define the first level as a bulleted list:
+level_0 = Level.new
+level_0.level = 0
+level_0.start = 1
+level_0.number_format = :bullet
+# This is the default bullet Word uses
+level_0.level_text = "\u00B7".encode("UTF-8")
+level_0.alignment = :left
+level_0.character_style.font.ascii = "Symbol"
+level_0.character_style.font.high_ansi = "Symbol"
+level_0.character_style.font.hint = :default
+level_0.paragraph_style.indentation.left = 720
+level_0.paragraph_style.indentation.hanging = 360
+abstract_numbering << level_0
+
+package.numbering << abstract_numbering
+
+package.document << create_paragraph("Example of adding a list to a document")
+
+list_item = create_paragraph("First list item")
+list_item.paragraph_style = 'ListParagraph'
+# Say that this list item belongs to our first abstract numbering:
+list_item.numbering.level = 0
+list_item.numbering.id = 1
+# This ID is NOT the numbering ID we created above. Instead, it is a concrete
+# numbering that defines an instance of a list in the document. To link it to
+# our existing abstract numbering, we need to create a concrete numbering
+# instance:
+
+numbering = Numbering.new(1)
+# Setting the abstract numbering ID here links it to a given abstract numbering
+numbering.abstract_numbering_id = 0
+
+# And add this number to the numbering
+package.numbering << numbering
+
+# All that allows us to finally add the item to the document.
+
+package.document << list_item
+
+list_item = create_paragraph("Second list item")
+list_item.paragraph_style = 'ListParagraph'
+
+# The second list item is simpler: we can reuse the numbering we used above.
+list_item.numbering.level = 0
+list_item.numbering.id = 1
+
+package.document << list_item
+
+package.document << create_paragraph("Outline Example")
+
+# Lists with numbers are a bit more complicated. The following creates an
+# "outline" list:
+
+abstract_numbering = AbstractNumbering.new(1)
+
+[:upperRoman, :upperLetter, :decimal, :lowerLetter, :lowerRoman, :decimal, :lowerLetter].each.with_index do |number_format, index|
+  level = Level.new
+  level.level = index
+  level.start = 1
+  level.number_format = number_format
+  # Level text replacement tokens are always 1-based, while the levels
+  # themselves are 0-based
+  level.level_text = index < 4 ? "%#{index+1}." : "(%#{index+1})"
+  level.alignment = :left
+  level.paragraph_style.indentation.left = (360 * (index+1))
+  level.paragraph_style.indentation.hanging = 360
+  abstract_numbering << level
+end
+
+package.numbering << abstract_numbering
+
+numbering = Numbering.new(2)
+numbering.abstract_numbering_id = 1
+
+package.numbering << numbering
+
+(0..6).each do |level|
+  list_item = create_paragraph("Level #{level+1}")
+  list_item.paragraph_style = 'ListParagraph'
+  list_item.numbering.level = level
+  list_item.numbering.id = 2
+  package.document << list_item
+end
+
+filename = "numbering_example.docx"
+package.save File.expand_path("#{filename}")

data/lib/openxml/docx/elements/abstract_numbering.rb

@@ -0,0 +1,34 @@
+module OpenXml
+  module Docx
+    module Elements
+      class AbstractNumbering < OpenXml::Docx::Element
+        include HasChildren, HasProperties
+        tag :abstractNum
+
+        def initialize(id)
+          super()
+          self.id = id
+        end
+        # TODO: child levels is limited to a max of 9
+
+        with_namespace :w do
+          attribute :id, expects: :integer, displays_as: :abstractNumId#, required: true
+        end
+
+        # value_property :nsid - this is a UI property and likely not worth implementing
+        value_property :multi_level_type
+        # value_property :tmpl - this is a UI property and likely not worth implementing
+        # value_property :name
+        # value_property :style_link
+        # value_property :num_style_link
+
+        def property_xml(xml)
+          props = properties.keys.map(&method(:send)).compact
+          return if props.none?(&:render?)
+
+          props.each { |prop| prop.to_xml(xml) }
+        end
+      end
+    end
+  end
+end

data/lib/openxml/docx/elements/level.rb

@@ -0,0 +1,53 @@
+module OpenXml
+  module Docx
+    module Elements
+      class Level < OpenXml::Docx::Element
+        include HasChildren, HasProperties
+        tag :lvl
+
+        with_namespace :w do
+          attribute :level, expects: :integer, displays_as: :ilvl # required
+          # tplc is an entirely opaque "Word template code" and is
+          # "application-specific" according to the spec
+          attribute :template_code, expects: :long_hex_number, displays_as: :tplc
+          attribute :tentative, expects: :boolean
+        end
+
+        value_property :start
+        value_property :number_format
+        value_property :level_restart
+        value_property :associated_paragraph_style, as: :paragraph_style
+        value_property :legal_numbering
+        value_property :suffix
+        value_property :level_text
+        # TODO: Add pic_bullet support (this refers to an element that isn't
+        # implemented in the Numbering part)
+        # value_property :lvl_pic_bullet_id
+        value_property :alignment, as: :level_alignment
+
+        def paragraph_style
+          @paragraph_style ||= Paragraph.new
+        end
+
+        def character_style
+          @character_style ||= Run.new
+        end
+
+        def property_xml(xml)
+          props = properties.keys.map(&method(:send)).compact
+          return if props.none?(&:render?)
+
+          props.each { |prop| prop.to_xml(xml) }
+        end
+
+        def to_xml(xml)
+          xml["w"].public_send(tag, xml_attributes) {
+            property_xml(xml)
+            @paragraph_style.property_xml(xml) unless @paragraph_style.nil?
+            @character_style.property_xml(xml) unless @character_style.nil?
+          }
+        end
+      end
+    end
+  end
+end

data/lib/openxml/docx/elements/level_override.rb

@@ -0,0 +1,27 @@
+module OpenXml
+  module Docx
+    module Elements
+      class LevelOverride < OpenXml::Docx::Element
+        include HasChildren, HasProperties
+        tag :lvlOverride
+
+        with_namespace :w do
+          attribute :level, expects: :integer, displays_as: :ilvl # required
+        end
+
+        value_property :start_override
+
+        def override
+          @override ||= Level.new
+        end
+
+        def to_xml(xml)
+          xml["w"].public_send(tag, xml_attributes) {
+            start_override.to_xml(xml)
+            @override.to_xml(xml) unless @override.nil?
+          }
+        end
+      end
+    end
+  end
+end

data/lib/openxml/docx/elements/numbering.rb

@@ -0,0 +1,29 @@
+module OpenXml
+  module Docx
+    module Elements
+      class Numbering < OpenXml::Docx::Element
+        include HasChildren, HasProperties
+        tag :num
+
+        def initialize(id)
+          super()
+          self.id = id
+        end
+        # TODO: child lvlOverride is limited to 9
+
+        with_namespace :w do
+          attribute :id, expects: :integer, displays_as: :numId#, required: true
+        end
+
+        value_property :abstract_numbering_id
+
+        def property_xml(xml)
+          props = properties.keys.map(&method(:send)).compact
+          return if props.none?(&:render?)
+
+          props.each { |prop| prop.to_xml(xml) }
+        end
+      end
+    end
+  end
+end

data/lib/openxml/docx/package.rb

@@ -10,6 +10,7 @@ module OpenXml
                   :footers,
                   :styles,
                   :fonts,
+                  :numbering,
                   :image_names
 
       content_types do
@@ -23,6 +24,7 @@ module OpenXml
         override "/word/styles.xml", TYPE_STYLES
         override "/word/settings.xml", TYPE_SETTINGS
         override "/word/fontTable.xml", TYPE_FONT_TABLE
+        override "/word/numbering.xml", TYPE_NUMBERING
       end
 
       def initialize
@@ -32,6 +34,7 @@ module OpenXml
         @settings = OpenXml::Docx::Parts::Settings.new
         @styles = OpenXml::Docx::Parts::Styles.new
         @fonts = OpenXml::Docx::Parts::Fonts.new
+        @numbering = OpenXml::Docx::Parts::Numbering.new
         @document = OpenXml::Docx::Parts::Document.new
         @headers = []
         @footers = []
@@ -40,6 +43,7 @@ module OpenXml
         document.relationships.add_relationship REL_STYLES, "styles.xml"
         document.relationships.add_relationship REL_SETTINGS, "settings.xml"
         document.relationships.add_relationship REL_FONT_TABLE, "fontTable.xml"
+        document.relationships.add_relationship REL_NUMBERING, "numbering.xml"
 
         add_part "word/_rels/document.xml.rels", document.relationships
         add_part "word/_rels/fontTable.xml.rels", fonts.relationships
@@ -47,6 +51,7 @@ module OpenXml
         add_part "word/settings.xml", settings
         add_part "word/styles.xml", styles
         add_part "word/fontTable.xml", fonts
+        add_part "word/numbering.xml", numbering
       end
 
       def embed_truetype_font(path: nil, name: nil)
@@ -97,7 +102,7 @@ module OpenXml
       def add_header(header)
         headers << header
         header_name = "header#{headers.count}.xml"
-        Package.content_types { override "/word/#{header_name}", TYPE_HEADER }
+        content_types.add_override "/word/#{header_name}", TYPE_HEADER
         add_part "word/#{header_name}", header
         add_part "word/_rels/#{header_name}.rels", header.relationships
         relationship = document.relationships.add_relationship REL_HEADER, header_name
@@ -107,7 +112,7 @@ module OpenXml
       def add_footer(footer)
         footers << footer
         footer_name = "footer#{footers.count}.xml"
-        Package.content_types { override "/word/#{footer_name}", TYPE_FOOTER }
+        content_types.add_override "/word/#{footer_name}", TYPE_FOOTER
         add_part "word/#{footer_name}", footer
         add_part "word/_rels/#{footer_name}.rels", footer.relationships
         relationship = document.relationships.add_relationship REL_FOOTER, footer_name

data/lib/openxml/docx/parts/numbering.rb

@@ -0,0 +1,42 @@
+module OpenXml
+  module Docx
+    module Parts
+      class Numbering < OpenXml::Part
+        include RootNamespaces
+
+        attr_reader :abstractNumbers, :numbers
+
+        use_namespaces :w
+
+        def initialize
+          @abstractNumbers = []
+          @numbers = []
+          @relationships = OpenXml::Parts::Rels.new
+        end
+
+        def <<(child)
+          if child.is_a?(OpenXml::Docx::Elements::AbstractNumbering)
+            abstractNumbers << child
+          elsif child.is_a?(OpenXml::Docx::Elements::Numbering)
+            numbers << child
+          end
+        end
+
+        def count
+          abstractNums.count
+        end
+
+        def to_xml
+          build_standalone_xml do |xml|
+            xml.numbering(root_namespaces) {
+              xml.parent.namespace = :w
+              abstractNumbers.each { |num| num.to_xml(xml) }
+              numbers.each { |number| number.to_xml(xml) }
+            }
+          end
+        end
+
+      end
+    end
+  end
+end

data/lib/openxml/docx/properties/abstract_number_id.rb

@@ -0,0 +1,10 @@
+module OpenXml
+  module Docx
+    module Properties
+      class AbstractNumberingId < IntegerProperty
+        tag :abstractNumId
+
+      end
+    end
+  end
+end

data/lib/openxml/docx/properties/legal_numbering.rb

@@ -0,0 +1,10 @@
+module OpenXml
+  module Docx
+    module Properties
+      class LegalNumbering < OnOffProperty
+        tag :isLgl
+
+      end
+    end
+  end
+end

data/lib/openxml/docx/properties/level_alignment.rb

@@ -0,0 +1,14 @@
+module OpenXml
+  module Docx
+    module Properties
+      class LevelAlignment < ValueProperty
+        tag :lvlJc
+
+        def ok_values
+          %i(both center distribute end highKashida lowKashida mediumKashida numTab start thaiDistribute left right)
+        end
+
+      end
+    end
+  end
+end

data/lib/openxml/docx/properties/level_restart.rb

@@ -0,0 +1,10 @@
+module OpenXml
+  module Docx
+    module Properties
+      class LevelRestart < IntegerProperty
+        tag :lvlRestart
+
+      end
+    end
+  end
+end

data/lib/openxml/docx/properties/level_text.rb

@@ -0,0 +1,14 @@
+module OpenXml
+  module Docx
+    module Properties
+      class LevelText < StringProperty
+        include HasAttributes
+        tag :lvlText
+
+        with_namespace :w do
+          attribute :null, expects: :boolean
+        end
+      end
+    end
+  end
+end

data/lib/openxml/docx/properties/multi_level_type.rb

@@ -0,0 +1,14 @@
+module OpenXml
+  module Docx
+    module Properties
+      class MultiLevelType < ValueProperty
+        tag :multiLevelType
+
+        def ok_values
+          %i(singleLevel multilevel hybridMultilevel)
+        end
+
+      end
+    end
+  end
+end

data/lib/openxml/docx/properties/number_format.rb

@@ -0,0 +1,46 @@
+module OpenXml
+  module Docx
+    module Properties
+      class NumberFormat < ValueProperty
+        tag :numFmt
+
+        # TODO: Also allow "format" when "custom" is the number format
+
+        def ok_values
+          %i(decimal upperRoman lowerRoman upperLetter lowerLetter ordinal
+            cardinalText ordinalText hex chicago ideographDigital japaneseCounting
+            aiueo iroha decimalFullWidth decimalHalfWidth japaneseLegal
+            japaneseDigitalTenThousand decimalEnclosedCircle decimalFullWidth2
+            aiueoFullWidth irohaFullWidth decimalZero bullet ganada chosung
+            decimalEnclosedFullstop
+            decimalEnclosedParen
+            decimalEnclosedCircleChinese
+            ideographEnclosedCircle
+            ideographTraditional
+            ideographZodiac
+            ideographZodiacTraditional
+            taiwaneseCounting
+            ideographLegalTraditional
+            taiwaneseCountingThousand
+            taiwaneseDigital
+            chineseCounting
+            chineseLegalSimplified
+            chineseCountingThousand
+            koreanDigital
+            koreanCounting
+            koreanLegal
+            koreanDigital2
+            vietnameseCounting
+            russianLower russianUpper
+            none numberInDash
+            hebrew1 hebrew2
+            arabicAlpha arabicAbjad
+            hindiVowels hindiConsonants hindiNumbers hindiCounting
+            thaiLetters thaiNumbers thaiCounting
+            bahtText
+            dollarText custom)
+        end
+      end
+    end
+  end
+end

data/lib/openxml/docx/properties/start.rb

@@ -0,0 +1,10 @@
+module OpenXml
+  module Docx
+    module Properties
+      class Start < IntegerProperty
+        tag :start
+
+      end
+    end
+  end
+end

data/lib/openxml/docx/properties/start_override.rb

@@ -0,0 +1,10 @@
+module OpenXml
+  module Docx
+    module Properties
+      class StartOverride < IntegerProperty
+        tag :startOverride
+
+      end
+    end
+  end
+end

data/lib/openxml/docx/properties/suffix.rb

@@ -0,0 +1,13 @@
+module OpenXml
+  module Docx
+    module Properties
+      class Suffix < ValueProperty
+        tag :suff
+
+        def ok_values
+          %i(tab space nothing)
+        end
+      end
+    end
+  end
+end

data/lib/openxml/docx/properties/tab.rb

@@ -4,7 +4,7 @@ module OpenXml
       class Tab < BaseProperty
         attr_reader :position, :type, :leader
 
-        VALID_TYPES = %i(bar center clear decimal end num start)
+        VALID_TYPES = %i(bar center clear decimal end num start left right)
         VALID_LEADERS = [nil, :dot, :heavy, :hyphen, :middleDot, :none, :underscore]
 
         def initialize(position, type, leader=nil)

data/lib/openxml/docx/version.rb

@@ -1,5 +1,5 @@
 module OpenXml
   module Docx
-    VERSION = "0.11.0.rc"
+    VERSION = "0.11.3"
   end
 end

data/lib/openxml/docx.rb

@@ -7,6 +7,7 @@ module OpenXml
     REL_FOOTER = "http://schemas.openxmlformats.org/officeDocument/2006/relationships/footer".freeze
     REL_FONT_TABLE = "http://schemas.openxmlformats.org/officeDocument/2006/relationships/fontTable".freeze
     REL_FONT = "http://schemas.openxmlformats.org/officeDocument/2006/relationships/font".freeze
+    REL_NUMBERING = "http://schemas.openxmlformats.org/officeDocument/2006/relationships/numbering".freeze
     REL_IMAGE = "http://schemas.openxmlformats.org/officeDocument/2006/relationships/image".freeze
 
     TYPE_STYLES = "application/vnd.openxmlformats-officedocument.wordprocessingml.styles+xml".freeze
@@ -14,6 +15,7 @@ module OpenXml
     TYPE_HEADER = "application/vnd.openxmlformats-officedocument.wordprocessingml.header+xml".freeze
     TYPE_FOOTER = "application/vnd.openxmlformats-officedocument.wordprocessingml.footer+xml".freeze
     TYPE_FONT_TABLE = "application/vnd.openxmlformats-officedocument.wordprocessingml.fontTable+xml".freeze
+    TYPE_NUMBERING = "application/vnd.openxmlformats-officedocument.wordprocessingml.numbering+xml".freeze
     TYPE_XML = "application/vnd.openxmlformats-officedocument.wordprocessingml.document.main+xml".freeze
     TYPE_OBSCURED_FONT = "application/vnd.openxmlformats-officedocument.obfuscatedFont".freeze
     TYPE_IMAGE = {

data/lib/openxml/vml/elements/group.rb

@@ -61,7 +61,7 @@ module OpenXml
 
         def valid_diagram_layout(value)
           message = "Invalid diagram layout. Must be a single digit between 0 and 3 inclusive"
-          raise ArgumentError, message unless (value.is_a?(Fixnum) && (0..3).include?(value)) || value =~ /^[0-3]$/
+          raise ArgumentError, message unless (value.is_a?(Integer) && (0..3).include?(value)) || value =~ /^[0-3]$/
         end
 
       end

data/lib/openxml/vml/elements/rectangle.rb

@@ -76,7 +76,7 @@ module OpenXml
 
         def valid_diagram_layout(value)
           message = "Invalid diagram layout. Must be a single digit between 0 and 3 inclusive"
-          raise ArgumentError, message unless (value.is_a?(Fixnum) && (0..3).include?(value)) || value =~ /^[0-3]$/
+          raise ArgumentError, message unless (value.is_a?(Integer) && (0..3).include?(value)) || value =~ /^[0-3]$/
         end
       end
     end

data/lib/openxml/vml/elements/rounded_rectangle.rb

@@ -82,7 +82,7 @@ module OpenXml
 
         def valid_diagram_layout(value)
           message = "Invalid diagram layout. Must be a single digit between 0 and 3 inclusive"
-          raise ArgumentError, message unless (value.is_a?(Fixnum) && (0..3).include?(value)) || value =~ /^[0-3]$/
+          raise ArgumentError, message unless (value.is_a?(Integer) && (0..3).include?(value)) || value =~ /^[0-3]$/
         end
 
       end

data/openxml-docx.gemspec

@@ -19,16 +19,12 @@ Gem::Specification.new do |spec|
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ["lib"]
 
-  spec.required_ruby_version = "~> 2.0"
+  spec.required_ruby_version = ">= 2.0"
 
   spec.add_dependency "nokogiri"
   spec.add_dependency "openxml-package", ">= 0.2.2"
   spec.add_dependency "openxml-drawingml"
-
-  # Ox 2.4.10 changed how special characters are encoded,
-  # but a few of openxml-docx's tests rely on the previous
-  # behavior. Remove this line after refactoring those tests.
-  spec.add_dependency "ox", "~> 2.4.3", "< 2.4.10"
+  spec.add_dependency "ox", "~> 2.9"
 
   spec.add_development_dependency "pry"
   spec.add_development_dependency "rspec"

metadata

@@ -1,15 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: openxml-docx
 version: !ruby/object:Gem::Version
-  version: 0.11.0.rc
+  version: 0.11.3
 platform: ruby
 authors:
 - Gene Doyel
 - Bob Lail
-autorequire: 
+autorequire:
 bindir: exe
 cert_chain: []
-date: 2017-06-13 00:00:00.000000000 Z
+date: 2021-10-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nokogiri
@@ -59,20 +59,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.4.3
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: 2.4.10
+        version: '2.9'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.4.3
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: 2.4.10
+        version: '2.9'
 - !ruby/object:Gem::Dependency
   name: pry
   requirement: !ruby/object:Gem::Requirement
@@ -165,8 +159,8 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- ".github/workflows/ci.yml"
 - ".gitignore"
-- ".travis.yml"
 - Gemfile
 - Gemfile.lock
 - LICENSE.txt
@@ -178,6 +172,7 @@ files:
 - examples/booklet-printing
 - examples/drawing-ml
 - examples/image-embedding
+- examples/numbering
 - examples/ochanomizu.jpg
 - examples/table
 - lib/openxml-docx.rb
@@ -185,6 +180,7 @@ files:
 - lib/openxml/docx/element.rb
 - lib/openxml/docx/elements.rb
 - lib/openxml/docx/elements/absolute_position_tab.rb
+- lib/openxml/docx/elements/abstract_numbering.rb
 - lib/openxml/docx/elements/background.rb
 - lib/openxml/docx/elements/bidi_embed.rb
 - lib/openxml/docx/elements/bidi_override.rb
@@ -217,6 +213,8 @@ files:
 - lib/openxml/docx/elements/grid_column.rb
 - lib/openxml/docx/elements/group_shape.rb
 - lib/openxml/docx/elements/last_rendered_page_break.rb
+- lib/openxml/docx/elements/level.rb
+- lib/openxml/docx/elements/level_override.rb
 - lib/openxml/docx/elements/long_day.rb
 - lib/openxml/docx/elements/long_month.rb
 - lib/openxml/docx/elements/long_year.rb
@@ -224,6 +222,7 @@ files:
 - lib/openxml/docx/elements/markup_compatibility_choice.rb
 - lib/openxml/docx/elements/markup_compatibility_fallback.rb
 - lib/openxml/docx/elements/nonbreaking_hyphen.rb
+- lib/openxml/docx/elements/numbering.rb
 - lib/openxml/docx/elements/optional_hyphen.rb
 - lib/openxml/docx/elements/page_number.rb
 - lib/openxml/docx/elements/paper_source.rb
@@ -277,9 +276,11 @@ files:
 - lib/openxml/docx/parts/fonts.rb
 - lib/openxml/docx/parts/footer.rb
 - lib/openxml/docx/parts/header.rb
+- lib/openxml/docx/parts/numbering.rb
 - lib/openxml/docx/parts/settings.rb
 - lib/openxml/docx/parts/styles.rb
 - lib/openxml/docx/properties.rb
+- lib/openxml/docx/properties/abstract_number_id.rb
 - lib/openxml/docx/properties/alignment.rb
 - lib/openxml/docx/properties/auto_adjust_right_indent.rb
 - lib/openxml/docx/properties/auto_space_de.rb
@@ -342,14 +343,20 @@ files:
 - lib/openxml/docx/properties/language.rb
 - lib/openxml/docx/properties/latent_styles.rb
 - lib/openxml/docx/properties/latent_styles_exception.rb
+- lib/openxml/docx/properties/legal_numbering.rb
+- lib/openxml/docx/properties/level_alignment.rb
+- lib/openxml/docx/properties/level_restart.rb
+- lib/openxml/docx/properties/level_text.rb
 - lib/openxml/docx/properties/line_numbering.rb
 - lib/openxml/docx/properties/linked_style.rb
 - lib/openxml/docx/properties/manual_width.rb
 - lib/openxml/docx/properties/math.rb
 - lib/openxml/docx/properties/mirror_indent.rb
+- lib/openxml/docx/properties/multi_level_type.rb
 - lib/openxml/docx/properties/next_style.rb
 - lib/openxml/docx/properties/no_proof.rb
 - lib/openxml/docx/properties/no_wrap.rb
+- lib/openxml/docx/properties/number_format.rb
 - lib/openxml/docx/properties/numbering.rb
 - lib/openxml/docx/properties/on_off_property.rb
 - lib/openxml/docx/properties/outline.rb
@@ -386,6 +393,8 @@ files:
 - lib/openxml/docx/properties/snap_to_grid.rb
 - lib/openxml/docx/properties/spacing.rb
 - lib/openxml/docx/properties/spec_vanish.rb
+- lib/openxml/docx/properties/start.rb
+- lib/openxml/docx/properties/start_override.rb
 - lib/openxml/docx/properties/strikethrough.rb
 - lib/openxml/docx/properties/string_property.rb
 - lib/openxml/docx/properties/style.rb
@@ -393,6 +402,7 @@ files:
 - lib/openxml/docx/properties/style_auto_redefinition.rb
 - lib/openxml/docx/properties/style_lock.rb
 - lib/openxml/docx/properties/style_name.rb
+- lib/openxml/docx/properties/suffix.rb
 - lib/openxml/docx/properties/supress_auto_hyphens.rb
 - lib/openxml/docx/properties/supress_line_numbers.rb
 - lib/openxml/docx/properties/supress_overlap.rb
@@ -452,24 +462,23 @@ homepage: https://github.com/openxml/openxml-docx
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - "~>"
+  - - ">="
     - !ruby/object:Gem::Version
       version: '2.0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">"
+  - - ">="
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.6.11
-signing_key: 
+rubygems_version: 3.1.6
+signing_key:
 specification_version: 4
 summary: Implements the Office Open XML spec for creating WordprocessingML documents
 test_files: []

data/.travis.yml

@@ -1,6 +0,0 @@
-# .travis.yml
-language: ruby
-rvm:
-  - 2.3.0
-script:
-  - bundle exec rake spec