openxml-docx 0.10.6 → 0.11.0.rc

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: cb6fb253a34f3c7919c6dbc7adaf421c6ee3a72c
-  data.tar.gz: 1ff1d8ca864e3d95c9fce8d1259cd56234def356
+  metadata.gz: 5237f91a84828cf674cdc2ba93b7f3ccca7500db
+  data.tar.gz: 0507dab47e9edbb7648fb994909d68bb24e3599a
 SHA512:
-  metadata.gz: a3826c5a0da2891945597b88aaa0b195e1754217a8e292a14efc0e526dc24bc33ab48e4633da4a22ce191f78e919090984eaf554941962ef0207e554b4c8b097
-  data.tar.gz: 95673e5763a453c7b70dd1b8836382126400bc4f1816efe4e718ccaf6c6509143e2de14c750acfcd1f7c009e58d62806b6a9ff1cca29370dc184fd645b1e92c3
+  metadata.gz: 3a1a8423874b848f4173c4ca1f02208b403c2e25cc53d3570d3b3313dc55cf8daea7890549c7f9228528356d8b63059b73ca57efb1f48d1724e97573a9df84de
+  data.tar.gz: 22f6bc385345e85ef2229b3166f14e282128fe972e0503f32fb0a0c29dc2dca6252b5a26d694c1724987cc6015b94014ccd0c3ce3b859647631f8c25bbcd07b4

data/.travis.yml

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

data/Gemfile

@@ -1,3 +1,9 @@
-source 'https://rubygems.org'
+source "https://rubygems.org"
 
 gemspec
+
+# Optional: use the development version of openxml-package
+# gem "openxml-package", github: "openxml/openxml-package", branch: "master"
+
+# Optional: use the development version of openxml-drawingml
+# gem "openxml-drawingml", github: "openxml/openxml-drawingml", branch: "master"

data/Gemfile.lock

@@ -1,53 +1,56 @@
 PATH
   remote: .
   specs:
-    openxml-docx (0.10.6)
+    openxml-docx (0.11.0.rc)
       nokogiri
+      openxml-drawingml
       openxml-package (>= 0.2.2)
+      ox (~> 2.4.3, < 2.4.10)
 
 GEM
   remote: https://rubygems.org/
   specs:
     coderay (1.1.1)
-    diff-lcs (1.2.5)
+    diff-lcs (1.3)
     docile (1.1.5)
-    json (1.8.3)
+    json (2.1.0)
     method_source (0.8.2)
-    mini_portile2 (2.1.0)
-    nokogiri (1.6.8)
-      mini_portile2 (~> 2.1.0)
-      pkg-config (~> 1.1.7)
-    openxml-package (0.2.4)
+    mini_portile2 (2.2.0)
+    nokogiri (1.8.0)
+      mini_portile2 (~> 2.2.0)
+    openxml-drawingml (0.1.0)
+      nokogiri
+      openxml-package (~> 0.2.9)
+    openxml-package (0.2.9)
       nokogiri
       ox
-      rubyzip (~> 1.1.0)
-    ox (2.4.3)
-    pkg-config (1.1.7)
-    pry (0.10.3)
+      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 (11.1.2)
-    rr (1.1.2)
-    rspec (3.4.0)
-      rspec-core (~> 3.4.0)
-      rspec-expectations (~> 3.4.0)
-      rspec-mocks (~> 3.4.0)
-    rspec-core (3.4.4)
-      rspec-support (~> 3.4.0)
-    rspec-expectations (3.4.0)
+    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)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.4.0)
-    rspec-mocks (3.4.1)
+      rspec-support (~> 3.6.0)
+    rspec-mocks (3.6.0)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.4.0)
-    rspec-support (3.4.1)
-    rubyzip (1.1.7)
-    simplecov (0.11.2)
+      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)
+      json (>= 1.8, < 3)
       simplecov-html (~> 0.10.0)
-    simplecov-html (0.10.0)
+    simplecov-html (0.10.1)
     slop (3.6.0)
     timecop (0.8.1)
 
@@ -64,4 +67,4 @@ DEPENDENCIES
   timecop
 
 BUNDLED WITH
-   1.11.2
+   1.14.6

data/README.md

