md2key 0.5.2 → 0.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ee2b4a206c2e364066144e6078e33d3568249fb7
-  data.tar.gz: db51f92d93466e01e6de76feffb63648351a96a5
+  metadata.gz: 3c7595398a53c91167545a3c662be59191368ce2
+  data.tar.gz: 3cd48b2fd10db287d216cc66763f42fbea4a6f74
 SHA512:
-  metadata.gz: 1d7ca73cc1e3179ad8c2aa68a89cb50b8efd9c78d9ca2dc514559122398909b55647d301292dcb487097864a8631fc554d8e099e537c0f0ebf4dcc1b614af6e1
-  data.tar.gz: 42da1d21e7f0583186b65f431cbf0ff11b25139b5b8f721a43ee8209d3d7af5b0e981ba29e86aa870290def24aa0981b5ee95c34201801392495a4cafe9af6d3
+  metadata.gz: c17ea6fe7f45fc60317e86686aa8045177df35c5ca1010581a8a1afd7dbcacd1d4a390a088da9ac8892bf73258c35229bc72507e2c391406e48eac23ed1814e1
+  data.tar.gz: 07ea02c224a2c633acc4b4c34e9bdc4e256f23bc6fe34d92ace3f9ee846f76babf7951d52dfa92dbfc513b210dc994d515150e66a2e3c7d56a1ee76bcca2e57c

data/CHANGELOG.md

@@ -1,3 +1,9 @@
+# v0.6.0
+
+- Add table support
+  - https://github.com/k0kubun/md2key/pull/25
+  - Thanks to @codeant
+
 # v0.5.2
 
 - Use delay before paste to prevent pasting wrong text

data/lib/md2key/converter.rb

@@ -27,9 +27,14 @@ module Md2key
     def generate_contents
       Keynote.update_cover(@markdown.cover)
       @markdown.slides.each_with_index do |slide, index|
-        Keynote.create_slide(slide)
-        Keynote.insert_image(slide.image) if slide.image
-        Keynote.insert_code(slide.code) if slide.code
+        if slide.table
+          Keynote.create_slide_with_table(slide, slide.table.rows, slide.table.columns)
+          Keynote.insert_table(slide.table.data)
+        else
+          Keynote.create_slide(slide)
+          Keynote.insert_image(slide.image) if slide.image
+          Keynote.insert_code(slide.code) if slide.code
+        end
       end
     end
   end

data/lib/md2key/highlight.rb

@@ -7,17 +7,10 @@ module Md2key
 
         extension = code.extension || DEFAULT_EXTENSION
 
-        file = Tempfile.new(["code", ".#{extension}"])
-        file.write(code.source)
-        file.close
-
-        IO.popen(['highlight', '-O', 'rtf', '-K', '28', '-s', 'rdark', '-k', 'Monaco', file.path], 'r+') do |highlight|
-          IO.popen('pbcopy', 'w+') do |pbcopy|
-            pbcopy.write(highlight.read)
-          end
+        IO.popen("highlight -O rtf -K 28 -s rdark -k Monaco -S #{extension} | pbcopy", 'w+') do |highlight|
+          highlight.write(code.source)
+          highlight.close
         end
-      ensure
-        file.delete
       end
 
       private

data/lib/md2key/keynote.rb

@@ -23,6 +23,11 @@ module Md2key
         end
       end
 
+      # @param [Md2key::Slide] slide
+      def create_slide_with_table(slide, rows, columns)
+        execute_applescript('create_slide_and_insert_table', slide.title, TEMPLATE_SLIDE_INDEX, rows, columns)
+      end
+
       def ensure_template_slide_availability
         return if slides_count >= 2
         execute_applescript('create_empty_slide')
@@ -49,6 +54,18 @@ module Md2key
         paste_clipboard
       end
 
+      def insert_table(data)
+        row_index = 1
+        data.each do |row|
+          param = [slides_count, row_index]
+          row.each do |cell|
+            param << cell
+          end
+          execute_applescript('update_table', *param)
+          row_index += 1
+        end
+      end
+
       private
 
       def insert_code_background

data/lib/md2key/markdown.rb

@@ -1,5 +1,6 @@
 require 'md2key/line'
 require 'md2key/slide'
+require 'md2key/table'
 require 'oga'
 require 'redcarpet'
 
@@ -51,6 +52,34 @@ module Md2key
           slide.title = node.text
         when 'ul'
           slide.lines.concat(li_lines(node))
