rocx 0.5.7 → 0.5.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7ebac9d8d2e707e65cf407ccc36232723b714808
-  data.tar.gz: 31d5f1ddbf1b278ffd9e7f28a615bd53e58c5f05
+  metadata.gz: e4eeb08bee13a8278c055c33dd6c18a6dad0fc8d
+  data.tar.gz: 3b733fe765443f5e4b56e9794b66f9bae84af56d
 SHA512:
-  metadata.gz: ff8b3600a3cb1319f49cfc4abef91b0494973f21f4cf3b8c958d860bf61c2223fdb32fe7b4f6bd959096fe5198cb10349ffb4d15417b24f48d067055deb5258d
-  data.tar.gz: 2227d88abf6fe8c3829fce89535b371af53302c0c761b63569fbd9d0b0831bc7acc80f383f09e3a0d7cf80ae1c2afa90978f14ba543f9f11330693aa1b2ec175
+  metadata.gz: 1fb231ad17a78eccddf31d2c3fc7373d0004a5a5cad0412875d0e50dfc6ac268af1891161e3ed05805ae14f2b38f22629fd694ae79a627924b09256219671b46
+  data.tar.gz: ee68b316c2ba4c1b87cd1f5d3ca1ceaeb6d791881f064267bbdb59b1be775353fd24ddfbe999554ab83d99fa572e33e2ca04d29c718a89da735e9a0573dd932a

data/.gitignore

@@ -1,5 +1,6 @@
 .DS_Store
 rocx-0.1.0.gem
 *.gem
+.rspec-local
 /coverage
 TODO.md

data/Gemfile.lock

@@ -1,15 +1,15 @@
 PATH
   remote: .
   specs:
-    rocx (0.5.7)
+    rocx (0.5.8)
       nokogiri
       open_xml_package
 
 GEM
   remote: https://rubygems.org/
   specs:
-    ansi (1.4.3)
     coderay (1.0.9)
+    diff-lcs (1.2.5)
     method_source (0.8.1)
     mini_portile (0.5.3)
     multi_json (1.7.2)
@@ -23,16 +23,21 @@ GEM
       slop (~> 3.4)
     rake (10.0.4)
     rr (1.1.2)
+    rspec (2.14.1)
+      rspec-core (~> 2.14.0)
+      rspec-expectations (~> 2.14.0)
+      rspec-mocks (~> 2.14.0)
+    rspec-core (2.14.7)
+    rspec-expectations (2.14.4)
+      diff-lcs (>= 1.1.3, < 2.0)
+    rspec-mocks (2.14.4)
     rubyzip (1.1.3)
-    shoulda-context (1.1.6)
     simplecov (0.7.1)
       multi_json (~> 1.0)
       simplecov-html (~> 0.7.1)
     simplecov-html (0.7.1)
     slop (3.4.4)
     timecop (0.6.3)
-    turn (0.9.6)
-      ansi
 
 PLATFORMS
   ruby
@@ -42,7 +47,6 @@ DEPENDENCIES
   rake
   rocx!
   rr
-  shoulda-context
+  rspec
   simplecov
   timecop
-  turn

data/Rakefile

@@ -1,9 +1,4 @@
-require "bundler/gem_tasks"
-require "rake/testtask"
+require "rspec/core/rake_task"
 
-Rake::TestTask.new(:test) do |t|
-  t.libs << 'lib'
-  t.libs << 'test'
-  t.pattern = 'test/**/*_test.rb'
-  t.verbose = false
-end
+RSpec::Core::RakeTask.new
+task default: :spec

data/lib/rocx/elements/base_container.rb

@@ -12,18 +12,21 @@ module Rocx
         def value_property(name)
           attr_reader name
 
-          define_method "#{name}=" do |value|
-            class_name = name.to_s.split("_").map(&:capitalize).join
+          class_eval <<-CODE, __FILE__, __LINE__ + 1
+          def #{name}=(value)
+            class_name = "#{name}".split.map(&:capitalize).join
             prop_class = Rocx::Properties.const_get class_name
             instance_variable_set "@#{name}", prop_class.new(value)
           end
+          CODE
 
           properties << name
         end
 
         def property(name)
-          define_method "#{name}" do
-            class_name = name.to_s.split("_").map(&:capitalize).join
+          class_eval <<-CODE, __FILE__, __LINE__ + 1
+          def #{name}
+            class_name = "#{name}".split("_").map(&:capitalize).join
             prop_class = Rocx::Properties.const_get class_name
 
             if instance_variable_get("@#{name}").nil?
