Tidying up.

infovore · Nov 9, 2013 · 0b6d8e9 · 0b6d8e9
1 parent 81f8bd8
commit 0b6d8e9
Show file tree

Hide file tree

Showing 4 changed files with 93 additions and 100 deletions.
diff --git a/keynote_dump.rb b/keynote_dump.rb
@@ -5,104 +5,9 @@
 require "bundler/setup"
 Bundler.require(:default)
 
-class KeynoteProcessor
-  include Appscript
-  attr_reader :slides, :app
+Dir[File.dirname(__FILE__) + '/lib/*.rb'].each {|file| require file }
 
-  def initialize(app_name)
-    @app = Appscript.app(app_name)
-    @slides = []
-  end
-
-  def ingest!
-    app.slideshows.get.first.slides.get.each do |s|
-      slide = Slide.new(s.notes.get)
-      @slides << slide
-    end
-  end
-end
-
-class Slide
-  attr_reader :raw_text, :formatted_notes
-  def initialize(raw)
-    @raw_text = raw
-    @formatted_notes = process_raw
-  end
-
-  def process_raw
-    o = Slide.create_breaks_around(Slide.make_ascii(@raw_text))
-    o = Slide.tidy(o)
-  end
-
-  def self.create_breaks_around(text)
-    "<p>#{text.gsub(/\n/, "</p>\n\n<p>")}</p>"
-  end
-
-  def self.tidy(text)
-    text.gsub("<p></p>", "").gsub("\n\n\n", "\n")
-  end
-
-  def self.make_ascii(string)
-    string = string.force_encoding('ASCII-8BIT')
-    string = string.gsub("\r", "\n")
-
-    string = string.gsub("\xe2\x80\x94", "--") # m dash
-    string = string.gsub("\xe2\x80\x98", "'")  # open single quote
-    string = string.gsub("\xe2\x80\x99", "'")  # close single quote
-    string = string.gsub("\xe2\x80\x9c", '"')  # open double quote
-    string = string.gsub("\xe2\x80\x9d", '"')  # close double quote
-
-    string = string.gsub("\xc3\xa1", "&#225;") # aacute
-    string = string.gsub("\xc3\x87", "&#199;") # Ccedil
-    string = string.gsub("\xc3\xb6", "&#246;") # ouml
-    string = string.gsub("\xc3\xbc", "&#252;") # uuml
-    string = string.gsub("\xc3\xa8", "&#232;") # egrave
-
-    string.strip
-  end
-end
-
-class SlideTemplater
-  attr_reader :slide_template, :page_template_string, :shortname
-
-  def initialize(slide_template_string, page_template_string, shortname)
-    @slide_template = slide_template_string
-    @page_template = page_template_string
-    @shortname = shortname
-  end
-
-  def process_keynote(keynote_obj)
-    process_page(keynote_obj)
-  end
-
-  def process_slides(keynote_obj)
-    # take the keynote obj, template up each slide, stick them in an array.
-    output = []
-    keynote_obj.slides.each_with_index do |s, i|
-      eruby = Erubis::Eruby.new(@slide_template)
-      notes = s.formatted_notes
-      index = i
-      shortname = @shortname
-      templated = eruby.evaluate(:notes => s.formatted_notes,
-                                 :index => i,
-                                 :shortname => @shortname)
-      output << templated 
-    end
-    # return the entire html
-    output
-  end
-
-  def process_page(keynote_obj)
-    all_slides = process_slides(keynote_obj).join("\n")
-    eruby = Erubis::Eruby.new(@page_template)
-    eruby.evaluate(:all_slides => all_slides)
-  end
-end
-
-shortname = ARGV[0]
-slide_template = ARGV[1]
-page_template = ARGV[2]
-aspect_ratio = ARGV[3]
+shortname, slide_template, page_template, aspect_ratio = ARGV
 
 unless shortname && slide_template && page_template
   puts "Usage: keynote_dump.rb shortname_for_slides slide_template_file page_template_file [imagemagick_resize_ratio]"
@@ -111,9 +16,6 @@ def process_page(keynote_obj)
 end
 
 if aspect_ratio
-  require 'mini_magick'
-  width = aspect_ratio.split("x").first.to_i
-  height = aspect_ratio.split("x").last.to_i
   begin
     puts "Resizing all slides in #{shortname}/img"
     Dir.glob("#{shortname}/img/*.png") do |file|

diff --git a/lib/keynote_processor.rb b/lib/keynote_processor.rb
@@ -0,0 +1,16 @@
+class KeynoteProcessor
+  include Appscript
+  attr_reader :slides, :app
+
+  def initialize(app_name)
+    @app = Appscript.app(app_name)
+    @slides = []
+  end
+
+  def ingest!
+    app.slideshows.get.first.slides.get.each do |s|
+      slide = Slide.new(s.notes.get)
+      @slides << slide
+    end
+  end
+end
diff --git a/lib/slide.rb b/lib/slide.rb
@@ -0,0 +1,39 @@
+class Slide
+  attr_reader :raw_text, :formatted_notes
+  def initialize(raw)
+    @raw_text = raw
+    @formatted_notes = process_raw
+  end
+
+  def process_raw
+    o = Slide.create_breaks_around(Slide.make_ascii(@raw_text))
+    o = Slide.tidy(o)
+  end
+
+  def self.create_breaks_around(text)
+    "<p>#{text.gsub(/\n/, "</p>\n\n<p>")}</p>"
+  end
+
+  def self.tidy(text)
+    text.gsub("<p></p>", "").gsub("\n\n\n", "\n")
+  end
+
+  def self.make_ascii(string)
+    string = string.force_encoding('ASCII-8BIT')
+    string = string.gsub("\r", "\n")
+
+    string = string.gsub("\xe2\x80\x94", "--") # m dash
+    string = string.gsub("\xe2\x80\x98", "'")  # open single quote
+    string = string.gsub("\xe2\x80\x99", "'")  # close single quote
+    string = string.gsub("\xe2\x80\x9c", '"')  # open double quote
+    string = string.gsub("\xe2\x80\x9d", '"')  # close double quote
+
+    string = string.gsub("\xc3\xa1", "&#225;") # aacute
+    string = string.gsub("\xc3\x87", "&#199;") # Ccedil
+    string = string.gsub("\xc3\xb6", "&#246;") # ouml
+    string = string.gsub("\xc3\xbc", "&#252;") # uuml
+    string = string.gsub("\xc3\xa8", "&#232;") # egrave
+
+    string.strip
+  end
+end
diff --git a/lib/slide_templater.rb b/lib/slide_templater.rb
@@ -0,0 +1,36 @@
+class SlideTemplater
+  attr_reader :slide_template, :page_template_string, :shortname
+
+  def initialize(slide_template_string, page_template_string, shortname)
+    @slide_template = slide_template_string
+    @page_template = page_template_string
+    @shortname = shortname
+  end
+
+  def process_keynote(keynote_obj)
+    process_page(keynote_obj)
+  end
+
+  def process_slides(keynote_obj)
+    # take the keynote obj, template up each slide, stick them in an array.
+    output = []
+    keynote_obj.slides.each_with_index do |s, i|
+      eruby = Erubis::Eruby.new(@slide_template)
+      notes = s.formatted_notes
+      index = i
+      shortname = @shortname
+      templated = eruby.evaluate(:notes => s.formatted_notes,
+                                 :index => i,
+                                 :shortname => @shortname)
+      output << templated 
+    end
+    # return the entire html
+    output
+  end
+
+  def process_page(keynote_obj)
+    all_slides = process_slides(keynote_obj).join("\n")
+    eruby = Erubis::Eruby.new(@page_template)
+    eruby.evaluate(:all_slides => all_slides)
+  end
+end