+        when 'ol'
+          slide.lines.concat(li_lines(node))
+        when 'table'
+          row_data = []
+          rows = 0
+          columns = 0
+          row_text = []
+          node.children[0].children.each do |child|
+            next if !child.is_a?(Oga::XML::Element) || child.name != 'tr'
+            rows += 1
+            child.children.each do |td|
+              next if !td.is_a?(Oga::XML::Element) || td.name != 'th'
+              columns += 1
+              row_text << td.text
+            end
+          end
+          row_data << row_text
+          node.children[1].children.each do |child|
+            next if !child.is_a?(Oga::XML::Element) || child.name != 'tr'
+            row_text = []
+            child.children.each do |td|
+              next if !td.is_a?(Oga::XML::Element) || td.name != 'td'
+              row_text << td.text
+            end
+            row_data << row_text
+            rows += 1
+          end
+          slide.table = Table.new(rows, columns, row_data)
         when 'p'
           node.children.each do |child|
             if child.is_a?(Oga::XML::Element) && child.name == 'img'
@@ -75,7 +104,7 @@ module Md2key
     # @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'
+      return [] if ul_node.name != 'ul' && ul_node.name != 'ol'
 
       lines = []
       ul_node.children.each do |li_node|
@@ -101,7 +130,7 @@ module Md2key
         Redcarpet::Render::XHTML.new(
           escape_html: true,
         ),
-        fenced_code_blocks: true,
+        fenced_code_blocks: true, :tables => true
       )
       redcarpet.render(markdown)
     end

data/lib/md2key/slide.rb

@@ -1,5 +1,5 @@
 module Md2key
-  class Slide < Struct.new(:title, :lines, :image, :code)
+  class Slide < Struct.new(:title, :lines, :image, :code, :table)
     def initialize(*)
       super
       self.lines ||= []

data/lib/md2key/table.rb

@@ -0,0 +1,4 @@
+module Md2key
+  class Table < Struct.new(:rows, :columns, :data)
+  end
+end

data/lib/md2key/version.rb

@@ -1,3 +1,3 @@
 module Md2key
-  VERSION = "0.5.2"
+  VERSION = "0.6.0"
 end

data/scripts/create_slide_and_insert_table.scpt

@@ -0,0 +1,29 @@
+on run argv
+  set slideTitle    to item 1 of argv
+  set templateIndex to item 2 of argv as number
+  set rowCount      to item 3 of argv as number
+  set columnCount   to item 4 of argv as number
+
+  set headerRowCount   to 1
+  set headerColumnCount to 0
+  set footerRowCount to 0
+
+  tell application "Keynote"
+    set thisDocument to the front document
+    tell thisDocument
+      -- 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
+        try
+          set base slide to master slide "Title - Top" of thisDocument
+        end try
+        set object text of default title item to slideTitle
+        set newTable to make new table with properties {column count:columnCount, row count:rowCount, footer row count:footerRowCount,header column count:headerColumnCount,header row count:headerRowCount}
+      end tell
+    end tell
+  end tell
+end run

data/scripts/update_table.scpt

@@ -0,0 +1,22 @@
+on run argv
+  set slideIndex to item 1 of argv as number
+  set rowIndex to item 2 of argv as number
+
+  tell application "Keynote"
+    tell the front document
+      tell slide slideIndex
+		set thisTable to the first table
+		tell thisTable
+		  set idx to 1
+		  repeat with i in items 3 thru end of argv
+		    tell cell rowIndex of column idx 
+			  set value to i
+			  set the font size to 12
+			end tell
+			set idx to idx + 1
+		  end repeat
+		end tell
+      end tell
+    end tell
+  end tell
+end run

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: md2key
 version: !ruby/object:Gem::Version
-  version: 0.5.2
+  version: 0.6.0
 platform: ruby
 authors:
 - Takashi Kokubun
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-05-10 00:00:00.000000000 Z
+date: 2016-08-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
@@ -119,10 +119,12 @@ files:
 - lib/md2key/markdown.rb
 - lib/md2key/pbcopy.rb
 - lib/md2key/slide.rb
+- lib/md2key/table.rb
 - lib/md2key/version.rb
 - md2key.gemspec
 - scripts/activate_slide.scpt
 - scripts/create_empty_slide.scpt
+- scripts/create_slide_and_insert_table.scpt
 - scripts/create_slide_and_select_body.scpt
 - scripts/create_slide_and_write_body.scpt
 - scripts/delete_extra_slides.scpt
@@ -133,6 +135,7 @@ files:
 - scripts/paste_clipboard.scpt
 - scripts/slides_count.scpt
 - scripts/update_slide.scpt
+- scripts/update_table.scpt
 homepage: https://github.com/k0kubun/md2key
 licenses: []
 metadata: {}
@@ -157,4 +160,3 @@ signing_key:
 specification_version: 4
 summary: Convert markdown to keynote
 test_files: []
-has_rdoc: