powerpoint 1.5 → 1.6

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    Mjk0N2U2ODk3YjIzNDkzY2Q4NTdiODBkNDc4Zjc0YWYyYzc3NzJlZQ==
+    ZmRkNjczMjVlMGFjMWMxMWYxOTNhY2NhNDFiMjA3MmU1NjU1ODNhZg==
   data.tar.gz: !binary |-
-    MzY5NWE3NGMyMzI1YTM0MWJlMDBlMTBlZGRmYjFlZWVhNjFlNTM0NA==
+    Mjg1OGZiYmFjY2ZiNjExY2JmYjkxNDk2MWJkMGYyMmI3MTk2ZDM5Zg==
 SHA512:
   metadata.gz: !binary |-
-    ODc4MjM2MDMxZWQ4OWM4ZWY4ZmMwZmVkYzY1MzAzZTMzMDMzNTdmYjJiMTcw
-    MTgyYzc4NDQyNDY5YTY0ZDQyNGJkM2MzMWUwYWUzMDk1YjIxMGIwNmRhNDA1
-    NjA1MWQ0NTU3YzI4NGE0OTViMzg5OTJkMjMyYWUwNjQ2NDFiOWI=
+    NTRhMmJiYjI0YWY4MDBhYTliZTYzOTU5ZjU4ODI5N2E0Yzk1OGM4NTI3YjEx
+    NmY2ZjBlZDVjZjZmNzY0YThmMWQ4N2VkYTE5OTdiNjRjOWUxMmZiYmU5ZjIy
+    ZGVjMDhmY2I5ZmM5NmE0Nzc3NzVjZWM4NzI1NmUzZTQxZDJjNTU=
   data.tar.gz: !binary |-
-    ZjdkMzhjZDMwOTkxZGQ0NWUyNWFhMWM5ODdhMDhhMTJiYmI2ZjM4MThiYTY2
-    MzE5NTFlNzdmMDdkODljMzVhYWI5NDcxZjc5ZjZkMTAyYjdlYTIxZWI5ZTUy
-    NjdjNGI0ZDdjOTNhOTAxMmNiZTM3ZmZiYWM0MjM5ZWQ1ZTJjZDA=
+    MWJhZjNkODJkYmUwNGZlMDgxNGZlYzg1NGRhNzMyNGQ0N2JiYmEwZDczMGVk
+    ZjU1Y2UwYjUwYzdhNmYyNTc4ODdiOTczNGIxNmQ1YTlhMzFiN2I3YzZjMzdj
+    ZjljYTZmYjI5MzI1OTM3OTk2ZmZkZDUyMTU0YzRlMDI0YzJlNTI=

data/.codeclimate.yml

@@ -0,0 +1,9 @@
+---
+engines:
+  rubocop:
+    enabled: true
+ratings:
+  paths:
+    - powerpoint/**
+exclude_paths:
+  - spec/**/*

data/.gitignore

@@ -15,3 +15,4 @@ spec/reports
 test/tmp
 test/version_tmp
 tmp
+.pryrc

data/Gemfile

@@ -1,4 +1,4 @@
 source 'https://rubygems.org'
 
 # Specify your gem's dependencies in powerpoint.gemspec
-gemspec
+gemspec

data/lib/powerpoint.rb

@@ -1,18 +1,15 @@
 require "powerpoint/version"
+require 'powerpoint/util'
 require 'powerpoint/slide/intro'
 require 'powerpoint/slide/textual'
 require 'powerpoint/slide/pictorial'
-require 'powerpoint/relationship'
-require 'powerpoint/slide/relationship'
-require 'powerpoint/content_type'
-require 'powerpoint/meta'
 require 'powerpoint/presentation'
 
 module Powerpoint
 
   spec = Gem::Specification.find_by_name("powerpoint")