@@ -32,6 +35,7 @@ module Rocx
 
             instance_variable_get "@#{name}"
           end
+          CODE
 
           properties << name
         end

data/lib/rocx/elements/paragraph.rb

@@ -11,29 +11,29 @@ module Rocx
       value_property :auto_space_dn
       value_property :bidi
       value_property :compress_punctuation
-      value_property :conditional_formatting
       value_property :contextual_spacing
       value_property :div_id
       value_property :keep_lines
       value_property :keep_next
-      value_property :indentation
       value_property :mirror_indent
       value_property :outline_level
       value_property :overflow_punctuation
       value_property :page_break_before
       value_property :snap_to_grid
-      value_property :style
+      value_property :paragraph_style
       value_property :supress_auto_hyphens
       value_property :supress_line_numbers
       value_property :supress_overlap
       value_property :textbox_tight_wrap
+      value_property :text_alignment
       value_property :text_direction
-      value_property :vertical_alignment
       value_property :widow_control
       value_property :word_wrap
 
       property :borders
+      property :conditional_formatting
       property :frame
+      property :indentation
       property :numbering
       property :shading
       property :spacing

data/lib/rocx/elements/run.rb

@@ -4,8 +4,47 @@ module Rocx
       tag_name :r
       namespace :w
       properties_tag :rPr
-      value_property :italics
+
       value_property :bold
+      value_property :caps
+      value_property :character_spacing
+      value_property :complex_bold
+      value_property :complex_font_size
+      value_property :complex_italics
+      value_property :complex_script_formatting
+      value_property :double_strikethrough
+      value_property :effect
+      value_property :emboss
+      value_property :emphasis
+      value_property :expansion
+      value_property :font_size
+      value_property :hidden_text
+      value_property :highlight
+      value_property :kerning
+      value_property :imprint
+      value_property :italics
+      value_property :math
+      value_property :no_proof
+      value_property :outline
+      value_property :position
+      value_property :right_to_left
+      value_property :run_style
+      value_property :shadow
+      value_property :small_caps
+      value_property :snap_to_grid
+      value_property :spec_vanish
+      value_property :strikethrough
+      value_property :vertical_alignment
+      value_property :web_hidden
+
+      property :border
+      property :color
+      property :font
+      property :east_asian_layout
+      property :language
+      property :manual_width
+      property :shading
+      property :underline
 
     end
   end

data/lib/rocx/properties.rb

@@ -4,9 +4,14 @@ module Rocx
 end
 
 require "rocx/properties/base_property"
+require "rocx/properties/complex_property"
+require "rocx/properties/value_property"
 require "rocx/properties/boolean_property"
+require "rocx/properties/integer_property"
+require "rocx/properties/positive_integer_property"
 require "rocx/properties/on_off_property"
 require "rocx/properties/toggle_property"
+require "rocx/properties/style"
 Dir.glob("#{File.join(File.dirname(__FILE__), "properties", "*.rb")}").each do |file|
   require file
 end

data/lib/rocx/properties/alignment.rb

@@ -1,25 +1,10 @@
 module Rocx
   module Properties
-    class Alignment < BaseProperty
-      attr_reader :value
+    class Alignment < ValueProperty
+      tag :jc
 
-      OK_VALUES = [:both, :center, :distribute, :end, :highKashida, :lowKashida, :mediumKashida, :numTab, :start, :thaiDistribute]
-
-      def initialize(value)
-        @value = value
-        raise ArgumentError invalid_message unless valid?
-      end
-
-      def invalid_message
-        "Invalid value for alignment; acceptable values are #{OK_VALUES.join(", ")}"
-      end
-
-      def valid?
-        OK_VALUES.member? value
-      end
-
-      def to_xml(xml)
-        xml["w"].jc("w:val" => value) if value
+      def ok_values
+        [:both, :center, :distribute, :end, :highKashida, :lowKashida, :mediumKashida, :numTab, :start, :thaiDistribute]
       end
 
     end

data/lib/rocx/properties/attribute_builder.rb

@@ -211,7 +211,8 @@ module Rocx
             instance_variable_set "@#{name}", value
           end
 
-          attributes[name] = displays_as || name
+          camelized_name = name.to_s.gsub(/_([a-z])/i) { $1.upcase }.to_sym
+          attributes[name] = displays_as || camelized_name
         end
 
         def attributes
@@ -261,6 +262,11 @@ module Rocx
         raise ArgumentError, message unless value.is_a?(Integer) && value >= 0
       end
 
