openxml-docx 0.10.1 → 0.10.2

data/lib/openxml/docx/version.rb

@@ -1,5 +1,5 @@
 module OpenXml
   module Docx
-    VERSION = "0.10.1"
+    VERSION = "0.10.2"
   end
 end

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

@@ -6,7 +6,7 @@ module OpenXml
         tag :blipFill
 
         attribute :dpi, expects: :integer
-        attribute :rotate_with_shape, expects: :true_or_false, displays_as: :rotWithShape
+        attribute :rotate_with_shape, expects: :boolean, displays_as: :rotWithShape
 
       end
     end

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

@@ -0,0 +1,14 @@
+module OpenXml
+  module DrawingML
+    module Elements
+      class ChildrenExtents < OpenXml::Docx::Elements::Element
+        namespace :a
+        tag :chExt
+
+        attribute :extent_length, expects: :positive_integer, displays_as: :cx
+        attribute :extent_width, expects: :positive_integer, displays_as: :cy
+
+      end
+    end
+  end
+end

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

@@ -0,0 +1,14 @@
+module OpenXml
+  module DrawingML
+    module Elements
+      class ChildrenOffset < OpenXml::Docx::Elements::Element
+        namespace :a
+        tag :chOff
+
+        attribute :x, expects: :integer
+        attribute :y, expects: :integer
+
+      end
+    end
+  end
+end

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

@@ -4,12 +4,12 @@ module OpenXml
       class GraphicFrameLocks < OpenXml::Docx::Elements::Element
         namespace :a
 
-        attribute :disallow_aspect_ratio_changes, expects: :true_or_false, displays_as: :noChangeAspect
-        attribute :disallow_drilldown, expects: :true_or_false, displays_as: :noDrilldown
-        attribute :disallow_grouping, expects: :true_or_false, displays_as: :noGrp
-        attribute :disallow_moving, expects: :true_or_false, displays_as: :noMove
-        attribute :disallow_resizing, expects: :true_or_false, displays_as: :noResize
-        attribute :disallow_selection, expects: :true_or_false, displays_as: :noSelect
+        attribute :disallow_aspect_ratio_changes, expects: :boolean, displays_as: :noChangeAspect
+        attribute :disallow_drilldown, expects: :boolean, displays_as: :noDrilldown
+        attribute :disallow_grouping, expects: :boolean, displays_as: :noGrp
+        attribute :disallow_moving, expects: :boolean, displays_as: :noMove
+        attribute :disallow_resizing, expects: :boolean, displays_as: :noResize
+        attribute :disallow_selection, expects: :boolean, displays_as: :noSelect
 
       end
     end

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

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

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

@@ -3,7 +3,7 @@ module OpenXml
     module Elements
       class NoFill < OpenXml::Docx::Elements::Element
         namespace :a
-
+        tag :noFill
       end
     end
   end

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

@@ -6,7 +6,7 @@ module OpenXml
         tag :cNvPr
 
         attribute :description, expects: :string, displays_as: :descr
-        attribute :hidden, expects: :true_or_false
+        attribute :hidden, expects: :boolean
         attribute :id, expects: :positive_integer
         attribute :picture_name, expects: :string, displays_as: :name
         attribute :title, expects: :string

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

@@ -5,7 +5,7 @@ module OpenXml
         namespace :pic
         tag :cNvPicPr
 
-        attribute :preferRelativeResize, expects: :true_or_false
+        attribute :preferRelativeResize, expects: :boolean
       end
     end
   end

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

@@ -0,0 +1,12 @@
+module OpenXml
+  module DrawingML
+    module Elements
+      class NonVisualShapeDrawingProperties < OpenXml::Docx::Elements::Container
+        namespace :wps
+        tag :cNvSpPr
+
+        attribute :textbox, expects: :boolean, displays_as: :txBox
+      end
+    end
+  end
+end

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

@@ -5,17 +5,17 @@ module OpenXml
         namespace :a
         tag :picLocks
 
