md2key 0.4.4 → 0.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4ba23c23006d361a3ac96773bce7d991f3f88650
-  data.tar.gz: 2aec7cc849fb5186259a1eaadc8f0e57d28a6ee0
+  metadata.gz: 28d015849054d2a590b378c0cc9b2f264a512f2a
+  data.tar.gz: f8ee2819fc70e399307cb661714f361368eef24f
 SHA512:
-  metadata.gz: 9dfa23a5c9ae95fb088d4ef0f59d7227875c92fa5b28411fa2c7fa05ce9500971e680f500c9b9b7d50c86fc75f6f4d42d8929d194a200496763e96ea7afd5099
-  data.tar.gz: 1814b9ef6726259e240cdd0c8757c928fa9515d245ecac74559bfd1bf819e4fbe94842c2099b2bddff56e5b7fdab3c898d8b7b58c5b4c079a551fed029aa7f13
+  metadata.gz: 6cbc3372b60e6a90b6aa78b35864429361e7e62c4a2417990bca2cc4d02ce90e79da403d2df4fe8ba70358caffe93fdfd090e3978e58d0e9dcd363eb156d80e5
+  data.tar.gz: 113be3fa091632a54984f0eb2b18216f75b0af9a2829881d338ddef29284f453ecfb4736163597015557036397c114c6c1eabdeb35e52d0b5233e9d53c0d55e3

data/CHANGELOG.md

@@ -1,3 +1,14 @@
+# v0.5.0
+
+- Support nested list
+  - https://github.com/k0kubun/md2key/pull/23
+
+# v0.4.4
+
+- Bugfix for code listing without extension
+  - https://github.com/k0kubun/md2key/pull/17
+  - Thanks to @ainoya
+
 # v0.4.3
 
 - Support relative path for images

data/README.md

@@ -36,8 +36,6 @@ You can separate slides with `---` just for readability.
 
 ### Insert image
 
-<img src='https://i.gyazo.com/c9870e72ddf35a9dbd487fad4e6968bd.png' width='60%'>
-
 ```markdown
 # image slide
 

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)
       @markdown.slides.each_with_index do |slide, index|
-        Keynote.create_slide(slide.title, slide.lines.join("\n"))
+        Keynote.create_slide(slide)
         Keynote.insert_image(slide.image) if slide.image
         Keynote.insert_code(slide.code) if slide.code
       end

data/lib/md2key/keynote.rb

@@ -1,3 +1,5 @@
+require 'md2key/pbcopy'
+
 module Md2key
   class Keynote
     COVER_SLIDE_INDEX    = 1
@@ -6,8 +8,19 @@ module Md2key
 
     class << self
       # You must provide a first slide as a cover slide.
-      def update_cover(title, content)
-        execute_applescript('update_slide', title, content, COVER_SLIDE_INDEX)
+      # @param [Md2key::Slide] slide
+      def update_cover(slide)
+        execute_applescript('update_slide', slide.title, slide.lines.map(&:text).join("\n"), COVER_SLIDE_INDEX)
+      end
+
+      # @param [Md2key::Slide] slide
+      def create_slide(slide)
+        if slide.lines.any?(&:indented?)
+          create_indented_slide(slide)
+        else
+          # Not using `create_indented_slide` because this is faster.
+          execute_applescript('create_slide_and_write_body', slide.title, slide.lines.map(&:text).join("\n"), TEMPLATE_SLIDE_INDEX)
+        end
       end
 
       def ensure_template_slide_availability
@@ -24,10 +37,6 @@ module Md2key
         execute_applescript('delete_slide', TEMPLATE_SLIDE_INDEX)
       end
 
-      def 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('insert_image', slides_count, File.absolute_path(path), TEMPLATE_SLIDE_INDEX)
@@ -58,6 +67,24 @@ module Md2key
         execute_applescript('slides_count').to_i
       end
 
+      # @param [Md2key::Slide] slide
+      def create_indented_slide(slide)
+        execute_applescript('create_slide_and_select_body', slide.title, TEMPLATE_SLIDE_INDEX)
+
+        last_index = slide.lines.size - 1
+        current_indent = 0
+        slide.lines.each_with_index do |line, index|
+          # Using copy and paste to input multibyte chars
+          Pbcopy.copy(line.text)
+          paste_and_indent(line.indent - current_indent, insert_newline: index < last_index)
+          current_indent = line.indent
+        end
+      end
+
+      def paste_and_indent(indent, insert_newline: true)
+        execute_applescript('paste_and_indent', indent, insert_newline)
+      end
+
       def execute_applescript(script_name, *args)
         path = script_path(script_name)
         `osascript #{path} "#{args.join('" "')}"`

data/lib/md2key/line.rb

@@ -0,0 +1,12 @@
+module Md2key
+  class Line < Struct.new(:text, :indent)
+    def initialize(*)
+      super
+      self.indent ||= 0
+    end
+
+    def indented?
+      indent > 0
+    end
+  end
+end

data/lib/md2key/markdown.rb

@@ -1,5 +1,7 @@
-require 'redcarpet'
+require 'md2key/line'
+require 'md2key/slide'
 require 'oga'
