md2key 0.4.1 → 0.4.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3bd96ffc0f4fefb99341bfed8c3f4f3c09ed3edb
-  data.tar.gz: e8734c6294e3bfc804ca93be06cc7e9f954acbf2
+  metadata.gz: e830ebe50efe1de313b1293cb3a5f6f2e4c7944b
+  data.tar.gz: a5e61934898bc39b8bd1bf59ecdea062f871e0f2
 SHA512:
-  metadata.gz: a6cbc4dea1091b64fcbcd5c70d4cbf824a313955bb4b15f12c9dd41e35c0a1b360834f753658459ffb4fc3f2651b71b8e6d4a3c2147a9b447d99edbc4c7b2e49
-  data.tar.gz: d340cb217bdcbb479f84da983f3a9459bd12f61bf622a2439692ff190c6e496b85361b8113d37d17850d67704f4885371dd585d49e288b4af2d2ee5dcdecab88
+  metadata.gz: e82f90d69a2358795c691eb3c7b76b263b5755462826036e04dd10b98dfe25fec5e58f85ce466586440f7897cc3550e5826fd0d27425d85f81db235bbfcfb341
+  data.tar.gz: 77e78642f8125801b1648b1772e61c45ed27260175187e1e60aaf3553ce907dd6b24c63390ccca184af40d913cd4e7ac1585f9917205f0a477c8d38ba5a0f0b0

data/CHANGELOG.md

@@ -1,3 +1,8 @@
+# v0.4.2
+
+- Internal refactorings
+- Drop unindent gem dependency
+
 # v0.4.1
 
 - Performance improvement

data/lib/md2key/keynote.rb

@@ -1,36 +1,36 @@
-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)
-        execute_applescript(:void, :update_cover, title, sub)
+      def update_cover(title, content)
+        execute_applescript('update_slide', title, content, COVER_SLIDE_INDEX)
       end
 
       def ensure_template_slide_availability
         return if slides_count >= 2
-        execute_applescript(:void, :ensure_template_slide_availability)
+        execute_applescript('create_empty_slide')
       end
 
       # All slides after a second slide are unnecessary and deleted.
       def delete_extra_slides
-        execute_applescript(:void, :delete_extra_slides, slides_count)
+        execute_applescript('delete_extra_slides', slides_count)
       end
 
       def delete_template_slide
-        execute_applescript(:void, :delete_template_slide)
+        execute_applescript('delete_slide', TEMPLATE_SLIDE_INDEX)
       end
 
       def create_slide(title, content)
-        execute_applescript(:void, :create_slide, title, content)
+        execute_applescript('create_slide', title, content, TEMPLATE_SLIDE_INDEX)
       end
 
       # Insert image to the last slide
       def insert_image(path)
-        execute_applescript(:void, :insert_image, slides_count, path)
+        execute_applescript('insert_image', slides_count, path, TEMPLATE_SLIDE_INDEX)
       end
 
       def insert_code(code)
@@ -43,34 +43,30 @@ module Md2key
       private
 
       def insert_code_background
-        execute_applescript(:void, :insert_code_background, slides_count, CODE_BACKGROUND_PATH)
+        execute_applescript('insert_code_background', slides_count, CODE_BACKGROUND_PATH)
       end
 
       def activate_last_slide
-        execute_applescript(:void, :activate_last_slide)
+        execute_applescript('activate_slide', slides_count)
       end
 
       def paste_clipboard
-        execute_applescript(:void, :paste_clipboard)
+        execute_applescript('paste_clipboard')
       end
 
       def slides_count
-        execute_applescript(:int, :slides_count)
+        execute_applescript('slides_count').to_i
       end
 
-      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
+      def execute_applescript(script_name, *args)
+        path = script_path(script_name)
+        `osascript #{path} "#{args.join('" "')}"`
       end
 
       def script_path(script_name)
-        applescripts_path = File.expand_path('applescripts', __dir__)
-        File.join(applescripts_path, "#{script_name}.applescript")
+        scripts_path = File.expand_path('../../scripts', __dir__)
+        File.join(scripts_path, "#{script_name}.scpt")
       end
-
     end
   end
 end

data/lib/md2key/version.rb

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

data/md2key.gemspec

@@ -18,7 +18,6 @@ Gem::Specification.new do |spec|
   spec.require_paths = ["lib"]
 
   spec.add_dependency "thor", "~> 0.19"
-  spec.add_dependency "unindent", "~> 1.0"
   spec.add_dependency "redcarpet", "~> 3.3"
   spec.add_dependency "oga", "~> 1.2"
   spec.add_development_dependency "bundler", "~> 1.10"

data/scripts/activate_slide.scpt

