md2key 0.8.4 → 0.9.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: cbd92251f22aada15ef3f7c4f0a857162d49381a
-  data.tar.gz: 8233265abc5fe0a51252b1c0373334d96b99232e
+SHA256:
+  metadata.gz: a24069768cd5c06091add93733afb5dd4ce5442fcc94795e5c47f4d263cfe6ec
+  data.tar.gz: 4b9c7b2f8aeaba697e42df6fbab3416c82631410d71e8e5a4df949cdb8e4f8af
 SHA512:
-  metadata.gz: 6df6f091d045ed0b9b0c71a7496c96f8f8056afdc317cbd87cb91e6811f998aaf0768466b1ccf2fa58eb652c7a46241962136f0892bb824fef3b66c9b133e863
-  data.tar.gz: 006b538a2457e1d4ade2b84e6c129c74129dae4ba2beaa943e0d7ead775f683c78e1d447f0a9e979f66a0c2af9547a7bc480de5d8ea307badad223c105cd5918
+  metadata.gz: 1ae1c513793ada5d034f2118029f1faf51a2e7b00805b1476a6ed37d2bb62a8335cb3bcdefc33b208cee5af49ec914c9fd170f578076aa62f5b2cdefc3545c29
+  data.tar.gz: 1c847482c40c60cf0e57e086240c1dbe5e4c13281be5917aab9b00d42b5ca9b25d6d51ee1596dada1dea5874c992808a45c88c4f1c088bea1e010908eb81e3e2

data/CHANGELOG.md

@@ -1,3 +1,8 @@
+# v0.9.0
+
+- Use master slides named "cover", "h1", "h2", ...
+  - See https://github.com/k0kubun/md2key/pull/46 for details
+
 # v0.8.4
 
 - Add `md2key listen` subcommand to update Keynote by watching file

data/Gemfile

@@ -2,3 +2,7 @@ source 'https://rubygems.org'
 
 # Specify your gem's dependencies in md2key.gemspec
 gemspec
+
+if Gem::Version.new(RUBY_VERSION) >= Gem::Version.new("2.2.5")
+  gem 'listen', '~> 3.0'
+end

data/lib/md2key/cli.rb

@@ -1,6 +1,7 @@
 require 'md2key/config_builder'
-require 'md2key/converter'
+require 'md2key/config_loader'
 require 'md2key/parser'
+require 'md2key/renderer'
 require 'thor'
 require 'yaml'
 
@@ -11,8 +12,9 @@ module Md2key
       abort "md2key: `#{path}` does not exist" unless File.exist?(path)
 
       markdown = File.read(path)
+      config = ConfigLoader.load('~/.md2key', './.md2key')
       ast = Parser.new.parse(markdown)
-      Converter.new.convert!(ast)
+      Renderer.new(config).render!(ast)
     end
 
     desc 'init', 'Put .md2key template to current directory'

data/lib/md2key/config_loader.rb

@@ -0,0 +1,41 @@
+require 'md2key/configuration'
+
+module Md2key
+  class ConfigLoader
+    class << self
+      # @param [Array<String>] paths - paths of YAML configs. Latter config overwrites former ones.
+      def load(*paths)
+        hash = {}
+        paths.each do |path|
+          hash.merge!(load_if_available(File.expand_path(path)))
+        end
+        Configuration.new(symbolize_keys(hash))
+      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
+  end
+end

data/lib/md2key/configuration.rb

@@ -2,67 +2,50 @@ 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))
+    class Master
+      # @param [String] name
+      # @param [TrueClass,FalseClass,nil] cover
+      # @param [Integer,nil] template
+      def initialize(name:, cover: nil, template: nil)
+        @name = name
+        @cover = cover
+        @template = template
       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
+      attr_reader :name, :cover, :template
     end
 
+    # @param [Array<Hash{ Symbol => String,Integer,TrueClass,FalseClass }>] masters
     def initialize(masters: [])
-      @masters = masters
+      @masters = masters.map { |m| Master.new(m) }
       validate!
     end
 
+    # @return [String,nil]
     def cover_master
       master = @masters.find do |master|
-        master[:cover]
+        master.cover
       end
-      master && master[:name]
+      master && master.name
     end
 
+    # @param [Integer] level
+    # @return [String,nil]
     def slide_master(level)
       master = @masters.find do |master|
-        master[:template] == level
+        master.template == level
       end
-      master && master[:name]
+      master && master.name
     end
 
     private
 
     def validate!
