ruby_pptx 0.1.0 → 0.2.0

data/lib/ruby_pptx/table.rb

@@ -22,43 +22,63 @@ module Pptx
       @parent = parent
     end
 
-    def part = @parent.part
+    def part
+      @parent.part
+    end
 
     # The cell at +row_idx+, +col_idx+.
-    def cell(row_idx, col_idx) = Cell.new(@element.tc(row_idx, col_idx), self)
+    def cell(row_idx, col_idx)
+      Cell.new(@element.tc(row_idx, col_idx), self)
+    end
 
     # `table[0, 1]` reads better than `table.cell(0, 1)` in a loop.
     alias [] cell
 
-    def rows = @rows ||= TableRows.new(@element, self)
+    def rows
+      @rows ||= TableRows.new(@element, self)
+    end
 
-    def columns = @columns ||= TableColumns.new(@element, self)
+    def columns
+      @columns ||= TableColumns.new(@element, self)
+    end
 
-    def row_count = @element.tr_list.size
+    def row_count
+      @element.tr_list.size
+    end
 
-    def column_count = @element.tblGrid.gridCol_list.size
+    def column_count
+      @element.tblGrid.gridCol_list.size
+    end
 
     # Whether the first row is styled as a header. The same pattern applies to
     # first_col, last_row, last_col, horz_banding and vert_banding.
-    def first_row? = @element.firstRow
+    def first_row?
+      @element.firstRow
+    end
 
     def first_row=(value)
       @element.firstRow = value
     end
 
-    def first_col? = @element.firstCol
+    def first_col?
+      @element.firstCol
+    end
 
     def first_col=(value)
       @element.firstCol = value
     end
 
-    def last_row? = @element.lastRow
+    def last_row?
+      @element.lastRow
+    end
 
     def last_row=(value)
       @element.lastRow = value
     end
 
-    def last_col? = @element.lastCol
+    def last_col?
+      @element.lastCol
+    end
 
     def last_col=(value)
       @element.lastCol = value
@@ -66,13 +86,17 @@ module Pptx
 
     # Whether alternate rows are shaded. Spelled out where python-pptx says
     # `horz_banding`.
-    def banded_rows? = @element.bandRow
+    def banded_rows?
+      @element.bandRow
+    end
 
     def banded_rows=(value)
       @element.bandRow = value
     end
 
-    def banded_columns? = @element.bandCol
+    def banded_columns?
+      @element.bandCol
+    end
 
     def banded_columns=(value)
       @element.bandCol = value
@@ -102,7 +126,9 @@ module Pptx
       self
     end
 
-    def inspect = "#<Pptx::Table #{row_count}x#{column_count}>"
+    def inspect
+      "#<Pptx::Table #{row_count}x#{column_count}>"
+    end
   end
 
   # The rows of a table.
@@ -124,7 +150,9 @@ module Pptx
       self
     end
 
-    def size = @element.tr_list.size
+    def size
+      @element.tr_list.size
+    end
     alias length size
 
     def [](index, length = nil)
@@ -151,7 +179,9 @@ module Pptx
       self
     end
 
-    def size = @element.tblGrid.gridCol_list.size
+    def size
+      @element.tblGrid.gridCol_list.size
+    end
     alias length size
 
     def [](index, length = nil)
@@ -168,16 +198,22 @@ module Pptx
       @table = table
     end
 
-    def height = @element.h
+    def height
+      @element.h
+    end
 
     def height=(value)
       @element.h = value
       @table.notify_height_changed
     end
 
-    def cells = @element.tc_list.map { |tc| Cell.new(tc, @table) }
+    def cells
+      @element.tc_list.map { |tc| Cell.new(tc, @table) }
+    end
 
-    def inspect = "#<Pptx::TableRow height=#{height&.inches}in>"
+    def inspect
+      "#<Pptx::TableRow height=#{height&.inches}in>"
+    end
   end
 
   # One column of a table.
@@ -187,14 +223,18 @@ module Pptx
       @table = table
     end
 
-    def width = @element.w
+    def width
+      @element.w
+    end
 
     def width=(value)
       @element.w = value
       @table.notify_width_changed
     end
 
-    def inspect = "#<Pptx::TableColumn width=#{width&.inches}in>"
+    def inspect
+      "#<Pptx::TableColumn width=#{width&.inches}in>"
+    end
   end
 
   # One cell of a table.
@@ -210,44 +250,62 @@ module Pptx
       @parent = parent
     end
 
-    def part = @parent.part
+    def part
+      @parent.part
+    end
 
-    def text_frame = @text_frame ||= TextFrame.new(@element.get_or_add_txBody, self)
+    def text_frame
+      @text_frame ||= TextFrame.new(@element.get_or_add_txBody, self)
+    end
 
-    def text = text_frame.text
+    def text
+      text_frame.text
+    end
 
     def text=(value)
       text_frame.text = value
     end
 
-    def fill = @fill ||= FillFormat.from_fill_parent(cell_properties)
+    def fill
+      @fill ||= FillFormat.from_fill_parent(cell_properties)
+    end
 
     # @return [Pptx::Enum::MSO_ANCHOR, nil]
-    def vertical_anchor = cell_properties.anchor
+    def vertical_anchor
+      cell_properties.anchor
+    end
 
     def vertical_anchor=(value)
       cell_properties.anchor = value
     end
 
-    def margin_left = cell_properties.marL
+    def margin_left
+      cell_properties.marL
+    end
 
     def margin_left=(value)
       cell_properties.marL = value
     end
 
-    def margin_right = cell_properties.marR
+    def margin_right
+      cell_properties.marR
+    end
 
     def margin_right=(value)
       cell_properties.marR = value
     end
 
-    def margin_top = cell_properties.marT
+    def margin_top
+      cell_properties.marT
+    end
 
     def margin_top=(value)
       cell_properties.marT = value
     end
 
-    def margin_bottom = cell_properties.marB
+    def margin_bottom
+      cell_properties.marB
+    end
 
     def margin_bottom=(value)
       cell_properties.marB = value
@@ -257,16 +315,24 @@ module Pptx
     #
     # Only a merge origin carries the real span; on any other cell this reads
     # 1 whether or not it is part of a merge. Test {#merge_origin?} first.
-    def span_width = @element.gridSpan
+    def span_width
+      @element.gridSpan
+    end
 
     # How many rows this cell spans. See {#span_width} on when to trust it.
-    def span_height = @element.rowSpan
+    def span_height
+      @element.rowSpan
+    end
 
     # True when this cell is the top-left of a merged range.
-    def merge_origin? = @element.merge_origin?
+    def merge_origin?
+      @element.merge_origin?
+    end
 
     # True when this cell is covered by a merge rather than being its origin.
-    def spanned? = @element.spanned?
+    def spanned?
+      @element.spanned?
+    end
 
     # Merge this cell with +other+, which is the opposite corner of the range.
     #
@@ -307,10 +373,14 @@ module Pptx
       self
     end
 
-    def inspect = "#<Pptx::Cell #{text.inspect}>"
+    def inspect
+      "#<Pptx::Cell #{text.inspect}>"
+    end
 
     private
 
-    def cell_properties = @element.get_or_add_tcPr
+    def cell_properties
+      @element.get_or_add_tcPr
+    end
   end
 end

data/lib/ruby_pptx/text/font_metrics.rb

@@ -23,11 +23,15 @@ module Pptx
         cache[real] ||= new(real)
       end
 
-      def clear_cache = cache.clear
+      def clear_cache
+        cache.clear
+      end
 
       private
 
-      def cache = @cache ||= {}
+      def cache
+        @cache ||= {}
+      end
     end
 
     # @param path [String] a .ttf or .otf file
@@ -64,7 +68,9 @@ module Pptx
       [to_emu(box[2] - left, point_size), to_emu(box[3] - box[1], point_size)]
     end
 
-    def inspect = "#<Pptx::FontMetrics #{File.basename(@path)} upem=#{@units_per_em}>"
+    def inspect
+      "#<Pptx::FontMetrics #{File.basename(@path)} upem=#{@units_per_em}>"
+    end
 
     private
 
@@ -87,8 +93,13 @@ module Pptx
       left && [left, bottom, right, top]
     end
 
-    def min(a, b) = a.nil? || b < a ? b : a
-    def max(a, b) = a.nil? || b > a ? b : a
+    def min(a, b)
+      a.nil? || b < a ? b : a
+    end
+
+    def max(a, b)
+      a.nil? || b > a ? b : a
+    end
 
     # Font units are relative to the em square, so scaling by the point size
     # gives points, which are 1/72 inch by definition.
@@ -96,7 +107,9 @@ module Pptx
       (units * point_size / @units_per_em.to_f / POINTS_PER_INCH * EMU_PER_INCH).to_i
     end
 
-    def glyph_id(codepoint) = @cmap[codepoint] || 0
+    def glyph_id(codepoint)
+      @cmap[codepoint] || 0
+    end
 
     # A font may store one advance for a run of trailing glyphs, in which case
     # hmtx is truncated and the last entry stands for all of them.
@@ -142,9 +155,17 @@ module Pptx
       @index_to_loc_format.zero? ? u16(base + (index * 2)) * 2 : u32(base + (index * 4))
     end
 
-    def u16(at) = @data.byteslice(at, 2).unpack1("n")
-    def s16(at) = @data.byteslice(at, 2).unpack1("s>")
-    def u32(at) = @data.byteslice(at, 4).unpack1("N")
+    def u16(at)
+      @data.byteslice(at, 2).unpack1("n")
+    end
+
+    def s16(at)
+      @data.byteslice(at, 2).unpack1("s>")
+    end
+
+    def u32(at)
+      @data.byteslice(at, 4).unpack1("N")
+    end
 
     def read_table_directory
       raise Error, "#{@path} is not a TrueType or OpenType font" unless sfnt_version?

data/lib/ruby_pptx/text/text.rb

@@ -31,19 +31,27 @@ module Pptx
       @parent = parent
     end
 
-    def part = @parent.part
+    def part
+      @parent.part
+    end
 
     # The paragraphs of this text frame; there is always at least one.
     #
     # @return [Array<Paragraph>]
-    def paragraphs = @element.p_list.map { |p| Paragraph.new(p, self) }
+    def paragraphs
+      @element.p_list.map { |p| Paragraph.new(p, self) }
+    end
 
     # Append an empty paragraph and return it.
-    def add_paragraph = Paragraph.new(@element.add_p, self)
+    def add_paragraph
+      Paragraph.new(@element.add_p, self)
+    end
 
     # All the text, with "\n" between paragraphs and "\v" for each soft line
     # break.
-    def text = paragraphs.map(&:text).join("\n")
+    def text
+      paragraphs.map(&:text).join("\n")
+    end
 
     # Replace all text. Each "\n" starts a new paragraph, each "\v" a soft
     # line break within one.
@@ -62,39 +70,51 @@ module Pptx
       self
     end
 
-    def margin_left = body_properties.lIns
+    def margin_left
+      body_properties.lIns
+    end
 
     def margin_left=(value)
       body_properties.lIns = value
     end
 
-    def margin_right = body_properties.rIns
+    def margin_right
+      body_properties.rIns
+    end
 
     def margin_right=(value)
       body_properties.rIns = value
     end
 
-    def margin_top = body_properties.tIns
+    def margin_top
+      body_properties.tIns
+    end
 
     def margin_top=(value)
       body_properties.tIns = value
     end
 
-    def margin_bottom = body_properties.bIns
+    def margin_bottom
+      body_properties.bIns
+    end
 
     def margin_bottom=(value)
       body_properties.bIns = value
     end
 
     # @return [Pptx::Enum::MSO_ANCHOR, nil] nil when inherited
-    def vertical_anchor = body_properties.anchor
+    def vertical_anchor
+      body_properties.anchor
+    end
 
     def vertical_anchor=(value)
       body_properties.anchor = value
     end
 
     # @return [Pptx::Enum::MSO_AUTO_SIZE, nil] nil when inherited
-    def auto_size = body_properties.autofit
+    def auto_size
+      body_properties.autofit
+    end
 
     def auto_size=(value)
       body_properties.autofit = value
@@ -154,7 +174,9 @@ module Pptx
       [@parent.width - margin_left - margin_right, @parent.height - margin_top - margin_bottom]
     end
 
-    def inspect = "#<Pptx::TextFrame #{text.inspect}>"
+    def inspect
+      "#<Pptx::TextFrame #{text.inspect}>"
+    end
 
     private
 
@@ -178,7 +200,9 @@ module Pptx
       end
     end
 
-    def body_properties = @element.bodyPr
+    def body_properties
+      @element.bodyPr
+    end
   end
 
   # One paragraph of a text frame.
@@ -194,12 +218,18 @@ module Pptx
       @parent = parent
     end
 
-    def part = @parent.part
+    def part
+      @parent.part
+    end
 
     # @return [Array<Run>]
-    def runs = @element.r_list.map { |r| Run.new(r, self) }
+    def runs
+      @element.r_list.map { |r| Run.new(r, self) }
+    end
 
-    def add_run(text = nil) = Run.new(@element.add_run(text), self)
+    def add_run(text = nil)
+      Run.new(@element.add_run(text), self)
+    end
 
     def add_line_break
       @element.add_line_break
@@ -207,7 +237,9 @@ module Pptx
     end
 
     # The text of this paragraph, with "\v" for each soft line break.
