openxml-drawingml 0.1.0 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8fffe8f73f341bd34a310c3e47d666cad68d00d3
-  data.tar.gz: abd19d696357d1e612053b2a1f48ff848755936e
+  metadata.gz: 0413c6049180f6a50091d4463825400da1208746
+  data.tar.gz: 6ebc2912bb0d41e02ad652149524f858e62f73a5
 SHA512:
-  metadata.gz: 2ec5003011c55b1b79e1157ab348215538cf8b3c0a3f03314882892e5c4f5f4f1f930f842b672dfd0916e599987648617337927de138e5f7a337710fcca9727c
-  data.tar.gz: b2d4ca42102ee57943d5744a0f3f737f80891726f649a8a5b5250292277fcf74753027adb084c33a476bacc63e0fcf7f01e8cc9256f9260212f8a65afd3f4bed
+  metadata.gz: 8b4a06a92a6809989cdb4e3fdf867e7db5675a605cbf2299ebbd3c0d82a2548282c3ef072c2181ae598c77ab202e8e3c6b0ad6cb6111c1a10bec35b446f7a057
+  data.tar.gz: ac611aa3706fb37e79d7b7be628c84ca3a3d01ad0d33e3dbf184a347ae644d0c0012e0f3616e9259d750eb6b80e5d15cffc58993c2dbf1ca362e31a39e844ab9

data/Gemfile.lock

@@ -1,9 +1,9 @@
 PATH
   remote: .
   specs:
-    openxml-drawingml (0.1.0)
+    openxml-drawingml (0.2.0)
       nokogiri
-      openxml-package (~> 0.2.9)
+      openxml-package (~> 0.3.2)
 
 GEM
   remote: https://rubygems.org/
@@ -13,14 +13,14 @@ GEM
     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-package (0.2.9)
+    mini_portile2 (2.3.0)
+    nokogiri (1.8.1)
+      mini_portile2 (~> 2.3.0)
+    openxml-package (0.3.2)
       nokogiri
       ox
       rubyzip (~> 1.2.1)
-    ox (2.5.0)
+    ox (2.8.0)
     pry (0.10.4)
       coderay (~> 1.1.0)
       method_source (~> 0.8.1)
@@ -62,4 +62,4 @@ DEPENDENCIES
   timecop
 
 BUNDLED WITH
-   1.14.6
+   1.15.4

data/lib/openxml/drawingml.rb

@@ -1,6 +1,17 @@
 module OpenXml
   module DrawingML
+    # Validation constants
+    ST_FixedPercentage = /^-?((100)|([0-9][0-9]?))(\.[0-9][0-9]?)?%$/ # Part 1 - 22.9.2.3
+    ST_PositiveFixedPercentage = /^((100)|([0-9][0-9]?))(\.[0-9][0-9]?)?%$/ # Part 1 - 22.9.2.10
+    ST_Percentage = /^-?[0-9]+(\.[0-9]+)?%$/ # Part 1 - 22.9.2.9
+    ST_PositivePercentage = /^[0-9]+(\.[0-9]+)?%$/ # Part 1 - 22.9.2.11
+    ST_UniversalMeasure = /^(-?[0-9]+(:?\.[0-9]+)?)(:?mm|cm|in|pt|pc|pi)?$/ # Part 1 - 22.9.2.15
+    ST_PositiveUniversalMeasure = /^[0-9]+(\.[0-9]+)?(mm|cm|in|pt|pc|pi)?$/ # Part 1 - 22.9.2.12
+
   end
 end
 
+require "openxml/package"
+require "openxml/drawingml/properties"
 require "openxml/drawingml/elements"
+require "openxml/drawingml/parts"

data/lib/openxml/drawingml/elements.rb

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

data/lib/openxml/drawingml/elements/adjust_values_list.rb

@@ -1,9 +1,9 @@
 module OpenXml
   module DrawingML
     module Elements
-      class AdjustValuesList < OpenXml::DrawingML::Element
+      class AdjustValuesList < OpenXml::Element
         include HasChildren
-
+        namespace :a
         tag :avLst
 
       end

data/lib/openxml/drawingml/elements/blip.rb

@@ -1,12 +1,12 @@
 module OpenXml
   module DrawingML
     module Elements
-      class Blip < OpenXml::DrawingML::Element
+      class Blip < OpenXml::Element
         include HasChildren
-
+        namespace :a
         tag :blip
 
-        attribute :compression_state, one_of: %i(email hqprint none print screen), displays_as: :cstate
+        attribute :compression_state, one_of: %i{ email hqprint none print screen }, displays_as: :cstate
 
         with_namespace :r do
           attribute :embed, expects: :string

data/lib/openxml/drawingml/elements/blip_fill.rb

