md2key 0.4.0 → 0.4.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5cb41f4bf6d0e31b689ac2d30b05c4e9d70c4ded
-  data.tar.gz: badaf24c7b6bda22c26d32832142050d3a58661a
+  metadata.gz: 3bd96ffc0f4fefb99341bfed8c3f4f3c09ed3edb
+  data.tar.gz: e8734c6294e3bfc804ca93be06cc7e9f954acbf2
 SHA512:
-  metadata.gz: e3a084189e758af94942187ff63d7f4d683b6ea8244ef26ef2693cd36bb54aed4df5af5093d2e8c09478964ac4ebdb80e6187497a64049d1c9fa4a06cc1fd55e
-  data.tar.gz: 58d9ac418c913b0ce95e65a4044033d42d4f84ce2d6725307290b991a82a326261fa7de7666191973fe3db615068ab7233c1d8630d6afd17c5e6c2c577ef5d66
+  metadata.gz: a6cbc4dea1091b64fcbcd5c70d4cbf824a313955bb4b15f12c9dd41e35c0a1b360834f753658459ffb4fc3f2651b71b8e6d4a3c2147a9b447d99edbc4c7b2e49
+  data.tar.gz: d340cb217bdcbb479f84da983f3a9459bd12f61bf622a2439692ff190c6e496b85361b8113d37d17850d67704f4885371dd585d49e288b4af2d2ee5dcdecab88

data/.gitignore

@@ -7,3 +7,4 @@
 /pkg/
 /spec/reports/
 /tmp/
+.DS_Store

data/CHANGELOG.md

@@ -1,3 +1,9 @@
+# v0.4.1
+
+- Performance improvement
+  - Stop generating applescript every time
+  - Thanks to @bogem
+
 # v0.4.0
 
 - Support sintax-highlighted source code insert
@@ -40,6 +46,7 @@
 - Temporarily support skipping `---`
   - Still expecting users to write a format like Deckset
   - https://github.com/k0kubun/md2key/pull/2
+  - Thanks to @liubin
 
 # v0.1.1
 

data/README.md

@@ -43,6 +43,9 @@ You can separate slides with `---` just for readability.
 
 ### Insert source code
 
+If you have `highlight` command, you can insert syntax-highlighted source code.  
+If you don't have it, execute `brew install highlight`.
+
 <img src='https://i.gyazo.com/7ff36be267652ab567191a6d5cae1d0f.png' width='60%'>
 
 <pre>

data/lib/md2key/applescripts/activate_last_slide.applescript

@@ -0,0 +1,14 @@
+on run argv
+	tell application "Keynote"
+		activate
+
+		tell the front document
+			set n to 0
+			repeat with s in slides
+				set n to n + 1
+			end repeat
+
+			move slide n to before slide n
+		end tell
+	end tell
+end run

data/lib/md2key/applescripts/create_slide.applescript

@@ -0,0 +1,19 @@
+-- First argument - title
+-- Second arument - content
+on run argv
+	tell application "Keynote"
+		tell the front document
+			-- Workaround to select correct master slide. In spite of master slide can be selected by name,
+			-- name property is not limited to be unique.
+			-- So move the focus to second slide and force "make new slide" to use the exact master slide.
+			set TEMPLATE_SLIDE_INDEX to 2
+			move slide TEMPLATE_SLIDE_INDEX to before slide TEMPLATE_SLIDE_INDEX
+
+			set newSlide to make new slide
+			tell newSlide
+				set object text of default title item to first item of argv
+				set object text of default body item to second item of argv
+			end tell
+		end tell
+	end tell
+end run

data/lib/md2key/applescripts/delete_extra_slides.applescript

@@ -0,0 +1,15 @@
+-- First argument - slides count
+on run argv
+	tell application "Keynote"
+		set theSlides to slides of the front document
+		set n to first item of argv as number
+
+		repeat with theSlide in theSlides
+			if n > 2 then
+				delete slide n of the front document
+			end if
+
+			set n to n - 1
+		end repeat
+	end tell
+end run

data/lib/md2key/applescripts/delete_template_slide.applescript

@@ -0,0 +1,6 @@
+tell application "Keynote"
+	set TEMPLATE_SLIDE_INDEX to 2
+	          tell the front document
+            delete slide TEMPLATE_SLIDE_INDEX
+          end tell
+end tell

data/lib/md2key/applescripts/ensure_template_slide_availability.applescript

@@ -0,0 +1,5 @@
+tell application "Keynote"
+          tell the front document
+            make new slide
+          end
+end tell

data/lib/md2key/applescripts/insert_code_background.applescript

@@ -0,0 +1,17 @@
+-- First argument - slides count
+-- Second argument - code background path
+
+on run argv
+	tell application "Keynote"
+		tell the front document
+			set theSlide to slide (first item of argv as number)
+			set theImage to second item of argv as POSIX file
+			set docWidth to its width
+			set docHeight to its height
+
+			tell theSlide
+				make new image with properties {opacity:80, file:theImage, width:docWidth - 180, position:{90, 240}}
+			end tell
+		end tell
+	end tell
+end run

