md2key 0.8.0 → 0.8.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 410568f3152ab6dcd1869b85bcfb8f2d9e68e1fd
-  data.tar.gz: 2b4c816530181bd706316b94025ffbc1a2830eb5
+  metadata.gz: 9b9ec20ac32a06499a88da4a9f83bacd72e7bcf2
+  data.tar.gz: 7b580eb3962a9ca8bdfc7ff33a0290e5cf87c71a
 SHA512:
-  metadata.gz: 5d5fa52861b324fd7653ad7144c7b76384efddd26a007fba6bcb33be197efb1c461de3dd595e747221f19a406b1206c9d840d7d7aa18693dda49ebc8358922ca
-  data.tar.gz: e99f5e622a77540a4114045e231fea43c023241d631d06e698e3ae93d6f934221b10b9e462171d14089db0b9bfa3bfb702f5bb9eb334bce01374f953677fd8c0
+  metadata.gz: 0de8ca21415763465fe9b649e7820dbf4b102ea3f15867c8e79133e8ff371d4ed9c7c648cc7ae1120e78c1e083ddef4c5db6ca24f21a3b48f592ed9a9d3c3aa3
+  data.tar.gz: 6f0a3144ed5e84f142045707c4cd653bb034de04fc975acdbb294e8253a2058463c806cb52bcc81122fd70aa6ff4eda9c72384a8d4c5791c6d3c66b28351c4fc

data/CHANGELOG.md

@@ -1,3 +1,7 @@
+# v0.8.1
+
+- Fix bug in converting nested list
+
 # v0.8.0
 
 - Add `md2key init` subcommand to generate .md2key

data/LICENSE.txt

@@ -0,0 +1,21 @@
+The MIT License (MIT)
+
+Copyright (c) 2015 Takashi Kokubun
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+THE SOFTWARE.

data/bin/console

@@ -0,0 +1,11 @@
+#!/usr/bin/env ruby
+
+require "bundler/setup"
+require "md2key"
+
+# You can add fixtures and/or initialization code here to make experimenting
+# with your gem easier. You can also use a different console, if you like.
+
+# (If you use this, don't forget to add pry to your Gemfile!)
+require "pry"
+Pry.start

data/bin/setup

@@ -0,0 +1,8 @@
+#!/usr/bin/env bash
+set -euo pipefail
+IFS=$'\n\t'
+set -vx
+
+bundle install
+
+# Do any other automated setup that you need to do here

data/lib/md2key/cli.rb

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

data/lib/md2key/converter.rb

@@ -1,15 +1,18 @@
+require 'md2key/configuration'
+require 'md2key/keynote'
+
 module Md2key
   class Converter
     attr_reader :config
 
-    def initialize(config)
-      @config = config
+    def initialize
+      @config = Configuration.load
     end
 
-    def convert!(path)
+    # @param [Md2key::Nodes::Presentation] ast
+    def convert!(ast)
       prepare_document_base
-      markdown = Markdown.new(path)
-      generate_contents(markdown)
+      generate_contents(ast)
     ensure
       Keynote.delete_template_slide
     end
@@ -21,12 +24,12 @@ module Md2key
       Keynote.delete_extra_slides
     end
 
-    def generate_contents(markdown)
+    def generate_contents(ast)
       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|
+      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)

data/lib/md2key/keynote.rb

@@ -1,6 +1,6 @@
-require 'md2key/pbcopy'
-require 'md2key/diagram'
 require 'erb'
+require 'md2key/diagram'
+require 'md2key/highlight'
 
 module Md2key
   class Keynote
@@ -10,12 +10,12 @@ module Md2key
 
     class << self
       # You must provide a first slide as a cover slide.
-      # @param [Md2key::Slide] slide
+      # @param [Md2key::Nodes::Slide] slide
       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
+      # @param [Md2key::Nodes::Slide] slide
       # @param [String] master_name
       def create_slide(slide, master_name)
         if slide.lines.any?(&:indented?)
@@ -26,7 +26,7 @@ module Md2key
         end
       end
 
-      # @param [Md2key::Slide] slide
+      # @param [Md2key::Nodes::Slide] slide
       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
@@ -117,7 +117,7 @@ module Md2key
         execute_applescript('slides_count').to_i
       end
 
-      # @param [Md2key::Slide] slide
+      # @param [Md2key::Nodes::Slide] slide
       # @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)
@@ -126,12 +126,19 @@ module Md2key
         current_indent = 0
         slide.lines.each_with_index do |line, index|
           # Using copy and paste to input multibyte chars
-          Pbcopy.copy(line.text)
+          pbcopy(line.text)
           paste_and_indent(line.indent - current_indent, insert_newline: index < last_index)
           current_indent = line.indent
         end
       end
 