-  gem_root = spec.gem_dir
-  TEMPLATE_PATH = "#{gem_root}/template/"
+  ROOT_PATH = spec.gem_dir
+  TEMPLATE_PATH = "#{ROOT_PATH}/template/"
 
   def self.decompress_pptx in_path, out_path
   	Zip::File.open(in_path) do |zip_file|

data/lib/powerpoint/presentation.rb

@@ -3,48 +3,63 @@ require 'fileutils'
 require 'tmpdir'
 
 module Powerpoint
-  class Powerpoint::Presentation
+  class Presentation
+    include Powerpoint::Util
 
-    attr_reader :pptx_path, :extract_path
+    attr_reader :pptx_path, :extract_path, :slides
 
     def initialize
-      @slide_count = 0
-      @extract_path =  File.join Dir.tmpdir, "extract_#{Time.now.strftime("%Y-%m-%d-%H%M%S")}"
-      FileUtils.copy_entry TEMPLATE_PATH, @extract_path
+      @slides = []
     end
 
     def add_intro title, subtitile=nil
-      @slide_count += 1
-      Powerpoint::Slide::Intro.new @extract_path, title, subtitile
+      existing_intro_slide = @slides.select {|s| s.class == Powerpoint::Slide::Intro}[0]
+      slide = Powerpoint::Slide::Intro.new(presentation: self, title: title, subtitile: subtitile)
+      if existing_intro_slide
+        @slides[@slides.index(existing_intro_slide)] = slide 
+      else
+        @slides.insert 0, slide
+      end
     end
 
     def add_textual_slide title, content=[]
-      @slide_count += 1
-      Powerpoint::Slide::Textual.new @extract_path, title, content, @slide_count
-      Powerpoint::Slide::Relationship.new @extract_path, @slide_count
-      setablish_relationships
+      @slides << Powerpoint::Slide::Textual.new(presentation: self, title: title, content: content)
     end
 
     def add_pictorial_slide title, image_path, coords={}
-      @slide_count += 1
-      Powerpoint::Slide::Pictorial.new @extract_path, title, image_path, @slide_count, coords
-      setablish_relationships
-    end    
-    
-    def setablish_relationships
-      if @slide_count > 2
-        Powerpoint::ContentType.new @extract_path, @slide_count
-        Powerpoint::Relationship.new @extract_path, @slide_count
-        Powerpoint::Meta.new @extract_path, @slide_count
-      end
+      @slides << Powerpoint::Slide::Pictorial.new(presentation: self, title: title, image_path: image_path, coords: coords)
     end
 
     def save path
+      # Copy template to temp path
+      @extract_path = File.join(Dir.tmpdir, "extract_#{Time.now.strftime("%Y-%m-%d-%H%M%S")}")
+      FileUtils.copy_entry TEMPLATE_PATH, @extract_path
+
+      # Remove keep files
+      FileUtils.rm_rf("#{@extract_path}/ppt/_rels/.keep")
+      FileUtils.rm_rf("#{@extract_path}/ppt/media/.keep")
+      FileUtils.rm_rf("#{@extract_path}/ppt/slides/_rels/.keep")
+
+      # Render/save generic stuff
+      File.open("#{extract_path}/[Content_Types].xml", 'w') { |f| f << render_view('content_type.xml.erb') }
+      File.open("#{extract_path}/ppt/_rels/presentation.xml.rels", 'w') { |f| f << render_view('presentation.xml.rel.erb') }
+      File.open("#{extract_path}/ppt/presentation.xml", 'w') { |f| f << render_view('presentation.xml.erb') }
+
+      # Save slides
+      slides.each_with_index do |slide, index|
+        slide.save(index + 1)
+      end
+
+      # Create .pptx file
       @pptx_path = path
       File.delete(path) if File.exist?(path)
       Powerpoint.compress_pptx @extract_path, @pptx_path
       FileUtils.rm_rf(@extract_path)
       path
     end
+
+    def file_types
+      slides.select {|slide| slide.class == Powerpoint::Slide::Pictorial}.map(&:file_type).uniq
+    end
   end
 end

data/lib/powerpoint/slide/intro.rb

