powerpoint 1.6 → 1.7

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    ZmRkNjczMjVlMGFjMWMxMWYxOTNhY2NhNDFiMjA3MmU1NjU1ODNhZg==
+    YTIyN2VhNDU0N2I4MTFkZTQxNTBmNzhiZTQ5OTYxMzA1NWFmOTgxNg==
   data.tar.gz: !binary |-
-    Mjg1OGZiYmFjY2ZiNjExY2JmYjkxNDk2MWJkMGYyMmI3MTk2ZDM5Zg==
+    MGNjNGJmODJlNzI2YTFiYzEyMzVlZGYxZTJhMDVmMTAyY2M5NWY0MQ==
 SHA512:
   metadata.gz: !binary |-
-    NTRhMmJiYjI0YWY4MDBhYTliZTYzOTU5ZjU4ODI5N2E0Yzk1OGM4NTI3YjEx
-    NmY2ZjBlZDVjZjZmNzY0YThmMWQ4N2VkYTE5OTdiNjRjOWUxMmZiYmU5ZjIy
-    ZGVjMDhmY2I5ZmM5NmE0Nzc3NzVjZWM4NzI1NmUzZTQxZDJjNTU=
+    MWYxMmE0ODg5Y2E1ZWU3MjZiYzhjYzkyYmUxOTlhNGRiZmU1NWM5M2JhZmI1
+    YzUxZjBmZDE0YTVhYTMxNjE1OGZlNjg0OGQ1ODhjZTlmM2EzMDk3N2U3MTYz
+    NGY2OGE0ZjRiMjYwNzI1N2EyNzI4NDNkNzA5NTliYjg1MThhYTA=
   data.tar.gz: !binary |-
-    MWJhZjNkODJkYmUwNGZlMDgxNGZlYzg1NGRhNzMyNGQ0N2JiYmEwZDczMGVk
-    ZjU1Y2UwYjUwYzdhNmYyNTc4ODdiOTczNGIxNmQ1YTlhMzFiN2I3YzZjMzdj
-    ZjljYTZmYjI5MzI1OTM3OTk2ZmZkZDUyMTU0YzRlMDI0YzJlNTI=
+    MWJkZDI5OTdiYzc5YTBmYmQ4ZTM3NjhiZmJjODk2ODUxNzMwY2E5YTg5YmZi
+    MzlkMjY4ZWZlMmIzNDk0MTAzYTZiYWU1NTUyZmI4YzA4NjViNGMwMWU0MzYw
+    OGNkOThjNmY5OGJhNGUzODRjOTQ0OWVkZjY5ODI4ZDJmMmVmYjE=

data/lib/powerpoint.rb

@@ -3,35 +3,11 @@ require 'powerpoint/util'
 require 'powerpoint/slide/intro'
 require 'powerpoint/slide/textual'
 require 'powerpoint/slide/pictorial'
+require 'powerpoint/compression'
 require 'powerpoint/presentation'
 
 module Powerpoint
-
-  spec = Gem::Specification.find_by_name("powerpoint")
-  ROOT_PATH = spec.gem_dir
+  ROOT_PATH = File.expand_path("../..", __FILE__)
   TEMPLATE_PATH = "#{ROOT_PATH}/template/"
-
-  def self.decompress_pptx in_path, out_path
-  	Zip::File.open(in_path) do |zip_file|
-  	  zip_file.each do |f|
-  	    f_path = File.join(out_path, f.name)
-  	    FileUtils.mkdir_p(File.dirname(f_path))
-  	    zip_file.extract(f, f_path) unless File.exist?(f_path)
-  	  end
-  	end
-  end
-
-  def self.compress_pptx in_path, out_path
-    Zip::File.open(out_path, Zip::File::CREATE) do |zip_file|
-      Dir.glob("#{in_path}/**/*", ::File::FNM_DOTMATCH).each do |path|
-        zip_path = path.gsub("#{in_path}/","")
-        next if zip_path == "." || zip_path == ".." || zip_path.match(/DS_Store/)
-        begin
-          zip_file.add(zip_path, path)
-        rescue Zip::ZipEntryExistsError
-          raise "#{out_path} allready exists!"
-        end
-      end
-    end
-  end  
+  VIEW_PATH = "#{ROOT_PATH}/lib/powerpoint/views/"
 end