+      def pbcopy(str)
+        IO.popen('pbcopy', 'w') do |io|
+          io.write(str)
+          io.close_write
+        end
+      end
+
       def paste_and_indent(indent, insert_newline: true)
         execute_applescript('paste_and_indent', indent, insert_newline)
       end
@@ -140,7 +147,11 @@ module Md2key
       def execute_applescript(script_name, *args)
         path = script_path(script_name)
         script = ERB.new(File.read(path)).result
-        IO.popen(['osascript', '-e', script, *args.map(&:to_s)], &:read)
+        IO.popen(['osascript', '-', *args.map(&:to_s)], 'r+') do |io|
+          io.write(script)
+          io.close_write
+          io.read
+        end
       end
 
       def script_path(script_name)

data/lib/md2key/nodes/code.rb

@@ -0,0 +1,6 @@
+module Md2key
+  module Nodes
+    class Code < Struct.new(:source, :extension)
+    end
+  end
+end

data/lib/md2key/nodes/line.rb

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

data/lib/md2key/nodes/presentation.rb

@@ -0,0 +1,6 @@
+module Md2key
+  module Nodes
+    class Presentation < Struct.new(:cover, :slides)
+    end
+  end
+end

data/lib/md2key/nodes/slide.rb

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

data/lib/md2key/nodes/table.rb

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

data/lib/md2key/nodes.rb

@@ -0,0 +1,5 @@
+require 'md2key/nodes/code'
+require 'md2key/nodes/line'
+require 'md2key/nodes/presentation'
+require 'md2key/nodes/slide'
+require 'md2key/nodes/table'

data/lib/md2key/{markdown.rb → parser.rb}

@@ -1,41 +1,28 @@
-require 'md2key/line'
-require 'md2key/slide'
-require 'md2key/table'
+require 'md2key/nodes'
 require 'oga'
 require 'redcarpet'
 
-# Parse markdown, generate AST and convert it to slides.
-# This is created to be compatible with Deckset.
+# Parse markdown and generate AST.
+# This is created to be compatible with Deckset as far as possible.
 # See: http://www.decksetapp.com/cheatsheet/
 module Md2key
-  class Markdown
-    def initialize(path)
-      markdown = File.read(path)
-      xhtml    = to_xhtml(markdown)
-      @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]
+  class Parser
+    # @param  [String] markdown
+    # @return [Md2key::Nodes::Presentation] ast
+    def parse(markdown)
+      slides = parse_slides(markdown)
+      cover  = slides.delete_at(0)
+      Nodes::Presentation.new(cover, slides)
     end
 
     private
 
-    def cached_slides
-      @cached_slides ||= generate_slides
-    end
-
-    def generate_slides
+    def parse_slides(markdown)
       slides = []
-      slide  = Slide.new
+      slide  = Nodes::Slide.new
 
-      @ast.children.each do |node|
+      html_nodes = Oga.parse_xml(to_xhtml(markdown))
+      html_nodes.children.each do |node|
         next unless node.is_a?(Oga::XML::Element)
 
         case node.name
@@ -45,7 +32,7 @@ module Md2key
           # more compatibility with Deckset.
           # See: https://github.com/k0kubun/md2key/pull/2
           if slides.any?
-            slide = Slide.new
+            slide = Nodes::Slide.new
           end
 
           slides << slide
@@ -80,7 +67,7 @@ module Md2key
             row_data << row_text
             rows += 1
           end
-          slide.table = Table.new(rows, columns, row_data)
+          slide.table = Nodes::Table.new(rows, columns, row_data)
         when 'p'
           node.children.each do |child|
             if child.is_a?(Oga::XML::Element) && child.name == 'img'
@@ -90,13 +77,13 @@ module Md2key
               slide.note = child.text.sub(/^\^ /, '')
               next
             end
-            slide.lines << Line.new(child.text)
+            slide.lines << Nodes::Line.new(child.text)
           end
         when 'pre'
           node.children.each do |child|
             next if !child.is_a?(Oga::XML::Element) || child.name != 'code'
             extension = child.attribute('class') ? child.attribute('class').value : nil
-            slide.code = Code.new(child.text, extension)
+            slide.code = Nodes::Code.new(child.text, extension)
           end
         when 'hr'
           # noop
@@ -105,7 +92,7 @@ module Md2key
       slides
     end
 
-    # @return [Array<Md2Key::Line>]
+    # @return [Array<Md2key::Nodes::Line>]
     def li_lines(ul_node, indent: 0)
       return [] unless ul_node.is_a?(Oga::XML::Element)
       return [] if ul_node.name != 'ul' && ul_node.name != 'ol'
@@ -119,7 +106,7 @@ module Md2key
           case node
           when Oga::XML::Text
             text = node.text.strip
-            lines << Line.new(text, indent) unless text.empty?
+            lines << Nodes::Line.new(text, indent) unless text.empty?
           when Oga::XML::Element
             next if node.name != 'ul'
             lines.concat(li_lines(node, indent: indent + 1))
@@ -134,7 +121,7 @@ module Md2key
         Redcarpet::Render::XHTML.new(
           escape_html: true,
         ),
-        fenced_code_blocks: true, :tables => true
+        fenced_code_blocks: true, tables: true
       )
       redcarpet.render(markdown)
     end

data/lib/md2key/version.rb

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

data/lib/md2key.rb

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

data/md2key.gemspec

@@ -4,23 +4,27 @@ $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 require 'md2key/version'
 
 Gem::Specification.new do |spec|
-  spec.name          = "md2key"
+  spec.name          = 'md2key'
   spec.version       = Md2key::VERSION
-  spec.authors       = ["Takashi Kokubun"]
-  spec.email         = ["takashi-kokubun@cookpad.com"]
+  spec.authors       = ['Takashi Kokubun']
+  spec.email         = ['takashikkbn@gmail.com']
 
-  spec.summary       = %q{Convert markdown to keynote}
-  spec.description   = %q{Convert markdown to keynote}
-  spec.homepage      = "https://github.com/k0kubun/md2key"
+  spec.summary       = 'Convert markdown to keynote'
+  spec.description   = 'Convert markdown to keynote'
+  spec.homepage      = 'https://github.com/k0kubun/md2key'
+  spec.license       = 'MIT'
 
-  spec.files         = `git ls-files -z`.split("\x0").reject { |f| f.match(%r{^(test|spec|features)/}) }
-  spec.executables   = spec.files.grep(%r{^bin/}) { |f| File.basename(f) }
-  spec.require_paths = ["lib"]
+  spec.files         = `git ls-files -z`.split("\x0").reject do |f|
+    f.match(%r{^(test|spec|features)/})
+  end
+  spec.bindir        = 'exe'
+  spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
+  spec.require_paths = ['lib']
 
-  spec.add_dependency "thor", "~> 0.19"
-  spec.add_dependency "redcarpet", "~> 3.3"
-  spec.add_dependency "oga", "~> 1.2"
-  spec.add_development_dependency "bundler", "~> 1.10"
-  spec.add_development_dependency "rake", "~> 10.0"
-  spec.add_development_dependency "pry"
+  spec.add_dependency 'thor', '~> 0.19'
+  spec.add_dependency 'redcarpet', '~> 3.3'
+  spec.add_dependency 'oga', '~> 1.2'
+  spec.add_development_dependency 'bundler', '~> 1.12'
+  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.0
+  version: 0.8.1
 platform: ruby
 authors:
 - Takashi Kokubun
 autorequire: 
-bindir: bin
+bindir: exe
 cert_chain: []
-date: 2016-10-04 00:00:00.000000000 Z
+date: 2016-10-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
@@ -58,14 +58,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.10'
+        version: '1.12'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.10'
+        version: '1.12'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -96,7 +96,7 @@ dependencies:
         version: '0'
 description: Convert markdown to keynote
 email:
-- takashi-kokubun@cookpad.com
+- takashikkbn@gmail.com
 executables:
 - md2key
 extensions: []
@@ -105,24 +105,28 @@ files:
 - ".gitignore"
 - CHANGELOG.md
 - Gemfile
+- LICENSE.txt
 - README.md
 - Rakefile
 - assets/background.png
-- bin/md2key
+- bin/console
+- bin/setup
+- exe/md2key
 - 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
 - lib/md2key/keynote.rb
-- lib/md2key/line.rb
-- lib/md2key/markdown.rb
-- lib/md2key/pbcopy.rb
-- lib/md2key/slide.rb
-- lib/md2key/table.rb
+- lib/md2key/nodes.rb
+- lib/md2key/nodes/code.rb
+- lib/md2key/nodes/line.rb
+- lib/md2key/nodes/presentation.rb
+- lib/md2key/nodes/slide.rb
+- lib/md2key/nodes/table.rb
+- lib/md2key/parser.rb
 - lib/md2key/version.rb
 - md2key.gemspec
 - scripts/activate_slide.scpt.erb
@@ -143,7 +147,8 @@ files:
 - scripts/update_slide.scpt.erb
 - scripts/update_table.scpt.erb
 homepage: https://github.com/k0kubun/md2key
-licenses: []
+licenses:
+- MIT
 metadata: {}
 post_install_message: 
 rdoc_options: []

data/lib/md2key/code.rb

@@ -1,4 +0,0 @@
-module Md2key
-  class Code < Struct.new(:source, :extension)
-  end
-end

data/lib/md2key/line.rb

@@ -1,12 +0,0 @@
-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/pbcopy.rb

@@ -1,10 +0,0 @@
-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/slide.rb

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

data/lib/md2key/table.rb

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