-    def text = @element.text
+    def text
+      @element.text
+    end
 
     # Replace this paragraph's text, turning "\v" (or "\n") into line breaks
     # rather than new paragraphs -- a paragraph cannot contain another.
@@ -223,46 +255,62 @@ module Pptx
     end
 
     # @return [Pptx::Enum::PP_ALIGN, nil] nil when inherited
-    def alignment = paragraph_properties.algn
+    def alignment
+      paragraph_properties.algn
+    end
 
     def alignment=(value)
       paragraph_properties.algn = value
     end
 
     # Outline level, 0 for the top level.
-    def level = paragraph_properties.lvl
+    def level
+      paragraph_properties.lvl
+    end
 
     def level=(value)
       paragraph_properties.lvl = value
     end
 
     # A Float is a number of lines; a {Pptx::Length} is a fixed distance.
-    def line_spacing = paragraph_properties.line_spacing
+    def line_spacing
+      paragraph_properties.line_spacing
+    end
 
     def line_spacing=(value)
       paragraph_properties.line_spacing = value
     end
 
-    def space_before = paragraph_properties.space_before
+    def space_before
+      paragraph_properties.space_before
+    end
 
     def space_before=(value)
       paragraph_properties.space_before = value
     end
 
-    def space_after = paragraph_properties.space_after
+    def space_after
+      paragraph_properties.space_after
+    end
 
     def space_after=(value)
       paragraph_properties.space_after = value
     end
 
     # The default character formatting for runs in this paragraph.
-    def font = Font.new(paragraph_properties.get_or_add_defRPr)
+    def font
+      Font.new(paragraph_properties.get_or_add_defRPr)
+    end
 
-    def inspect = "#<Pptx::Paragraph #{text.inspect}>"
+    def inspect
+      "#<Pptx::Paragraph #{text.inspect}>"
+    end
 
     private
 
-    def paragraph_properties = @element.get_or_add_pPr
+    def paragraph_properties
+      @element.get_or_add_pPr
+    end
   end
 
   # A run: a span of text sharing one set of character properties.
@@ -278,27 +326,39 @@ module Pptx
       @parent = parent
     end
 
-    def part = @parent.part
+    def part
+      @parent.part
+    end
 
-    def text = @element.text
+    def text
+      @element.text
+    end
 
     def text=(value)
       @element.text = value
     end
 
-    def font = Font.new(@element.get_or_add_rPr)
+    def font
+      Font.new(@element.get_or_add_rPr)
+    end
 
     # What happens when this run of text is clicked.
-    def click_action = @click_action ||= ActionSetting.new(@element.get_or_add_rPr, self)
+    def click_action
+      @click_action ||= ActionSetting.new(@element.get_or_add_rPr, self)
+    end
 
     # The URL this run links to, or nil.
-    def hyperlink = click_action.url
+    def hyperlink
+      click_action.url
+    end
 
     def hyperlink=(url)
       click_action.address = url
     end
 
-    def inspect = "#<Pptx::Run #{text.inspect}>"
+    def inspect
+      "#<Pptx::Run #{text.inspect}>"
+    end
   end
 
   # Character formatting: typeface, size, weight, colour.
@@ -317,20 +377,26 @@ module Pptx
       @element = r_pr
     end
 
-    def bold = @element.b
+    def bold
+      @element.b
+    end
 
     def bold=(value)
       @element.b = value
     end
 
-    def italic = @element.i
+    def italic
+      @element.i
+    end
 
     def italic=(value)
       @element.i = value
     end
 
     # The typeface name, or nil when inherited from the theme.
-    def name = @element.latin&.typeface
+    def name
+      @element.latin&.typeface
+    end
 
     def name=(value)
       if value.nil?
@@ -372,14 +438,18 @@ module Pptx
     end
 
     # @return [Pptx::Enum::MSO_LANGUAGE_ID, nil]
-    def language = @element.lang
+    def language
+      @element.lang
+    end
 
     def language=(value)
       @element.lang = value
     end
 
     # The fill of the text itself.
-    def fill = @fill ||= FillFormat.from_fill_parent(@element)
+    def fill
+      @fill ||= FillFormat.from_fill_parent(@element)
+    end
 
     # The text colour. Accessing it makes the fill solid, since a colour has
     # to live on some fill.
@@ -388,6 +458,8 @@ module Pptx
       fill.fore_color
     end
 
-    def inspect = "#<Pptx::Font name=#{name.inspect} size=#{size&.pt} bold=#{bold.inspect}>"
+    def inspect
+      "#<Pptx::Font name=#{name.inspect} size=#{size&.pt} bold=#{bold.inspect}>"
+    end
   end
 end