md2key 0.3.1 → 0.3.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 29fd6b603848015b2693b9fcce9711bfa0263f5d
-  data.tar.gz: ad03c56d3d802deb901ed64ec3114b36e976a05c
+  metadata.gz: 5bf3372d25640ed9712e7448a44282d821a19ca4
+  data.tar.gz: 7c0def31d4368cb7ce5c4e937079fbc0b77869f2
 SHA512:
-  metadata.gz: 0f0d5622209334146fd148b4aae44a520066bab4df69f5fbb1ad56a9400bc6db3f091a3437b762ef471dcf641947e10b7e79c9a5346e3d0d92ec2b922f102bb0
-  data.tar.gz: c5209f6eca3d337ed1c6f9023711042194fa04aaa1675c94d0f3b713bf41a1fe5f0f7d4f4876bb7c80fbe2872876bdcafe1a7146da1e7b4ccb53bb7e4e9ea666
+  metadata.gz: f008ec28023e80ab3911b591850422f8a8fe01ff966c13e95da32e641544c468ca24f99aa3aff7e4da93e266939f3aeb7ee2df02fc012dd6b745e507e6ffab5a
+  data.tar.gz: 406465a82cef73f131d84ef61030c143753d0cd653e0926f9ff7ba27777552df19e253bb2ee9d490f79fad5479dabf3e07b1b67273d2f57f95abd098dcea6863

data/CHANGELOG.md

@@ -1,3 +1,7 @@
+# v0.3.2
+
+- You no longer need to select the second slide by hand
+
 # v0.3.1
 
 - Support inserting images

data/README.md

@@ -9,37 +9,12 @@ Convert your markdown to keynote.
 - 3. Create a second slide to choose a slide layout
 - 4. Then execute `gem install md2key && md2key markdown.md`
 
-### Example
-
 ![](https://i.gyazo.com/9d4d00164683f516d44b3e536b3dd3e9.gif)
 
-The slides in the movie are generated from following markdown.
-
-```markdown
-# The presentation
-
-@k0kubun
-
----
-
-# Hello world
-
-- I'm takashi kokubun
-- This is a pen
-
----
-
-# How are you?
-
-- I'm fine thank you
-```
-
-This is designed to be compatible with [Deckset](http://www.decksetapp.com/).
-
-### No horizontal lines
+### Basic example
 
-Currently md2key supports a short format that does not need `---`.
-Headers always create a new slide.
+The slides in the movie can be generated with following markdown.  
+You can separate slides with `---` just for readability.
 
 ```markdown
 # The presentation
@@ -53,9 +28,9 @@ Headers always create a new slide.
 - I'm fine thank you
 ```
 
-### Image
+### Insert image
 
-![](https://i.gyazo.com/c9870e72ddf35a9dbd487fad4e6968bd.png)
+<img src='https://i.gyazo.com/c9870e72ddf35a9dbd487fad4e6968bd.png' width='60%'>
 
 ```markdown
 # image slide

data/lib/md2key/converter.rb

@@ -11,17 +11,26 @@ module Md2key
     end
 
     def generate_keynote!
-      Keynote.activate
-      Keynote.update_cover(@markdown.cover.title, @markdown.cover.lines.join('\n'))
+      prepare_document_base
+      generate_contents
+    ensure
+      Keynote.delete_template_slide
+    end
+
+    private
 
+    def prepare_document_base
+      Keynote.activate
+      Keynote.ensure_template_slide_availability
       Keynote.delete_extra_slides
-      Keynote.show_template_slide # to select a layout of slide
+    end
+
+    def generate_contents
+      Keynote.update_cover(@markdown.cover.title, @markdown.cover.lines.join('\n'))
       @markdown.slides.each_with_index do |slide, index|
         Keynote.create_slide(slide.title, slide.lines.join('\n'))
         Keynote.insert_image(slide.image) if slide.image
       end
-
-      Keynote.delete_template_slide
     end
   end
 end

data/lib/md2key/keynote.rb

@@ -24,14 +24,13 @@ module Md2key
         APPLE
       end
 
-      # You must provide a second slide as a template slide.
-      # This is just a workaround to select a layout of slides.
-      # If you tell `make new slide`, your current slide's theme
-      # will be used.
-      def show_template_slide
-        create_slide('', '') if slides_count < 2
+      def ensure_template_slide_availability
+        return if slides_count >= 2
+
         tell_keynote(<<-APPLE.unindent)
-          show slide #{TEMPLATE_SLIDE_INDEX} of document 1
+          tell document 1
+            make new slide
+          end
         APPLE
       end
 
@@ -62,8 +61,12 @@ module Md2key
       def create_slide(title, content)
         tell_keynote(<<-APPLE.unindent)
           tell document 1
-            set newSlide to make new slide
+            -- 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 #{TEMPLATE_SLIDE_INDEX} to before slide #{TEMPLATE_SLIDE_INDEX}
 
+            set newSlide to make new slide
             tell newSlide
               set object text of default title item to "#{title}"
               set object text of default body item to "#{content}"

data/lib/md2key/version.rb

@@ -1,3 +1,3 @@
 module Md2key
-  VERSION = "0.3.1"
+  VERSION = "0.3.2"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: md2key
 version: !ruby/object:Gem::Version
-  version: 0.3.1
+  version: 0.3.2
 platform: ruby
 authors:
 - Takashi Kokubun