-        attribute :hide_adjust_handles, expects: :true_or_false, displays_as: :noAdjustHandles
-        attribute :disallow_arrowhead_changes, expects: :true_or_false, displays_as: :noChangeArrowheads
-        attribute :disallow_aspect_ratio_changes, expects: :true_or_false, displays_as: :noChangeAspect
-        attribute :disallow_shape_type_changes, expects: :true_or_false, displays_as: :noChangeShapeType
-        attribute :disallow_cropping, expects: :true_or_false, displays_as: :noCrop
-        attribute :disallow_editing_points, expects: :true_or_false, displays_as: :noEditPoints
-        attribute :disallow_grouping, expects: :true_or_false, displays_as: :noGrp
-        attribute :disallow_moving, expects: :true_or_false, displays_as: :noMove
-        attribute :disallow_resizing, expects: :true_or_false, displays_as: :noResize
-        attribute :disallow_rotation, expects: :true_or_false, displays_as: :noRot
-        attribute :disallow_selection, expects: :true_or_false, displays_as: :noSelect
+        attribute :hide_adjust_handles, expects: :boolean, displays_as: :noAdjustHandles
+        attribute :disallow_arrowhead_changes, expects: :boolean, displays_as: :noChangeArrowheads
+        attribute :disallow_aspect_ratio_changes, expects: :boolean, displays_as: :noChangeAspect
+        attribute :disallow_shape_type_changes, expects: :boolean, displays_as: :noChangeShapeType
+        attribute :disallow_cropping, expects: :boolean, displays_as: :noCrop
+        attribute :disallow_editing_points, expects: :boolean, displays_as: :noEditPoints
+        attribute :disallow_grouping, expects: :boolean, displays_as: :noGrp
+        attribute :disallow_moving, expects: :boolean, displays_as: :noMove
+        attribute :disallow_resizing, expects: :boolean, displays_as: :noResize
+        attribute :disallow_rotation, expects: :boolean, displays_as: :noRot
+        attribute :disallow_selection, expects: :boolean, displays_as: :noSelect
 
       end
     end

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

@@ -0,0 +1,25 @@
+module OpenXml
+  module DrawingML
+    module Elements
+      class PresetTextWarp < OpenXml::Docx::Elements::Container
+        namespace :a
+        tag :prstTxWarp
+
+        attribute :preset, one_of: %i(textArchDown textArchDownPour textArchUp
+                                    textArchUpPour textButton textButtonPour
+                                    textCanDown textCanUp textCascadeDown
+                                    textCascadeUp textChevron textChevronInverted
+                                    textCircle textCirclePour textCurveDown
+                                    textCurveUp textDeflate textDeflateBottom
+                                    textDeflateInflate textDeflateTop
+                                    textDoubleWave1 textFadeDown textFadeLeft
+                                    textFadeRight textFadeUp textInflate
+                                    textInflateBottom textInflateTop textNoShape
+                                    textPlain textRingInside textRingOutside
+                                    textSlantDown textSlantUp textStop textTriangle
+                                    textTriangleInverted textWave1 textWave2
+                                    textWave4), displays_as: :prst
+      end
+    end
+  end
+end

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

@@ -6,45 +6,45 @@ module OpenXml
 
         attribute :alt, expects: :string
         attribute :css_class, expects: :string, displays_as: :class
-        attribute :coordinate_origin, expects: :valid_coordinate, displays_as: :coordorigin
-        attribute :coordinate_size, expects: :valid_coordinate, displays_as: :coordsize
+        attribute :coordinate_origin, matches: /^[\-0-9]+,\s?[\-0-9]+$/, displays_as: :coordorigin
+        attribute :coordinate_size, matches: /^[\-0-9]+,\s?[\-0-9]+$/, displays_as: :coordsize
         attribute :edit_as, one_of: %i(bullseye canvas cycle orgchart radial stacked venn), displays_as: :editas
         attribute :fill_color, expects: :valid_color, displays_as: :fillcolor
-        attribute :filled, expects: :explicit_true_false
+        attribute :filled, expects: :boolean
         attribute :href, expects: :string
         attribute :id, expects: :string
-        attribute :print, expects: :explicit_true_false
+        attribute :print, expects: :boolean
         attribute :style, expects: :string
         attribute :target, expects: :string
         attribute :title, expects: :string
         attribute :wrap_coordinates, expects: :string, displays_as: :wrapcoords
 
         with_namespace :o do