-      if @masters.select { |m| m[:cover] }.length > 1
+      if @masters.select(&: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
+        if @masters.select { |m| m.template == level }.length > 1
           abort "`Config error!\ntemplate: #{level}` cannot be specified multiple times"
         end
       end

data/lib/md2key/keynote.rb

@@ -91,10 +91,13 @@ module Md2key
         execute_applescript('insert_note', slides_count, note)
       end
 
+      # @param [Integer] slide_index
+      # @return [String]
       def fetch_master_slide_name(slide_index)
         execute_applescript('fetch_master_slide_name', slide_index).rstrip
       end
 
+      # @return [Array<String>]
       def fetch_master_slide_names
         execute_applescript('fetch_master_slide_names').strip.split("\n")
       end

data/lib/md2key/renderer.rb

@@ -0,0 +1,71 @@
+require 'md2key/configuration'
+require 'md2key/keynote'
+
+module Md2key
+  class Renderer
+    # Magic number index for master slide named "cover"
+    COVER_LEVEL = 0
+
+    # @param [Md2key::Configuration] config
+    def initialize(config)
+      @config = config
+    end
+
+    # @param [Md2key::Nodes::Presentation] ast
+    def render!(ast)
+      prepare_document_base
+      generate_contents(ast)
+    ensure
+      Keynote.delete_template_slide
+    end
+
+    private
+
+    def prepare_document_base
+      Keynote.ensure_template_slide_availability
+      Keynote.delete_extra_slides
+    end
+
+    # @param [Md2key::Nodes::Presentation] ast
+    def generate_contents(ast)
+      first_master    = Keynote.fetch_master_slide_name(1)
+      second_master   = Keynote.fetch_master_slide_name(2)
+      master_by_level = fetch_master_by_level
+
+      cover_master = @config.cover_master || master_by_level.fetch(COVER_LEVEL, first_master)
+      Keynote.update_cover(ast.cover, cover_master)
+
+      ast.slides.each do |slide|
+        slide_master = @config.slide_master(slide.level) || master_by_level.fetch(slide.level, second_master)
+
+        if slide.table
+          Keynote.create_slide_with_table(slide, slide.table.rows, slide.table.columns, slide_master)
+          Keynote.insert_table(slide.table.data)
+        else
+          Keynote.create_slide(slide, slide_master)
+          Keynote.insert_image(slide.image) if slide.image
+          Keynote.insert_code(slide.code) if slide.code
+        end
+
+        Keynote.insert_note(slide.note) if slide.note
+      end
+    end
+
+    # Find master names like "h1", "h2", ... and return { 1 => "h1", 2 => "h2" } only for available ones.
+    # @return [Hash{ Integer => String }]
+    def fetch_master_by_level
+      masters = Keynote.fetch_master_slide_names
+
+      {}.tap do |result|
+        masters.each do |master|
+          if master.match(/\Ah(?<level>[1-5])\z/)
+            level = Integer(Regexp.last_match[:level])
+            result[level] = master
+          elsif master == 'cover'
+            result[COVER_LEVEL] = 'cover'
+          end
+        end
+      end
+    end
+  end
+end

data/lib/md2key/version.rb

@@ -1,3 +1,3 @@
 module Md2key
-  VERSION = '0.8.4'
+  VERSION = '0.9.0'
 end

data/md2key.gemspec

@@ -25,7 +25,6 @@ Gem::Specification.new do |spec|
   spec.add_dependency 'redcarpet', '~> 3.3'
   spec.add_dependency 'oga', '~> 1.2'
   spec.add_development_dependency 'bundler', '~> 1.12'
-  spec.add_development_dependency 'listen', '~> 3.0'
   spec.add_development_dependency 'rake', '~> 10.0'
   spec.add_development_dependency 'pry'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: md2key
 version: !ruby/object:Gem::Version
-  version: 0.8.4
+  version: 0.9.0
 platform: ruby
 authors:
 - Takashi Kokubun
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-07-21 00:00:00.000000000 Z
+date: 2017-12-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
@@ -66,20 +66,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.12'
-- !ruby/object:Gem::Dependency
-  name: listen
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '3.0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '3.0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -132,8 +118,8 @@ files:
 - lib/md2key.rb
 - lib/md2key/cli.rb
 - lib/md2key/config_builder.rb
+- lib/md2key/config_loader.rb
 - lib/md2key/configuration.rb
-- lib/md2key/converter.rb
 - lib/md2key/diagram.rb
 - lib/md2key/highlight.rb
 - lib/md2key/keynote.rb
@@ -144,6 +130,7 @@ files:
 - lib/md2key/nodes/slide.rb
 - lib/md2key/nodes/table.rb
 - lib/md2key/parser.rb
+- lib/md2key/renderer.rb
 - lib/md2key/version.rb
 - md2key.gemspec
 - scripts/activate_slide.scpt.erb
@@ -183,7 +170,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.2
+rubygems_version: 2.6.14
 signing_key: 
 specification_version: 4
 summary: Convert markdown to keynote

data/lib/md2key/converter.rb

@@ -1,46 +0,0 @@
-require 'md2key/configuration'
-require 'md2key/keynote'
-
-module Md2key
-  class Converter
-    attr_reader :config
-
-    def initialize
-      @config = Configuration.load
-    end
-
-    # @param [Md2key::Nodes::Presentation] ast
-    def convert!(ast)
-      prepare_document_base
-      generate_contents(ast)
-    ensure
-      Keynote.delete_template_slide
-    end
-
-    private
-
-    def prepare_document_base
-      Keynote.ensure_template_slide_availability
-      Keynote.delete_extra_slides
-    end
-
-    def generate_contents(ast)
-      cover_master = Keynote.fetch_master_slide_name(1)
-      main_master  = Keynote.fetch_master_slide_name(2)
-
-      Keynote.update_cover(ast.cover, config.cover_master || cover_master)
-      ast.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, master)
-          Keynote.insert_table(slide.table.data)
-        else
-          Keynote.create_slide(slide, master)
-          Keynote.insert_image(slide.image) if slide.image
-          Keynote.insert_code(slide.code) if slide.code
-        end
-        Keynote.insert_note(slide.note) if slide.note
-      end
-    end
-  end
-end