write_xlsx 0.0.3 → 0.0.4

data/lib/write_xlsx/chart/stock.rb

@@ -43,12 +43,10 @@ def write_stock_chart
         # Add default formatting to the series data.
         modify_series_formatting
 
-        @writer.start_tag('c:stockChart')
-
-        # Write the series elements.
-        write_series
-
-        @writer.end_tag('c:stockChart')
+        @writer.tag_elements('c:stockChart') do
+          # Write the series elements.
+          write_series
+        end
       end
 
       #
@@ -83,21 +81,16 @@ def write_series
       # Write the <c:plotArea> element.
       #
       def write_plot_area
-        @writer.start_tag('c:plotArea')
-
-        # Write the c:layout element.
-        write_layout
-
-        # Write the subclass chart type element.
-        write_chart_type
-
-        # Write the c:dateAx element.
-        write_date_axis
-
-        # Write the c:catAx element.
-        write_val_axis
-
-        @writer.end_tag('c:plotArea')
+        @writer.tag_elements('c:plotArea') do 
+          # Write the c:layout element.
+          write_layout
+          # Write the subclass chart type element.
+          write_chart_type
+          # Write the c:dateAx element.
+          write_date_axis
+          # Write the c:catAx element.
+          write_val_axis
+        end
       end
 
       #

data/lib/write_xlsx/chartsheet.rb

@@ -161,10 +161,10 @@ def _write_sheet_pr # :nodoc:
       attributes << {'filterMode' => 1} if @filter_on
 
       if @fit_page || @tab_color
-        @writer.start_tag('sheetPr', attributes)
-        write_tab_color
-        write_page_set_up_pr
-        @writer.end_tag('sheetPr')
+        @writer.tag_elements('sheetPr', attributes) do
+          write_tab_color
+          write_page_set_up_pr
+        end
       else
         @writer.empty_tag('sheetPr', attributes)
       end

data/lib/write_xlsx/drawing.rb

@@ -88,68 +88,55 @@ def write_two_cell_anchor(*args)
       # Add attribute for images.
       attributes << :editAs << 'oneCell' if type == 2
 
-      @writer.start_tag('xdr:twoCellAnchor', attributes)
-
-      # Write the xdr:from element.
-      write_from(col_from, row_from, col_from_offset, row_from_offset)
-
-      # Write the xdr:from element.
-      write_to(col_to, row_to, col_to_offset, row_to_offset)
-
-      if type == 1
-        # Write the xdr:graphicFrame element for charts.
-        write_graphic_frame(index)
-      else
-        # Write the xdr:pic element.
-        write_pic(index, col_absolute, row_absolute, width, height, description)
+      @writer.tag_elements('xdr:twoCellAnchor', attributes) do
+        # Write the xdr:from element.
+        write_from(col_from, row_from, col_from_offset, row_from_offset)
+        # Write the xdr:from element.
+        write_to(col_to, row_to, col_to_offset, row_to_offset)
+
+        if type == 1
+          # Write the xdr:graphicFrame element for charts.
+          write_graphic_frame(index)
+        else
+          # Write the xdr:pic element.
+          write_pic(index, col_absolute, row_absolute, width, height, description)
+        end
+
+        # Write the xdr:clientData element.
+        write_client_data
       end
-
-      # Write the xdr:clientData element.
-      write_client_data
-
-      @writer.end_tag('xdr:twoCellAnchor')
     end
 
     #
     # Write the <xdr:from> element.
     #
     def write_from(col, row, col_offset, row_offset)
-      @writer.start_tag('xdr:from')
-
-      # Write the xdr:col element.
-      write_col(col)
-
-      # Write the xdr:colOff element.
-      write_col_off(col_offset)
-
-      # Write the xdr:row element.
-      write_row(row)
-
-      # Write the xdr:rowOff element.
-      write_row_off(row_offset)
-
-      @writer.end_tag('xdr:from')
+      @writer.tag_elements('xdr:from') do
+        # Write the xdr:col element.
+        write_col(col)
+        # Write the xdr:colOff element.
+        write_col_off(col_offset)
+        # Write the xdr:row element.
+        write_row(row)
+        # Write the xdr:rowOff element.
+        write_row_off(row_offset)
+      end
     end
 
     #
     # Write the <xdr:to> element.
     #
     def write_to(col, row, col_offset, row_offset)
-      @writer.start_tag('xdr:to')
-
-      # Write the xdr:col element.
-      write_col(col)
-
-      # Write the xdr:colOff element.
-      write_col_off(col_offset)
-
-      # Write the xdr:row element.
-      write_row(row)
-
-      # Write the xdr:rowOff element.
-      write_row_off(row_offset)
-
-      @writer.end_tag('xdr:to')
+      @writer.tag_elements('xdr:to') do
+        # Write the xdr:col element.
+        write_col(col)
+        # Write the xdr:colOff element.
+        write_col_off(col_offset)
+        # Write the xdr:row element.
+        write_row(row)
+        # Write the xdr:rowOff element.
+        write_row_off(row_offset)
+      end
     end
 
     #
@@ -190,33 +177,26 @@ def write_graphic_frame(index)
 
       attributes = ['macro', macro]
 
-      @writer.start_tag('xdr:graphicFrame', attributes)
-
-      # Write the xdr:nvGraphicFramePr element.
-      write_nv_graphic_frame_pr(index)
-
-      # Write the xdr:xfrm element.
-      write_xfrm
-
-      # Write the a:graphic element.
-      write_atag_graphic(index)
-
-      @writer.end_tag('xdr:graphicFrame')
+      @writer.tag_elements('xdr:graphicFrame', attributes) do
+        # Write the xdr:nvGraphicFramePr element.
+        write_nv_graphic_frame_pr(index)
+        # Write the xdr:xfrm element.
+        write_xfrm
+        # Write the a:graphic element.
+        write_atag_graphic(index)
+      end
     end
 
     #
     # Write the <xdr:nvGraphicFramePr> element.
     #
     def write_nv_graphic_frame_pr(index)
-      @writer.start_tag('xdr:nvGraphicFramePr')
-
-      # Write the xdr:cNvPr element.
-      write_c_nv_pr( index + 1, "Chart #{index}" )
-
-      # Write the xdr:cNvGraphicFramePr element.
-      write_c_nv_graphic_frame_pr
-
-      @writer.end_tag('xdr:nvGraphicFramePr')
+      @writer.tag_elements('xdr:nvGraphicFramePr') do
+        # Write the xdr:cNvPr element.
+        write_c_nv_pr( index + 1, "Chart #{index}" )
+        # Write the xdr:cNvGraphicFramePr element.
+        write_c_nv_graphic_frame_pr
+      end
     end
 
     #
@@ -242,12 +222,10 @@ def write_c_nv_graphic_frame_pr
       if @embedded
         @writer.empty_tag('xdr:cNvGraphicFramePr')
       else
-        @writer.start_tag('xdr:cNvGraphicFramePr')
-
-        # Write the a:graphicFrameLocks element.
-        write_a_graphic_frame_locks
-
-        @writer.end_tag('xdr:cNvGraphicFramePr')
+        @writer.tag_elements('xdr:cNvGraphicFramePr') do
+          # Write the a:graphicFrameLocks element.
+          write_a_graphic_frame_locks
+        end
       end
     end
 
@@ -266,15 +244,12 @@ def write_a_graphic_frame_locks
     # Write the <xdr:xfrm> element.
     #
     def write_xfrm
-      @writer.start_tag('xdr:xfrm')
-
-      # Write the xfrmOffset element.
-      write_xfrm_offset
-
-      # Write the xfrmOffset element.
-      write_xfrm_extension
-
-      @writer.end_tag('xdr:xfrm')
+      @writer.tag_elements('xdr:xfrm') do
+        # Write the xfrmOffset element.
+        write_xfrm_offset
+        # Write the xfrmOffset element.
+        write_xfrm_extension
+      end
     end
 
     #
@@ -311,12 +286,10 @@ def write_xfrm_extension
     # Write the <a:graphic> element.
     #
     def write_atag_graphic(index)
-      @writer.start_tag('a:graphic')
-
-      # Write the a:graphicData element.
-      write_atag_graphic_data(index)
-
-      @writer.end_tag('a:graphic')
+      @writer.tag_elements('a:graphic') do
+        # Write the a:graphicData element.
+        write_atag_graphic_data(index)
+      end
     end
 
     #
@@ -327,12 +300,10 @@ def write_atag_graphic_data(index)
 
       attributes = ['uri', uri]
 
-      @writer.start_tag('a:graphicData', attributes)
-
-      # Write the c:chart element.
-      write_c_chart("rId#{index}")
-
-      @writer.end_tag('a:graphicData')
+      @writer.tag_elements('a:graphicData', attributes) do
+        # Write the c:chart element.
+        write_c_chart("rId#{index}")
+      end
     end
 
     #
@@ -364,45 +335,36 @@ def write_client_data
     # Write the <xdr:pic> element.
     #
     def write_pic(index, col_absolute, row_absolute, width, height, description)