-          attribute :allow_in_cell, expects: :explicit_true_false, displays_as: :allowincell
-          attribute :allow_overlap, expects: :explicit_true_false, displays_as: :allowoverlap
+          attribute :allow_in_cell, expects: :boolean, displays_as: :allowincell
+          attribute :allow_overlap, expects: :boolean, displays_as: :allowoverlap
           attribute :border_bottom_color, expects: :string, displays_as: :borderbottomcolor
           attribute :border_left_color, expects: :string, displays_as: :borderleftcolor
           attribute :border_right_color, expects: :string, displays_as: :borderrightcolor
           attribute :border_top_color, expects: :string, displays_as: :bordertopcolor
-          attribute :bullet, expects: :explicit_true_false
-          attribute :button, expects: :explicit_true_false
+          attribute :bullet, expects: :boolean
+          attribute :button, expects: :boolean
           attribute :diagram_node_layout, expects: :valid_diagram_layout, displays_as: :dgmlayout
           attribute :diagram_node_recent_layout, expects: :valid_diagram_layout, displays_as: :dgmlayoutmru
           attribute :diagram_node_kind, expects: :integer, displays_as: :dgmnodekind
-          attribute :double_click_notify, expects: :explicit_true_false, displays_as: :doubleclicknotify
-          attribute :hr, expects: :explicit_true_false
-          attribute :hr_align, expects: :valid_hr_align, displays_as: :hralign
-          attribute :hr_no_shade, expects: :explicit_true_false, displays_as: :hrnoshade
+          attribute :double_click_notify, expects: :boolean, displays_as: :doubleclicknotify
+          attribute :hr, expects: :boolean
+          attribute :hr_align, one_of: %i(center left right), displays_as: :hralign
+          attribute :hr_no_shade, expects: :boolean, displays_as: :hrnoshade
           attribute :hr_percent, expects: :integer, displays_as: :hrpct
-          attribute :hr_standard, expects: :explicit_true_false, displays_as: :hrstd
-          attribute :inset_mode, expects: :valid_inset_mode, displays_as: :insetmode
-          attribute :hide_extra_handles, expects: :explicit_true_false, displays_as: :oned
+          attribute :hr_standard, expects: :boolean, displays_as: :hrstd
+          attribute :inset_mode, one_of: %i(auto custom), displays_as: :insetmode
+          attribute :hide_extra_handles, expects: :boolean, displays_as: :oned
           attribute :regroup_id, expects: :integer, displays_as: :regroupid
           attribute :optional_string, expects: :string, displays_as: :spid
           attribute :table_limits, expects: :string, displays_as: :tablelimits
           attribute :table_properties, expects: :string, displays_as: :tableproperties
-          attribute :user_drawn, expects: :explicit_true_false, displays_as: :userdrawn
-          attribute :user_hidden, expects: :explicit_true_false, displays_as: :userhidden
+          attribute :user_drawn, expects: :boolean, displays_as: :userdrawn
+          attribute :user_hidden, expects: :boolean, displays_as: :userhidden
         end
 
       private
@@ -57,31 +57,11 @@ module OpenXml
           raise ArgumentError, message unless ok_color_names.include?(value) || value =~ valid_hex || value =~ valid_palette_entry
         end
 
-        def valid_coordinate(value)
-          raise ArgumentError, "Invalid coordinates." unless value =~ /^[\-0-9]+,\s?[\-0-9]+$/
-        end
-
         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]$/
         end
 
-        def valid_hr_align(value)
-          ok_values = %i(center left right)
-          message = "Invalid hr alignment (#{value}). Valid values are: #{ok_values.join(", ")}."
-          raise ArgumentError, message unless ok_values.include? value
-        end
-
-        def valid_inset_mode(value)
-          ok_values = %i(auto custom)
-          message = "Invalid inset mode (#{value}). Valid modes are: #{ok_values.join(", ")}."
-          raise ArgumentError, message unless ok_values.include? value
-        end
-
-        def explicit_true_false(value)
-          raise ArgumentError unless value.to_s =~ /^(?:[01tf]|true|false)$/
-        end
-
       end
     end
   end

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

@@ -8,17 +8,17 @@ module OpenXml
         attribute :alt, expects: :string
         attribute :chroma_key, expects: :valid_color, displays_as: :chromakey
         attribute :css_class, expects: :string, displays_as: :class
-        attribute :coordinate_origin, expects: :valid_coordinate, displays_as: :coordorigin
-        attribute :coordinate_size, expects: :valid_coordinate, displays_as: :coordsize
+        attribute :coordinate_origin, matches: /^[\-0-9]+,\s?[\-0-9]+$/, displays_as: :coordorigin
+        attribute :coordinate_size, matches: /^[\-0-9]+,\s?[\-0-9]+$/, displays_as: :coordsize
         attribute :fill_color, expects: :valid_color, displays_as: :fillcolor
-        attribute :filled, expects: :explicit_true_false
+        attribute :filled, expects: :boolean
         attribute :href, expects: :string
         attribute :id, expects: :string
-        attribute :inset_pen, expects: :explicit_true_false, displays_as: :insetpen
+        attribute :inset_pen, expects: :boolean, displays_as: :insetpen
         attribute :opacity, expects: :string # Can be a float or 1/65536ths when followed by `f`
-        attribute :print, expects: :explicit_true_false
+        attribute :print, expects: :boolean
         attribute :stroke_color, expects: :valid_color, displays_as: :strokecolor
-        attribute :stroked, expects: :explicit_true_false
+        attribute :stroked, expects: :boolean
         attribute :stroke_weight, expects: :string, displays_as: :strokeweight # Expects number with units
         attribute :style, expects: :string
         attribute :target, expects: :string
@@ -26,50 +26,44 @@ module OpenXml
         attribute :wrap_coordinates, expects: :string, displays_as: :wrapcoords
 
         with_namespace :o do
-          attribute :allow_in_cell, expects: :explicit_true_false, displays_as: :allowincell
-          attribute :allow_overlap, expects: :explicit_true_false, displays_as: :allowoverlap
+          attribute :allow_in_cell, expects: :boolean, displays_as: :allowincell
+          attribute :allow_overlap, expects: :boolean, displays_as: :allowoverlap
           attribute :border_bottom_color, expects: :string, displays_as: :borderbottomcolor
           attribute :border_left_color, expects: :string, displays_as: :borderleftcolor
           attribute :border_right_color, expects: :string, displays_as: :borderrightcolor
           attribute :border_top_color, expects: :string, displays_as: :bordertopcolor
-          attribute :bullet, expects: :explicit_true_false
-          attribute :button, expects: :explicit_true_false
-          attribute :bw_mode, expects: :valid_bw_mode, displays_as: :bwmode
-          attribute :bw_normal, expects: :valid_bw_mode, displays_as: :bwnormal
-          attribute :bw_pure, expects: :valid_bw_mode, displays_as: :bwpure
-          attribute :clip, expects: :explicit_true_false
-          attribute :clip_to_wrap, expects: :explicit_true_false, displays_as: :cliptowrap
-          attribute :connector_type, expects: :valid_connector_type, displays_as: :connectortype
+          attribute :bullet, expects: :boolean
+          attribute :button, expects: :boolean
+          attribute :bw_mode, one_of: %i(auto black blackTextAndLines color grayOutline grayScale hide highContrast inverseGray lightGrayscale undrawn white), displays_as: :bwmode
+          attribute :bw_normal, one_of: %i(auto black blackTextAndLines color grayOutline grayScale hide highContrast inverseGray lightGrayscale undrawn white), displays_as: :bwnormal
+          attribute :bw_pure, one_of: %i(auto black blackTextAndLines color grayOutline grayScale hide highContrast inverseGray lightGrayscale undrawn white), displays_as: :bwpure
+          attribute :clip, expects: :boolean
+          attribute :clip_to_wrap, expects: :boolean, displays_as: :cliptowrap
+          attribute :connector_type, one_of: %i(curved elbow none straight), displays_as: :connectortype
           attribute :diagram_node_layout, expects: :valid_diagram_layout, displays_as: :dgmlayout
           attribute :diagram_node_recent_layout, expects: :valid_diagram_layout, displays_as: :dgmlayoutmru
           attribute :diagram_node_kind, expects: :integer, displays_as: :dgmnodekind
-          attribute :double_click_notify, expects: :explicit_true_false, displays_as: :doubleclicknotify
-          attribute :force_dash, expects: :explicit_true_false, displays_as: :forcedash
-          attribute :hr, expects: :explicit_true_false
-          attribute :hr_align, expects: :valid_hr_align, displays_as: :hralign
-          attribute :hr_no_shade, expects: :explicit_true_false, displays_as: :hrnoshade
+          attribute :double_click_notify, expects: :boolean, displays_as: :doubleclicknotify
+          attribute :force_dash, expects: :boolean, displays_as: :forcedash
+          attribute :hr, expects: :boolean
+          attribute :hr_align, one_of: %i(center left right), displays_as: :hralign
+          attribute :hr_no_shade, expects: :boolean, displays_as: :hrnoshade
           attribute :hr_percent, expects: :integer, displays_as: :hrpct
-          attribute :hr_standard, expects: :explicit_true_false, displays_as: :hrstd
-          attribute :inset_mode, expects: :valid_inset_mode, displays_as: :insetmode
-          attribute :ole, expects: :explicit_true_false
-          attribute :ole_icon, expects: :explicit_true_false, displays_as: :oleicon
-          attribute :hide_extra_handles, expects: :explicit_true_false, displays_as: :oned
-          attribute :prefer_relative, expects: :explicit_true_false, displays_as: :preferrelative
+          attribute :hr_standard, expects: :boolean, displays_as: :hrstd
+          attribute :inset_mode, one_of: %i(auto custom), displays_as: :insetmode
+          attribute :ole, expects: :boolean
+          attribute :ole_icon, expects: :boolean, displays_as: :oleicon
+          attribute :hide_extra_handles, expects: :boolean, displays_as: :oned
+          attribute :prefer_relative, expects: :boolean, displays_as: :preferrelative
           attribute :regroup_id, expects: :integer, displays_as: :regroupid
           attribute :optional_string, expects: :string, displays_as: :spid
           attribute :optional_number, expects: :string, displays_as: :spt # Actually expects float
-          attribute :user_drawn, expects: :explicit_true_false, displays_as: :userdrawn
-          attribute :user_hidden, expects: :explicit_true_false, displays_as: :userhidden
+          attribute :user_drawn, expects: :boolean, displays_as: :userdrawn
+          attribute :user_hidden, expects: :boolean, displays_as: :userhidden
         end
 
       private
 
-        def valid_bw_mode(value)
-          ok_values = %i(auto black blackTextAndLines color grayOutline grayScale hide highContrast inverseGray lightGrayscale undrawn white)
-          message = "Invalid black and white mode (#{value}). Valid options are: #{ok_values.join(", ")}."
-          raise ArgumentError, message unless ok_values.include? value
-        end
-
         def valid_color(value)
           ok_color_names = %i(black silver gray white maroon red purple fuchsia green lime olive yellow navy blue teal aqua)
           valid_hex = /#[0-9a-f]{6}/i
@@ -78,37 +72,10 @@ module OpenXml
           raise ArgumentError, message unless ok_color_names.include?(value) || value =~ valid_hex || value =~ valid_palette_entry
         end
 
-        def valid_connector_type(value)
-          ok_values = %i(curved elbow none straight)
-          message = "Invalid connector type (#{value}). Valid types are: #{ok_values.join(", ")}."
-          raise ArgumentError, message unless ok_values.include? value
-        end
-
-        def valid_coordinate(value)
-          raise ArgumentError, "Invalid coordinates." unless value =~ /^[\-0-9]+,\s?[\-0-9]+$/
-        end
-
         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]$/
         end
-
-        def valid_hr_align(value)
-          ok_values = %i(center left right)
-          message = "Invalid hr alignment (#{value}). Valid values are: #{ok_values.join(", ")}."
-          raise ArgumentError, message unless ok_values.include? value
-        end
-
-        def valid_inset_mode(value)
-          ok_values = %i(auto custom)
-          message = "Invalid inset mode (#{value}). Valid modes are: #{ok_values.join(", ")}."
-          raise ArgumentError, message unless ok_values.include? value
-        end
-
-        def explicit_true_false(value)
-          raise ArgumentError unless value.to_s =~ /^(?:[01tf]|true|false)$/
-        end
-
       end
     end
   end

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

@@ -9,17 +9,17 @@ module OpenXml
         attribute :arc_size, expects: :valid_arc_size, displays_as: :arcsize
         attribute :chroma_key, expects: :valid_color, displays_as: :chromakey
         attribute :css_class, expects: :string, displays_as: :class
-        attribute :coordinate_origin, expects: :valid_coordinate, displays_as: :coordorigin
-        attribute :coordinate_size, expects: :valid_coordinate, displays_as: :coordsize
+        attribute :coordinate_origin, matches: /^[\-0-9]+,\s?[\-0-9]+$/, displays_as: :coordorigin
+        attribute :coordinate_size, matches: /^[\-0-9]+,\s?[\-0-9]+$/, displays_as: :coordsize
         attribute :fill_color, expects: :valid_color, displays_as: :fillcolor
-        attribute :filled, expects: :explicit_true_false
+        attribute :filled, expects: :boolean
         attribute :href, expects: :string
         attribute :id, expects: :string
-        attribute :inset_pen, expects: :explicit_true_false, displays_as: :insetpen
+        attribute :inset_pen, expects: :boolean, displays_as: :insetpen
         attribute :opacity, expects: :string # Can be a float or 1/65536ths when followed by `f`
-        attribute :print, expects: :explicit_true_false
+        attribute :print, expects: :boolean
         attribute :stroke_color, expects: :valid_color, displays_as: :strokecolor
-        attribute :stroked, expects: :explicit_true_false
+        attribute :stroked, expects: :boolean
         attribute :stroke_weight, expects: :string, displays_as: :strokeweight # Expects number with units
         attribute :style, expects: :string
         attribute :target, expects: :string
@@ -27,40 +27,40 @@ module OpenXml
         attribute :wrap_coordinates, expects: :string, displays_as: :wrapcoords
 
         with_namespace :o do
-          attribute :allow_in_cell, expects: :explicit_true_false, displays_as: :allowincell
-          attribute :allow_overlap, expects: :explicit_true_false, displays_as: :allowoverlap
+          attribute :allow_in_cell, expects: :boolean, displays_as: :allowincell
+          attribute :allow_overlap, expects: :boolean, displays_as: :allowoverlap
           attribute :border_bottom_color, expects: :string, displays_as: :borderbottomcolor
           attribute :border_left_color, expects: :string, displays_as: :borderleftcolor
           attribute :border_right_color, expects: :string, displays_as: :borderrightcolor
           attribute :border_top_color, expects: :string, displays_as: :bordertopcolor
-          attribute :bullet, expects: :explicit_true_false
-          attribute :button, expects: :explicit_true_false
-          attribute :bw_mode, expects: :valid_bw_mode, displays_as: :bwmode
-          attribute :bw_normal, expects: :valid_bw_mode, displays_as: :bwnormal
-          attribute :bw_pure, expects: :valid_bw_mode, displays_as: :bwpure
-          attribute :clip, expects: :explicit_true_false
-          attribute :clip_to_wrap, expects: :explicit_true_false, displays_as: :cliptowrap
-          attribute :connector_type, expects: :valid_connector_type, displays_as: :connectortype
+          attribute :bullet, expects: :boolean
+          attribute :button, expects: :boolean
+          attribute :bw_mode, displays_as: :bwmode, one_of: %i(auto black blackTextAndLines color grayOutline grayScale hide highContrast inverseGray lightGrayscale undrawn white)
+          attribute :bw_normal, displays_as: :bwnormal, one_of: %i(auto black blackTextAndLines color grayOutline grayScale hide highContrast inverseGray lightGrayscale undrawn white)
+          attribute :bw_pure, displays_as: :bwpure, one_of: %i(auto black blackTextAndLines color grayOutline grayScale hide highContrast inverseGray lightGrayscale undrawn white)
+          attribute :clip, expects: :boolean
+          attribute :clip_to_wrap, expects: :boolean, displays_as: :cliptowrap
+          attribute :connector_type, one_of: %i(curved elbow none straight), displays_as: :connectortype
           attribute :diagram_node_layout, expects: :valid_diagram_layout, displays_as: :dgmlayout
           attribute :diagram_node_recent_layout, expects: :valid_diagram_layout, displays_as: :dgmlayoutmru
           attribute :diagram_node_kind, expects: :integer, displays_as: :dgmnodekind