+require 'redcarpet'
 
 # Parse markdown, generate AST and convert it to slides.
 # This is created to be compatible with Deckset.
@@ -12,10 +14,12 @@ module Md2key
       @ast     = Oga.parse_xml(xhtml)
     end
 
+    # @return [Md2key::Slide]
     def cover
       cached_slides.first
     end
 
+    # @return [Array<Md2key::Slide>]
     def slides
       cached_slides[1..-1]
     end
@@ -46,15 +50,14 @@ module Md2key
           slides << slide
           slide.title = node.text
         when 'ul'
-          # FIXME: support nested list
-          slide.lines += li_texts(node).flatten
+          slide.lines.concat(li_lines(node))
         when 'p'
           node.children.each do |child|
             if child.is_a?(Oga::XML::Element) && child.name == 'img'
               slide.image = child.attribute('src').value
               next
             end
-            slide.lines << child.text
+            slide.lines << Line.new(child.text)
           end
         when 'pre'
           node.children.each do |child|
@@ -69,11 +72,12 @@ module Md2key
       slides
     end
 
-    def li_texts(ul_node)
+    # @return [Array<Md2Key::Line>]
+    def li_lines(ul_node, indent: 0)
       return [] unless ul_node.is_a?(Oga::XML::Element)
       return [] if ul_node.name != 'ul'
 
-      texts = []
+      lines = []
       ul_node.children.each do |li_node|
         next unless li_node.is_a?(Oga::XML::Element)
         next if li_node.name != 'li'
@@ -82,14 +86,14 @@ module Md2key
           case node
           when Oga::XML::Text
             text = node.text.strip
-            texts << text unless text.empty?
+            lines << Line.new(text, indent) unless text.empty?
           when Oga::XML::Element
             next if node.name != 'ul'
-            texts << li_texts(node)
+            lines.concat(li_lines(node, indent: indent + 1))
           end
         end
       end
-      texts
+      lines
     end
 
     def to_xhtml(markdown)

data/lib/md2key/pbcopy.rb

@@ -0,0 +1,10 @@
+module Md2key
+  class Pbcopy
+    def self.copy(str)
+      IO.popen('pbcopy', 'w') do |io|
+        io.write(str)
+        io.close_write
+      end
+    end
+  end
+end

data/lib/md2key/version.rb

@@ -1,3 +1,3 @@
 module Md2key
-  VERSION = "0.4.4"
+  VERSION = "0.5.0"
 end

data/lib/md2key.rb

@@ -1,5 +1,4 @@
 require 'md2key/code'
-require 'md2key/slide'
 require 'md2key/markdown'
 require 'md2key/highlight'
 require 'md2key/keynote'

data/scripts/create_slide_and_select_body.scpt

@@ -0,0 +1,25 @@
+on run argv
+  set slideTitle    to item 1 of argv
+  set templateIndex to item 2 of argv as number
+
+  tell application "Keynote"
+    activate
+
+    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
+
+        -- select the default body item
+        set position of default body item to position of default body item
+        -- press the Enter key
+        tell application "System Events" to key code 76
+      end tell
+    end tell
+  end tell
+end run

data/scripts/paste_and_indent.scpt

@@ -0,0 +1,24 @@
+on run argv
+  set indent to item 1 of argv as number
+  set insertNewline to item 2 of argv as boolean
+
+  tell application "System Events"
+    keystroke "v" using { command down }
+
+    if indent is greater than 0 then
+      repeat indent times
+        key code 48 -- tab
+      end repeat
+    else
+      if indent is less than 0 then
+        repeat indent * -1 times
+          key code 48 using { shift down } -- tab
+        end repeat
+      end if
+    end if
+
+    if insertNewline is true then
+      key code 36 -- return
+    end if
+  end tell
+end run

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: md2key
 version: !ruby/object:Gem::Version
-  version: 0.4.4
+  version: 0.5.0
 platform: ruby
 authors:
 - Takashi Kokubun
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-08-25 00:00:00.000000000 Z
+date: 2016-04-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
@@ -115,17 +115,21 @@ files:
 - lib/md2key/converter.rb
 - lib/md2key/highlight.rb
 - lib/md2key/keynote.rb
+- lib/md2key/line.rb
 - lib/md2key/markdown.rb
+- lib/md2key/pbcopy.rb
 - lib/md2key/slide.rb
 - lib/md2key/version.rb
 - md2key.gemspec
 - scripts/activate_slide.scpt
 - scripts/create_empty_slide.scpt
-- scripts/create_slide.scpt
+- scripts/create_slide_and_select_body.scpt
+- scripts/create_slide_and_write_body.scpt
 - scripts/delete_extra_slides.scpt
 - scripts/delete_slide.scpt
 - scripts/insert_code_background.scpt
 - scripts/insert_image.scpt
+- scripts/paste_and_indent.scpt
 - scripts/paste_clipboard.scpt
 - scripts/slides_count.scpt
 - scripts/update_slide.scpt
@@ -148,8 +152,9 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5
+rubygems_version: 2.4.5.1
 signing_key: 
 specification_version: 4
 summary: Convert markdown to keynote
 test_files: []
+has_rdoc: