rocx 0.5.8 → 0.6.0

data/lib/rocx/elements/symbol.rb

@@ -1,10 +1,11 @@
 module Rocx
   module Elements
-    class Symbol < BaseElement
-      tag_name :sym
-      namespace :w
-      attribute :font, xml_name: "w:font"
-      attribute :char, xml_name: "w:char", regex: /[0-9a-f]{4}/
+    class Symbol < Element
+      tag :sym
+
+      attribute :font, expects: :string
+      attribute :character, expects: :hex_digit_4, displays_as: :char
+
     end
   end
 end

data/lib/rocx/elements/tab.rb

@@ -0,0 +1,6 @@
+module Rocx
+  module Elements
+    class Tab < Element
+    end
+  end
+end

data/lib/rocx/elements/text.rb

@@ -1,19 +1,26 @@
 module Rocx
   module Elements
-    class Text < BaseElement
+    class Text < Element
       attr_reader :text
 
-      tag_name :t
-      namespace :w
-      attribute :space, xml_name: "xml:space", limit_to: [nil, :preserve]
+      tag :t
 
-      def initialize(text, **args)
+      attribute :space, expects: :valid_space_preserve, namespace: :xml
+
+      VALID_SPACE_PRESERVES = [:preserve, nil]
+
+      def initialize(text=nil)
         @text = text
-        super args
       end
 
       def to_xml(xml)
-        xml[namespace].public_send tag_name, text, xml_attributes
+        xml["w"].public_send(tag, text, xml_attributes)
+      end
+
+    private
+
+      def valid_space_preserve(value)
+        valid_in? value, VALID_SPACE_PRESERVES
       end
 
     end

data/lib/rocx/properties/border.rb

@@ -1,8 +1,6 @@
 module Rocx
   module Properties
     class Border < ComplexProperty
-      include AttributeBuilder
-
       attr_reader :tag
 
       attribute :color, expects: :hex_color

data/lib/rocx/properties/color.rb

@@ -1,8 +1,6 @@
 module Rocx
   module Properties
     class Color < ComplexProperty
-      include AttributeBuilder
-
       attribute :color, expects: :hex_color, displays_as: :val
       attribute :theme_color, expects: :valid_theme_color
       attribute :theme_shade, expects: :hex_digit

data/lib/rocx/properties/complex_property.rb

@@ -1,6 +1,7 @@
 module Rocx
   module Properties
     class ComplexProperty < BaseProperty
+      include AttributeBuilder
 
       def to_xml(xml)
         return unless render?

data/lib/rocx/properties/conditional_formatting.rb

@@ -1,8 +1,6 @@
 module Rocx
   module Properties
     class ConditionalFormatting < ComplexProperty
-      include AttributeBuilder
-
       tag :cnfStyle
 
       attribute :even_horizontal_band, expects: :true_or_false, displays_as: :evenHBand

data/lib/rocx/properties/east_asian_layout.rb

@@ -1,16 +1,14 @@
 module Rocx
   module Properties
     class EastAsianLayout < ComplexProperty
-      include AttributeBuilder
-
-      VALID_BRACKETS = %i(angle curly none round square)
-
       attribute :combine, expects: :on_or_off
       attribute :combine_brackets, expects: :valid_bracket
       attribute :id, expects: :integer
       attribute :vertical, expects: :on_or_off, displays_as: :vert
       attribute :vertical_compress, expects: :on_or_off, displays_as: :vertCompress
 
+      VALID_BRACKETS = %i(angle curly none round square)
+
     private
 
       def valid_bracket(value)

data/lib/rocx/properties/font.rb

@@ -1,8 +1,6 @@
 module Rocx
   module Properties
     class Font < ComplexProperty
-      include AttributeBuilder
-
       tag :rFonts
 
       attribute :ascii, expects: :string

data/lib/rocx/properties/frame.rb

@@ -1,17 +1,8 @@
 module Rocx
   module Properties
     class Frame < ComplexProperty
-      include AttributeBuilder
-
       tag :framePr
 
-      VALID_ANCHORS = %i(margin page text)
-      VALID_DROP_CAPS = %i(drop margin none)
-      VALID_HEIGHT_RULES = %i(atLeast auto exact)
-      VALID_RELATIVE_HORIZONTAL_POSITIONS = %i(center inside left outside right)
-      VALID_RELATIVE_VERTICAL_POSITIONS = %i(bottom center inline inside outside top)
-      VALID_WRAPS = %i(around auto none notBeside through tight)
-
       attribute :anchor_lock, expects: :true_or_false
       attribute :drop_cap, expects: :valid_drop_cap
       attribute :height, expects: :positive_integer, displays_as: :h
@@ -28,6 +19,13 @@ module Rocx
       attribute :width, expects: :positive_integer, displays_as: :w
       attribute :wrap, expects: :valid_wrap
 
+      VALID_ANCHORS = %i(margin page text)
+      VALID_DROP_CAPS = %i(drop margin none)
+      VALID_HEIGHT_RULES = %i(atLeast auto exact)
+      VALID_RELATIVE_HORIZONTAL_POSITIONS = %i(center inside left outside right)
+      VALID_RELATIVE_VERTICAL_POSITIONS = %i(bottom center inline inside outside top)
+      VALID_WRAPS = %i(around auto none notBeside through tight)
+
     private
 
       def valid_drop_cap(value)

data/lib/rocx/properties/indentation.rb

@@ -1,8 +1,6 @@
 module Rocx
   module Properties
     class Indentation < ComplexProperty
-      include AttributeBuilder
-
       tag :ind
 
       attribute :end, expects: :integer

data/lib/rocx/properties/language.rb

@@ -1,9 +1,8 @@
 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

data/lib/rocx/properties/manual_width.rb

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

data/lib/rocx/properties/numbering.rb

@@ -1,8 +1,6 @@
 module Rocx
   module Properties
     class Numbering < ComplexProperty
-      include AttributeBuilder
-
       tag :numPr
 
       attribute :level, expects: :positive_integer, displays_as: :ilvl

data/lib/rocx/properties/phonetic_guide_alignment.rb

@@ -0,0 +1,13 @@
+module Rocx
+  module Properties
+    class PhoneticGuideAlignment < ValueProperty
+      tag :rubyAlign
+      name "alignment"
+
+      def ok_values
+        %i(center distributeLetter distributeSpace left right rightVertical)
+      end
+
+    end
+  end
+end

data/lib/rocx/properties/phonetic_guide_base_font_size.rb

@@ -0,0 +1,8 @@
+module Rocx
+  module Properties
+    class PhoneticGuideBaseFontSize < PositiveIntegerProperty
+      tag :hpsBaseText
+      name "base_font_size"
+    end
+  end
+end

data/lib/rocx/properties/phonetic_guide_font_size.rb

@@ -0,0 +1,8 @@
+module Rocx
+  module Properties
+    class PhoneticGuideFontSize < PositiveIntegerProperty
+      tag :hps
+      name "font_size"
+    end
+  end
+end

data/lib/rocx/properties/phonetic_guide_font_size_raise.rb

@@ -0,0 +1,8 @@
+module Rocx
+  module Properties
+    class PhoneticGuideFontSizeRaise < PositiveIntegerProperty
+      tag :hpsRaise
+      name "font_size_raise"
+    end
+  end
+end

data/lib/rocx/properties/phonetic_guide_language.rb

@@ -0,0 +1,17 @@
+module Rocx
+  module Properties
+    class PhoneticGuideLanguage < ValueProperty
+      tag :lid
+      name "language"
+
+      def valid?
+        value =~ /[a-z]{2}-[A-Z]{2}/
+      end
+
+      def invalid_message
+        "Invalid #{name}: must be a language code (RFC 4646)"
+      end
+
+    end
+  end
+end

data/lib/rocx/properties/shading.rb

@@ -1,8 +1,6 @@
 module Rocx
   module Properties
     class Shading < ComplexProperty