data/lib/powerpoint/compression.rb

@@ -0,0 +1,25 @@
+module Powerpoint
+  def self.decompress_pptx(in_path, out_path)
+    Zip::File.open(in_path) do |zip_file|
+      zip_file.each do |f|
+        f_path = File.join(out_path, f.name)
+        FileUtils.mkdir_p(File.dirname(f_path))
+        zip_file.extract(f, f_path) unless File.exist?(f_path)
+      end
+    end
+  end
+
+  def self.compress_pptx(in_path, out_path)
+    Zip::File.open(out_path, Zip::File::CREATE) do |zip_file|
+      Dir.glob("#{in_path}/**/*", ::File::FNM_DOTMATCH).each do |path|
+        zip_path = path.gsub("#{in_path}/","")
+        next if zip_path == "." || zip_path == ".." || zip_path.match(/DS_Store/)
+        begin
+          zip_file.add(zip_path, path)
+        rescue Zip::ZipEntryExistsError
+          raise "#{out_path} already exists!"
+        end
+      end
+    end
+  end  
+end

data/lib/powerpoint/presentation.rb

@@ -6,13 +6,13 @@ module Powerpoint
   class Presentation
     include Powerpoint::Util
 
-    attr_reader :pptx_path, :extract_path, :slides
+    attr_reader :slides
 
     def initialize
       @slides = []
     end
 
-    def add_intro title, subtitile=nil
+    def add_intro(title, subtitile = nil)
       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
@@ -22,39 +22,41 @@ module Powerpoint
       end
     end
 
-    def add_textual_slide title, content=[]
+    def add_textual_slide(title, content = [])
       @slides << Powerpoint::Slide::Textual.new(presentation: self, title: title, content: content)
     end
 
-    def add_pictorial_slide title, image_path, coords={}
+    def add_pictorial_slide(title, image_path, coords = {})
       @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
+    def save(path)
+      Dir.mktmpdir do |dir|
+        extract_path = "#{dir}/extract_#{Time.now.strftime("%Y-%m-%d-%H%M%S")}"
 
-      # 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")
+        # Copy template to temp path
+        FileUtils.copy_entry(TEMPLATE_PATH, extract_path)
 
-      # 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') }
+        # Remove keep files
+        Dir.glob("#{extract_path}/**/.keep").each do |keep_file|
+          FileUtils.rm_rf(keep_file)
+        end
 
-      # Save slides
-      slides.each_with_index do |slide, index|
-        slide.save(index + 1)
+        # Render/save generic stuff
+        render_view('content_type.xml.erb', "#{extract_path}/[Content_Types].xml")
+        render_view('presentation.xml.rel.erb', "#{extract_path}/ppt/_rels/presentation.xml.rels")
+        render_view('presentation.xml.erb', "#{extract_path}/ppt/presentation.xml")
+
+        # Save slides
+        slides.each_with_index do |slide, index|
+          slide.save(extract_path, index + 1)
+        end
+
+        # Create .pptx file
+        File.delete(path) if File.exist?(path)
+        Powerpoint.compress_pptx(extract_path, path)
       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
 
@@ -62,4 +64,4 @@ module Powerpoint
       slides.select {|slide| slide.class == Powerpoint::Slide::Pictorial}.map(&:file_type).uniq
     end
   end
-end
+end

data/lib/powerpoint/slide/intro.rb

@@ -13,20 +13,20 @@ module Powerpoint
         options.each {|k, v| instance_variable_set("@#{k}", v)}
       end
 
-      def save(index)
-        save_rel_xml(index)
-        save_slide_xml(index)
+      def save(extract_path, index)
+        save_rel_xml(extract_path, index)
+        save_slide_xml(extract_path, index)
       end
 
-      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') }
+      def save_rel_xml(extract_path, index)
+        render_view('textual_rel.xml.erb', "#{extract_path}/ppt/slides/_rels/slide#{index}.xml.rels")
       end
+      private :save_rel_xml
 
-      def save_slide_xml index
-        File.open("#{extract_path}/ppt/slides/slide#{index}.xml", 'w'){ |f| f << render_view('intro_slide.xml.erb') }
+      def save_slide_xml(extract_path, index)
+        render_view('intro_slide.xml.erb', "#{extract_path}/ppt/slides/slide#{index}.xml")
       end