@@ -0,0 +1,13 @@
+on run argv
+  set slideIndex to item 1 of argv as number
+
+  tell application "Keynote"
+    -- This can't be removed because using Cmd-v to paste.
+    activate
+
+    tell the front document
+      -- Workaround to focus on specified slide.
+      move slide slideIndex to before slide slideIndex
+    end tell
+  end tell
+end run

data/scripts/create_empty_slide.scpt

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

data/scripts/create_slide.scpt

@@ -0,0 +1,20 @@
+on run argv
+  set slideTitle    to item 1 of argv
+  set slideBody     to item 2 of argv
+  set templateIndex to item 3 of argv as number
+
+  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.
+      move slide templateIndex to before slide templateIndex
+
+      set newSlide to make new slide
+      tell newSlide
+        set object text of default title item to slideTitle
+        set object text of default body item to slideBody
+      end tell
+    end tell
+  end tell
+end run

data/scripts/delete_extra_slides.scpt

@@ -0,0 +1,17 @@
+on run argv
+  set slidesCount to item 1 of argv as number
+
+  tell application "Keynote"
+    tell the front document
+      set i to slidesCount
+
+      repeat with s in slides
+        if i > 2 then
+          delete slide i
+        end if
+
+        set i to i - 1
+      end repeat
+    end tell
+  end tell
+end run

data/scripts/delete_slide.scpt

@@ -0,0 +1,9 @@
+on run argv
+  set slideIndex to item 1 of argv as number
+
+  tell application "Keynote"
+    tell the front document
+      delete slide slideIndex
+    end tell
+  end tell
+end run

data/scripts/insert_code_background.scpt

@@ -0,0 +1,15 @@
+on run argv
+  set lastIndex to item 1 of argv as number
+  set theImage  to item 2 of argv as POSIX file
+
+  tell application "Keynote"
+    tell the front document
+      set docWidth to its width
+      set docHeight to its height
+
+      tell slide lastIndex
+        make new image with properties { opacity: 80, file: theImage, width: docWidth - 180, position: { 90, 240 } }
+      end tell
+    end tell
+  end tell
+end run

data/scripts/insert_image.scpt

@@ -0,0 +1,25 @@
+on run argv
+  set lastIndex     to item 1 of argv as number
+  set theImage      to item 2 of argv as POSIX file
+  set templateIndex to item 3 of argv as number
+
+  tell application "Keynote"
+    tell the front document
+      set docWidth to its width
+      set docHeight to its height
+
+      -- Create temporary slide to fix the image size
+      tell slide templateIndex
+        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 slide lastIndex
+        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/scripts/paste_clipboard.scpt

@@ -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/scripts/slides_count.scpt

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

data/scripts/update_slide.scpt

@@ -0,0 +1,14 @@
+on run argv
+  set slideTitle to item 1 of argv
+  set slideBody  to item 2 of argv
+  set slideIndex to item 3 of argv as number
+
+  tell application "Keynote"
+    tell the front document
+      tell slide slideIndex
+        set object text of default title item to slideTitle
+        set object text of default body item to slideBody
+      end tell
+    end tell
+  end tell
+end run

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: md2key
 version: !ruby/object:Gem::Version
-  version: 0.4.1
+  version: 0.4.2
 platform: ruby
 authors:
 - Takashi Kokubun
@@ -24,20 +24,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.19'
-- !ruby/object:Gem::Dependency
-  name: unindent
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.0'
 - !ruby/object:Gem::Dependency
   name: redcarpet
   requirement: !ruby/object:Gem::Requirement
@@ -124,16 +110,6 @@ 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
@@ -143,6 +119,16 @@ files:
 - lib/md2key/slide.rb
 - lib/md2key/version.rb
 - md2key.gemspec
+- scripts/activate_slide.scpt
+- scripts/create_empty_slide.scpt
+- scripts/create_slide.scpt
+- scripts/delete_extra_slides.scpt
+- scripts/delete_slide.scpt
+- scripts/insert_code_background.scpt
+- scripts/insert_image.scpt
+- scripts/paste_clipboard.scpt
+- scripts/slides_count.scpt
+- scripts/update_slide.scpt
 homepage: https://github.com/k0kubun/md2key
 licenses: []
 metadata: {}

data/lib/md2key/applescripts/activate_last_slide.applescript

@@ -1,14 +0,0 @@
-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

@@ -1,19 +0,0 @@
--- 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

@@ -1,15 +0,0 @@
--- 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

@@ -1,6 +0,0 @@
-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

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

data/lib/md2key/applescripts/insert_code_background.applescript

@@ -1,17 +0,0 @@
--- 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

@@ -1,28 +0,0 @@
--- 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

@@ -1,7 +0,0 @@
-          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

@@ -1,8 +0,0 @@
-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

@@ -1,14 +0,0 @@
--- 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