mdslide 0.0.4 → 1.0.0

data/Rakefile

@@ -12,10 +12,10 @@ Hoe.plugin :newgem
 # 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.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         = [
-      ['ArgsParser','>= 1.0.0'],
+      ['args_parser','>= 0.0.1'],
       ['redcarpet', '>= 2.1.1'],
   ]
 end

data/lib/mdslide.rb

@@ -4,5 +4,5 @@ $:.unshift(File.dirname(__FILE__)) unless
 require 'mdslide/creator'
 
 module Mdslide
-  VERSION = '0.0.4'
+  VERSION = '1.0.0'
 end

data/lib/mdslide/command.rb

@@ -1,96 +1,122 @@
 #coding:UTF-8
-require 'ArgsParser'
+require 'args_parser'
 require 'mdslide'
+require 'yaml'
+require 'fileutils'
 
 module Mdslide
 
-  
-  def Mdslide.command parser = ArgsParser.parser
-    parser.bind(:help,   :h, "Shows Help")
-    parser.bind(:output, :o, "Output")
-    parser.bind(:input,  :i, "Input")
-    parser.bind(:theme,  :t, "theme")
-    parser.bind(:server, :s, "Start HTTP Server")
-    parser.bind(:bind,   :b, "Bind IP Address for HTTP Server")
-    parser.bind(:port,   :p, "Setting Port Number for HTTP Server")
-    parser.bind(:title, :T, "set Presentaion tiltle")
-    parser.comment('without-assets-dir', "Does not create js/css directory")
-    parser.comment('without-css-dir',    "Does not create css directory")
-    parser.comment('without-js-dir',     "Does not create js directory")
-    
-    params = parser.parse(ARGV)
-    
-    if parser.params[:help] or !parser.params[:input]
+  ASSETS_DIR = File.expand_path(File.dirname(__FILE__) + '/../../assets')
+  CONFIG_DIR = File.expand_path('~/.mdslide')
+
+  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
+      arg :help,   "Shows Help",      :alias => :h
+      arg :input,  "Input File",      :alias => :i
+      arg :theme,  "Theme",           :alias => :t, :default => 'white'
+      arg :bind,   "Bind IP Address", :alias => :b, :default => '127.0.0.1'
+      arg :port,   "Port Number",     :alias => :p, :default => '3000'
+      arg :title,  "Title",           :alias => :T, :default => 'Slides converted by Mdslide'
+      arg :output, "Output File",     :alias => :o
+      arg :'without-assets-dir', "Does not create js/css directory"
+      arg :'without-css-dir',    "Does not create css directory"
+      arg :'without-js-dir',     "Does not create js directory"
+    end
+
+    if parser.has_option? :help or !parser.has_param?(:input)
       puts "mdslide [options] -i <Input File>"
       puts parser.help
       return 0
     end
 
-    output = parser.params[:output]
-    f = STDOUT
-    if output
-      f = File.open(File.expand_path(parser.params[:output]),'w')
+    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
-    if parser.params[:title]
-      creator.title = parser.params[:title]
-    end
+    creator.title = parser[:title]
+    default_theme = parser[:theme]
 
+    file_path = File.expand_path(parser[:input])
+    dir_path = File.dirname(file_path)
 
-    default_theme = parser.params[:theme] || 'white'
-    creator.set_theme default_theme
+    if parser.has_param? :output
+      output_path = File.expand_path(parser[:output])
+      output_dir_path = File.dirname(output_path)
 
-    file = File.expand_path(parser.params[:input])
+      creator.set_theme default_theme
+      input = nil
+      File.open(file_path,'r'){|r| input = r.read.force_encoding(Encoding::UTF_8) }
+      File.open(output_path,'w'){|f| f.puts creator.convert_markdown(input)}
 