@@ -1,4 +1,8 @@
-# OpenXml::Docx [![Code Climate](https://codeclimate.com/github/openxml/openxml-docx.png)](https://codeclimate.com/github/openxml/openxml-docx)
+# OpenXml::Docx
+
+[![Gem Version](https://badge.fury.io/rb/openxml-docx.svg)](https://rubygems.org/gems/openxml-docx)
+[![Code Climate](https://codeclimate.com/github/openxml/openxml-docx.svg)](https://codeclimate.com/github/openxml/openxml-docx)
+[![Build Status](https://travis-ci.org/openxml/openxml-docx.svg)](https://travis-ci.org/openxml/openxml-docx)
 
 OpenXml::Docx is a gem for creating .docx (Office Open XML) files. It's designed to validate _before_ the document is generated, so (hopefully) any errors are caught prior to opening the file using software that can handle OOXML (like Microsoft Word, Apache Open Office, Google Docs, etc).
 
@@ -19,9 +23,23 @@ document.document << paragraph
 document.save("/path/where/i/save/things/test.docx")
 ```
 
+
 ## Installation
 
-You can install OpenXml::Docx by running `gem install openxml-docx`, or if you like Rails, include `gem "openxml-docx"` in your Gemfile.
+Add this line to your application's Gemfile:
+
+```ruby
+gem 'openxml-docx'
+```
+
+And then execute:
+
+    $ bundle
+
+Or install it yourself as:
+
+    $ gem install openxml-docx
+
 
 ## Current features
 
@@ -29,6 +47,7 @@ You can install OpenXml::Docx by running `gem install openxml-docx`, or if you l
   - Runs and text
   - Formatting and styles for the paragraphs, runs, and text
 
+
 ## Roadmap
 
 It's important to note that lists goes off into the future quite a bit, therefore it's very likely that it will change. That being said, this is the plan for future releases:
@@ -48,14 +67,21 @@ It's important to note that lists goes off into the future quite a bit, therefor
   - 0.19.0: Mail merge
   - 0.20.0: Layer on a DSL for making the whole thing smoother
 
-## Contribute!
 
-Want to help? Thanks, friend! Here's how:
 
-  1. Fork it
-  2. Make your changes on a topic branch
-  3. Create new a pull request
-  4. Receive many thank-yous
+## Development
+
+After checking out the repo, run `bin/setup` to install dependencies. Then, run `rake spec` to run the tests. You can also run `bin/console` for an interactive prompt that will allow you to experiment.
+
+Reference for WordprocessingML can be found in Part 1 of the Fourth Edition of [ECMA-376](http://www.ecma-international.org/publications/standards/Ecma-376.htm) (the Office Open XML Standard).
+
+To install this gem onto your local machine, run `bundle exec rake install`. To release a new version, update the version number in `version.rb`, and then run `bundle exec rake release`, which will create a git tag for the version, push git commits and tags, and push the `.gem` file to [rubygems.org](https://rubygems.org).
+
+
+## Contributing
+
+Bug reports and pull requests are welcome on GitHub at https://github.com/openxml/openxml-docx.
+
 
 ## Changelog
 

data/bin/console

@@ -0,0 +1,14 @@
+#!/usr/bin/env ruby
+
+require "bundler/setup"
+require "openxml/docx"
+
+# You can add fixtures and/or initialization code here to make experimenting
+# with your gem easier. You can also use a different console, if you like.
+
+# (If you use this, don't forget to add pry to your Gemfile!)
+# require "pry"
+# Pry.start
+
+require "irb"
+IRB.start

data/bin/setup

@@ -0,0 +1,8 @@
+#!/usr/bin/env bash
+set -euo pipefail
+IFS=$'\n\t'
+set -vx
+
+bundle install
+
+# Do any other automated setup that you need to do here

data/lib/openxml/docx.rb

@@ -23,11 +23,14 @@ module OpenXml
       bmp: "image/bmp".freeze,
       tiff: "image/tiff".freeze
     }
+
+    THEME_COLORS = %i(accent1 accent2 accent3 accent4 accent5 accent6 background1 background2 dark1 dark2 followedHyperlink hyperlink light1 light2 none text1 text2).freeze
+
+    BORDER_TYPES = %i(apples archedScallops babyPacifier babyRattle balloons3Colors balloonsHotAir basicBlackDashes basicBlackDots basicBlackSquares basicThinLines basicWhiteDashes basicWhiteDots basicWhiteSquares basicWideInline basicWideMidline basicWideOutline bats birds birdsFlight cabins cakeSlice candyCorn celticKnotwork certificateBanner chainLink champagneBottle checkedBarBlack checkedBarColor checkered christmasTree circlesLines circlesRectangles classicalWave clocks compass confetti confettiGrays confettiOutlines confettiStreamers confettiWhite cornerTriangles couponCutoutDashes couponCutoutDots crazyMaze creaturesButterfly creaturesFish creaturesInsects creaturesLadyBug crossStitch cup custom dashDotStroked dashed dashSmallGap decoArch decoArchColor decoBlocks diamondsGray dotDash dotDotDash dotted double doubleD doubleDiamonds doubleWave earth1 earth2 earth3 eclipsingSquares1 eclipsingSquares2 eggsBlack fans film firecrackers flowersBlockPrint flowersDaisies flowersModern1 flowersModern2 flowersPansy flowersRedRose flowersRoses flowersTeacup flowersTiny gems gingerbreadMan gradient handmade1 handmade2 heartBalloon heartGray hearts heebieJeebies holly houseFunky hypnotic iceCreamCones inset lightBulb lightning1 lightning2 mapleLeaf mapleMuffins mapPins marquee marqueeToothed moons mosaic musicNotes nil none northwest outset ovals packages palmsBlack palmsColor paperClips papyrus partyFavor partyGlass pencils people peopleHats peopleWaving poinsettias postageStamp pumpkin1 pushPinNote1 pushPinNote2 pyramids pyramidsAbove quadrants rings safari sawtooth sawtoothGray scaredCat seattle shadowedSquares shapes1 shapes2 sharksTeeth shorebirdTracks single skyrocket snowflakeFancy snowflaskes sombrero southwest stars stars3d starsBlack starsShadowed starsTop sun swirligig thick thickThinLargeGap thickThinMediumGap thickThinSmallGap thinThickLargeGap thinThickMediumGap thinThickSmallGap thinThickThinLargeGap thinThickThinMediumGap thinThickThinSmallGap threeDEmboss threeDEngrave tornPaper tornPaperBlack trees triangle1 triangle2 triangleCircle1 triangleCircle2 triangleParty triangle triple twistedLines1 twistedLines2 vine wave waveline weavingAngles weavingBraid weavingRibbon weavingStrips whiteFlowers woodwork xIllusions zanyTriangles zigZag zigZagStitch).freeze
   end
 end
 
-require "openxml/docx/attribute_builder"
-require "openxml/docx/property_builder"
+require "openxml/docx/has_properties"
 require "openxml/docx/properties"
 require "openxml/docx/root_namespaces"
 require "openxml/docx/elements"

data/lib/openxml/docx/element.rb

@@ -0,0 +1,9 @@
+require "openxml/element"
+
+module OpenXml
+  module Docx
+    class Element < ::OpenXml::Element
+      namespace :w
+    end
+  end
+end

data/lib/openxml/docx/elements.rb

@@ -5,8 +5,8 @@ module OpenXml
   end
 end
 
-require "openxml/docx/elements/element"
-require "openxml/docx/elements/container"
+require "openxml/docx/element"
+require "openxml/has_children"
 require "openxml/docx/elements/text"
 Dir.glob("#{File.join(File.dirname(__FILE__), "elements", "*.rb")}").each do |file|
   require file

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

@@ -1,7 +1,7 @@
 module OpenXml
   module Docx
     module Elements
-      class AbsolutePositionTab < Element
+      class AbsolutePositionTab < OpenXml::Docx::Element
         tag :ptab
 
         with_namespace :w do

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

@@ -1,11 +1,12 @@
 module OpenXml
   module Docx
     module Elements
-      class Background < Container
+      class Background < OpenXml::Docx::Element
+        include HasChildren, HasProperties
 
         with_namespace :w do
           attribute :color, expects: :hex_color
-          attribute :theme_color, expects: :valid_theme_color, displays_as: :themeColor
+          attribute :theme_color, one_of: OpenXml::Docx::THEME_COLORS, displays_as: :themeColor
           attribute :theme_shade, expects: :hex_digit, displays_as: :themeShade
           attribute :theme_tint, expects: :hex_digit, displays_as: :themeTint
         end

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

@@ -1,7 +1,9 @@
 module OpenXml
   module Docx
     module Elements
-      class BidiEmbed < Container
+      class BidiEmbed < OpenXml::Docx::Element
+        include HasChildren, HasProperties
+
         tag :dir
         attribute :direction, one_of: %i(rtl ltr), displays_as: :val, namespace: :w
       end

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

@@ -1,7 +1,9 @@
 module OpenXml
   module Docx
     module Elements
-      class BidiOverride < Container
+      class BidiOverride < OpenXml::Docx::Element
+        include HasChildren, HasProperties
+
         tag :bdo
         attribute :direction, one_of: %i(rtl ltr), displays_as: :val, namespace: :w
 

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

@@ -1,7 +1,7 @@
 module OpenXml
   module Docx
     module Elements
-      class BookFoldPrinting < Element
+      class BookFoldPrinting < OpenXml::Docx::Element
         tag :bookFoldPrinting
 
         attribute :value, expects: :boolean, displays_as: :val, namespace: :w

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

@@ -1,7 +1,7 @@
 module OpenXml
   module Docx
     module Elements
-      class BookFoldPrintingSheets < Element
+      class BookFoldPrintingSheets < OpenXml::Docx::Element
         tag :bookFoldPrintingSheets
 
         attribute :value, expects: :positive_integer, displays_as: :val, namespace: :w

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

@@ -1,7 +1,7 @@
 module OpenXml
   module Docx
     module Elements
-      class BookFoldReversePrinting < Element
+      class BookFoldReversePrinting < OpenXml::Docx::Element
         tag :bookFoldRevPrinting
 
         attribute :value, expects: :boolean, displays_as: :val, namespace: :w

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

@@ -1,7 +1,7 @@
 module OpenXml
   module Docx
     module Elements
-      class Break < Element
+      class Break < OpenXml::Docx::Element
         tag :br
 
         with_namespace :w do

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

@@ -1,7 +1,7 @@
 module OpenXml
   module Docx
     module Elements
-      class CarriageReturn < Element
+      class CarriageReturn < OpenXml::Docx::Element
         tag :cr
 
       end

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

@@ -1,7 +1,9 @@
 module OpenXml
   module Docx
     module Elements
-      class CompatibilitySettings < Container
+      class CompatibilitySettings < OpenXml::Docx::Element
+        include HasChildren, HasProperties
+
         tag :compat
 
       end

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

@@ -1,7 +1,9 @@
 module OpenXml
   module Docx
     module Elements
-      class CompatibilitySetting < Container
+      class CompatibilitySetting < OpenXml::Docx::Element
+        include HasChildren, HasProperties
+
         tag :compatSetting
 
         with_namespace :w do

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

@@ -1,7 +1,7 @@
 module OpenXml
   module Docx
     module Elements
-      class ContentPart < Element
+      class ContentPart < OpenXml::Docx::Element
         attribute :id, expects: :string, namespace: :r
 
       end

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

@@ -1,7 +1,7 @@
 module OpenXml
   module Docx
     module Elements
-      class Control < Element
+      class Control < OpenXml::Docx::Element
         attribute :id, expects: :string, namespace: :r
 
         with_namespace :w do

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

@@ -1,7 +1,7 @@
 module OpenXml
   module Docx
     module Elements
-      class Dirty < Element
+      class Dirty < OpenXml::Docx::Element
       end
     end
   end

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

@@ -1,8 +1,11 @@
 module OpenXml
   module Docx
     module Elements
-      class Drawing < Container
+      class Drawing < OpenXml::Docx::Element
+        include HasChildren, HasProperties
+
         tag :drawing
+
       end
     end
   end

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

@@ -1,7 +1,7 @@
 module OpenXml
   module Docx
     module Elements
-      class EmbedBold < Element
+      class EmbedBold < OpenXml::Docx::Element
         namespace :w
 
         with_namespace :w do

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

@@ -1,7 +1,7 @@
 module OpenXml
   module Docx
     module Elements
-      class EmbedBoldItalic < Element
+      class EmbedBoldItalic < OpenXml::Docx::Element
         namespace :w
 
         with_namespace :w do