@@ -1,21 +1,31 @@
-require 'zip/filesystem'
 require 'fileutils'
+require 'erb'
 
 module Powerpoint
   module Slide
-    class Powerpoint::Slide::Intro
-      def initialize extract_path, title, subtitile=nil
-        template_path = "#{TEMPLATE_PATH}/ppt/slides/slide1.xml"
-        xml = File.read template_path
+    class Intro
+      include Powerpoint::Util
+      
+      attr_reader :title, :subtitile
 
-        xml_title = '<a:p><a:r><a:rPr lang="en-US" dirty="0" smtClean="0"/><a:t>' + title.to_s + '</a:t></a:r><a:endParaRPr lang="en-US" dirty="0"/></a:p>'
-        xml.gsub!('PRESENTATION_TITLE_PACEHOLDER', xml_title)
+      def initialize(options={})
+        require_arguments [:title, :subtitile], options
+        options.each {|k, v| instance_variable_set("@#{k}", v)}
+      end
+
+      def save(index)
+        save_rel_xml(index)
+        save_slide_xml(index)
+      end
 
-        xml_subtitle = '<a:p><a:r><a:rPr lang="en-US" dirty="0" smtClean="0"/><a:t>' + subtitile.to_s+ '</a:t></a:r><a:endParaRPr lang="en-US" dirty="0"/></a:p>'
-        xml.gsub!('PRESENTATION_SUBTITLE_PACEHOLDER', xml_subtitle)
+      private
+
+      def save_rel_xml index
+        File.open("#{extract_path}/ppt/slides/_rels/slide#{index}.xml.rels", 'w'){ |f| f << render_view('textual_rel.xml.erb') }
+      end
 
-        intro_slide_path = "#{extract_path}/ppt/slides/slide1.xml"
-        File.open(intro_slide_path, 'w'){ |f| f << xml }
+      def save_slide_xml index
+        File.open("#{extract_path}/ppt/slides/slide#{index}.xml", 'w'){ |f| f << render_view('intro_slide.xml.erb') }
       end
     end
   end

data/lib/powerpoint/slide/pictorial.rb

@@ -1,108 +1,56 @@
 require 'zip/filesystem'
 require 'fileutils'
+require 'fastimage'
+require 'erb'
 
 module Powerpoint
   module Slide
-    class Powerpoint::Slide::Pictorial
-      def initialize extract_path, title, image_path, slide_number, coords={}
-      	
-      	image_name = File.basename(image_path)
-      	FileUtils.copy_file(image_path, "#{extract_path}/ppt/media/#{image_name}")
+    class Pictorial
+      include Powerpoint::Util
 
-      	coords_tag = (coords.empty?) ? '' : '<p:spPr>
-									            <a:xfrm>
-									                <a:off x="' + coords[:x].to_s + '" y="' + coords[:y].to_s + '" />
-									                <a:ext cx="' + coords[:cx].to_s + '" cy="' + coords[:cy].to_s + '" />
-									            </a:xfrm>
-									        </p:spPr>'
+    	attr_reader :image_name, :title, :coords, :image_path
 
-        rel_xml =  '<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-					<Relationships xmlns="http://schemas.openxmlformats.org/package/2006/relationships">
-					    <Relationship Id="rId2" Type="http://schemas.openxmlformats.org/officeDocument/2006/relationships/image" Target="../media/' + image_name + '" />
-					    <Relationship Id="rId1" Type="http://schemas.openxmlformats.org/officeDocument/2006/relationships/slideLayout" Target="../slideLayouts/slideLayout2.xml" />
-					</Relationships>'
+    	def initialize(options={})
+				require_arguments [:presentation, :title, :image_path], options
+      	options.each {|k, v| instance_variable_set("@#{k}", v)}
+        @coords = default_coords unless @coords.any?
+      	@image_name = File.basename(@image_path)
+      end
+
+      def save(index)
+        copy_media_to_extract_path
+        save_rel_xml(index)
+        save_slide_xml(index)
+      end
 
