mdslide 3.1.0 → 3.2.0

data/.gitignore

@@ -0,0 +1,20 @@
+.*.swp
+*~
+pkg/*
+*.gem
+*.rbc
+.bundle
+.config
+.yardoc
+Gemfile.lock
+InstalledFiles
+_yardoc
+coverage
+doc/
+lib/bundler/man
+pkg
+rdoc
+spec/reports
+test/tmp
+test/version_tmp
+tmp

data/Gemfile

@@ -0,0 +1,4 @@
+source 'https://rubygems.org'
+
+# Specify your gem's dependencies in mdslide.gemspec
+gemspec

data/Rakefile

@@ -1,28 +1,2 @@
-require 'rubygems'
-gem 'hoe', '>= 2.1.0'
-require 'hoe'
-require 'fileutils'
-require './lib/mdslide'
-
-Hoe.plugin :newgem
-# Hoe.plugin :website
-# Hoe.plugin :cucumberfeatures
-
-# Generate all the Rake tasks
-# Run 'rake -T' to see list of generated tasks (from gem root directory)
-$hoe = Hoe.spec 'mdslide' do
-  self.developer 'Allu Yamane', 'ymrl@ymrl.net'
-  #self.post_install_message = 'PostInstall.txt' # TODO remove if post-install message not required
-  self.rubyforge_name       = self.name # TODO this is default value
-  self.extra_deps         = [
-      ['args_parser','>= 0.0.1'],
-      ['kramdown', '>= 0.13.6'],
-  ]
-end
-
-Dir['tasks/**/*.rake'].each { |t| load t }
-require 'newgem/tasks'
-
-# TODO - want other tests/tasks run by default? Add them to the list
-# remove_task :default
-#task :default => [:spec, :features]
+#!/usr/bin/env rake
+require "bundler/gem_tasks"

data/assets/css/base.css

@@ -89,3 +89,6 @@ body {
 #toolbox a:hover {
 	text-decoration:none;
 }
+#toolbox input {
+	display:none;
+}

data/assets/js/slides.coffee

@@ -33,6 +33,7 @@ jQuery ->
     return div
 
   showOutline = ()->
+    createOutline()
     jQuery(KEYTARGET).unbind('keyup',keyAction)
     jQuery('#outline').show()
     jQuery('#slides').hide()
@@ -43,10 +44,10 @@ jQuery ->
   hideOutline = ()->
     jQuery(KEYTARGET).unbind('keyup',keyAction)
     jQuery(KEYTARGET).keyup keyAction
-    jQuery('#outline').hide()
     jQuery('#slides').show()
     jQuery('#toolbox .forOutline').hide()
     jQuery('#toolbox .forSlides').show()
+    jQuery('#outline').remove()
     jQuery('body').css overflow:'hidden'
 
   showSlide = (num)->
@@ -111,9 +112,29 @@ jQuery ->
       #else if sh < h
       t.css 'top', h/2 - sh/2
 
-  jQuery(window).bind('resize',resize)
-  resize()
-  jQuery('img').bind('load',resize)
+  jQuery('#resizeToggle').change (e)->
+    t = $(this)
+    if t.attr('checked')
+      console.log true
+      jQuery(window).bind('resize',resize)
+      resize()
+      jQuery('img').bind('load',resize)
+      jQuery('#resizeLabel').html("&#9745; Adjustment : ON&nbsp;")
+      jQuery('body').css('overflow','hidden')
+    else
+      console.log false
+      jQuery(window).unbind('resize',resize)
+      jQuery('img' ).unbind('load'  ,resize)
+      jQuery('.slide').each ()->
+        t = jQuery(this)
+        t.css TRANSFORM,''
+        t.css
+          width : ''
+          height: ''
+          top:    0
+      jQuery('#resizeLabel').html("&#9744; Adjustment : OFF")
+      jQuery('body').css('overflow','visible')
+  jQuery('#resizeToggle').change()
 
   createOutline()
   checkURL(true)

data/assets/js/slides.js

@@ -1,3 +1,4 @@
+// Generated by CoffeeScript 1.3.1
 (function() {
 
   jQuery(function() {
@@ -40,6 +41,7 @@
       return div;
     };
     showOutline = function() {
+      createOutline();
       jQuery(KEYTARGET).unbind('keyup', keyAction);
       jQuery('#outline').show();
       jQuery('#slides').hide();
@@ -52,10 +54,10 @@
     hideOutline = function() {
       jQuery(KEYTARGET).unbind('keyup', keyAction);
       jQuery(KEYTARGET).keyup(keyAction);
-      jQuery('#outline').hide();
       jQuery('#slides').show();
       jQuery('#toolbox .forOutline').hide();
       jQuery('#toolbox .forSlides').show();
+      jQuery('#outline').remove();
       return jQuery('body').css({
         overflow: 'hidden'
       });
@@ -104,7 +106,9 @@
           show = true;
         }
       }
-      if (show) showSlide(slideNum);
+      if (show) {
+        showSlide(slideNum);
+      }
       if (outline) {
         return showOutline();
       } else {
@@ -136,9 +140,34 @@
         return t.css('top', h / 2 - sh / 2);
       });
     };
-    jQuery(window).bind('resize', resize);
-    resize();
-    jQuery('img').bind('load', resize);
+    jQuery('#resizeToggle').change(function(e) {
+      var t;
+      t = $(this);
+      if (t.attr('checked')) {
+        console.log(true);
+        jQuery(window).bind('resize', resize);
+        resize();
+        jQuery('img').bind('load', resize);
+        jQuery('#resizeLabel').html("☑ Adjustment : ON ");
+        return jQuery('body').css('overflow', 'hidden');
+      } else {
+        console.log(false);
+        jQuery(window).unbind('resize', resize);
+        jQuery('img').unbind('load', resize);
+        jQuery('.slide').each(function() {
+          t = jQuery(this);
+          t.css(TRANSFORM, '');
+          return t.css({
+            width: '',
+            height: '',
+            top: 0
+          });
+        });
+        jQuery('#resizeLabel').html("☐ Adjustment : OFF");
+        return jQuery('body').css('overflow', 'visible');
+      }
+    });
+    jQuery('#resizeToggle').change();
     createOutline();
     checkURL(true);
     setInterval(checkURL, 50);

data/lib/mdslide.rb

@@ -1,8 +1,11 @@
 $:.unshift(File.dirname(__FILE__)) unless
   $:.include?(File.dirname(__FILE__)) || $:.include?(File.expand_path(File.dirname(__FILE__)))
 
+require 'mdslide/themes'
+require 'mdslide/config'
+require 'mdslide/path'
 require 'mdslide/creator'
 
 module Mdslide
-  VERSION = '3.1.0'
+  VERSION = '3.2.0'
 end

data/lib/mdslide/command.rb

@@ -6,20 +6,10 @@ require 'yaml'
 require 'fileutils'
 
 module Mdslide
-
   ASSETS_DIR = File.expand_path(File.dirname(__FILE__) + '/../../assets')
 
-  def Mdslide.find_path path, dir_list
-    dir_list.each do |dir_path|
-      if File.exist?(dir_path + path)
-        return dir_path
-      end
-    end
-    return nil
-  end
-
-  def Mdslide.command
-    parser = ArgsParser.parse ARGV do
+  def Mdslide.command argv=ARGV
+    parser = ArgsParser.parse argv do
       arg :version,"Shows Mdslide Version", :alias => :v
       arg :help,   "Shows Help",      :alias => :h
       arg :input,  "Input File",      :alias => :i
@@ -41,13 +31,6 @@ module Mdslide
       return 0
     end
 
-    #config_path = File.expand_path(CONFIG_DIR + '/config.yaml')
-    #my_config = nil
-    #if File.exist? config_path
-    #  my_config = YAML.load_file(config_path)
-    #  Themes.merge! my_config[:themes]
-    #end
-
     creator = Creator.new
     creator.title = parser[:title]
     default_theme = parser[:theme]
@@ -70,22 +53,23 @@ module Mdslide
       
       if output_js
         js_path = output_dir_path+'/js'
-        #Dir::mkdir(js_path) unless Dir.exist?(js_path)
         Dir::mkdir(js_path) unless File.exist?(js_path) and File.directory?(js_path)
-
         (creator.scripts + creator.theme_scripts).each do |e| 
-          src_dir = Mdslide.find_path(e,src_dirs.map{|m| "#{m}/js/"})
-          FileUtils.cp("#{src_dir}/#{e}",js_path) if src_dir
+          src_file = Mdslide.find_js_path(e)
+          FileUtils.cp("#{src_file}",js_path)
+          #src_dir = Mdslide.find_path(e,src_dirs.map{|m| "#{m}/js/"})
+          #FileUtils.cp("#{src_dir}/#{e}",js_path) if src_dir
         end
       end
       if output_css
         css_path = output_dir_path+'/css'
-        #Dir::mkdir(css_path) unless Dir.exist?(css_path)
         Dir::mkdir(css_path) unless File.exist?(css_path) and File.directory?(css_path)
 
         (creator.stylesheets + creator.theme_stylesheets).each do |e| 
-          src_dir = Mdslide.find_path(e,src_dirs.map{|m| "#{m}/css/"})
-          FileUtils.cp("#{src_dir}/#{e}",css_path) if src_dir
+          src_file = Mdslide.find_css_path(e)
+          FileUtils.cp("#{src_file}",css_path)
+          #src_dir = Mdslide.find_path(e,src_dirs.map{|m| "#{m}/css/"})
+          #FileUtils.cp("#{src_dir}/#{e}",css_path) if src_dir
         end
       end
 

data/lib/mdslide/creator.rb

@@ -1,8 +1,8 @@
 require 'rubygems'
 require 'kramdown'
 require 'erb'
-require 'mdslide/themes'
-require 'mdslide/config'
+require 'kconv'
+
 
 module Mdslide
 
@@ -35,7 +35,7 @@ module Mdslide
 
     def convert_markdown md
       body = ''
-      md.split(/^\/\/+$/).map do |slide|
+      md.toutf8.gsub(/\r\n?/, "\n").split(/^\/\/+$/).map do |slide|
         if slide =~ /(^|\s)(https?:\/\/[^\s]+)($|\s)/
           slide.gsub!(/(^|\s)(https?:\/\/[^\s]+)($|\s)/){"#{$1}[#{$2}](#{$2})#{$3}"}
         end

data/lib/mdslide/path.rb

@@ -0,0 +1,38 @@
+module Mdslide
+
+  def Mdslide.find_file file, dir_list
+    dir_list.each do |dir_path|
+      if File.exist?(dir_path + file)
+        return dir_path + file
+      end
+    end
+    return nil
+  end
+
+  def Mdslide.find_path path, dir_list
+    dir_list.each do |dir_path|
+      if File.exist?(dir_path + path)
+        return dir_path
+      end
+    end
+    return nil
+  end
+
+  def Mdslide.get_directories current = nil
+    dirs = [CONFIG_DIR,ASSETS_DIR]
+    dirs.unshift current if current 
+    return dirs
+  end
+
+  def Mdslide.find_js_path file,current = nil
+    dirs = Mdslide.get_directories(current).map{|e| "#{e}/js/"}
+    return Mdslide.find_file file,dirs
+  end
+
+  def Mdslide.find_css_path file,current = nil
+    dirs = Mdslide.get_directories(current).map{|e| "#{e}/css/"}
+    return Mdslide.find_file file,dirs
+  end
+
+end
+

data/mdslide.gemspec

@@ -0,0 +1,21 @@
+# -*- encoding: utf-8 -*-
+require File.expand_path('../lib/mdslide', __FILE__)
+
+Gem::Specification.new do |gem|
+  gem.authors       = ["Allu Yamane"]
+  gem.email         = ["ymrl@ymrl.net"]
+  gem.description   = %q{HTML5 presentation generator}
+  gem.summary       = %q{HTML5 presentation generator}
+  gem.homepage      = "http://ymrl.github.com/mdslide/"
+
+  gem.files         = `git ls-files`.split($\)
+  gem.executables   = gem.files.grep(%r{^bin/}).map{ |f| File.basename(f) }
+  gem.test_files    = gem.files.grep(%r{^(test|spec|features)/})
+  gem.name          = "mdslide"
+  gem.require_paths = ["lib"]
+  gem.version       = Mdslide::VERSION
+  gem.add_dependency 'args_parser', '>= 0.0.1'
+  gem.add_dependency 'kramdown',    '>= 0.13.6'
+  gem.add_development_dependency('rspec', '~> 2.10.0')
+  gem.add_development_dependency('rake')
+end

data/samples/hoge.md

@@ -0,0 +1,38 @@
+Test presentation
+====================
+Allu Yamane  
+2012/04/21
+
+///
+
+First Slide
+-----------------
+* This is list
+* This is second element
+  * this is nested list
+    * this is second nested element
+* And more...
+
+////
+
+
+Second Slide
+----------------
+1. hogehoge
+2. fugafuga
+   * mogemoge
+   * piyopiyo
+////
+
+
+Third Slide
+---------------
+
+    10.times do |i|
+            puts "hello #{i}"
+    end
+///
+Fourth Slide
+-----------
+test
+

data/samples/readme.md

@@ -0,0 +1,85 @@
+スライド作成システムMdslide
+==============
+@ymrl
+
+//////
+
+Mdslideとは
+------------
+* Markdownを使ったスライド作成システム
+* Rubygemsでインストール可能
+* HTML5 + JavaScriptによるスライド
+* MIT Lisence
+
+//////
+
+Mdslideの機能
+-------------
+* Markdownファイルの変換
+* HTML+CSS+JavaScriptファイルの出力
+* Webサーバー機能
+//////
+Mdslide用Markdown
+----------------
+	First Slide
+	==========
+	My Name
+	/////
+	Second Slide
+	------
+	* list 1
+	* list 2
+	* list 3
+/////
+スライドに変換
+--------------
+	$ mdslide -i hoge.md -o hoge.html
+//////
+First Slide
+==========
+My Name
+/////
+Second Slide
+------
+* list 1
+* list 2
+* list 3
+/////////
+Mdslide Markdown
+--------------
+* /が複数個連続しているだけの行をスライド区切りとして扱う
+////////
+HTTPサーバー機能
+--------------
+	$ mdslide -i hoge.md -s
+
+* http://localhost:3000/
+* http://localhost:3000/black
+* 変換前・変換後をそれぞれ保存しなくていい
+//////////
+テーマ機能
+-------------
+	$ mdslide -i hoge.md -o hoge.html -t black
+
+* 2012年4月現在 white/black/takahashi のみ
+  * 増やしたい
+* サーバー起動後、/takahashi とかでプレビュー
+* デフォルトでサイズ調整機能あり
+//////
+
+アウトライン表示
+-------------
+右下の [View Outline](#outline) をクリック
+
+//////
+便利な点
+--------
+* Webブラウザさえあれば見られる
+* スライドの見栄えとか気にしなくていい
+	* 作業量が少ない
+	* 発表内容に集中できる
+* 全体を俯瞰しやすい
+/////
+画像も使える
+----------
+![kitty](kitty.jpg)

data/samples/takahashi.md

@@ -0,0 +1,51 @@
+高橋メソッド
+//
+の
+//
+特徴
+//
+1
+//
+字
+//
+でかい
+//
+2
+//
+文字列
+//
+短い
+//
+3
+//
+テンポ
+//
+早い
+//
+超高速
+//
+1秒1枚
+//
+インパクト  
+//
+重視
+//
+字が小さいと1枚にたくさん書けるわけですが、こうなると読みづらいですし、プレゼン自体もただスライドに書かれている文字を読み上げるだけの非常に単調なものになってしまいます。高橋メソッドであればとにかくテンポよく進められますし、短く字をでかくする過程で内容も整理されてわかりやすくなります。
+//
+テンポ
+//
+良い
+//
+わかり  
+やすい
+//
+スライド  
+作ると
+//
+喋ることも  
+整理される
+//
+良い
+//
+すばらしい
+

data/script/destroy

@@ -0,0 +1,14 @@
+#!/usr/bin/env ruby
+APP_ROOT = File.expand_path(File.join(File.dirname(__FILE__), '..'))
+
+begin
+  require 'rubigen'
+rescue LoadError
+  require 'rubygems'
+  require 'rubigen'
+end
+require 'rubigen/scripts/destroy'
+
+ARGV.shift if ['--help', '-h'].include?(ARGV[0])
+RubiGen::Base.use_component_sources! [:rubygems, :newgem, :newgem_theme, :test_unit]
+RubiGen::Scripts::Destroy.new.run(ARGV)

data/script/generate

@@ -0,0 +1,14 @@
+#!/usr/bin/env ruby
+APP_ROOT = File.expand_path(File.join(File.dirname(__FILE__), '..'))
+
+begin
+  require 'rubigen'
+rescue LoadError
+  require 'rubygems'
+  require 'rubigen'
+end
+require 'rubigen/scripts/generate'
+
+ARGV.shift if ['--help', '-h'].include?(ARGV[0])
+RubiGen::Base.use_component_sources! [:rubygems, :newgem, :newgem_theme, :test_unit]
+RubiGen::Scripts::Generate.new.run(ARGV)

data/spec/mdslide_spec.rb

@@ -0,0 +1,32 @@
+require File.dirname(__FILE__) + '/spec_helper.rb'
+
+# Time to add your specs!
+# http://rspec.info/
+describe "Mdslide" do
+  it 'has some themes' do
+    Mdslide::Themes.should have_key(:white)
+    Mdslide::Themes[:white][:css].should have_at_least(1).item
+    Mdslide::Themes.should have_key(:black)
+    Mdslide::Themes[:black][:css].should have_at_least(1).item
+  end
+
+  describe "Creator" do
+    before do
+      @creator = Mdslide::Creator.new
+    end
+
+    it "can be initialized" do
+      @creator.should be_true
+      @creator.should be_kind_of(Mdslide::Creator)
+    end
+    it "can be set theme" do
+      @creator.set_theme('black').should be_true
+      @creator.theme_stylesheets.should have_at_least(1).items
+    end
+    it "can convert markdown" do
+      slide = @creator.convert_markdown("sample")
+      slide.should be_true
+      slide.should be_kind_of(String)
+    end
+  end
+end

data/templates/page.html.erb

@@ -16,9 +16,16 @@
     </div>
   <div id="toolbox">
     <div class="forSlides">
-      <a href="#" class="prev">&lt;&lt;</a>
-      <a href="#outline">View Outline</a>
-      <a href="#" class="next">&gt;&gt;</a>
+			<div>
+				<form>
+					<input name="resizeToggle" type="checkbox" id="resizeToggle" checked/><label for="resizeToggle" id="resizeLabel">&#9745; Adjustment : ON</label>
+				</form>
+			</div>
+			<div>
+				<a href="#" class="prev">&lt;&lt;</a>
+				<a href="#outline">View Outline</a>
+				<a href="#" class="next">&gt;&gt;</a>
+			</div>
     </div>
     <div class="forOutline">
       <a href="#" class="toSlide">View Slide</a>

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mdslide
 version: !ruby/object:Gem::Version
-  version: 3.1.0
+  version: 3.2.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-05-24 00:00:00.000000000 Z
+date: 2012-11-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: args_parser
-  requirement: &72351760 !ruby/object:Gem::Requirement
+  requirement: &80611960 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: 0.0.1
   type: :runtime
   prerelease: false
-  version_requirements: *72351760
+  version_requirements: *80611960
 - !ruby/object:Gem::Dependency
   name: kramdown
-  requirement: &72350550 !ruby/object:Gem::Requirement
+  requirement: &80611710 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,90 +32,80 @@ dependencies:
         version: 0.13.6
   type: :runtime
   prerelease: false
-  version_requirements: *72350550
+  version_requirements: *80611710
 - !ruby/object:Gem::Dependency
-  name: rdoc
-  requirement: &72349590 !ruby/object:Gem::Requirement
+  name: rspec
+  requirement: &80611390 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '3.10'
+        version: 2.10.0
   type: :development
   prerelease: false
-  version_requirements: *72349590
+  version_requirements: *80611390
 - !ruby/object:Gem::Dependency
-  name: newgem
-  requirement: &72348750 !ruby/object:Gem::Requirement
+  name: rake
+  requirement: &80611060 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 1.5.3
+        version: '0'
   type: :development
   prerelease: false
-  version_requirements: *72348750
-- !ruby/object:Gem::Dependency
-  name: hoe
-  requirement: &72347670 !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '3.0'
-  type: :development
-  prerelease: false
-  version_requirements: *72347670
-description: Mdslide is an slide generator for presentation based on Markdown (RedCarpet).
-  It can convert extended Markdown file to HTML it can show as aslides and/or outlines.
-  It outputs HTML, CSS and Javascript files, also you can use this HTTP Server for
-  your convinience.
+  version_requirements: *80611060
+description: HTML5 presentation generator
 email:
 - ymrl@ymrl.net
 executables:
 - mdslide
 extensions: []
-extra_rdoc_files:
-- History.txt
-- Manifest.txt
-- PostInstall.txt
-- README.rdoc
+extra_rdoc_files: []
 files:
+- .gitignore
+- Gemfile
 - History.txt
 - Manifest.txt
 - PostInstall.txt
 - README.rdoc
 - Rakefile
-- lib/mdslide.rb
-- lib/mdslide/command.rb
-- lib/mdslide/creator.rb
-- lib/mdslide/themes.rb
-- lib/mdslide/config.rb
-- templates/page.html.erb
-- templates/slide.html.erb
-- assets/themes.yaml
-- assets/js/jquery.min.js
-- assets/js/slides.js
-- assets/js/slides.coffee
 - assets/css/base.css
 - assets/css/color-black.css
 - assets/css/color-white.css
 - assets/css/position-takahashi.css
 - assets/css/transition-crossfade.css
 - assets/css/transition-hide-show.css
+- assets/js/jquery.min.js
+- assets/js/slides.coffee
+- assets/js/slides.js
+- assets/themes.yaml
+- bin/mdslide
+- lib/mdslide.rb
+- lib/mdslide/command.rb
+- lib/mdslide/config.rb
+- lib/mdslide/creator.rb
+- lib/mdslide/path.rb
+- lib/mdslide/themes.rb
+- mdslide.gemspec
+- samples/hoge.md
+- samples/kitty.jpg
+- samples/readme.md
+- samples/takahashi.md
 - script/console
+- script/destroy
+- script/generate
 - spec/creator_spec.rb
+- spec/mdslide_spec.rb
 - spec/spec.opts
 - spec/spec_helper.rb
 - tasks/rspec.rake
-- bin/mdslide
-- .gemtest
-homepage: http://github.com/ymrl/mdslide
+- templates/page.html.erb
+- templates/slide.html.erb
+homepage: http://ymrl.github.com/mdslide/
 licenses: []
 post_install_message: 
-rdoc_options:
-- --main
-- README.rdoc
+rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
@@ -131,9 +121,13 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: mdslide
+rubyforge_project: 
 rubygems_version: 1.8.11
 signing_key: 
 specification_version: 3
-summary: Mdslide is an slide generator for presentation based on Markdown (RedCarpet)
-test_files: []
+summary: HTML5 presentation generator
+test_files:
+- spec/creator_spec.rb
+- spec/mdslide_spec.rb
+- spec/spec.opts
+- spec/spec_helper.rb