-    input = nil
-    File.open(file,'r'){|r| input = r.read }
-    creator.convert_markdown(input)
+      output_js  = !parser[:"without-assets-dir"] and !parser[:"without-js-dir"]
+      output_css = !parser[:"without-assets-dir"] and !parser[:"without-css-dir"]
+      src_dirs = [dir_path,CONFIG_DIR,ASSETS_DIR].delete_if{|e| e == output_dir_path}
+      
+      if output_js
+        js_path = output_dir_path+'/js'
+        Dir::mkdir(js_path) unless Dir.exist?(js_path)
 
-    server = parser.params[:server]
+        (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
+        end
+      end
+      if output_css
+        css_path = output_dir_path+'/css'
+        Dir::mkdir(css_path) unless Dir.exist?(css_path)
 
-    if !server or output
-      f.puts creator.convert_markdown(input)
- 
-    end
+        (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
+        end
+      end
 
-    if server
+    else
       require 'webrick'
-      srv = WEBrick::HTTPServer.new({ :DocumentRoot => './',
-                                      :BindAddress => (parser.params[:bind] or '127.0.0.1'),
-                                      :DoNotReverseLookup => true,
-                                      :Port => (parser.params[:port] or 3000)})
-      srv.mount '/js', WEBrick::HTTPServlet::FileHandler, File.expand_path(File.dirname(__FILE__) + '/../../assets/js')
-      srv.mount '/css', WEBrick::HTTPServlet::FileHandler, File.expand_path(File.dirname(__FILE__) + '/../../assets/css')
+      srv = WEBrick::HTTPServer.new( 
+        :BindAddress => parser[:bind],
+        :DoNotReverseLookup => true,
+        :Port => parser[:port],
+        :MimeTypes => WEBrick::HTTPUtils::DefaultMimeTypes.merge({"js"=>"application/javascript"})
+      )
       srv.mount_proc '/' do |req,res|
-        theme = default_theme
-        if req.path =~ /\/(.+)/
-          theme = $1
+        root_path = nil
+        if req.path != '/'
+          root_path = Mdslide.find_path(req.path,[dir_path,CONFIG_DIR,ASSETS_DIR])
+          if root_path
+            si = WEBrick::HTTPServlet::FileHandler.get_instance(srv, root_path)
+            si.service(req,res)
+          end
+        end
+
+        if !root_path
+          m = req.path.match(/\/(.+)/)
+          theme = (m && m[1]) || default_theme
+          creator.set_theme theme
+          File.open(file_path,'r'){|r| input = r.read.force_encoding(Encoding::UTF_8) }
+
+          res.body = creator.convert_markdown(input)
+          res['Content-Type'] = 'text/html'
+          res['Content-Length'] = res.body.bytesize
         end
-        creator.set_theme theme
-        res['Content-Type'] = 'text/html'
-        File.open(file,'r'){|r| input = r.read }
-        res.body = creator.convert_markdown(input)
       end
       Signal.trap(:INT){ srv.shutdown }
       srv.start
     end
-
-    if output
-      f.close
-      dir = File.dirname(File.expand_path(parser.params[:output]))
-      js = !parser.params[:"without-assets-dir"] and !parser.params[:"without-js-dir"]
-      css = !parser.params[:"without-assets-dir"] and !parser.params[:"without-css-dir"]
-      
-      if js
-        system "cp -r #{File.expand_path(File.dirname(__FILE__) + '/../../assets/js')} #{dir}"
-      end
-      if css
-        system "cp -r #{File.expand_path(File.dirname(__FILE__) + '/../../assets/css')} #{dir}"
-      end
-
-    end
-
     return 0
   end
 end

data/lib/mdslide/creator.rb

@@ -3,17 +3,20 @@ require 'erb'
 
 module Mdslide
     Themes = {
-      'black' => 'black.css',
-      'white' => 'white.css',
-      'takahashi' => 'takahashi.css',
+      :black     => {:css => ['black.css'],},
+      :white     => {:css => ['white.css'],},
+      :takahashi => {:css => ['takahashi.css'],},
     }
 
   class Creator
-    attr_reader :stylesheets,:scripts
+    attr_reader :stylesheets,:scripts,:theme_stylesheets,:theme_scripts
     attr_accessor :title
     def initialize
       @stylesheets = ['base.css']
       @scripts = ['jquery.min.js','slides.js']
+      @theme_scripts     = []
+      @theme_stylesheets = []
+
       @converter =  Redcarpet::Markdown.new(Redcarpet::Render::HTML, :autolink => true, :space_after_headers => true)
       @page_template = File.open(File.dirname(__FILE__)  + '/../../templates/page.html.erb','r'){|r| erb = ERB.new(r.read)}
       @slide_template = File.open(File.dirname(__FILE__) + '/../../templates/slide.html.erb','r'){|r| erb = ERB.new(r.read)}
@@ -21,10 +24,10 @@ module Mdslide
     end
 
     def set_theme name
-      theme = Themes[name]
-      @stylesheets.pop while @stylesheets.length > 1
+      theme = Themes[name.to_sym]
       if theme
-        @stylesheets.push theme
+        theme[:css] && @theme_stylesheets.replace(theme[:css])
+        theme[:js]  && @theme_scripts.replace(theme[:js])
       end
     end
 

data/templates/page.html.erb

@@ -2,10 +2,10 @@
 <html>
   <head>
     <meta charset="UTF-8" />
-    <% @stylesheets.each do |filename| %>
+    <% (@stylesheets + @theme_stylesheets).each do |filename| %>
     <link type="text/css" rel="stylesheet" href="./css/<%= filename %>" />
     <% end %>
-    <% @scripts.each do |filename| %>
+    <% (@scripts + @theme_scripts).each do |filename| %>
     <script type="text/javascript" src="./js/<%= filename %>"></script>
     <% end %>
     <title><%= @title %></title>

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mdslide
 version: !ruby/object:Gem::Version
-  version: 0.0.4
+  version: 1.0.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,22 +9,22 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-04-30 00:00:00.000000000 Z
+date: 2012-05-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: ArgsParser
-  requirement: &70355159587160 !ruby/object:Gem::Requirement
+  name: args_parser
+  requirement: &76102320 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 1.0.0
+        version: 0.0.1
   type: :runtime
   prerelease: false
-  version_requirements: *70355159587160
+  version_requirements: *76102320
 - !ruby/object:Gem::Dependency
   name: redcarpet
-  requirement: &70355159586520 !ruby/object:Gem::Requirement
+  requirement: &76101930 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: 2.1.1
   type: :runtime
   prerelease: false
-  version_requirements: *70355159586520
+  version_requirements: *76101930
 - !ruby/object:Gem::Dependency
   name: rdoc
-  requirement: &70355159585720 !ruby/object:Gem::Requirement
+  requirement: &76101360 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -43,10 +43,10 @@ dependencies:
         version: '3.10'
   type: :development
   prerelease: false
-  version_requirements: *70355159585720
+  version_requirements: *76101360
 - !ruby/object:Gem::Dependency
   name: newgem
-  requirement: &70355159584900 !ruby/object:Gem::Requirement
+  requirement: &76099860 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: 1.5.3
   type: :development
   prerelease: false
-  version_requirements: *70355159584900
+  version_requirements: *76099860
 - !ruby/object:Gem::Dependency
   name: hoe
-  requirement: &70355159584360 !ruby/object:Gem::Requirement
+  requirement: &76082010 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -65,7 +65,7 @@ dependencies:
         version: '3.0'
   type: :development
   prerelease: false
-  version_requirements: *70355159584360
+  version_requirements: *76082010
 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
@@ -107,7 +107,7 @@ files:
 - .gemtest
 homepage: http://github.com/ymrl/mdslide
 licenses: []
-post_install_message: PostInstall.txt
+post_install_message: 
 rdoc_options:
 - --main
 - README.rdoc