-          attribute :double_click_notify, expects: :explicit_true_false, displays_as: :doubleclicknotify
-          attribute :force_dash, expects: :explicit_true_false, displays_as: :forcedash
-          attribute :hr, expects: :explicit_true_false
-          attribute :hr_align, expects: :valid_hr_align, displays_as: :hralign
-          attribute :hr_no_shade, expects: :explicit_true_false, displays_as: :hrnoshade
+          attribute :double_click_notify, expects: :boolean, displays_as: :doubleclicknotify
+          attribute :force_dash, expects: :boolean, displays_as: :forcedash
+          attribute :hr, expects: :boolean
+          attribute :hr_align, one_of: %i(center left right), displays_as: :hralign
+          attribute :hr_no_shade, expects: :boolean, displays_as: :hrnoshade
           attribute :hr_percent, expects: :integer, displays_as: :hrpct
-          attribute :hr_standard, expects: :explicit_true_false, displays_as: :hrstd
-          attribute :inset_mode, expects: :valid_inset_mode, displays_as: :insetmode
-          attribute :ole, expects: :explicit_true_false
-          attribute :ole_icon, expects: :explicit_true_false, displays_as: :oleicon
-          attribute :hide_extra_handles, expects: :explicit_true_false, displays_as: :oned
-          attribute :prefer_relative, expects: :explicit_true_false, displays_as: :preferrelative
+          attribute :hr_standard, expects: :boolean, displays_as: :hrstd
+          attribute :inset_mode, one_of: %i(auto custom), displays_as: :insetmode
+          attribute :ole, expects: :boolean
+          attribute :ole_icon, expects: :boolean, displays_as: :oleicon
+          attribute :hide_extra_handles, expects: :boolean, displays_as: :oned
+          attribute :prefer_relative, expects: :boolean, displays_as: :preferrelative
           attribute :regroup_id, expects: :integer, displays_as: :regroupid
           attribute :optional_string, expects: :string, displays_as: :spid
           attribute :optional_number, expects: :string, displays_as: :spt # Actually expects float
-          attribute :user_drawn, expects: :explicit_true_false, displays_as: :userdrawn
-          attribute :user_hidden, expects: :explicit_true_false, displays_as: :userhidden
+          attribute :user_drawn, expects: :boolean, displays_as: :userdrawn
+          attribute :user_hidden, expects: :boolean, displays_as: :userhidden
         end
 
       private
@@ -70,12 +70,6 @@ module OpenXml
           raise ArgumentError, message unless value.is_a?(String) && value =~ /^[0-9]+[%f]$/
         end
 
-        def valid_bw_mode(value)
-          ok_values = %i(auto black blackTextAndLines color grayOutline grayScale hide highContrast inverseGray lightGrayscale undrawn white)
-          message = "Invalid black and white mode (#{value}). Valid options are: #{ok_values.join(", ")}."
-          raise ArgumentError, message unless ok_values.include? value
-        end
-
         def valid_color(value)
           ok_color_names = %i(black silver gray white maroon red purple fuchsia green lime olive yellow navy blue teal aqua)
           valid_hex = /#[0-9a-f]{6}/i
@@ -84,37 +78,11 @@ module OpenXml
           raise ArgumentError, message unless ok_color_names.include?(value) || value =~ valid_hex || value =~ valid_palette_entry
         end
 
-        def valid_connector_type(value)
-          ok_values = %i(curved elbow none straight)
-          message = "Invalid connector type (#{value}). Valid types are: #{ok_values.join(", ")}."
-          raise ArgumentError, message unless ok_values.include? value
-        end
-
-        def valid_coordinate(value)
-          raise ArgumentError, "Invalid coordinates." unless value =~ /^[\-0-9]+,\s?[\-0-9]+$/
-        end
-
         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]$/
         end
 
-        def valid_hr_align(value)
-          ok_values = %i(center left right)
-          message = "Invalid hr alignment (#{value}). Valid values are: #{ok_values.join(", ")}."
-          raise ArgumentError, message unless ok_values.include? value
-        end
-
-        def valid_inset_mode(value)
-          ok_values = %i(auto custom)
-          message = "Invalid inset mode (#{value}). Valid modes are: #{ok_values.join(", ")}."
-          raise ArgumentError, message unless ok_values.include? value
-        end
-
-        def explicit_true_false(value)
-          raise ArgumentError unless value.to_s =~ /^(?:[01tf]|true|false)$/
-        end
-
       end
     end
   end