data/lib/md2key/applescripts/insert_image.applescript

@@ -0,0 +1,28 @@
+-- First argument - slides count
+-- Second argument - POSIX path
+on run argv
+	tell application "Keynote"
+		tell the front document
+			set TEMPLATE_SLIDE_INDEX to 2
+
+			set slideNumber to first item of argv as number
+			set theSlide to slide slideNumber
+			set theImage to second item of argv as POSIX file
+			set docWidth to its width
+			set docHeight to its height
+
+ 			-- Create temporary slide to fix the image size
+			tell slide TEMPLATE_SLIDE_INDEX
+				set imgFile to make new image with properties { file:theImage, width:docWidth / 3 }
+				tell imgFile
+					set imgWidth to its width
+					set imgHeight to its width
+				end tell
+			end tell
+
+			tell theSlide
+				make new image with properties {file:theImage, width:imgWidth, position:{ docWidth - imgWidth - 60, docHeight / 2 - imgHeight / 2 } }
+			end tell
+		end tell
+	end tell
+end run

data/lib/md2key/applescripts/paste_clipboard.applescript

@@ -0,0 +1,7 @@
+          tell application "Keynote"
+            tell application "System Events"
+              tell application process "Keynote"
+                keystroke "v" using { command down }
+              end tell
+            end tell
+          end tell

data/lib/md2key/applescripts/slides_count.applescript

@@ -0,0 +1,8 @@
+tell application "Keynote"
+	set n to 0
+	set theSlides to slides of the front document
+	repeat with theSlide in theSlides
+		set n to n + 1
+	end repeat
+	do shell script "echo " & n
+end tell

data/lib/md2key/applescripts/update_cover.applescript

@@ -0,0 +1,14 @@
+-- First argument - title
+-- Second argument - sub
+on run argv
+	tell application "Keynote"
+		set COVER_SLIDE_INDEX to 1
+
+		tell the front document
+			tell slide COVER_SLIDE_INDEX
+				set object text of default title item to first item of argv
+				set object text of default body item to second item of argv
+			end tell
+		end tell
+	end tell
+end run

data/lib/md2key/converter.rb

@@ -25,9 +25,9 @@ module Md2key
     end
 
     def generate_contents
-      Keynote.update_cover(@markdown.cover.title, @markdown.cover.lines.join('\n'))
+      Keynote.update_cover(@markdown.cover.title, @markdown.cover.lines.join("\n"))
       @markdown.slides.each_with_index do |slide, index|
-        Keynote.create_slide(slide.title, slide.lines.join('\n'))
+        Keynote.create_slide(slide.title, slide.lines.join("\n"))
         Keynote.insert_image(slide.image) if slide.image
         Keynote.insert_code(slide.code) if slide.code
       end

data/lib/md2key/keynote.rb

@@ -2,97 +2,35 @@ require 'unindent'
 
 module Md2key
   class Keynote
-    COVER_SLIDE_INDEX    = 1
-    TEMPLATE_SLIDE_INDEX = 2
     CODE_BACKGROUND_PATH = File.expand_path('../../assets/background.png', __dir__)
 
     class << self
       # You must provide a first slide as a cover slide.
       def update_cover(title, sub)
-        tell_keynote(<<-APPLE.unindent)
-          tell the front document
-            tell slide #{COVER_SLIDE_INDEX}
-              set object text of default title item to "#{title}"
-              set object text of default body item to "#{sub}"
-            end tell
-          end tell
-        APPLE
+        execute_applescript(:void, :update_cover, title, sub)
       end
 
       def ensure_template_slide_availability
         return if slides_count >= 2
-
-        tell_keynote(<<-APPLE.unindent)
-          tell the front document
-            make new slide
-          end
-        APPLE
+        execute_applescript(:void, :ensure_template_slide_availability)
       end
 
       # All slides after a second slide are unnecessary and deleted.
       def delete_extra_slides
-        tell_keynote(<<-APPLE.unindent)
-          set theSlides to slides of the front document
-          set n to #{slides_count}
-
-          repeat with theSlide in theSlides
-            if n > 2 then
-              delete slide n of the front document
-            end if
-
-            set n to n - 1
-          end repeat
-        APPLE
+        execute_applescript(:void, :delete_extra_slides, slides_count)
       end
 
       def delete_template_slide
-        tell_keynote(<<-APPLE.unindent)
-          tell the front document
-            delete slide #{TEMPLATE_SLIDE_INDEX}
-          end tell
-        APPLE
+        execute_applescript(:void, :delete_template_slide)
       end
 
       def create_slide(title, content)
-        tell_keynote(<<-APPLE.unindent)
-          tell the front document
-            -- Workaround to select correct master slide. In spite of master slide can be selected by name,
-            -- name property is not limited to be unique.
-            -- So move the focus to second slide and force "make new slide" to use the exact master slide.
-            #{move_to_slide(TEMPLATE_SLIDE_INDEX)}
-
-            set newSlide to make new slide
-            tell newSlide
-              set object text of default title item to "#{title}"
-              set object text of default body item to "#{content}"
-            end tell
-          end tell
-        APPLE
+        execute_applescript(:void, :create_slide, title, content)
       end
 
       # Insert image to the last slide
       def insert_image(path)
-        tell_keynote(<<-APPLE.unindent)
-          tell the front document
-            set theSlide to slide #{slides_count}
-            set theImage to POSIX file "#{path}"
-            set docWidth to its width
-            set docHeight to its height
-
-            -- Create temporary slide to fix the image size
-            tell slide #{TEMPLATE_SLIDE_INDEX}
-              set imgFile to make new image with properties { file: theImage, width: docWidth / 3 }
-              tell imgFile
-                set imgWidth to its width
-                set imgHeight to its width
-              end tell
-            end tell
-
-            tell theSlide
-              make new image with properties { file: theImage, width: imgWidth, position: { docWidth - imgWidth - 60, docHeight / 2 - imgHeight / 2 } }
-            end tell
-          end tell
-        APPLE
+        execute_applescript(:void, :insert_image, slides_count, path)
       end
 
       def insert_code(code)
@@ -105,76 +43,34 @@ module Md2key
       private
 
       def insert_code_background
-        tell_keynote(<<-APPLE.unindent)
-          tell the front document
-            set theSlide to slide #{slides_count}
-            set theImage to POSIX file "#{CODE_BACKGROUND_PATH}"
-            set docWidth to its width
-            set docHeight to its height
-
-            tell theSlide
-              make new image with properties { opacity: 80, file: theImage, width: docWidth - 180, position: { 90, 240 } }
-            end tell
-          end tell
-        APPLE
+        execute_applescript(:void, :insert_code_background, slides_count, CODE_BACKGROUND_PATH)
       end
 
       def activate_last_slide
-        tell_keynote(<<-APPLE.unindent)
-          activate
-
-          tell the front document
-            #{move_to_slide(slides_count)}
-          end tell
-        APPLE
-      end
-
-      # Workaround to activate the slide of given index. `show slide [index]`
-      # didn't work...
-      def move_to_slide(index)
-        "move slide #{index} to before slide #{index}"
+        execute_applescript(:void, :activate_last_slide)
       end
 
       def paste_clipboard
-        execute_applescript(<<-APPLE.unindent)
-          tell application "Keynote"
-            tell application "System Events"
-              tell application process "Keynote"
-                keystroke "v" using { command down }
-              end tell
-            end tell
-          end tell
-        APPLE
+        execute_applescript(:void, :paste_clipboard)
       end
 
       def slides_count
-        tell_keynote(<<-APPLE.unindent).to_i
-          set n to 0
-          set theSlides to slides of the front document
-          repeat with theSlide in theSlides
-            set n to n + 1
-          end repeat
-          do shell script "echo " & n
-        APPLE
+        execute_applescript(:int, :slides_count)
       end
 
-      def tell_keynote(script)
-        lines = [
-          'tell application "Keynote"',
-          *script.split("\n"),
-          'end tell',
-        ]
-        execute_applescript(lines.join("\n"))
+      def execute_applescript(type, script_name, *args)
+        path = script_path(script_name.to_s)
+        args.map! { |arg|  "\"#{arg}\"" }
+        command = "osascript #{path} #{args.join(' ')}"
+        `#{command + ' > /dev/null'}` if type == :void
+        `#{command}}`.to_i if type == :int
       end
 
-      def execute_applescript(script)
-        file = Tempfile.new('applescript')
-        file.write(script)
-        file.close
-        `osascript #{file.path}`.strip
-      ensure
-        file.delete
+      def script_path(script_name)
+        applescripts_path = File.expand_path('applescripts', __dir__)
+        File.join(applescripts_path, "#{script_name}.applescript")
       end
+
     end
   end
 end

data/lib/md2key/version.rb

@@ -1,3 +1,3 @@
 module Md2key
-  VERSION = "0.4.0"
+  VERSION = "0.4.1"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: md2key
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.4.1
 platform: ruby
 authors:
 - Takashi Kokubun
@@ -124,6 +124,16 @@ files:
 - assets/background.png
 - bin/md2key
 - lib/md2key.rb
+- lib/md2key/applescripts/activate_last_slide.applescript
+- lib/md2key/applescripts/create_slide.applescript
+- lib/md2key/applescripts/delete_extra_slides.applescript
+- lib/md2key/applescripts/delete_template_slide.applescript
+- lib/md2key/applescripts/ensure_template_slide_availability.applescript
+- lib/md2key/applescripts/insert_code_background.applescript
+- lib/md2key/applescripts/insert_image.applescript
+- lib/md2key/applescripts/paste_clipboard.applescript
+- lib/md2key/applescripts/slides_count.applescript
+- lib/md2key/applescripts/update_cover.applescript
 - lib/md2key/cli.rb
 - lib/md2key/code.rb
 - lib/md2key/converter.rb