-        rel_path = "#{extract_path}/ppt/slides/_rels/slide#{slide_number}.xml.rels"
-        File.open(rel_path, 'w'){ |f| f << rel_xml }
+      def file_type
+        File.extname(image_name).gsub('.', '')
+      end
+
+    	private
 
-		slide_xml =  '<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-					<p:sld xmlns:a="http://schemas.openxmlformats.org/drawingml/2006/main" xmlns:r="http://schemas.openxmlformats.org/officeDocument/2006/relationships" xmlns:p="http://schemas.openxmlformats.org/presentationml/2006/main">
-					    <p:cSld>
-					        <p:spTree>
-					            <p:nvGrpSpPr>
-					                <p:cNvPr id="1" name="" />
-					                <p:cNvGrpSpPr />
-					                <p:nvPr />
-					            </p:nvGrpSpPr>
-					            <p:grpSpPr>
-					                <a:xfrm>
-					                    <a:off x="0" y="0" />
-					                    <a:ext cx="0" cy="0" />
-					                    <a:chOff x="0" y="0" />
-					                    <a:chExt cx="0" cy="0" />
-					                </a:xfrm>
-					            </p:grpSpPr>
-					            <p:sp>
-					                <p:nvSpPr>
-					                    <p:cNvPr id="2" name="Title 1" />
-					                    <p:cNvSpPr>
-					                        <a:spLocks noGrp="1" />
-					                    </p:cNvSpPr>
-					                    <p:nvPr>
-					                        <p:ph type="title" />
-					                    </p:nvPr>
-					                </p:nvSpPr>
-					                <p:spPr />
-					                <p:txBody>
-					                    <a:bodyPr />
-					                    <a:lstStyle />
-					                    <a:p>
-					                        <a:r>
-					                            <a:rPr lang="en-US" dirty="0" smtClean="0" />
-					                            <a:t>' + title + '</a:t>
-					                        </a:r>
-					                        <a:endParaRPr lang="en-US" dirty="0" />
-					                    </a:p>
-					                </p:txBody>
-					            </p:sp>
-					            <p:pic>
-					                <p:nvPicPr>
-					                    <p:cNvPr id="4" name="Content Placeholder 3" />
-					                    <p:cNvPicPr>
-					                        <a:picLocks noGrp="1" noChangeAspect="1" />
-					                    </p:cNvPicPr>
-					                    <p:nvPr>
-					                        <p:ph idx="1" />
-					                    </p:nvPr>
-					                </p:nvPicPr>
-					                <p:blipFill>
-					                    <a:blip r:embed="rId2">
-					                        <a:extLst>
-					                            <a:ext uri="{28A0092B-C50C-407E-A947-70E740481C1C}">
-					                                <a14:useLocalDpi xmlns:a14="http://schemas.microsoft.com/office/drawing/2010/main" val="0" />
-					                            </a:ext>
-					                        </a:extLst>
-					                    </a:blip>
-					                    <a:stretch>
-					                        <a:fillRect />
-					                    </a:stretch>
-					                </p:blipFill>' + coords_tag +
-					            '</p:pic>
-					        </p:spTree>
-					        <p:extLst>
-					            <p:ext uri="{BB962C8B-B14F-4D97-AF65-F5344CB8AC3E}">
-					                <p14:creationId xmlns:p14="http://schemas.microsoft.com/office/powerpoint/2010/main" val="1474098577" />
-					            </p:ext>
-					        </p:extLst>
-					    </p:cSld>
-					    <p:clrMapOvr>
-					        <a:masterClrMapping />
-					    </p:clrMapOvr>
-					</p:sld>'
+      def default_coords
+        slide_width = pixle_to_pt(720); slide_height = pixle_to_pt(540); default_width = pixle_to_pt(550)
+        return {} unless dimensions = FastImage.size(image_path)
+        image_width, image_height = dimensions.map {|d| pixle_to_pt(d)}
+        new_width = default_width < image_width ? default_width : image_width
+        ratio = new_width / image_width.to_f
+        new_height = (image_height.to_f * ratio).round
+        {x: (slide_width / 2) - (new_width/2), y: pixle_to_pt(120), cx: new_width, cy: new_height}
+      end
 
