vimdeck 0.0.3 → 0.0.4

data/README.md

@@ -1,4 +1,4 @@
-# vimdown
+# vimdeck
 
 VIM as a presentation tool
 
@@ -7,24 +7,24 @@ VIM as a presentation tool
 
 1. Write your slides in a markdown file
 
-2. Run `bin/vimdown` and it will generate a file for each slide and open them in VIM
+2. Run `bin/vimdeck` and it will generate a file for each slide and open them in VIM
 
 ## VIM Script
 
-Vimdown will also provide a script file that will set up keybindings for you.
+Vimdeck will also provide a script file that will set up keybindings for you.
 
 PageUp/Left go backwards
 PageDown/Right go forward
 
 ##Screenshots:
 
-Vimdown converts h1s and h2s into ascii art
+Vimdeck converts h1s and h2s into ascii art
 ![](img/demo1.png)
 
 Lists are displayed as they are written
 ![](img/demo2.png)
 
-Vimdown will also augment its vimscript to provide syntax highlighting
+Vimdeck will also augment its vimscript to provide syntax highlighting
 ![](img/demo3.png)
 
 Images are even converted to ascii art!

data/VERSION

@@ -1 +1 @@
-0.0.3
+0.0.4

data/lib/vimdeck.rb

@@ -16,7 +16,8 @@ module Vimdeck
   end
 
   def self.ascii_art(img)
-    AsciiArt.new(img)
+    a = AsciiArt.new(img)
+    a.to_ascii_art width: 30
   end
 
   def self.script_template
@@ -30,70 +31,62 @@ module Vimdeck
     @buffers = []
 
     Dir.mkdir("presentation") unless File.exists?("presentation")
+
     slides.each_with_index do |slide, i|
-      new_slide = ''
-      headers = []
+      code_block = false
 
       slide.each_line do |line|
-        match = line.match( /##\s*(.*)/ )
-        if match && match[1]
-          headers << artii(match[1], "small")
-        else
-          match = line.match( /#\s*(.*)/ )
+        match = line.match( /```(.*)$/ )
+        if !code_block && match && match[1]
+          code_block = true
+        elsif code_block && line.match( /```/ )
+          code_block=false
+        elsif !code_block
+          match = line.match( /##\s*(.*)\n/ )
           if match && match[1]
-            headers << artii(match[1], "large")
+            slide.sub!( match[0], artii(match[1], "small") + "\n" )
+          else
+            match = line.match( /#\s*(.*)\n/ )
+            if match && match[1]
+              slide.sub!( match[0], artii(match[1], "large") + "\n" )
+            else
+              match = line.match( /\!\[\]\(([^\(\)]*)\)/ )
+              if match && match[1]
+                slide.sub!(match[0], self.ascii_art(match[1]))
+              end
+            end
           end
         end
       end
 
-      rest = slide.gsub( /#+\s*(.*)\n/, '' )
-      images = rest.scan( /\!\[\]\([^\(\)]*\)/ )
-      text = rest.split( /\!\[\]\([^\(\)]*\)/ )
-
-      if images.length > 0
-        rest = ''
-        images.each_with_index do |img,j|
-          rest += text[j] if text[j]
-
-          a = AsciiArt.new(img.match(/\(([^\(\)]*)\)/)[1])
-          rest += a.to_ascii_art width: 30
-        end
-      end
-
       buffer = {:num => i + 1}
       code_height = 0
       code = nil
-      if rest
-        code = rest.match( /```([^\n]*)\n.*\n```/m )
-        if code
-          buffer[:code] = { :language => code[1] }
-          code_height = code[0].split("\n").length - 2
-          code = code[0].gsub( /```[^\n]*\n/, '' ).gsub( /\n```/, '' )
-          rest = rest.gsub( /```[^\n]*\n/, '' ).gsub( /\n```/, '' )
-        end
+      code = slide.match( /```([^\n]*)\n.*\n```/m )
+      if code
+        buffer[:code] = { :language => code[1] }
+        code_height = code[0].split("\n").length - 2
+        code = code[0].gsub( /```[^\n]*\n/, '' ).gsub( /\n```/, '' )
+        slide = slide.gsub( /```[^\n]*\n/, '' ).gsub( /\n```/, '' )
       end
 
-      headers.each do |h|
-        new_slide += h + "\n"
-      end
-      new_slide += rest if rest
-      new_slide += "\n" * 80
+      slide += "\n" * 80
 
       if code_height > 0
-        start = new_slide.index(code)
-        start = new_slide[0..start].split("\n").length
+        start = slide.index(code)
+        start = slide[0..start].split("\n").length
         buffer[:code][:end] = code_height + start - 1
         buffer[:code][:start] = start
       end
 
       spaces = "           "
-      new_slide = new_slide.gsub( /\n/, "\n#{spaces}" )
-      new_slide = spaces + new_slide
-      new_slide = new_slide.gsub( / *\n/, "\n" ).gsub( / *$/, '' )
+      slide = slide.gsub( /\n/, "\n#{spaces}" )
+      slide = spaces + slide
+      slide = slide.gsub( / *\n/, "\n" ).gsub( / *$/, '' )
 
 
       File.open("presentation/slide#{i}.md", "w") do |file|
-        file.write new_slide
+        file.write slide
       end
 
       @buffers << buffer

data/presentation/script.vim

@@ -18,7 +18,7 @@ b 4
 
 b 5
 
-10,14SyntaxInclude javascript
+10,15SyntaxInclude ruby
 
 
 b 6

data/presentation/slide2.md

@@ -1,8 +1,7 @@
-               _   __                __                       __   __    _      __
-              / | / /_  ______ ___  / /_  ___  ________  ____/ /  / /   (_)____/ /_
-             /  |/ / / / / __ `__ \/ __ \/ _ \/ ___/ _ \/ __  /  / /   / / ___/ __/
-            / /|  / /_/ / / / / / / /_/ /  __/ /  /  __/ /_/ /  / /___/ (__  ) /_
-           /_/ |_/\__,_/_/ /_/ /_/_.___/\___/_/   \___/\__,_/  /_____/_/____/\__/
+              _  __           __                 __  __   _    __
+             / |/ /_ ____ _  / / ___ _______ ___/ / / /  (_)__/ /_
+            /    / // /  ' \/ _ \ -_) __/ -_) _  / / /__/ (_-< __/
+           /_/|_/\_,_/_/_/_/_.__\__/_/  \__/\_,_/ /____/_/___\__/
 
 
            1. This is how a numbered list

data/presentation/slide4.md

@@ -7,11 +7,12 @@
 
            Vimdeck does syntax highlighting too!
 
-           var x = true;
+           require 'erb'
 
-           if ( x ) {
-             console.log( 'foo' );
-           }
+           template = ERB.new('template.erb')
+
+           # Compile template
+           template.result(binding)
 
 
 

data/slides.md

@@ -8,7 +8,7 @@ Presentations with nothing but vim
 ![](img/vim.png)
 
 
-# Numbered List
+## Numbered List
 
 1. This is how a numbered list
 2. Looks in vimdeck
@@ -26,12 +26,13 @@ Presentations with nothing but vim
 
 Vimdeck does syntax highlighting too!
 
-```javascript
-var x = true;
+```ruby
+require 'erb'
 
-if ( x ) {
-  console.log( 'foo' );
-}
+template = ERB.new('template.erb')
+
+# Compile template
+template.result(binding)
 ```
 
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: vimdeck
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.4
   prerelease: 
 platform: ruby
 authors:
@@ -39,7 +39,7 @@ files:
 - README.md
 - slides.md
 - VERSION
-- vimdeck-0.0.2.gem
+- vimdeck-0.0.4.gem
 - vimdeck.gemspec
 homepage: http://github.com/tybenz/vimdeck
 licenses: