ruby_pptx 0.1.0 → 0.2.0

data/lib/ruby_pptx/oxml/text.rb

@@ -24,7 +24,9 @@ module Pptx
       zero_or_one "a:rPr", successors: %w[a:t]
       one_and_only_one "a:t"
 
-      def text = t.text
+      def text
+        t.text
+      end
 
       def text=(value)
         t.text = CT_RegularTextRun.escape_control_chars(value.to_s)
@@ -46,7 +48,9 @@ module Pptx
       # A break carries no text of its own; it *is* the line feed, which we
       # report as a vertical tab to match how PowerPoint puts it on the
       # clipboard.
-      def text = "\v"
+      def text
+        "\v"
+      end
     end
 
     # `a:fld`, a slide-number or date field.
@@ -55,7 +59,9 @@ module Pptx
       zero_or_one "a:rPr", successors: %w[a:pPr a:t]
       zero_or_one "a:t", successors: []
 
-      def text = t&.text.to_s
+      def text
+        t&.text.to_s
+      end
     end
 
     # `a:latin`, `a:ea`, `a:cs` and `a:sym`: a typeface reference.
@@ -84,7 +90,9 @@ module Pptx
       optional_attr "i", type: SimpleTypes::XsdBoolean
       optional_attr "u", type: Enum::MSO_TEXT_UNDERLINE_TYPE
 
-      def new_gradFill = CT_GradientFillProperties.new_grad_fill(self)
+      def new_gradFill
+        CT_GradientFillProperties.new_grad_fill(self)
+      end
     end
 
     # `a:bodyPr`, the properties of a text body: margins, anchoring, autofit.
@@ -197,14 +205,18 @@ module Pptx
         value.is_a?(Pptx::Length) ? spacing.set_spc_pts(value) : spacing.set_spc_pct(value)
       end
 
-      def space_before = spcBef&.spcPts&.val
+      def space_before
+        spcBef&.spcPts&.val
+      end
 
       def space_before=(value)
         remove_spcBef
         get_or_add_spcBef.set_spc_pts(value) unless value.nil?
       end
 
-      def space_after = spcAft&.spcPts&.val
+      def space_after
+        spcAft&.spcPts&.val
+      end
 
       def space_after=(value)
         remove_spcAft
@@ -223,7 +235,9 @@ module Pptx
       CONTENT_TAGS = %w[a:r a:br a:fld].freeze
 
       # A run is created with its required `a:t` already in place.
-      def new_r = build_from_xml(%(<a:r #{Ns.nsdecls("a")}><a:t/></a:r>))
+      def new_r
+        build_from_xml(%(<a:r #{Ns.nsdecls("a")}><a:t/></a:r>))
+      end
 
       def add_run(text = nil)
         run = add_r
@@ -231,7 +245,9 @@ module Pptx
         run
       end
 
-      def add_line_break = add_br
+      def add_line_break
+        add_br
+      end
 
       # Append +text+ as runs, turning each "\n" or "\v" into a line break.
       #
@@ -248,12 +264,12 @@ module Pptx
       # The `a:r`, `a:br` and `a:fld` children, in document order.
       def content_children
         tags = CONTENT_TAGS.map { |t| Ns.qn(t) }
-        @node.element_children
-             .select { |c| tags.include?(Ns.clark_name_of(c)) }
-             .map { |c| Element.wrap(c) }
+        element_children.select { |c| tags.include?(c.clark_name) }
       end
 
-      def text = content_children.map(&:text).join
+      def text
+        content_children.map(&:text).join
+      end
     end
 
     # `p:txBody`, `a:txBody` and `c:txPr`: a body of text.
@@ -267,7 +283,9 @@ module Pptx
       # A chart's `c:txPr` holds a paragraph for its formatting alone; the
       # default run properties of that first paragraph are where a chart,
       # axis, legend or data-label font lives.
-      def defRPr = p_list.first.get_or_add_pPr.get_or_add_defRPr
+      def defRPr
+        p_list.first.get_or_add_pPr.get_or_add_defRPr
+      end
 
       # The `c:txPr` a chart element gains when its font is first set.
       TXPR_XML = <<~XML.freeze
@@ -284,10 +302,14 @@ module Pptx
 
       class << self
         # A `p:txBody` with one empty paragraph, built in +context+'s document.
-        def new_element(context) = context.build_from_xml(txbody_xml)
+        def new_element(context)
+          context.build_from_xml(txbody_xml)
+        end
 
         # A standalone `p:txBody`, for callers with no element to build from.
-        def parse_new = Element.parse(txbody_xml)
+        def parse_new
+          Element.parse(txbody_xml)
+        end
 
         def txbody_xml
           <<~XML

data/lib/ruby_pptx/oxml/theme.rb

@@ -20,10 +20,17 @@ module Pptx
       one_and_only_one "a:themeElements"
       required_attr "name", type: SimpleTypes::XsdString
 
-      def self.new_default = Oxml.parse_from_template("theme")
+      def self.new_default
+        Oxml.parse_from_template("theme")
+      end
+
+      def clrScheme
+        themeElements.clrScheme
+      end
 
-      def clrScheme = themeElements.clrScheme
-      def fontScheme = themeElements.fontScheme
+      def fontScheme
+        themeElements.fontScheme
+      end
     end
 
     # `a:themeElements`, the four schemes that make up a theme.
@@ -83,7 +90,9 @@ module Pptx
       one_and_only_one "a:ea"
       one_and_only_one "a:cs"
 
-      def typeface = latin.typeface
+      def typeface
+        latin.typeface
+      end
 
       def typeface=(value)
         latin.typeface = value

data/lib/ruby_pptx/package.rb

@@ -22,7 +22,9 @@ module Pptx
       end
     end
 
-    def presentation_part = main_document_part
+    def presentation_part
+      main_document_part
+    end
 
     # The media part holding +video+, created if the package has no part with
     # the same content. Matched by SHA-1, as images are.
@@ -41,10 +43,14 @@ module Pptx
     end
 
     # The next free `/ppt/media/imageN.<ext>` partname, reusing gaps.
-    def next_image_partname(ext) = next_media_like_partname("image", ext)
+    def next_image_partname(ext)
+      next_media_like_partname("image", ext)
+    end
 
     # The next free `/ppt/media/mediaN.<ext>` partname, reusing gaps.
-    def next_media_partname(ext) = next_media_like_partname("media", ext)
+    def next_media_partname(ext)
+      next_media_like_partname("media", ext)
+    end
 
     private
 

data/lib/ruby_pptx/parts/chart.rb

@@ -39,9 +39,13 @@ module Pptx
         part
       end
 
-      def chart = @chart ||= Chart.new(element, self)
+      def chart
+        @chart ||= Chart.new(element, self)
+      end
 
-      def workbook = @workbook ||= ChartWorkbook.new(element, self)
+      def workbook
+        @workbook ||= ChartWorkbook.new(element, self)
+      end
     end
 
     # The embedded workbook behind a chart.

data/lib/ruby_pptx/parts/image.rb

@@ -20,15 +20,23 @@ module Pptx
         @source_filename = source_filename
       end
 
-      def image = @image ||= Image.from_blob(blob, @source_filename)
+      def image
+        @image ||= Image.from_blob(blob, @source_filename)
+      end
 
-      def ext = partname.ext
+      def ext
+        partname.ext
+      end
 
       # The name PowerPoint shows in the alt-text/description field: the file
       # the image came from, or a generic name when it came from a stream.
-      def desc = @source_filename || "image.#{ext}"
+      def desc
+        @source_filename || "image.#{ext}"
+      end
 
-      def sha1 = image.sha1
+      def sha1
+        image.sha1
+      end
 
       # Resolve a requested size against the image's native size.
       #

data/lib/ruby_pptx/parts/media.rb

@@ -11,7 +11,9 @@ module Pptx
         new(package.next_media_partname(video.ext), video.content_type, package, video.blob)
       end
 
-      def sha1 = @sha1 ||= Digest::SHA1.hexdigest(blob)
+      def sha1
+        @sha1 ||= Digest::SHA1.hexdigest(blob)
+      end
     end
   end
 end

data/lib/ruby_pptx/parts/presentation.rb

@@ -11,7 +11,9 @@ module Pptx
     # The presentation part, `/ppt/presentation.xml`; the package's main
     # document part.
     class PresentationPart < Opc::XmlPart
-      def presentation = @presentation ||= Presentation.new(element, self)
+      def presentation
+        @presentation ||= Presentation.new(element, self)
+      end
 
       # Create a blank slide part inheriting from +slide_layout+.
       #
@@ -22,7 +24,9 @@ module Pptx
         [r_id, slide_part.slide]
       end
 
-      def core_properties = package.core_properties
+      def core_properties
+        package.core_properties
+      end
 
       # The presentation's notes master, created from the default template on
       # first use.
@@ -38,9 +42,13 @@ module Pptx
         part
       end
 
-      def related_slide(r_id) = related_part(r_id).slide
+      def related_slide(r_id)
+        related_part(r_id).slide
+      end
 
-      def related_slide_master(r_id) = related_part(r_id).slide_master
+      def related_slide_master(r_id)
+        related_part(r_id).slide_master
+      end
 
       # The slide with presentation-wide id +slide_id+.
       #
@@ -73,7 +81,9 @@ module Pptx
         Opc::PackURI.new("/ppt/slides/slide#{count + 1}.xml")
       end
 
-      def save(path_or_stream) = package.save(path_or_stream)
+      def save(path_or_stream)
+        package.save(path_or_stream)
+      end
     end
   end
 end

data/lib/ruby_pptx/parts/slide.rb

@@ -12,7 +12,9 @@ module Pptx
     # and the notes master.
     class BaseSlidePart < Opc::XmlPart
       # The internal name of this slide.
-      def name = element.cSld.name
+      def name
+        element.cSld.name
+      end
 
       # Create a chart part for +chart_data+ and relate this slide to it.
       #
@@ -81,7 +83,9 @@ module Pptx
         part
       end
 
-      def slide = @slide ||= Slide.new(element, self)
+      def slide
+        @slide ||= Slide.new(element, self)
+      end
 
       # The layout part this slide inherits from.
       def slide_layout
@@ -89,9 +93,13 @@ module Pptx
       end
 
       # The presentation-wide id of this slide.
-      def slide_id = package.presentation_part.slide_id_for(self)
+      def slide_id
+        package.presentation_part.slide_id_for(self)
+      end
 
-      def notes_slide? = rels.any? { |r| r.reltype == Opc::RELATIONSHIP_TYPE::NOTES_SLIDE }
+      def notes_slide?
+        rels.any? { |r| r.reltype == Opc::RELATIONSHIP_TYPE::NOTES_SLIDE }
+      end
 
       # This slide's notes slide, created on first use.
       def notes_slide
@@ -117,7 +125,9 @@ module Pptx
         part
       end
 
-      def slide_layout = @slide_layout ||= SlideLayout.new(element, self)
+      def slide_layout
+        @slide_layout ||= SlideLayout.new(element, self)
+      end
 
       def slide_master
         part_related_by(Opc::RELATIONSHIP_TYPE::SLIDE_MASTER).slide_master
@@ -143,10 +153,14 @@ module Pptx
         part
       end
 
-      def slide_master = @slide_master ||= SlideMaster.new(element, self)
+      def slide_master
+        @slide_master ||= SlideMaster.new(element, self)
+      end
 
       # The theme this master draws its colours and fonts from.
-      def theme_part = part_related_by(Opc::RELATIONSHIP_TYPE::THEME)
+      def theme_part
+        part_related_by(Opc::RELATIONSHIP_TYPE::THEME)
+      end
 
       # Add +slide_layout_part+ to this master's layout list.
       #
@@ -159,7 +173,9 @@ module Pptx
         r_id
       end
 
-      def related_slide_layout(r_id) = related_part(r_id).slide_layout
+      def related_slide_layout(r_id)
+        related_part(r_id).slide_layout
+      end
 
       private
 
@@ -192,7 +208,9 @@ module Pptx
         part
       end
 
-      def notes_master = @notes_master ||= NotesMaster.new(element, self)
+      def notes_master
+        @notes_master ||= NotesMaster.new(element, self)
+      end
     end
 
     # A notes-slide part, `/ppt/notesSlides/notesSlideN.xml`.
@@ -213,9 +231,13 @@ module Pptx
         part
       end
 
-      def notes_slide = @notes_slide ||= NotesSlide.new(element, self)
+      def notes_slide
+        @notes_slide ||= NotesSlide.new(element, self)
+      end
 
-      def notes_master = part_related_by(Opc::RELATIONSHIP_TYPE::NOTES_MASTER).notes_master
+      def notes_master
+        part_related_by(Opc::RELATIONSHIP_TYPE::NOTES_MASTER).notes_master
+      end
     end
   end
 end

data/lib/ruby_pptx/parts/theme.rb

@@ -20,7 +20,9 @@ module Pptx
         part
       end
 
-      def theme = @theme ||= Theme.new(element, self)
+      def theme
+        @theme ||= Theme.new(element, self)
+      end
     end
   end
 end

data/lib/ruby_pptx/pattern_matching.rb

@@ -20,7 +20,9 @@ module Pptx
   # Only the keys a pattern actually asks for are computed, so matching on a
   # shape's name does not walk its text.
   module PatternMatching
-    def self.included(base) = base.extend(ClassMethods)
+    def self.included(base)
+      base.extend(ClassMethods)
+    end
 
     # A member reads as its name; anything else is passed through.
     def self.for_pattern(value)
@@ -45,6 +47,8 @@ module Pptx
   # means enumerating all of it, which is the opposite of the lazy wrapping
   # everything else here does. Use it where the whole list is wanted anyway.
   module DeconstructToArray
-    def deconstruct = to_a
+    def deconstruct
+      to_a
+    end
   end
 end

data/lib/ruby_pptx/presentation.rb

@@ -42,7 +42,9 @@ module Pptx
       end
 
       # A new presentation based on the built-in default template.
-      def new_default = Presentation.open(nil)
+      def new_default
+        Presentation.open(nil)
+      end
 
       def default_template_path
         File.expand_path("templates/default.pptx", __dir__)
@@ -55,7 +57,9 @@ module Pptx
     ].freeze
 
     # The Dublin Core metadata for this presentation.
-    def core_properties = part.core_properties
+    def core_properties
+      part.core_properties
+    end
 
     # The slides in this presentation.
     def slides
@@ -74,32 +78,44 @@ module Pptx
     # The notes master, created from the default template on first use.
     #
     # @return [NotesMaster]
-    def notes_master = part.notes_master_part.notes_master
+    def notes_master
+      part.notes_master_part.notes_master
+    end
 
     # The first slide master, which is the only one in most presentations.
-    def slide_master = slide_masters[0]
+    def slide_master
+      slide_masters[0]
+    end
 
     # The layouts of the first slide master.
     #
     # A presentation may have several masters, each with its own layouts; this
     # is a convenience for the common case of one.
-    def slide_layouts = slide_master.slide_layouts
+    def slide_layouts
+      slide_master.slide_layouts
+    end
 
     # The sections grouping this presentation's slides.
     #
     # Sections are a PowerPoint 2010 extension; a presentation with none has
     # an empty collection and writes no extension element.
-    def sections = @sections ||= Sections.new(self)
+    def sections
+      @sections ||= Sections.new(self)
+    end
 
     # @return [Length, nil] nil when the presentation defines no slide size
-    def slide_width = @element.sldSz&.cx
+    def slide_width
+      @element.sldSz&.cx
+    end
 
     def slide_width=(width)
       @element.get_or_add_sldSz.cx = width
     end
 
     # @return [Length, nil]
-    def slide_height = @element.sldSz&.cy
+    def slide_height
+      @element.sldSz&.cy
+    end
 
     def slide_height=(height)
       @element.get_or_add_sldSz.cy = height

data/lib/ruby_pptx/section.rb

@@ -32,10 +32,14 @@ module Pptx
       self
     end
 
-    def size = section_elements.size
+    def size
+      section_elements.size
+    end
     alias length size
 
-    def empty? = size.zero?
+    def empty?
+      size.zero?
+    end
 
     # Indexed by position, or looked up by name.
     def [](key, length = nil)
@@ -45,7 +49,9 @@ module Pptx
     end
 
     # @return [Section, nil]
-    def by_name(name) = find { |section| section.name == name }
+    def by_name(name)
+      find { |section| section.name == name }
+    end
 
     # Add a section, optionally containing +slides+.
     #
@@ -69,11 +75,15 @@ module Pptx
       section
     end
 
-    def inspect = "#<Pptx::Sections #{map(&:name).inspect}>"
+    def inspect
+      "#<Pptx::Sections #{map(&:name).inspect}>"
+    end
 
     private
 
-    def section_elements = @presentation.element.section_list&.section_list || []
+    def section_elements
+      @presentation.element.section_list&.section_list || []
+    end
   end
 
   # One named section of a presentation.
@@ -87,14 +97,18 @@ module Pptx
       @presentation = presentation
     end
 
-    def name = @element.name
+    def name
+      @element.name
+    end
 
     def name=(value)
       @element.name = value.to_s
     end
 
     # The GUID PowerPoint uses to identify this section.
-    def id = @element.id
+    def id
+      @element.id
+    end
 
     # The slides in this section, in section order.
     #
@@ -104,7 +118,9 @@ module Pptx
       slide_ids.filter_map { |slide_id| @presentation.slides.by_id(slide_id) }
     end
 
-    def slide_ids = @element.sldIdLst.sldId_list.map(&:id)
+    def slide_ids
+      @element.sldIdLst.sldId_list.map(&:id)
+    end
 
     # Put +slide+ in this section. A slide belongs to at most one section, so
     # it is removed from any other first.
@@ -123,8 +139,12 @@ module Pptx
       slide
     end
 
-    def include?(slide) = slide_ids.include?(slide.slide_id)
+    def include?(slide)
+      slide_ids.include?(slide.slide_id)
+    end
 
-    def inspect = "#<Pptx::Section #{name.inspect} slides=#{slide_ids.size}>"
+    def inspect
+      "#<Pptx::Section #{name.inspect} slides=#{slide_ids.size}>"
+    end
   end
 end

data/lib/ruby_pptx/shapes/adjustments.rb

@@ -21,7 +21,9 @@ module Pptx
     SCALE = 100_000.0
 
     Adjustment = Struct.new(:name, :default, :actual) do
-      def raw = actual || default
+      def raw
+        actual || default
+      end
     end
 
     # @param preset_geometry [Pptx::Oxml::Element, nil] the shape's
@@ -57,10 +59,14 @@ module Pptx
       self
     end
 
-    def size = @adjustments.size
+    def size
+      @adjustments.size
+    end
     alias length size
 
-    def inspect = "#<Pptx::Adjustments #{to_a.inspect}>"
+    def inspect
+      "#<Pptx::Adjustments #{to_a.inspect}>"
+    end
 
     private
 

data/lib/ruby_pptx/shapes/authoring.rb

@@ -74,7 +74,9 @@ module Pptx
 
     private
 
-    def scale(fraction, extent) = Length.emu((fraction * extent.emu).round)
+    def scale(fraction, extent)
+      Length.emu((fraction * extent.emu).round)
+    end
 
     def place(shape, at, size)
       shape.left, shape.top = at if at