rocx 0.5.7 → 0.5.8

data/lib/rocx/properties/integer_property.rb

@@ -0,0 +1,15 @@
+module Rocx
+  module Properties
+    class IntegerProperty < ValueProperty
+
+      def valid?
+        value.is_a? Integer
+      end
+
+      def invalid_message
+        "Invalid #{name}: must be an integer"
+      end
+
+    end
+  end
+end

data/lib/rocx/properties/italics.rb

@@ -1,10 +1,7 @@
 module Rocx
   module Properties
     class Italics < ToggleProperty
-
-      def tag
-        :i
-      end
+      tag :i
 
     end
   end

data/lib/rocx/properties/kerning.rb

@@ -0,0 +1,8 @@
+module Rocx
+  module Properties
+    class Kerning < PositiveIntegerProperty
+      tag :kern
+      
+    end
+  end
+end

data/lib/rocx/properties/language.rb

@@ -0,0 +1,20 @@
+module Rocx
+  module Properties
+    class Language < ComplexProperty
+      include AttributeBuilder
+
+      tag :lang
+      attribute :bidi, expects: :valid_language
+      attribute :east_asia, expects: :valid_language
+      attribute :latin, expects: :valid_language, displays_as: :val
+
+    private
+
+      def valid_language(value)
+        message = "Invalid #{name}: must be a language code (RFC 4646)"
+        raise ArgumentError, message unless value =~ /[a-z]{2}-[A-Z]{2}/
+      end
+
+    end
+  end
+end

data/lib/rocx/properties/manual_width.rb

@@ -0,0 +1,12 @@
+module Rocx
+  module Properties
+    class ManualWidth < ComplexProperty
+      include AttributeBuilder
+
+      attribute :id, expects: :integer
+      attribute :width, expects: :positive_integer, displays_as: :val
+
+      tag :fitText
+    end
+  end
+end

data/lib/rocx/properties/math.rb

@@ -0,0 +1,8 @@
+module Rocx
+  module Properties
+    class Math < ToggleProperty
+      tag :oMath
+      
+    end
+  end
+end

data/lib/rocx/properties/no_proof.rb

@@ -0,0 +1,6 @@
+module Rocx
+  module Properties
+    class NoProof < BooleanProperty
+    end
+  end
+end

data/lib/rocx/properties/numbering.rb

@@ -1,21 +1,15 @@
 module Rocx
   module Properties
-    class Numbering
+    class Numbering < ComplexProperty
       include AttributeBuilder
 
+      tag :numPr
+
       attribute :level, expects: :positive_integer, displays_as: :ilvl
       attribute :id, expects: :positive_integer, displays_as: :numId
 
-      def name
-        "numbering"
-      end
-
-      def tag
-        :numPr
-      end
-
       def to_xml(xml)