@@ -1,9 +1,8 @@
 module OpenXml
   module DrawingML
     module Elements
-      class BlipFill < OpenXml::DrawingML::Element
+      class BlipFill < OpenXml::Element
         include HasChildren
-
         namespace :pic
         tag :blipFill
 

data/lib/openxml/drawingml/elements/children_extents.rb

@@ -1,7 +1,8 @@
 module OpenXml
   module DrawingML
     module Elements
-      class ChildrenExtents < OpenXml::DrawingML::Element
+      class ChildrenExtents < OpenXml::Element
+        namespace :a
         tag :chExt
 
         attribute :extent_length, expects: :positive_integer, displays_as: :cx

data/lib/openxml/drawingml/elements/children_offset.rb

@@ -1,7 +1,8 @@
 module OpenXml
   module DrawingML
     module Elements
-      class ChildrenOffset < OpenXml::DrawingML::Element
+      class ChildrenOffset < OpenXml::Element
+        namespace :a
         tag :chOff
 
         attribute :x, expects: :integer

data/lib/openxml/drawingml/elements/extension.rb

@@ -1,7 +1,8 @@
 module OpenXml
   module DrawingML
     module Elements
-      class Extension < OpenXml::DrawingML::Element
+      class Extension < OpenXml::Element
+        namespace :a
         tag :ext
 
         attribute :uri, expects: :string

data/lib/openxml/drawingml/elements/extension_list.rb

@@ -1,9 +1,9 @@
 module OpenXml
   module DrawingML
     module Elements
-      class ExtensionList < OpenXml::DrawingML::Element
+      class ExtensionList < OpenXml::Element
         include HasChildren
-
+        namespace :a
         tag :extLst
 
       end

data/lib/openxml/drawingml/elements/extents.rb

@@ -1,7 +1,8 @@
 module OpenXml
   module DrawingML
     module Elements
-      class Extents < OpenXml::DrawingML::Element
+      class Extents < OpenXml::Element
+        namespace :a
         tag :ext
 
         attribute :extent_length, expects: :positive_integer, displays_as: :cx

data/lib/openxml/drawingml/elements/fill_rectangle.rb

@@ -1,7 +1,8 @@
 module OpenXml
   module DrawingML
     module Elements
-      class FillRectangle < OpenXml::DrawingML::Element
+      class FillRectangle < OpenXml::Element
+        namespace :a
         tag :fillRect
 
         attribute :bottom_offset, expects: :percentage, displays_as: :b

data/lib/openxml/drawingml/elements/graphic.rb

@@ -1,8 +1,11 @@
 module OpenXml
   module DrawingML
     module Elements
-      class Graphic < OpenXml::DrawingML::Element
+      class Graphic < OpenXml::Element
         include HasChildren
+        namespace :a
+        tag :graphic
+
       end
     end
   end

data/lib/openxml/drawingml/elements/graphic_data.rb

@@ -1,8 +1,10 @@
 module OpenXml
   module DrawingML
     module Elements
-      class GraphicData < OpenXml::DrawingML::Element
+      class GraphicData < OpenXml::Element
         include HasChildren
+        namespace :a
+        tag :graphicData
 
         attribute :uri, expects: :string
 

data/lib/openxml/drawingml/elements/graphic_frame_locks.rb

@@ -1,7 +1,9 @@
 module OpenXml
   module DrawingML
     module Elements
-      class GraphicFrameLocks < OpenXml::DrawingML::Element
+      class GraphicFrameLocks < OpenXml::Element
+        namespace :a
+        tag :graphicFrameLocks
 
         attribute :disallow_aspect_ratio_changes, expects: :boolean, displays_as: :noChangeAspect
         attribute :disallow_drilldown, expects: :boolean, displays_as: :noDrilldown

data/lib/openxml/drawingml/elements/head_end.rb

@@ -1,7 +1,9 @@
 module OpenXml
   module DrawingML
     module Elements
-      class HeadEnd < OpenXml::DrawingML::Element
+      class HeadEnd < OpenXml::Element
+        namespace :a
+        tag :headEnd
 
         attribute :length, expects: :valid_end_size, displays_as: :len
         attribute :type, expects: :valid_end_type

data/lib/openxml/drawingml/elements/line_break.rb

@@ -0,0 +1,89 @@
+module OpenXml
+  module DrawingML
+    module Elements
+      class LineBreak < OpenXml::Element
+        include HasProperties
+        namespace :a
+        tag :br
+        properties_tag :rPr
+
+        # Includes the same rPr as run so that if text is added to the position
+        # later, it can apply that formatting to the new text. cf. Part 1 - 21.1.2.2.1
+
+        UNDERLINE_STYLES = %i{
+          dash dashHeavy dashLong dashLongHeavy dbl dotDash dotDashHeavy
+          dotDotDash dotDotDashHeavy dotted dottedHeavy heavy none sng wavy
+          wavyDbl wavyHeavy words
+        }.freeze
+
+        # Validations
+        point = lambda { |value|
+          valid_point = value.is_a?(Integer) && (-400_000..400_000).covers?(value)
+          valid_measure = value =~ /-?[0-9]+(\.[0-9]+)?(mm|cm|in|pt|pc|pi)/
+          raise ArgumentError unless valid_point || valid_measure
+        }
+
+        properties_attribute :alternative_language, displays_as: :altLang, expects: :string
+        properties_attribute :bold, displays_as: :b, expects: :boolean
+        properties_attribute :baseline, expects: :percentage
+        properties_attribute :bookmark_target, displays_as: :bmk, expects: :string
+        properties_attribute :capitalization, displays_as: :cap, one_of: %i{ all none small }
+        properties_attribute :dirty, expects: :boolean
+        properties_attribute :spelling_error, displays_as: :err, expects: :boolean
+        properties_attribute :italic, displays_as: :i, expects: :boolean
+        properties_attribute :kerning, displays_as: :kern, expects: :integer, in_range: (0..400_000)
+        properties_attribute :kumimoji, expects: :boolean
+        properties_attribute :language, displays_as: :lang, expects: :string
+        properties_attribute :no_proofing, displays_as: :noProof, expects: :boolean
+        properties_attribute :normalize_heights, displays_as: :normalizeH, expects: :boolean
+        properties_attribute :smart_tag_clean, displays_as: :smtClean, expects: :boolean
+        properties_attribute :smart_tag_id, displays_as: :smtId, expects: :positive_integer
+        properties_attribute :spacing, displays_as: :spc, validation: point
+        properties_attribute :strikethrough, displays_as: :strike, one_of: %i{ dblStrike noStrike sngStrike }
+        properties_attribute :font_size, displays_as: :sz, expects: :integer, in_range: (100..400_000)
+        properties_attribute :underline, displays_as: :u, one_of: UNDERLINE_STYLES
+
+        property :outline
+
+        property_choice do
+          value_property :no_fill, as: :fill_none
+          property :solid_fill, as: :fill_solid
+          property :gradient_fill, as: :fill_gradient
+          property :pattern_fill, as: :fill_pattern
+          property :blip_fill, as: :fill_blip
+          value_property :inherit_group_fill, as: :fill_group
+        end
+
+        property_choice do
+          property :effect_list
+          property :effect_dag
+        end
+
+        property :highlight
+
+        property_choice do
+          value_property :underline_inherits, as: :underline_text
+          property :underline
+        end
+
+        property_choice do
+          value_property :underline_fill_inherits, as: :underline_fill_text
+          property :underline_fill
+        end
+
+        value_property :latin_font
+        value_property :east_asian_font
+        value_property :complex_script_font
+        value_property :symbol_font
+
+        property :hyperlink_click
+        property :hyperlink_mouse_over
+
+        value_property :right_to_left
+
+        property :extension_list
+
+      end
+    end
+  end
+end

data/lib/openxml/drawingml/elements/no_autofit.rb

@@ -1,8 +1,8 @@
 module OpenXml
   module DrawingML
     module Elements
-      class NoAutofit < OpenXml::DrawingML::Element
-
+      class NoAutofit < OpenXml::Element
+        namespace :a
         tag :noAutofit
 
       end

data/lib/openxml/drawingml/elements/no_fill.rb

@@ -1,8 +1,10 @@
 module OpenXml
   module DrawingML
     module Elements
-      class NoFill < OpenXml::DrawingML::Element
+      class NoFill < OpenXml::Element
+        namespace :a
         tag :noFill
+
       end
     end
   end

data/lib/openxml/drawingml/elements/non_visual_drawing_properties.rb

@@ -1,7 +1,7 @@
 module OpenXml
   module DrawingML
     module Elements
-      class NonVisualDrawingProperties < OpenXml::DrawingML::Element
+      class NonVisualDrawingProperties < OpenXml::Element
         namespace :pic
         tag :cNvPr
 

data/lib/openxml/drawingml/elements/non_visual_picture_drawing_properties.rb

@@ -1,9 +1,8 @@
 module OpenXml
   module DrawingML
     module Elements
-      class NonVisualPictureDrawingProperties < OpenXml::DrawingML::Element
+      class NonVisualPictureDrawingProperties < OpenXml::Element
         include HasChildren
-
         namespace :pic
         tag :cNvPicPr
 

data/lib/openxml/drawingml/elements/non_visual_picture_properties.rb

@@ -1,9 +1,8 @@
 module OpenXml
   module DrawingML
     module Elements
-      class NonVisualPictureProperties < OpenXml::DrawingML::Element
+      class NonVisualPictureProperties < OpenXml::Element
         include HasChildren
-
         namespace :pic
         tag :nvPicPr
 

data/lib/openxml/drawingml/elements/non_visual_shape_drawing_properties.rb

@@ -1,9 +1,8 @@
 module OpenXml
   module DrawingML
     module Elements
-      class NonVisualShapeDrawingProperties < OpenXml::DrawingML::Element
+      class NonVisualShapeDrawingProperties < OpenXml::Element
         include HasChildren
-
         namespace :wps
         tag :cNvSpPr
 

data/lib/openxml/drawingml/elements/offset.rb

@@ -1,7 +1,7 @@
 module OpenXml
   module DrawingML
     module Elements
-      class Offset < OpenXml::DrawingML::Element
+      class Offset < OpenXml::Element
         namespace :a
         tag :off
 

data/lib/openxml/drawingml/elements/outline.rb

@@ -1,9 +1,9 @@
 module OpenXml
   module DrawingML
     module Elements
-      class Outline < OpenXml::DrawingML::Element
+      class Outline < OpenXml::Element
         include HasChildren
-
+        namespace :a
         tag :ln
 
         attribute :alignment, expects: :valid_stroke_alignment, displays_as: :algn

data/lib/openxml/drawingml/elements/paragraph.rb

@@ -0,0 +1,78 @@
+module OpenXml
+  module DrawingML
+    module Elements
+      class Paragraph < OpenXml::Element
+        include HasChildren
+        include HasProperties
+        namespace :a
+        tag :p
+
+        # Validations
+        coordinate = lambda do |value|
+          message = "Invalid coordinate: Must either be an integer or include units"
+          is_integer = value.is_a?(Integer)
+          is_measure = value.is_a?(String) && value =~ OpenXml::DrawingML::ST_UniversalMeasure
+          raise ArgumentError, message unless is_integer || is_measure
+        end
+
+        indent_range = lambda do |value|
+          message = "Invalid indentation range: Must be an integer between -51,206,400 and 51,206,400 or include units"
+          is_integer_in_range = value.is_a?(Integer) && (-51_206_400..51_206_400).cover?(value)
+          is_measure = value.is_a?(String) && value =~ OpenXml::DrawingML::ST_UniversalMeasure
+          raise ArgumentError, message unless is_integer_in_range || is_measure
+        end
+
+        text_margin = lambda do |value|
+          message = "Invalid text margin: Must be an integer between 0 and 51,206,400 or include units"
+          is_integer_in_range = value.is_a?(Integer) && (0..51_206_400).cover?(value)
+          is_measure = value.is_a?(String) && value =~ OpenXml::DrawingML::ST_PositiveUniversalMeasure
+          raise ArgumentError, message unless is_integer_in_range || is_measure
+        end
+
+        properties_attribute :alignment, displays_as: :algn, one_of: %i{ ctr dist just justLow l r thaiDist }
+        properties_attribute :default_tab_size, displays_as: :defTabSz, validation: coordinate
+        properties_attribute :east_asian_line_break, displays_as: :eaLnBrk, expects: :boolean
+        properties_attribute :vertical_alignment, displays_as: :fontAlgn, one_of: %i{ auto b base ctr t }
+        properties_attribute :hanging_punctuation, displays_as: :hangingPunct, expects: :boolean
+        properties_attribute :indent, validation: indent_range
+        properties_attribute :latin_line_break, displays_as: :latinLnBrk, expects: :boolean
+        properties_attribute :level, displays_as: :lvl, in_range: 0..8
+        properties_attribute :left_margin, displays_as: :marL, validation: text_margin
+        properties_attribute :right_margin, displays_as: :marR, validation: text_margin
+        properties_attribute :right_to_left, displays_as: :rtl, expects: :boolean
+
+        property :line_spacing
+        property :space_before
+        property :space_after
+
+        property_choice do
+          property :bullet_color
+          value_property :bullet_color_matches_text, as: :bullet_color_text
+        end
+
+        property_choice do
+          value_property :bullet_size_matches_text, as: :bullet_size_text
+          value_property :bullet_size_percent
+          value_property :bullet_size_points
+        end
+
+        property_choice do
+          value_property :bullet_font_matches_text, as: :bullet_font_text
+          value_property :bullet_font
+        end
+
+        property_choice do
+          value_property :disable_bullets, as: :bullet_style_none
+          property :autonumbered_bullets, as: :bullet_style_auto_numbered
+          property :character_bullets, as: :bullet_style_character
+          property :blip_bullets, as: :bullet_style_blip
+        end
+
+        property :tab_list
+        property :default_run_properties
+        property :extension_list
+
+      end
+    end
+  end
+end