md2key 0.7.0 → 0.8.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5160e8e3f9c8a30aed93d347178d4ece5b8406d9
-  data.tar.gz: e9bf49a0c93e7e6e3d20f33d0e64b61619a8c50e
+  metadata.gz: 410568f3152ab6dcd1869b85bcfb8f2d9e68e1fd
+  data.tar.gz: 2b4c816530181bd706316b94025ffbc1a2830eb5
 SHA512:
-  metadata.gz: e2ee89a2f607a077768655978f14873de2c52e5afe9a8a78b32003824abd2b87b991afb7df61ae7b879fa09b1353fa970efd6608071afb641449a175f9bf0172
-  data.tar.gz: a8c48b7ae5f2c569bc5066f4e0c7146f6c480debfe06538e2a63354abb203a16f899fe714df5f0d9fa4061ac3d60abf2fad2708bc6ede3963ded87e0326db0f1
+  metadata.gz: 5d5fa52861b324fd7653ad7144c7b76384efddd26a007fba6bcb33be197efb1c461de3dd595e747221f19a406b1206c9d840d7d7aa18693dda49ebc8358922ca
+  data.tar.gz: e99f5e622a77540a4114045e231fea43c023241d631d06e698e3ae93d6f934221b10b9e462171d14089db0b9bfa3bfb702f5bb9eb334bce01374f953677fd8c0

data/.gitignore

@@ -8,3 +8,4 @@
 /spec/reports/
 /tmp/
 .DS_Store
+.md2key

data/CHANGELOG.md

@@ -1,3 +1,9 @@
+# v0.8.0
+
+- Add `md2key init` subcommand to generate .md2key
+- Allow changing master slide by .md2key
+  - See https://github.com/k0kubun/md2key/pull/32 for details
+
 # v0.7.0
 
 - Support presenter notes

data/lib/md2key/cli.rb

@@ -1,22 +1,37 @@
+require 'md2key/config_builder'
+require 'md2key/configuration'
+require 'md2key/converter'
 require 'thor'
+require 'yaml'
 
 module Md2key
   class CLI < Thor
     desc 'convert MARKDOWN', 'Convert markdown to keynote'
     def convert(path)
-      Converter.convert_markdown(path)
+      abort "md2key: `#{path}` does not exist" unless File.exist?(path)
+
+      config = Configuration.load
+      Converter.new(config).convert!(path)
+    end
+
+    desc 'init', 'Put .md2key template to current directory'
+    option :skip_options, type: :boolean, default: false, aliases: %w[-n]
+    def init
+      yaml = ConfigBuilder.build(skip_options: options[:skip_options])
+      File.write('.md2key', yaml)
+      puts "# Successfully generated .md2key!\n#{yaml}"
     end
 
     private
 
-    # Shorthand for `md2key convert`
+    # Shorthand for `md2key convert *.md`
     def method_missing(*args)
-      return super(*args) if args.length > 1
-      default_task(args.first.to_s)
-    end
-
-    def default_task(arg)
-      convert(arg)
+      path = args.first.to_s
+      if args.length == 1 && path.end_with?('.md')
+        convert(path)
+      else
+        return super(*args)
+      end
     end
   end
 end

data/lib/md2key/config_builder.rb

@@ -0,0 +1,27 @@
+module Md2key
+  module ConfigBuilder
+    class << self
+      def build(skip_options: true)
+        master_names = Keynote.fetch_master_slide_names
+        masters = master_names.map.with_index do |name, i|
+          build_master_config(name, i, skip_options: skip_options)
+        end
+        ["masters:\n", *masters].join
+      end
+
+      private
+
+      def build_master_config(master_name, index, skip_options:)
+        "  - name: #{master_name.inspect}\n".tap do |config|
+          next if skip_options
+
+          if index == 0
+            config << "    cover: true\n"
+          elsif (1..3).cover?(index)
+            config << "    template: #{index}\n"
+          end
+        end
+      end
+    end
+  end
+end

data/lib/md2key/configuration.rb

@@ -0,0 +1,71 @@
+require 'yaml'
+
+module Md2key
+  class Configuration
+    class << self
+      def load
+        config = {}
+        config.merge!(load_if_available(File.expand_path('~/.md2key')))
+        config.merge!(load_if_available(File.expand_path('./.md2key')))
+        new(symbolize_keys(config))
+      end
+
+      private
+
+      def load_if_available(path)
+        if File.exist?(path)
+          YAML.load(File.read(path))
+        else
+          {}
+        end
+      end
+
+      def symbolize_keys(object)
+        case object
+        when Hash
+          Hash.new.tap do |result|
+            object.each do |key, value|
+              result[key.to_sym] = symbolize_keys(value)
+            end
+          end
+        when Array
+          object.map(&method(:symbolize_keys))
+        else
+          object
+        end
+      end
+    end
+
+    def initialize(masters: [])
+      @masters = masters
+      validate!
+    end
+
+    def cover_master
+      master = @masters.find do |master|
+        master[:cover]
+      end
+      master && master[:name]
+    end
+
+    def slide_master(level)
+      master = @masters.find do |master|
+        master[:template] == level
+      end
+      master && master[:name]
+    end
+
+    private
+
+    def validate!
+      if @masters.select { |m| m[:cover] }.length > 1
+        abort "Config error!\n`cover: true` cannot be specified multiple times"
+      end
+      (1..5).each do |level|
+        if @masters.select { |m| m[:template] == level }.length > 1
+          abort "`Config error!\ntemplate: #{level}` cannot be specified multiple times"
+        end
+      end
+    end
+  end
+end

data/lib/md2key/converter.rb

@@ -1,18 +1,15 @@
 module Md2key
   class Converter
-    def self.convert_markdown(path)
-      abort "md2key: `#{path}` does not exist" unless File.exist?(path)
+    attr_reader :config
 
-      self.new(path).generate_keynote!
+    def initialize(config)
+      @config = config
     end
 
-    def initialize(path)
-      @markdown = Markdown.new(path)
-    end
-
-    def generate_keynote!
+    def convert!(path)
       prepare_document_base
-      generate_contents
+      markdown = Markdown.new(path)
+      generate_contents(markdown)
     ensure
       Keynote.delete_template_slide
     end
@@ -24,14 +21,18 @@ module Md2key
       Keynote.delete_extra_slides
     end
 
-    def generate_contents
-      Keynote.update_cover(@markdown.cover)
-      @markdown.slides.each do |slide|
+    def generate_contents(markdown)
+      cover_master = Keynote.fetch_master_slide_name(1)
+      main_master  = Keynote.fetch_master_slide_name(2)
+
+      Keynote.update_cover(markdown.cover, config.cover_master || cover_master)
+      markdown.slides.each do |slide|
+        master = config.slide_master(slide.level) || main_master
         if slide.table
-          Keynote.create_slide_with_table(slide, slide.table.rows, slide.table.columns)
+          Keynote.create_slide_with_table(slide, slide.table.rows, slide.table.columns, master)
           Keynote.insert_table(slide.table.data)
         else
-          Keynote.create_slide(slide)
+          Keynote.create_slide(slide, master)
           Keynote.insert_image(slide.image) if slide.image
           Keynote.insert_code(slide.code) if slide.code
         end

data/lib/md2key/keynote.rb

@@ -11,23 +11,24 @@ module Md2key
     class << self
       # You must provide a first slide as a cover slide.
       # @param [Md2key::Slide] slide
-      def update_cover(slide)
-        execute_applescript('update_slide', slide.title, slide.lines.map(&:text).join("\n"), COVER_SLIDE_INDEX)
+      def update_cover(slide, master_name)
+        execute_applescript('update_slide', slide.title, slide.lines.map(&:text).join("\n"), master_name, COVER_SLIDE_INDEX)
       end
 
       # @param [Md2key::Slide] slide
-      def create_slide(slide)
+      # @param [String] master_name
+      def create_slide(slide, master_name)
         if slide.lines.any?(&:indented?)
-          create_indented_slide(slide)
+          create_indented_slide(slide, master_name)
         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)
+          execute_applescript('create_slide_and_write_body', slide.title, slide.lines.map(&:text).join("\n"), master_name, TEMPLATE_SLIDE_INDEX)
         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)
+      def create_slide_with_table(slide, rows, columns, master_name)
+        execute_applescript('create_slide_and_insert_table', slide.title, TEMPLATE_SLIDE_INDEX, rows, columns, master_name)
       end
 
       def ensure_template_slide_availability
@@ -90,6 +91,14 @@ module Md2key
         execute_applescript('insert_note', slides_count, note)
       end
 
+      def fetch_master_slide_name(slide_index)
+        execute_applescript('fetch_master_slide_name', slide_index).rstrip
+      end
+
+      def fetch_master_slide_names
+        execute_applescript('fetch_master_slide_names').strip.split("\n")
+      end
+
       private
 
       def insert_code_background
@@ -109,8 +118,9 @@ module Md2key
       end
 
       # @param [Md2key::Slide] slide
-      def create_indented_slide(slide)
-        execute_applescript('create_slide_and_select_body', slide.title, TEMPLATE_SLIDE_INDEX)
+      # @param [String] master_name
+      def create_indented_slide(slide, master_name)
+        execute_applescript('create_slide_and_select_body', slide.title, master_name, TEMPLATE_SLIDE_INDEX)
 
         last_index = slide.lines.size - 1
         current_indent = 0

