openxml-docx 0.9.0 → 0.10.0

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

@@ -4,12 +4,15 @@ module OpenXml
       class LatentStylesException < ComplexProperty
         tag :lsdException
 
-        attribute :locked, expects: :true_or_false
-        attribute :style_name, expects: :string, displays_as: :name
-        attribute :qFormat, expects: :true_or_false
-        attribute :semi_hidden, expects: :true_or_false, displays_as: :semiHidden
-        attribute :ui_priority, expects: :integer, displays_as: :uiPriority
-        attribute :unhide_when_used, expects: :true_or_false, displays_as: :unhideWhenUsed
+        with_namespace :w do
+          attribute :locked, expects: :true_or_false
+          attribute :style_name, expects: :string, displays_as: :name
+          attribute :qFormat, expects: :true_or_false
+          attribute :semi_hidden, expects: :true_or_false, displays_as: :semiHidden
+          attribute :ui_priority, expects: :integer, displays_as: :uiPriority
+          attribute :unhide_when_used, expects: :true_or_false, displays_as: :unhideWhenUsed
+        end
+
 
         def initialize(style_name)
           self.style_name = style_name

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

@@ -4,17 +4,11 @@ module OpenXml
       class LineNumbering < ComplexProperty
         tag :lnNumType
 
-        attribute :count_by, expects: :integer
-        attribute :distance, expects: :positive_integer
-        attribute :restart, expects: :valid_line_numbering_restart
-        attribute :start, expects: :integer
-
-        VALID_LINE_NUMBERING_RESTARTS = %i(continuous newPage newSection)
-
-      private
-
-        def valid_line_numbering_restart(value)
-          valid_in? value, VALID_LINE_NUMBERING_RESTARTS
+        with_namespace :w do
+          attribute :count_by, expects: :integer
+          attribute :distance, expects: :positive_integer
+          attribute :restart, one_of: %i(continuous newPage newSection)
+          attribute :start, expects: :integer
         end
 
       end

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

@@ -4,8 +4,10 @@ module OpenXml
       class ManualWidth < ComplexProperty
         tag :fitText
 
-        attribute :id, expects: :integer
-        attribute :width, expects: :positive_integer, displays_as: :val
+        with_namespace :w do
+          attribute :id, expects: :integer
+          attribute :width, expects: :positive_integer, displays_as: :val
+        end
 
       end
     end

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

@@ -4,8 +4,10 @@ module OpenXml
       class Numbering < ComplexProperty
         tag :numPr
 
-        attribute :level, expects: :positive_integer, displays_as: :ilvl
-        attribute :id, expects: :positive_integer, displays_as: :numId
+        with_namespace :w do
+          attribute :level, expects: :positive_integer, displays_as: :ilvl
+          attribute :id, expects: :positive_integer, displays_as: :numId
+        end
 
         def to_xml(xml)
           return unless render?

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

@@ -5,9 +5,12 @@ module OpenXml
         attr_reader :left, :right, :top, :bottom
 
         tag :pgBorders
-        attribute :display, expects: :valid_display
-        attribute :offset_from, expects: :valid_offset
-        attribute :z_order, expects: :valid_z_order
+
+        with_namespace :w do
+          attribute :display, one_of: %i(allPages firstPage notFirstPage)
+          attribute :offset_from, one_of: %i(page text)
+          attribute :z_order, one_of: %i(front back)
+        end
 
         def initialize
           @left = new_border :left
@@ -25,10 +28,6 @@ module OpenXml
           xml["w"].public_send(tag, xml_attributes) { render_borders_xml(xml) }
         end
 
-        VALID_DISPLAYS = %i(allPages firstPage notFirstPage)
-        VALID_OFFSETS = %i(page text)
-        VALID_Z_ORDERS = %i(front back)
-
       private
 
         def render_borders_xml(xml)
@@ -43,18 +42,6 @@ module OpenXml
           OpenXml::Docx::Properties::Border.new direction
         end
 
-        def valid_display(value)
-          valid_in? value, VALID_DISPLAYS
-        end
-
-        def valid_offset(value)
-          valid_in? value, VALID_OFFSETS
-        end
-
-        def valid_z_order(value)
-          valid_in? value, VALID_Z_ORDERS
-        end
-
       end
     end
   end

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

@@ -4,13 +4,16 @@ module OpenXml
       class PageMargins < ComplexProperty
         tag :pgMar
 
-        attribute :bottom, expects: :integer
-        attribute :footer, expects: :positive_integer
-        attribute :gutter, expects: :positive_integer
-        attribute :header, expects: :positive_integer
-        attribute :left, expects: :positive_integer
-        attribute :right, expects: :positive_integer
-        attribute :top, expects: :integer
+        with_namespace :w do
+          attribute :bottom, expects: :integer
+          attribute :footer, expects: :positive_integer
+          attribute :gutter, expects: :positive_integer
+          attribute :header, expects: :positive_integer
+          attribute :left, expects: :positive_integer
+          attribute :right, expects: :positive_integer
+          attribute :top, expects: :integer
+        end
+
       end
     end
   end

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

