lib/openxml/docx/properties/table_p_pr.rb in openxml-docx-0.9.0 vs lib/openxml/docx/properties/table_p_pr.rb in openxml-docx-0.10.0

@@ -2,40 +2,21 @@
   module Docx
     module Properties
       class TablePPr < ComplexProperty
         tag :tblpPr
 
-        attribute :bottomFromText, expects: :positive_integer
-        attribute :horizAnchor, expects: :valid_anchor
-        attribute :leftFromText, expects: :positive_integer
-        attribute :rightFromText, expects: :positive_integer
-        attribute :tblpX, expects: :integer
-        attribute :tblpXSpec, expects: :valid_x_spec
-        attribute :tblpY, expects: :integer
-        attribute :tblpYSpec, expects: :valid_y_spec
-        attribute :topFromText, expects: :positive_integer
-        attribute :vertAnchor, expects: :valid_anchor
-
-      private
-
-        def valid_anchor(value)
-          list = %i(margin page text)
-          message = "Invalid #{name}: must be one of #{list.join(", ")} (was #{value.inspect})"
-          raise ArgumentError, message unless list.include? value
+        with_namespace :w do
+          attribute :bottomFromText, expects: :positive_integer
+          attribute :horizAnchor, one_of: %i(margin page text)
+          attribute :leftFromText, expects: :positive_integer
+          attribute :rightFromText, expects: :positive_integer
+          attribute :tblpX, expects: :integer
+          attribute :tblpXSpec, one_of: %i(center inside left outside right)
+          attribute :tblpY, expects: :integer
+          attribute :tblpYSpec, one_of: %i(bottom center inline inside outside top)
+          attribute :topFromText, expects: :positive_integer
+          attribute :vertAnchor, one_of: %i(margin page text)
         end
-
-        def valid_x_spec(value)
-          list = %i(center inside left outside right)
-          message = "Invalid #{name}: must be one of #{list.join(", ")} (was #{value.inspect})"
-          raise ArgumentError, message unless list.include? value
-        end
-
-        def valid_y_spec(value)
-          list = %i(bottom center inline inside outside top)
-          message = "Invalid #{name}: must be one of #{list.join(", ")} (was #{value.inspect})"
-          raise ArgumentError, message unless list.include? value
-        end
-
       end
     end
   end
 end