-        slide_path = "#{extract_path}/ppt/slides/slide#{slide_number}.xml"
-        File.open(slide_path, 'w'){ |f| f << slide_xml }        
+      def copy_media_to_extract_path
+        FileUtils.copy_file(@image_path, "#{extract_path}/ppt/media/#{@image_name}")
       end
+
+      def save_rel_xml index
+        File.open("#{extract_path}/ppt/slides/_rels/slide#{index}.xml.rels", 'w'){ |f| f << render_view('pictorial_rel.xml.erb') }
+      end
+
+      def save_slide_xml index
+        File.open("#{extract_path}/ppt/slides/slide#{index}.xml", 'w'){ |f| f << render_view('pictorial_slide.xml.erb') }
+      end
+
     end
   end
 end

data/lib/powerpoint/slide/textual.rb

@@ -1,25 +1,31 @@
-require 'zip/filesystem'
 require 'fileutils'
+require 'erb'
 
 module Powerpoint
   module Slide
-    class Powerpoint::Slide::Textual
-      def initialize extract_path, title, content, slide_number
-        template_path = "#{TEMPLATE_PATH}/ppt/slides/slide2.xml"
-        xml = File.read template_path
+    class Textual
+      include Powerpoint::Util
+      
+      attr_reader :title, :content
 
-        title_xml = '<a:p><a:r><a:rPr lang="en-US" dirty="0" smtClean="0"/><a:t>'+ title.to_s + '</a:t></a:r><a:endParaRPr lang="en-US" dirty="0"/></a:p>'
-        xml.gsub!('SLIDE_TITLE_PACEHOLDER', title_xml)
+      def initialize(options={})
+        require_arguments [:title, :content], options
+        options.each {|k, v| instance_variable_set("@#{k}", v)}
+      end
+
+      def save(index)
+        save_rel_xml(index)
+        save_slide_xml(index)
+      end
 
-        content_xml = ''
-        content.each do |i|
-          content_xml += '<a:p><a:r><a:rPr lang="en-US" dirty="0" smtClean="0"/><a:t>' + i.to_s + '</a:t></a:r></a:p>'
-        end
+      private
 
-        xml.gsub!('CONTENT_PACEHOLDER', content_xml)
+      def save_rel_xml index
+        File.open("#{extract_path}/ppt/slides/_rels/slide#{index}.xml.rels", 'w'){ |f| f << render_view('textual_rel.xml.erb') }
+      end
 
-        slide_path = "#{extract_path}/ppt/slides/slide#{slide_number}.xml"
-        File.open(slide_path, 'w'){ |f| f << xml }
+      def save_slide_xml index
+        File.open("#{extract_path}/ppt/slides/slide#{index}.xml", 'w'){ |f| f << render_view('textual_slide.xml.erb') }
       end
     end
   end

data/lib/powerpoint/util.rb

@@ -0,0 +1,26 @@
+module Powerpoint
+  module Util
+
+    def pixle_to_pt(px)
+      px * 12700
+    end
+
+    def render_view(filename)
+      view_contents = read_template(filename)
+      renderer = ERB.new(view_contents)
+      renderer.result( binding )
+    end
+
+    def read_template(filename)
+      File.read(Powerpoint::ROOT_PATH + "/lib/powerpoint/views/#{filename}")
+    end
+
+    def require_arguments(required_argements, argements)
+      raise ArgumentError unless required_argements.all? {|required_key| argements.keys.include? required_key}
+    end
+
+    def extract_path
+      @presentation.extract_path
+    end
+  end
+end

data/lib/powerpoint/version.rb

@@ -1,3 +1,3 @@
 module Powerpoint