@@ -4,84 +4,76 @@ module OpenXml
       class PageNumbering < ComplexProperty
         tag :pgNumType
 
-        attribute :chapter_separator, expects: :valid_chapter_separator, displays_as: :chapSep
-        attribute :chapter_style, expects: :integer, displays_as: :chapStyle
-        attribute :format, expects: :valid_page_number_format, displays_as: :fmt
-        attribute :start, expects: :integer
+        with_namespace :w do
+          attribute :chapter_separator, one_of: %i(colon emDash enDash hyphen period), displays_as: :chapSep
+          attribute :chapter_style, expects: :integer, displays_as: :chapStyle
+          attribute :start, expects: :integer
+          attribute :format, displays_as: :fmt, one_of: %i(aiueo
+                                                           aiueoFullWidth
+                                                           arabicAbjad
+                                                           arabicAlpha
+                                                           bahtText
+                                                           bullet
+                                                           cardinalText
+                                                           chicago
+                                                           chineseCounting
+                                                           chineseCountingThousand
+                                                           chineseLegalSimplified
+                                                           chosung
+                                                           custom
+                                                           decimal
+                                                           decimalEnclosedCircle
+                                                           decimalEnclosedCircleChinese
+                                                           decimalEnclosedFullstop
+                                                           decimalEnclosedParen
+                                                           decimalFullWidth
+                                                           decimalHalfWidth
+                                                           decimalZero
+                                                           dollarText
+                                                           ganada
+                                                           hebrew1
+                                                           hebrew2
+                                                           hex
+                                                           hindiConsonants
+                                                           hindiCounting
+                                                           hindiNumbers
+                                                           hindiVowels
+                                                           ideographDigital
+                                                           ideographEnclosedCircle
+                                                           taiwaneseDigital
+                                                           ideographLegalTraditional
+                                                           ideographTraditional
+                                                           ideographZodiac
+                                                           ideographZodiacTraditional
+                                                           iroha
+                                                           irohaFullWidth
+                                                           japaneseCounting
+                                                           japaneseDigitalTenThousand
+                                                           japaneseLegal
+                                                           koreanCounting
+                                                           koreanDigital
+                                                           koreanDigital2
+                                                           koreanLegal
+                                                           lowerLetter
+                                                           lowerRoman
+                                                           none
+                                                           numberInDash
+                                                           ordinal
+                                                           ordinalText
+                                                           russianLower
+                                                           russianUpper
+                                                           taiwaneseCounting
+                                                           taiwaneseCountingThousand
+                                                           thaiCounting
+                                                           thaiLetters
+                                                           thaiNumbers
+                                                           upperLetter
+                                                           upperRoman
+                                                           vietnameseCounting)
 
-        VALID_CHAPTER_SEPARATORS = %i(colon emDash enDash hyphen period)
-        VALID_PAGE_NUMBER_FORMATS = %i(aiueo
-                                       aiueoFullWidth
-                                       arabicAbjad
-                                       arabicAlpha
-                                       bahtText
-                                       bullet
-                                       cardinalText
-                                       chicago
-                                       chineseCounting
-                                       chineseCountingThousand
-                                       chineseLegalSimplified
-                                       chosung
-                                       custom
-                                       decimal
-                                       decimalEnclosedCircle
-                                       decimalEnclosedCircleChinese
-                                       decimalEnclosedFullstop
-                                       decimalEnclosedParen
-                                       decimalFullWidth
-                                       decimalHalfWidth
-                                       decimalZero
-                                       dollarText
-                                       ganada
-                                       hebrew1
-                                       hebrew2
-                                       hex
-                                       hindiConsonants
-                                       hindiCounting
-                                       hindiNumbers
-                                       hindiVowels
-                                       ideographDigital
-                                       ideographEnclosedCircle
-                                       taiwaneseDigital
-                                       ideographLegalTraditional
-                                       ideographTraditional
-                                       ideographZodiac
-                                       ideographZodiacTraditional
-                                       iroha
-                                       irohaFullWidth
-                                       japaneseCounting
-                                       japaneseDigitalTenThousand
-                                       japaneseLegal
-                                       koreanCounting
-                                       koreanDigital
-                                       koreanDigital2
-                                       koreanLegal
-                                       lowerLetter
-                                       lowerRoman
-                                       none
-                                       numberInDash
-                                       ordinal
-                                       ordinalText
-                                       russianLower
-                                       russianUpper
-                                       taiwaneseCounting
-                                       taiwaneseCountingThousand
-                                       thaiCounting
-                                       thaiLetters
-                                       thaiNumbers
-                                       upperLetter
-                                       upperRoman
-                                       vietnameseCounting)
 
-      private
-
-        def valid_chapter_separator(value)
-          valid_in? value, VALID_CHAPTER_SEPARATORS
         end
 
-        def valid_page_number_format(value)
-          valid_in? value, VALID_PAGE_NUMBER_FORMATS
-        end
 
       end
     end

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

@@ -4,19 +4,12 @@ module OpenXml
       class PageSize < ComplexProperty
         tag :pgSz
 
-        attribute :code, expects: :integer
-        attribute :height, expects: :positive_integer, displays_as: :h
-        attribute :orientation, expects: :valid_orientation, displays_as: :orient
-        attribute :width, expects: :positive_integer, displays_as: :w
-
-        VALID_PAGE_ORIENTATIONS = %i(portrait landscape)
-
-      private
-
-        def valid_orientation(value)
-          valid_in? value, VALID_PAGE_ORIENTATIONS
+        with_namespace :w do
+          attribute :code, expects: :integer
+          attribute :height, expects: :positive_integer, displays_as: :h
+          attribute :orientation, one_of: %i(portrait landscape), displays_as: :orient
+          attribute :width, expects: :positive_integer, displays_as: :w
         end
-
       end
     end
   end

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

@@ -4,58 +4,52 @@ module OpenXml
       class Shading < ComplexProperty
         tag :shd
 
-        VALID_SHADING_PATTERNS = %i(clear
-                                    diagCross
-                                    diagStripe
-                                    horzCross
-                                    horzStripe
-                                    nil
-                                    pct10
-                                    pct12
-                                    pct15
-                                    pct20
-                                    pct25
-                                    pct30
-                                    pct35
-                                    pct37
-                                    pct45
-                                    pct5
-                                    pct50
-                                    pct55
-                                    pct60
-                                    pct62
-                                    pct65
-                                    pct70
-                                    pct75
-                                    pct80
-                                    pct85
-                                    pct87
-                                    pct90
-                                    pct95
-                                    reverseDiagStripe
-                                    solid
-                                    thinDiagCross
-                                    thinDiagStripe
-                                    thinHorzCross
-                                    thinHorzStripe
-                                    thinReverseDiagStripe
-                                    thinVertStripe
-                                    vertStripe)
-
-        attribute :color, expects: :hex_color
-        attribute :fill, expects: :hex_color
-        attribute :theme_color, expects: :valid_theme_color
-        attribute :theme_fill, expects: :valid_theme_color
-        attribute :theme_fill_shade, expects: :hex_digit
-        attribute :theme_fill_tint, expects: :hex_digit
-        attribute :theme_shade, expects: :hex_digit
-        attribute :theme_tint, expects: :hex_digit
-        attribute :pattern, expects: :shading_pattern, displays_as: :val
-
-      private
-
-        def shading_pattern(value)
-          valid_in? value, VALID_SHADING_PATTERNS
+        with_namespace :w do
+          attribute :color, expects: :hex_color
+          attribute :fill, expects: :hex_color
+          attribute :theme_color, expects: :valid_theme_color
+          attribute :theme_fill, expects: :valid_theme_color
+          attribute :theme_fill_shade, expects: :hex_digit
+          attribute :theme_fill_tint, expects: :hex_digit
+          attribute :theme_shade, expects: :hex_digit
+          attribute :theme_tint, expects: :hex_digit
+          attribute :pattern, displays_as: :val, one_of: %i(clear
+                                                            diagCross
+                                                            diagStripe
+                                                            horzCross
+                                                            horzStripe
+                                                            nil
+                                                            pct10
+                                                            pct12
+                                                            pct15
+                                                            pct20
+                                                            pct25
+                                                            pct30
+                                                            pct35
+                                                            pct37
+                                                            pct45
+                                                            pct5
+                                                            pct50
+                                                            pct55
+                                                            pct60
+                                                            pct62
+                                                            pct65
+                                                            pct70
+                                                            pct75
+                                                            pct80
+                                                            pct85
+                                                            pct87
+                                                            pct90
+                                                            pct95
+                                                            reverseDiagStripe
+                                                            solid
+                                                            thinDiagCross
+                                                            thinDiagStripe
+                                                            thinHorzCross
+                                                            thinHorzStripe
+                                                            thinReverseDiagStripe
+                                                            thinVertStripe
+                                                            vertStripe)
         end
 
       end

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

@@ -2,21 +2,16 @@ module OpenXml
   module Docx
     module Properties
       class Spacing < ComplexProperty
-        VALID_LINE_RULES = %i(atLeast auto exact)
 
-        attribute :after, expects: :positive_integer
-        attribute :after_auto, expects: :on_or_off, displays_as: :afterAutospacing
-        attribute :after_lines, expects: :integer
-        attribute :before, expects: :positive_integer
-        attribute :before_auto, expects: :on_or_off, displays_as: :beforeAutospacing
-        attribute :before_lines, expects: :integer
-        attribute :line, expects: :integer
-        attribute :line_rule, expects: :valid_line_rule
-
-      private
-
-        def valid_line_rule(value)
-          valid_in? value, VALID_LINE_RULES
+        with_namespace :w do
+          attribute :after, expects: :positive_integer
+          attribute :after_auto, expects: :on_or_off, displays_as: :afterAutospacing
+          attribute :after_lines, expects: :integer
+          attribute :before, expects: :positive_integer
+          attribute :before_auto, expects: :on_or_off, displays_as: :beforeAutospacing
+          attribute :before_lines, expects: :integer
+          attribute :line, expects: :integer
+          attribute :line_rule, one_of: %i(atLeast auto exact)
         end
 
       end