+      def string(value)
+        message = "Invalid #{name}: must be a string"
+        raise ArgumentError, message unless value.is_a?(String)
+      end
+
       def on_or_off(value)
         valid_in? value, [:on, :off]
       end
@@ -274,7 +280,7 @@ module Rocx
       end
 
       def valid_in?(value, list)
-        message = "Invalid #{name}: must be one of #{list.join(", ")}"
+        message = "Invalid #{name}: must be one of #{list.join(", ")} (was #{value.inspect})"
         raise ArgumentError, message unless list.member?(value)
       end
 

data/lib/rocx/properties/auto_adjust_right_indent.rb

@@ -1,15 +1,9 @@
 module Rocx
   module Properties
     class AutoAdjustRightIndent < BooleanProperty
-
-      def name
-        "auto_adjust_right_ind"
-      end
-
-      def tag
-        :adjustRightInd
-      end
-
+      tag :adjustRightInd
+      name "auto_adjust_right_ind"
+      
     end
   end
 end

data/lib/rocx/properties/auto_space_de.rb

@@ -1,14 +1,7 @@
 module Rocx
   module Properties
     class AutoSpaceDe < BooleanProperty
-
-      def name
-        "auto_space_de"
-      end
-
-      def tag
-        :autoSpaceDE
-      end
+      tag :autoSpaceDE
 
     end
   end

data/lib/rocx/properties/auto_space_dn.rb

@@ -1,14 +1,7 @@
 module Rocx
   module Properties
     class AutoSpaceDn < BooleanProperty
-
-      def name
-        "auto_space_dn"
-      end
-
-      def tag
-        :autoSpaceDN
-      end
+      tag :autoSpaceDN
 
     end
   end

data/lib/rocx/properties/base_property.rb

@@ -3,17 +3,18 @@ module Rocx
     class BaseProperty
       attr_reader :value
 
-      def initialize(value)
-        @value = value
-        raise ArgumentError, invalid_message unless valid?
-      end
-
-      def valid?
-        ok_values.member? value
-      end
-
-      def invalid_message
-        "Invalid value for #{name}; acceptable values are #{ok_values.join(", ")}"
+      class << self
+        attr_reader :property_name
+
+        def tag(*args)
+          @tag = args.first if args.any?
+          @tag
+        end
+
+        def name(*args)
+          @property_name = args.first if args.any?
+          @name
+        end
       end
 
       def render?
@@ -21,10 +22,18 @@ module Rocx
       end
 
       def name
+        self.class.property_name || default_name
+      end
+
+      def default_name
         class_name.gsub(/(.)([A-Z])/, '\1_\2').downcase
       end
 
       def tag
+        self.class.tag || default_tag
+      end
+
+      def default_tag
         (class_name[0, 1].downcase + class_name[1..-1]).to_sym
       end
 

data/lib/rocx/properties/bold.rb

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

data/lib/rocx/properties/boolean_property.rb

@@ -1,6 +1,6 @@
 module Rocx
   module Properties
-    class BooleanProperty < BaseProperty
+    class BooleanProperty < ValueProperty
 
       def ok_values
         [nil, true, false]

data/lib/rocx/properties/border.rb

@@ -1,6 +1,6 @@
 module Rocx
   module Properties
-    class Border
+    class Border < ComplexProperty
       include AttributeBuilder
 
       attr_reader :tag
@@ -10,23 +10,15 @@ module Rocx
       attribute :shadow, expects: :true_or_false
       attribute :size, expects: :positive_integer, displays_as: :sz
       attribute :space, expects: :positive_integer
-      attribute :theme_color, expects: :valid_theme_color, displays_as: :themeColor
-      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_shade, expects: :hex_digit
+      attribute :theme_tint, expects: :hex_digit
       attribute :type, expects: :valid_type, displays_as: :val
 
-      def initialize(tag)
+      def initialize(tag=:bdr)
         @tag = tag
       end
 
-      def name
-        "border"
-      end
-
-      def to_xml(xml)
-        xml["w"].public_send(tag, xml_attributes)
-      end
-
     end
   end
 end

data/lib/rocx/properties/borders.rb

@@ -1,6 +1,6 @@
 module Rocx
   module Properties
-    class Borders
+    class Borders < ComplexProperty
       attr_reader :left, :right, :top, :bottom, :between, :bar
 
       def initialize
@@ -12,13 +12,7 @@ module Rocx
         @bar = new_border :bar
       end
 
-      def tag
-        :pBdr
-      end
-
-      def name
-        "borders"
-      end
+      tag :pBdr
 
       def render?
         !renderable_borders.length.zero?