+      private :save_slide_xml
     end
   end
-end
+end

data/lib/powerpoint/slide/pictorial.rb

@@ -17,20 +17,20 @@ module Powerpoint
       	@image_name = File.basename(@image_path)
       end
 
-      def save(index)
-        copy_media_to_extract_path
-        save_rel_xml(index)
-        save_slide_xml(index)
+      def save(extract_path, index)
+        copy_media(extract_path)
+        save_rel_xml(extract_path, index)
+        save_slide_xml(extract_path, index)
       end
 
       def file_type
         File.extname(image_name).gsub('.', '')
       end
 
-    	private
-
       def default_coords
-        slide_width = pixle_to_pt(720); slide_height = pixle_to_pt(540); default_width = pixle_to_pt(550)
+        slide_width = pixle_to_pt(720)
+        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
@@ -38,19 +38,22 @@ module Powerpoint
         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
+      private :default_coords
 
-      def copy_media_to_extract_path
+      def copy_media(extract_path)
         FileUtils.copy_file(@image_path, "#{extract_path}/ppt/media/#{@image_name}")
       end
+      private :copy_media
 
-      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') }
+      def save_rel_xml(extract_path, index)
+        render_view('pictorial_rel.xml.erb', "#{extract_path}/ppt/slides/_rels/slide#{index}.xml.rels")
       end
+      private :save_rel_xml
 
-      def save_slide_xml index
-        File.open("#{extract_path}/ppt/slides/slide#{index}.xml", 'w'){ |f| f << render_view('pictorial_slide.xml.erb') }
+      def save_slide_xml(extract_path, index)
+        render_view('pictorial_slide.xml.erb', "#{extract_path}/ppt/slides/slide#{index}.xml")
       end
-
+      private :save_slide_xml
     end
   end
-end
+end

data/lib/powerpoint/slide/textual.rb

@@ -13,20 +13,20 @@ module Powerpoint
         options.each {|k, v| instance_variable_set("@#{k}", v)}
       end
 
-      def save(index)
-        save_rel_xml(index)
-        save_slide_xml(index)
+      def save(extract_path, index)
+        save_rel_xml(extract_path, index)
+        save_slide_xml(extract_path, index)
       end
 
-      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') }
+      def save_rel_xml(extract_path, index)
+        render_view('textual_rel.xml.erb', "#{extract_path}/ppt/slides/_rels/slide#{index}.xml.rels")
       end
+      private :save_rel_xml
 
-      def save_slide_xml index
-        File.open("#{extract_path}/ppt/slides/slide#{index}.xml", 'w'){ |f| f << render_view('textual_slide.xml.erb') }
+      def save_slide_xml(extract_path, index)
+        render_view('textual_slide.xml.erb', "#{extract_path}/ppt/slides/slide#{index}.xml")
       end
+      private :save_slide_xml
     end
   end
-end
+end

data/lib/powerpoint/util.rb

@@ -5,22 +5,20 @@ module Powerpoint
       px * 12700
     end
 
-    def render_view(filename)
-      view_contents = read_template(filename)
+    def render_view(template_name, path)
+      view_contents = read_template(template_name)
       renderer = ERB.new(view_contents)
-      renderer.result( binding )
+      data = renderer.result(binding)
+
+      File.open(path, 'w') { |f| f << data }
     end
 
     def read_template(filename)
-      File.read(Powerpoint::ROOT_PATH + "/lib/powerpoint/views/#{filename}")
+      File.read("#{Powerpoint::VIEW_PATH}/#{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
+end

data/lib/powerpoint/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: powerpoint
 version: !ruby/object:Gem::Version
-  version: '1.6'
+  version: '1.7'
 platform: ruby
 authors:
 - pythonicrubyist
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-09-29 00:00:00.000000000 Z
+date: 2015-09-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -108,6 +108,7 @@ files:
 - README.rdoc
 - Rakefile
 - lib/powerpoint.rb
+- lib/powerpoint/compression.rb
 - lib/powerpoint/presentation.rb
 - lib/powerpoint/slide/intro.rb
 - lib/powerpoint/slide/pictorial.rb