-      include AttributeBuilder
-
       tag :shd
 
       VALID_SHADING_PATTERNS = %i(clear

data/lib/rocx/properties/spacing.rb

@@ -1,8 +1,6 @@
 module Rocx
   module Properties
     class Spacing < ComplexProperty
-      include AttributeBuilder
-
       VALID_LINE_RULES = %i(atLeast auto exact)
 
       attribute :after, expects: :positive_integer

data/lib/rocx/properties/underline.rb

@@ -1,8 +1,6 @@
 module Rocx
   module Properties
     class Underline < ComplexProperty
-      include AttributeBuilder
-
       tag :u
 
       VALID_UNDERLINE_TYPES = %i(dash dashDotDotHeavy dashDotHeavy dashedHeavy dashLong dashLongHeavy dotDash dotDotDash dotted dottedHeavy double none single thick wave wavyDouble wavyHeavy words)

data/lib/rocx/properties/value_property.rb

@@ -13,7 +13,7 @@ module Rocx
       end
 
       def invalid_message
-        "Invalid value for #{name}; acceptable values are #{ok_values.join(", ")}"
+        "Invalid value for #{name}; acceptable values are #{ok_values.join(", ")} (provided: #{value.inspect})"
       end
 
       def render?

data/lib/rocx/version.rb

@@ -1,3 +1,3 @@
 module Rocx
-  VERSION = "0.5.8"
+  VERSION = "0.6.0"
 end

data/spec/elements/absolute_position_tab_spec.rb

@@ -0,0 +1,84 @@
+require "spec_helper"
+
+describe Rocx::Elements::AbsolutePositionTab do
+  include ElementTestMacros
+
+  it_should_use tag: :ptab, name: "absolute_position_tab"
+
+  for_attribute(:alignment) do
+    with_value(:center) do
+      it_should_assign_successfully
+      it_should_output "<w:ptab w:alignment=\"center\"/>"
+    end
+
+    with_value(:left) do
+      it_should_assign_successfully
+      it_should_output "<w:ptab w:alignment=\"left\"/>"
+    end
+
+    with_value(:right) do
+      it_should_assign_successfully
+      it_should_output "<w:ptab w:alignment=\"right\"/>"
+    end
+
+    with_value(:somethingElse) do
+      it_should_raise_an_exception
+    end
+  end
+
+  for_attribute(:leader) do
+    with_value(:dot) do
+      it_should_assign_successfully
+      it_should_output "<w:ptab w:leader=\"dot\"/>"
+    end
+
+    with_value(:hyphen) do
+      it_should_assign_successfully
+      it_should_output "<w:ptab w:leader=\"hyphen\"/>"
+    end
+
+    with_value(:middleDot) do
+      it_should_assign_successfully
+      it_should_output "<w:ptab w:leader=\"middleDot\"/>"
+    end
+
+    with_value(:none) do
+      it_should_assign_successfully
+      it_should_output "<w:ptab w:leader=\"none\"/>"
+    end
+
+    with_value(:underscore) do
+      it_should_assign_successfully
+      it_should_output "<w:ptab w:leader=\"underscore\"/>"
+    end
+
+    with_value(:somethingElse) do
+      it_should_raise_an_exception
+    end
+  end
+
+  for_attribute(:relativeTo) do
+    with_value(:indent) do
+      it_should_assign_successfully
+      it_should_output "<w:ptab w:relativeTo=\"indent\"/>"
+    end
+
+    with_value(:margin) do
+      it_should_assign_successfully
+      it_should_output "<w:ptab w:relativeTo=\"margin\"/>"
+    end
+
+    with_value(:somethingElse) do
+      it_should_raise_an_exception
+    end
+  end
+
+  with_no_attributes_set do
+    it_should_output "<w:ptab/>", assign: false
+  end
+
+  with_these_attributes_set(alignment: :center, relativeTo: :margin) do
+    it_should_output "<w:ptab w:alignment=\"center\" w:relativeTo=\"margin\"/>", assign: false
+  end
+
+end

data/spec/elements/bidi_embed_spec.rb

@@ -0,0 +1,31 @@
+require "spec_helper"
+
+describe Rocx::Elements::BidiEmbed do
+  include ElementTestMacros
+
+  it_should_use tag: :dir, name: "bidi_embed"
+
+  for_attribute(:direction) do
+    with_value(:rtl) do
+      it_should_assign_successfully
+      it_should_output "<w:dir w:val=\"rtl\"/>"
+    end
+
+    with_value(:ltr) do
+      it_should_assign_successfully
+      it_should_output "<w:dir w:val=\"ltr\"/>"
+    end
+  end
+
+  context "with children" do
+    before(:each) do
+      @instance = described_class.new
+      text = Rocx::Elements::Text.new("Smucker's Preserves")
+      run = Rocx::Elements::Run.new
+      run << text
+      instance << run
+    end
+
+    it_should_output "<w:dir>\n    <w:r>\n      <w:t>Smucker's Preserves</w:t>\n    </w:r>\n  </w:dir>", assign: false
+  end
+end

data/spec/elements/bidi_override_spec.rb

@@ -0,0 +1,31 @@
+require "spec_helper"
+
+describe Rocx::Elements::BidiOverride do
+  include ElementTestMacros
+
+  it_should_use tag: :bdo, name: "bidi_override"
+
+  for_attribute(:direction) do
+    with_value(:rtl) do
+      it_should_assign_successfully
+      it_should_output "<w:bdo w:val=\"rtl\"/>"
+    end
+
+    with_value(:ltr) do
+      it_should_assign_successfully
+      it_should_output "<w:bdo w:val=\"ltr\"/>"
+    end
+  end
+
+  context "with children" do
+    before(:each) do
+      @instance = described_class.new
+      text = Rocx::Elements::Text.new("Smucker's Preserves")
+      run = Rocx::Elements::Run.new
+      run << text
+      instance << run
+    end
+
+    it_should_output "<w:bdo>\n    <w:r>\n      <w:t>Smucker's Preserves</w:t>\n    </w:r>\n  </w:bdo>", assign: false
+  end
+end