-        return if xml_attributes.empty?
+        return unless render?
         xml["w"].public_send(tag) {
           xml_attributes.each do |tag_name, value|
             xml.public_send(tag_name, "w:val" => value)

data/lib/rocx/properties/on_off_property.rb

@@ -1,6 +1,6 @@
 module Rocx
   module Properties
-    class OnOffProperty < BaseProperty
+    class OnOffProperty < ValueProperty
 
       def ok_values
         [nil, :on, :off]

data/lib/rocx/properties/outline.rb

@@ -0,0 +1,6 @@
+module Rocx
+  module Properties
+    class Outline < BooleanProperty
+    end
+  end
+end

data/lib/rocx/properties/outline_level.rb

@@ -1,22 +1,7 @@
 module Rocx
   module Properties
-    class OutlineLevel < BaseProperty
-
-      def valid?
-        value.is_a?(Integer) && value >= 0
-      end
-
-      def invalid_message
-        "Invalid value for #{name}; acceptable values are integers greater than or equal to 0"
-      end
-
-      def tag
-        :outlineLvl
-      end
-
-      def to_xml(xml)
-        xml["w"].public_send(tag, "w:val" => value)
-      end
+    class OutlineLevel < PositiveIntegerProperty
+      tag :outlineLvl
 
     end
   end

data/lib/rocx/properties/overflow_punctuation.rb

@@ -1,14 +1,7 @@
 module Rocx
   module Properties
     class OverflowPunctuation < BooleanProperty
-
-      def name
-        "overflow_punctuation"
-      end
-
-      def tag
-        :overflowPunct
-      end
+      tag :overflowPunct
 
     end
   end

data/lib/rocx/properties/paragraph_style.rb

@@ -0,0 +1,8 @@
+module Rocx
+  module Properties
+    class ParagraphStyle < Style
+      tag :pStyle
+
+    end
+  end
+end

data/lib/rocx/properties/position.rb

@@ -0,0 +1,6 @@
+module Rocx
+  module Properties
+    class Position < IntegerProperty
+    end
+  end
+end

data/lib/rocx/properties/positive_integer_property.rb

@@ -0,0 +1,15 @@
+module Rocx
+  module Properties
+    class PositiveIntegerProperty < IntegerProperty
+
+      def valid?
+        super && value >= 0
+      end
+
+      def invalid_message
+        "Invalid #{name}: must be a positive integer"
+      end
+
+    end
+  end
+end

data/lib/rocx/properties/right_to_left.rb

@@ -0,0 +1,8 @@
+module Rocx
+  module Properties
+    class RightToLeft < ToggleProperty
+      tag :rtl
+      
+    end
+  end
+end

data/lib/rocx/properties/run_style.rb

@@ -0,0 +1,8 @@
+module Rocx
+  module Properties
+    class RunStyle < Style
+      tag :rStyle
+
+    end
+  end
+end

data/lib/rocx/properties/shading.rb

@@ -1,8 +1,10 @@
 module Rocx
   module Properties
-    class Shading
+    class Shading < ComplexProperty
       include AttributeBuilder
 
+      tag :shd
+
       VALID_SHADING_PATTERNS = %i(clear
                                   diagCross
                                   diagStripe
@@ -43,27 +45,14 @@ module Rocx
 
       attribute :color, expects: :hex_color
       attribute :fill, expects: :hex_color
-      attribute :theme_color, expects: :valid_theme_color, displays_as: :themeColor
-      attribute :theme_fill, expects: :valid_theme_color, displays_as: :themeFill
-      attribute :theme_fill_shade, expects: :hex_digit, displays_as: :themeFillShade
-      attribute :theme_fill_tint, expects: :hex_digit, displays_as: :themeFillTint
-      attribute :theme_shade, expects: :hex_digit, displays_as: :themeShade
-      attribute :theme_tint, expects: :hex_digit, displays_as: :themeTint
+      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
 
-      def name
-        "shading"
-      end
-
-      def tag
-        :shd
-      end
-
-      def to_xml(xml)
-        return if xml_attributes.empty?
-        xml["w"].public_send(tag, xml_attributes)
-      end
-
     private
 
       def shading_pattern(value)

data/lib/rocx/properties/shadow.rb

@@ -0,0 +1,6 @@
+module Rocx
+  module Properties
+    class Shadow < BooleanProperty
+    end
+  end
+end

data/lib/rocx/properties/small_caps.rb

@@ -0,0 +1,6 @@
+module Rocx
+  module Properties
+    class SmallCaps < BooleanProperty
+    end
+  end
+end

data/lib/rocx/properties/spacing.rb

@@ -1,31 +1,18 @@
 module Rocx
   module Properties
-    class Spacing
+    class Spacing < ComplexProperty
       include AttributeBuilder
 
       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, displays_as: :afterLines
+      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, displays_as: :beforeLines
+      attribute :before_lines, expects: :integer
       attribute :line, expects: :integer
-      attribute :line_rule, expects: :valid_line_rule, displays_as: :lineRule
-
-      def name
-        "spacing"
-      end
-
-      def tag
-        :spacing
-      end
-
-      def to_xml(xml)
-        return if xml_attributes.empty?
-        xml["w"].public_send(tag, xml_attributes)
-      end
+      attribute :line_rule, expects: :valid_line_rule
 
     private
 

data/lib/rocx/properties/spec_vanish.rb

@@ -0,0 +1,6 @@
+module Rocx
+  module Properties
+    class SpecVanish < ToggleProperty
+    end
+  end
+end

data/lib/rocx/properties/strikethrough.rb

@@ -0,0 +1,8 @@
+module Rocx
+  module Properties
+    class Strikethrough < BooleanProperty
+      tag :strike
+
+    end
+  end
+end

data/lib/rocx/properties/style.rb

@@ -0,0 +1,15 @@
+module Rocx
+  module Properties
+    class Style < ValueProperty
+
+      def valid?
+        !value.nil?
+      end
+
+      def invalid_message
+        "Invalid #{name}: value must not be nil"
+      end
+
+    end
+  end
+end

data/lib/rocx/properties/tab.rb

@@ -1,6 +1,6 @@
 module Rocx
   module Properties
-    class Tab
+    class Tab < BaseProperty
       attr_reader :position, :type, :leader
 
       VALID_TYPES = %i(bar center clear decimal end num start)
@@ -31,14 +31,6 @@ module Rocx
         xml["w"].public_send(tag, xml_attributes)
       end
 
-      def tag
-        :tab
-      end
-
-      def name
-        "tab"
-      end
-
     private
 
       def xml_attributes

data/lib/rocx/properties/tabs.rb

@@ -1,6 +1,6 @@
 module Rocx
   module Properties
-    class Tabs
+    class Tabs < BaseProperty
       include Enumerable
 
       def initialize
@@ -28,14 +28,6 @@ module Rocx
         }
       end
 
-      def name
-        "tabs"
-      end
-
-      def tag
-        :tabs
-      end
-
     protected
 
       attr_reader :tabs

data/lib/rocx/properties/text_alignment.rb

@@ -0,0 +1,11 @@
+module Rocx
+  module Properties
+    class TextAlignment < ValueProperty
+
+      def ok_values
+        %i(auto baseline bottom center top)
+      end
+
+    end
+  end
+end

data/lib/rocx/properties/text_direction.rb

@@ -1,15 +1,11 @@
 module Rocx
   module Properties
-    class TextDirection < BaseProperty
+    class TextDirection < ValueProperty
 
       def ok_values
         %i(lr lrV rl rlV tb tbV)
       end
 
-      def to_xml(xml)
-        xml["w"].public_send(tag, "w:val" => value)
-      end
-
     end
   end
 end

data/lib/rocx/properties/textbox_tight_wrap.rb

@@ -1,15 +1,11 @@
 module Rocx
   module Properties
-    class TextboxTightWrap < BaseProperty
+    class TextboxTightWrap < ValueProperty
 
       def ok_values
         %i(allLines firstAndLastLine firstLineOnly lastLineOnly none)
       end
 
-      def to_xml(xml)
-        xml["w"].public_send(tag, "w:val" => value)
-      end
-
     end
   end
 end