-      @writer.start_tag('xdr:pic')
-
-      # Write the xdr:nvPicPr element.
-      write_nv_pic_pr(index, description)
-
-      # Write the xdr:blipFill element.
-      write_blip_fill(index)
-
-      # Write the xdr:spPr element.
-      write_sp_pr(col_absolute, row_absolute, width, height)
-
-      @writer.end_tag('xdr:pic')
+      @writer.tag_elements('xdr:pic') do
+        # Write the xdr:nvPicPr element.
+        write_nv_pic_pr(index, description)
+        # Write the xdr:blipFill element.
+        write_blip_fill(index)
+        # Write the xdr:spPr element.
+        write_sp_pr(col_absolute, row_absolute, width, height)
+      end
     end
 
     #
     # Write the <xdr:nvPicPr> element.
     #
     def write_nv_pic_pr(index, description)
-      @writer.start_tag('xdr:nvPicPr')
-
-      # Write the xdr:cNvPr element.
-      write_c_nv_pr( index + 1, "Picture #{index}", description )
-
-      # Write the xdr:cNvPicPr element.
-      write_c_nv_pic_pr
-
-      @writer.end_tag('xdr:nvPicPr')
+      @writer.tag_elements('xdr:nvPicPr') do
+        # Write the xdr:cNvPr element.
+        write_c_nv_pr( index + 1, "Picture #{index}", description )
+        # Write the xdr:cNvPicPr element.
+        write_c_nv_pic_pr
+      end
     end
 
     #
     # Write the <xdr:cNvPicPr> element.
     #
     def write_c_nv_pic_pr
-      @writer.start_tag('xdr:cNvPicPr')
-
-      # Write the a:picLocks element.
-      write_a_pic_locks
-
-      @writer.end_tag('xdr:cNvPicPr')
+      @writer.tag_elements('xdr:cNvPicPr') do
+        # Write the a:picLocks element.
+        write_a_pic_locks
+      end
     end
 
     #
@@ -420,15 +382,12 @@ def write_a_pic_locks
     # Write the <xdr:blipFill> element.
     #
     def write_blip_fill(index)
-      @writer.start_tag('xdr:blipFill')
-
-      # Write the a:blip element.
-      write_a_blip(index)
-
-      # Write the a:stretch element.
-      write_a_stretch
-
-      @writer.end_tag('xdr:blipFill')
+      @writer.tag_elements('xdr:blipFill') do
+        # Write the a:blip element.
+        write_a_blip(index)
+        # Write the a:stretch element.
+        write_a_stretch
+      end
     end
 
     #
@@ -451,12 +410,10 @@ def write_a_blip(index)
     # Write the <a:stretch> element.
     #
     def write_a_stretch
-      @writer.start_tag('a:stretch')
-
-      # Write the a:fillRect element.
-      write_a_fill_rect
-
-      @writer.end_tag('a:stretch')
+      @writer.tag_elements('a:stretch') do
+        # Write the a:fillRect element.
+        write_a_fill_rect
+      end
     end
 
     #
@@ -470,30 +427,24 @@ def write_a_fill_rect
     # Write the <xdr:spPr> element.
     #
     def write_sp_pr(col_absolute, row_absolute, width, height)
-      @writer.start_tag('xdr:spPr')
-
-      # Write the a:xfrm element.
-      write_a_xfrm(col_absolute, row_absolute, width, height)
-
-      # Write the a:prstGeom element.
-      write_a_prst_geom
-
-      @writer.end_tag('xdr:spPr')
+      @writer.tag_elements('xdr:spPr') do
+        # Write the a:xfrm element.
+        write_a_xfrm(col_absolute, row_absolute, width, height)
+        # Write the a:prstGeom element.
+        write_a_prst_geom
+      end
     end
 
     #
     # Write the <a:xfrm> element.
     #
     def write_a_xfrm(col_absolute, row_absolute, width, height)
-      @writer.start_tag('a:xfrm')
-
-      # Write the a:off element.
-      write_a_off( col_absolute, row_absolute )
-
-      # Write the a:ext element.
-      write_a_ext( width, height )
-
-      @writer.end_tag('a:xfrm')
+      @writer.tag_elements('a:xfrm') do
+        # Write the a:off element.
+        write_a_off( col_absolute, row_absolute )
+        # Write the a:ext element.
+        write_a_ext( width, height )
+      end
     end
 
     #
@@ -529,12 +480,10 @@ def write_a_prst_geom
 
       attributes = ['prst', prst]
 
-      @writer.start_tag('a:prstGeom', attributes)
-
-      # Write the a:avLst element.
-      write_a_av_lst
-
-      @writer.end_tag('a:prstGeom')
+      @writer.tag_elements('a:prstGeom', attributes) do
+        # Write the a:avLst element.
+        write_a_av_lst
+      end
     end
 
     #

data/lib/write_xlsx/format.rb

@@ -163,9 +163,8 @@ class Format
     attr_reader :diag_type, :diag_color, :font_only, :color, :color_indexed   # :nodoc:
     attr_reader :left, :left_color, :right, :right_color, :top, :top_color, :bottom, :bottom_color   # :nodoc:
     attr_reader :font_scheme   # :nodoc:
-    attr_accessor :font_index, :has_font, :has_dxf_font, :has_dxf_fill, :has_dxf_border   # :nodoc:
-    attr_accessor :num_format_index, :border_index, :has_border   # :nodoc:
-    attr_accessor :fill_index, :has_fill, :font_condense, :font_extend, :diag_border   # :nodoc:
+    attr_accessor :num_format_index, :border_index, :font_index   # :nodoc:
+    attr_accessor :fill_index, :font_condense, :font_extend, :diag_border   # :nodoc:
     attr_accessor :bg_color, :fg_color, :pattern   # :nodoc:
 
     def initialize(xf_format_indices = {}, dxf_format_indices = {}, params = {})   # :nodoc:
@@ -178,8 +177,6 @@ def initialize(xf_format_indices = {}, dxf_format_indices = {}, params = {})   #
       @num_format     = 0
       @num_format_index = 0
       @font_index     = 0
-      @has_font       = 0
-      @has_dxf_font   = 0
       @font           = 'Calibri'
       @size           = 11
       @bold           = 0
@@ -210,14 +207,10 @@ def initialize(xf_format_indices = {}, dxf_format_indices = {}, params = {})   #
       @fg_color       = 0x00
       @bg_color       = 0x00
       @pattern        = 0
-      @has_fill       = 0
-      @has_dxf_fill   = 0
       @fill_index     = 0
       @fill_count     = 0
 
       @border_index   = 0
-      @has_border     = 0
-      @has_dxf_border = 0
       @border_count   = 0
 
       @bottom         = 0
@@ -477,27 +470,7 @@ def get_color(color)
     #
     def self.get_color(color)
 
-      colors = {
-        :aqua    => 0x0F,
-        :cyan    => 0x0F,
-        :black   => 0x08,
-        :blue    => 0x0C,
-        :brown   => 0x10,
-        :magenta => 0x0E,
-        :fuchsia => 0x0E,
-        :gray    => 0x17,
-        :grey    => 0x17,
-        :green   => 0x11,
-        :lime    => 0x0B,
-        :navy    => 0x12,
-        :orange  => 0x35,
-        :pink    => 0x21,
-        :purple  => 0x14,
-        :red     => 0x0A,
-        :silver  => 0x16,
-        :white   => 0x09,
-        :yellow  => 0x0D,
-      }
+      colors = Colors::COLORS
 
       if color.respond_to?(:to_str)
         # Return RGB style colors for processing later.
@@ -652,39 +625,81 @@ def method_missing(name, *args)  # :nodoc:
     end
 
     def bold?
-      return false unless @bold
-      return false if @bold == 0
-      true
+      bool_both_ruby_and_perl?(@bold)
     end
 
     def italic?
-      return false unless @italic
-      return false if @italic == 0
-      true
+      bool_both_ruby_and_perl?(@italic)
     end
 
     def strikeout?
-      return false unless @font_strikeout
-      return false if @font_strikeout == 0
-      true
+      bool_both_ruby_and_perl?(@font_strikeout)
     end
 
     def outline?
-      return false unless @font_outline
-      return false if @font_outline == 0
-      true
+      bool_both_ruby_and_perl?(@font_outline)
     end
 
     def shadow?
-      return false unless @font_shadow
-      return false if @font_shadow == 0
-      true
+      bool_both_ruby_and_perl?(@font_shadow)
     end
 
     def underline?
-      return false unless @underline
-      return false if @underline == 0
+      bool_both_ruby_and_perl?(@underline)
+    end
+
+    def bool_both_ruby_and_perl?(val)
+      return false unless val
+      return false if val == 0
       true
     end
+
+    def has_border(flag)
+      @has_border = flag
+    end
+
+    def has_border? # :nodoc:
+      @has_border
+    end
+
+    def has_dxf_border(flag)
+      @has_dxf_border = flag
+    end
+
+    def has_dxf_border?
+      @has_dxf_border
+    end
+
+    def has_font(flag)
+      @has_font = flag
+    end
+
+    def has_font?
+      @has_font
+    end
+
+    def has_dxf_font(flag)
+      @has_dxf_font = flag
+    end
+
+    def has_dxf_font?
+      @has_dxf_font
+    end
+
+    def has_fill(flag)
+      @has_fill = flag
+    end
+
+    def has_fill?
+      @has_fill
+    end
+
+    def has_dxf_fill(flag)
+      @has_dxf_fill = flag
+    end
+
+    def has_dxf_fill?
+      @has_dxf_fill
+    end
   end
 end