-  VERSION = "1.5"
+  VERSION = "1.6"
 end

data/lib/powerpoint/views/content_type.xml.erb

@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<Types xmlns="http://schemas.openxmlformats.org/package/2006/content-types">
+  <Default ContentType="application/xml" Extension="xml"/>
+  <Default ContentType="application/vnd.openxmlformats-package.relationships+xml" Extension="rels"/>
+  <% file_types.each do |type| %>
+  <Default ContentType="image/<%= type %>" Extension="<%= type %>"/>
+  <% end %>
+  <Override ContentType="application/vnd.openxmlformats-officedocument.presentationml.presentation.main+xml" PartName="/ppt/presentation.xml"/>
+  <Override ContentType="application/vnd.openxmlformats-officedocument.presentationml.slideMaster+xml" PartName="/ppt/slideMasters/slideMaster1.xml"/>
+  <% slides.each_with_index do |slide, index| %>
+  <Override ContentType="application/vnd.openxmlformats-officedocument.presentationml.slide+xml" PartName="/ppt/slides/slide<%= index + 1 %>.xml"/>
+  <% end %>
+  <Override ContentType="application/vnd.openxmlformats-officedocument.presentationml.presProps+xml" PartName="/ppt/presProps.xml"/>
+  <Override ContentType="application/vnd.openxmlformats-officedocument.presentationml.viewProps+xml" PartName="/ppt/viewProps.xml"/>
+  <Override ContentType="application/vnd.openxmlformats-officedocument.theme+xml" PartName="/ppt/theme/theme1.xml"/>
+  <Override ContentType="application/vnd.openxmlformats-officedocument.presentationml.tableStyles+xml" PartName="/ppt/tableStyles.xml"/>
+  <Override ContentType="application/vnd.openxmlformats-officedocument.presentationml.slideLayout+xml" PartName="/ppt/slideLayouts/slideLayout1.xml"/>
+  <Override ContentType="application/vnd.openxmlformats-officedocument.presentationml.slideLayout+xml" PartName="/ppt/slideLayouts/slideLayout2.xml"/>
+  <Override ContentType="application/vnd.openxmlformats-officedocument.presentationml.slideLayout+xml" PartName="/ppt/slideLayouts/slideLayout3.xml"/>
+  <Override ContentType="application/vnd.openxmlformats-officedocument.presentationml.slideLayout+xml" PartName="/ppt/slideLayouts/slideLayout4.xml"/>
+  <Override ContentType="application/vnd.openxmlformats-officedocument.presentationml.slideLayout+xml" PartName="/ppt/slideLayouts/slideLayout5.xml"/>
+  <Override ContentType="application/vnd.openxmlformats-officedocument.presentationml.slideLayout+xml" PartName="/ppt/slideLayouts/slideLayout6.xml"/>
+  <Override ContentType="application/vnd.openxmlformats-officedocument.presentationml.slideLayout+xml" PartName="/ppt/slideLayouts/slideLayout7.xml"/>
+  <Override ContentType="application/vnd.openxmlformats-officedocument.presentationml.slideLayout+xml" PartName="/ppt/slideLayouts/slideLayout8.xml"/>
+  <Override ContentType="application/vnd.openxmlformats-officedocument.presentationml.slideLayout+xml" PartName="/ppt/slideLayouts/slideLayout9.xml"/>
+  <Override ContentType="application/vnd.openxmlformats-officedocument.presentationml.slideLayout+xml" PartName="/ppt/slideLayouts/slideLayout10.xml"/>
+  <Override ContentType="application/vnd.openxmlformats-officedocument.presentationml.slideLayout+xml" PartName="/ppt/slideLayouts/slideLayout11.xml"/>
+  <Override ContentType="application/vnd.openxmlformats-package.core-properties+xml" PartName="/docProps/core.xml"/>
+  <Override ContentType="application/vnd.openxmlformats-officedocument.extended-properties+xml" PartName="/docProps/app.xml"/>
+</Types>