data/lib/md2key/markdown.rb

@@ -39,7 +39,7 @@ module Md2key
         next unless node.is_a?(Oga::XML::Element)
 
         case node.name
-        when /^h[1-9]$/
+        when /^h(?<level>[1-9])$/
           # New slide by header. You can skip to write `---`.
           # This feature will be removed in the future to provide
           # more compatibility with Deckset.
@@ -50,6 +50,7 @@ module Md2key
 
           slides << slide
           slide.title = node.text
+          slide.level = Regexp.last_match[:level].to_i
         when 'ul'
           slide.lines.concat(li_lines(node))
         when 'ol'

data/lib/md2key/slide.rb

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

data/lib/md2key/version.rb

@@ -1,3 +1,3 @@
 module Md2key
-  VERSION = "0.7.0"
+  VERSION = "0.8.0"
 end

data/lib/md2key.rb

@@ -2,5 +2,4 @@ require 'md2key/code'
 require 'md2key/markdown'
 require 'md2key/highlight'
 require 'md2key/keynote'
-require 'md2key/converter'
 require 'md2key/cli'

data/scripts/create_slide_and_insert_table.scpt.erb

@@ -3,6 +3,7 @@ on run 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 masterName    to item 5 of argv as string
 
   set headerRowCount   to 1
   set headerColumnCount to 0
@@ -11,12 +12,7 @@ on run argv
   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
+      set newSlide to make new slide with properties {base slide:master slide masterName}
       tell newSlide
         try
           set base slide to master slide "Title - Top" of thisDocument

data/scripts/create_slide_and_select_body.scpt.erb

@@ -1,17 +1,13 @@
 on run argv
   set slideTitle    to item 1 of argv
-  set templateIndex to item 2 of argv as number
+  set masterName    to item 2 of argv as string
+  set templateIndex to item 3 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
+      set newSlide to make new slide with properties {base slide:master slide masterName}
       tell newSlide
         set object text of default title item to slideTitle
 

data/scripts/create_slide_and_write_body.scpt.erb

@@ -1,16 +1,12 @@
 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
+  set masterName    to item 3 of argv as string
+  set templateIndex to item 4 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
+      set newSlide to make new slide with properties {base slide:master slide masterName}
       tell newSlide
         set object text of default title item to slideTitle
         set object text of default body item to slideBody

data/scripts/fetch_master_slide_name.scpt.erb

@@ -0,0 +1,10 @@
+on run argv
+  set slideIndex to item 1 of argv as number
+
+  tell application "Keynote"
+    tell the front document
+      set masterName to the name of the base slide of slide slideIndex
+      return masterName
+    end tell
+  end tell
+end run

data/scripts/fetch_master_slide_names.scpt.erb

@@ -0,0 +1,11 @@
+tell application "Keynote"
+  tell the front document
+    set the ret to ""
+
+    set the masterSlideNames to the name of every master slide
+    repeat with masterName in the masterSlideNames
+      set the ret to ret & "\n" & masterName
+    end repeat
+    return ret
+  end tell
+end tell

data/scripts/update_slide.scpt.erb

@@ -1,10 +1,12 @@
 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
+  set masterName to item 3 of argv as string
+  set slideIndex to item 4 of argv as number
 
   tell application "Keynote"
     tell the front document
+      set the base slide of the slide slideIndex to master slide masterName
       tell slide slideIndex
         set object text of default title item to slideTitle
         set object text of default body item to slideBody

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: md2key
 version: !ruby/object:Gem::Version
-  version: 0.7.0
+  version: 0.8.0
 platform: ruby
 authors:
 - Takashi Kokubun
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-09-26 00:00:00.000000000 Z
+date: 2016-10-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
@@ -112,6 +112,8 @@ files:
 - lib/md2key.rb
 - lib/md2key/cli.rb
 - lib/md2key/code.rb
+- lib/md2key/config_builder.rb
+- lib/md2key/configuration.rb
 - lib/md2key/converter.rb
 - lib/md2key/diagram.rb
 - lib/md2key/highlight.rb
@@ -130,6 +132,8 @@ files:
 - scripts/create_slide_and_write_body.scpt.erb
 - scripts/delete_extra_slides.scpt.erb
 - scripts/delete_slide.scpt.erb
+- scripts/fetch_master_slide_name.scpt.erb
+- scripts/fetch_master_slide_names.scpt.erb
 - scripts/insert_code_background.scpt.erb
 - scripts/insert_image.scpt.erb
 - scripts/insert_note.scpt.erb