mdslide 2.1.1 → 3.0.0

data/History.txt

@@ -1,3 +1,14 @@
+=== 3.0.0 2012-05-20
+
+* My-own-configurations is implemented
+=== 2.1.1 2012-05-16
+=== 2.1.0 2012-05-16
+=== 2.0.0 2012-05-16
+=== 1.1.0 2012-05-16
+=== 1.0.0 2012-05-11
+=== 0.0.4 2012-04-23
+=== 0.0.3 2012-04-23
+=== 0.0.2 2012-04-23
 === 0.0.1 2012-04-21
 
 * 1 major enhancement:

data/Manifest.txt

@@ -6,17 +6,22 @@ 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/black.css
-assets/css/takahashi.css
-assets/css/white.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
 script/console
-spec/mdslide_spec.rb
+spec/creator_spec.rb
 spec/spec.opts
 spec/spec_helper.rb
 tasks/rspec.rake

data/README.rdoc

@@ -54,6 +54,25 @@ Others can be shown with --help option
 
   $ mdslide --help
 
+=== CONFIGURATIONS
+`mdslide` command reads ~/.mdslide/config.yaml if it exists. You can describe your own settings and themes in YAML format.
+
+  :themes:
+    :my-theme:
+      :css:
+        - my-theme.css
+        - color-black.css
+        - transition-crossfade.css
+      :js:
+        - my-theme.js
+  :config:
+    :bind: 0.0.0.0
+    :title: "My Slide"
+    :port: 10080
+    :theme: white-crossfade
+
+CSS/JS files included in customized themes will be loaded in  this order: relative path from the Markdown file -> relative path from your configuration directory (~/.mdslide/) -> assets directory of mdslide library (default). If you want to create your own theme, locate files on ~/.mdslide/.
+
 == LICENSE:
 
 (The MIT License)

data/assets/css/base.css

@@ -1,7 +1,6 @@
 body {
 	color: #000;
 	background-color:#fff;
-	overflow: hidden;
 }
 .slide {
 	position:absolute;

data/assets/css/color-black.css

@@ -0,0 +1,12 @@
+body {
+  background-color:#000;
+  color:#fff;
+  font-family: sans-serif;
+}
+
+a { color: #66f; text-decoration:none; }
+a:hover {  text-decoration:underline; }
+
+.slide pre {
+  border: 3px solid #ccc;
+}

data/assets/css/color-white.css

@@ -0,0 +1,12 @@
+body {
+  background-color:#fff;
+  color:#000;
+  font-family: sans-serif;
+}
+
+a { color: #66f; text-decoration:none; }
+a:hover {  text-decoration:underline; }
+
+.slide pre {
+  border: 3px solid #ccc;
+}

data/assets/css/position-takahashi.css

@@ -0,0 +1,5 @@
+.slide {
+  font-weight:bold;
+	font-family:sans-serif;
+	font-size: 300px;
+}

data/assets/css/transition-crossfade.css

@@ -0,0 +1,11 @@
+.slide {
+	opacity: 0;
+	-moz-opacity: 0;
+	filter: alpha(opacity=0);
+  -webkit-transition-duration:0.3s;
+}
+.slide.current {
+	opacity: 1;
+	-moz-opacity: 1;
+	filter: alpha(opacity=100);
+}

data/assets/css/transition-hide-show.css

@@ -0,0 +1,6 @@
+.slide {
+	display:none;
+}
+.slide.current {
+	display:block;
+}

data/assets/js/slides.coffee

@@ -38,6 +38,7 @@ jQuery ->
     jQuery('#slides').hide()
     jQuery('#toolbox .forOutline').show()
     jQuery('#toolbox .forSlides').hide()
+    jQuery('body').css overflow:'visible'
 
   hideOutline = ()->
     jQuery(KEYTARGET).unbind('keyup',keyAction)
@@ -46,6 +47,7 @@ jQuery ->
     jQuery('#slides').show()
     jQuery('#toolbox .forOutline').hide()
     jQuery('#toolbox .forSlides').show()
+    jQuery('body').css overflow:'hidden'
 
   showSlide = (num)->
     slides = jQuery('.slide')

data/assets/js/slides.js

@@ -44,7 +44,10 @@
       jQuery('#outline').show();
       jQuery('#slides').hide();
       jQuery('#toolbox .forOutline').show();
-      return jQuery('#toolbox .forSlides').hide();
+      jQuery('#toolbox .forSlides').hide();
+      return jQuery('body').css({
+        overflow: 'visible'
+      });
     };
     hideOutline = function() {
       jQuery(KEYTARGET).unbind('keyup', keyAction);
@@ -52,7 +55,10 @@
       jQuery('#outline').hide();
       jQuery('#slides').show();
       jQuery('#toolbox .forOutline').hide();
-      return jQuery('#toolbox .forSlides').show();
+      jQuery('#toolbox .forSlides').show();
+      return jQuery('body').css({
+        overflow: 'hidden'
+      });
     };
     showSlide = function(num) {
       var slides;

data/assets/themes.yaml

@@ -0,0 +1,22 @@
+---
+:white:
+  :css:
+  - color-white.css
+  - transition-hide-show.css
+:black:
+  :css:
+  - color-black.css
+  - transition-hide-show.css
+:black-crossfade:
+  :css:
+  - color-black.css
+  - transition-crossfade.css
+:white-crossfade:
+  :css:
+  - color-white.css
+  - transition-crossfade.css
+:takahashi:
+  :css:
+  - color-white.css
+  - position-takahashi.css
+  - transition-hide-show.css

data/lib/mdslide.rb

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

data/lib/mdslide/command.rb

@@ -8,7 +8,6 @@ require 'fileutils'
 module Mdslide
 
   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|
@@ -24,10 +23,10 @@ module Mdslide
       arg :version,"Shows Mdslide Version", :alias => :v
       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 :theme,  "Theme",           :alias => :t, :default => Defaults[:theme]
+      arg :bind,   "Bind IP Address", :alias => :b, :default => Defaults[:bind ]
+      arg :port,   "Port Number",     :alias => :p, :default => Defaults[:port ]
+      arg :title,  "Title",           :alias => :T, :default => Defaults[:title]
       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"
@@ -42,13 +41,12 @@ 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
-
+    #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]
@@ -110,6 +108,7 @@ module Mdslide
         end
 
         if !root_path
+          Mdslide.load_config
           m = req.path.match(/\/(.+)/)
           theme = (m && m[1]) || default_theme
           creator.set_theme theme

data/lib/mdslide/config.rb

@@ -0,0 +1,22 @@
+require 'yaml'
+module Mdslide
+  CONFIG_DIR = File.expand_path('~/.mdslide')
+  Defaults = {
+    :theme => 'white',
+    :bind  => '127.0.0.1',
+    :port  => '3000',
+    :title => 'Slides converted by Mdslide',
+  }
+
+  def Mdslide.load_config config_file=(CONFIG_DIR + '/config.yaml')
+    config_path = File.expand_path(config_file)
+    my_config = nil
+    if File.exist? config_path
+      my_config = YAML.load_file(config_path)
+      Themes.merge!   my_config[:themes] if my_config[:themes]
+      Defaults.merge! my_config[:config] if my_config[:config]
+    end
+  end
+
+  Mdslide.load_config
+end

data/lib/mdslide/creator.rb

@@ -1,13 +1,10 @@
 require 'rubygems'
 require 'kramdown'
 require 'erb'
+require 'mdslide/themes'
+require 'mdslide/config'
 
 module Mdslide
-    Themes = {
-      :black     => {:css => ['black.css'],},
-      :white     => {:css => ['white.css'],},
-      :takahashi => {:css => ['takahashi.css'],},
-    }
 
   class Creator
     attr_reader :stylesheets,:scripts,:theme_stylesheets,:theme_scripts

data/lib/mdslide/themes.rb

@@ -0,0 +1,4 @@
+require 'yaml'
+module Mdslide
+  Themes =  YAML.load_file(File.dirname(__FILE__)+'/../../assets/themes.yaml')
+end

data/spec/{mdslide_spec.rb → creator_spec.rb}

@@ -28,5 +28,6 @@ describe "Mdslide" do
       slide.should be_true
       slide.should be_kind_of(String)
     end
+
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mdslide
 version: !ruby/object:Gem::Version
-  version: 2.1.1
+  version: 3.0.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-05-17 00:00:00.000000000 Z
+date: 2012-05-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: args_parser
-  requirement: &82646180 !ruby/object:Gem::Requirement
+  requirement: &68500600 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: 0.0.1
   type: :runtime
   prerelease: false
-  version_requirements: *82646180
+  version_requirements: *68500600
 - !ruby/object:Gem::Dependency
   name: kramdown
-  requirement: &82645730 !ruby/object:Gem::Requirement
+  requirement: &68499270 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: 0.13.6
   type: :runtime
   prerelease: false
-  version_requirements: *82645730
+  version_requirements: *68499270
 - !ruby/object:Gem::Dependency
   name: rdoc
-  requirement: &82645140 !ruby/object:Gem::Requirement
+  requirement: &68498280 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -43,10 +43,10 @@ dependencies:
         version: '3.10'
   type: :development
   prerelease: false
-  version_requirements: *82645140
+  version_requirements: *68498280
 - !ruby/object:Gem::Dependency
   name: newgem
-  requirement: &82644720 !ruby/object:Gem::Requirement
+  requirement: &68496640 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: 1.5.3
   type: :development
   prerelease: false
-  version_requirements: *82644720
+  version_requirements: *68496640
 - !ruby/object:Gem::Dependency
   name: hoe
-  requirement: &82644210 !ruby/object:Gem::Requirement
+  requirement: &68495040 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -65,7 +65,7 @@ dependencies:
         version: '3.0'
   type: :development
   prerelease: false
-  version_requirements: *82644210
+  version_requirements: *68495040
 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
@@ -89,17 +89,22 @@ files:
 - 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/black.css
-- assets/css/takahashi.css
-- assets/css/white.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
 - script/console
-- spec/mdslide_spec.rb
+- spec/creator_spec.rb
 - spec/spec.opts
 - spec/spec_helper.rb
 - tasks/rspec.rake

data/assets/css/black.css

@@ -1,28 +0,0 @@
-body {
-  background-color:#000;
-  color:#fff;
-  font-family: sans-serif;
-}
-
-a { color: #66f; text-decoration:none; }
-a:hover {  text-decoration:underline; }
-
-.slide {
-	opacity: 0;
-	-moz-opacity: 0;
-	filter: alpha(opacity=0);
-  -webkit-transition-duration:0.2s;
-}
-.slide.current {
-	opacity: 1;
-	-moz-opacity: 1;
-	filter: alpha(opacity=100);
-}
-
-.slide pre {
-  border: 3px solid #ccc;
-}
-
-code {
-  font-family: monospace;
-}

data/assets/css/takahashi.css

@@ -1,15 +0,0 @@
-body {
-  background-color:#fff;
-  color:#000;
-}
-
-.slide {
-  font-weight:bold;
-	font-family:sans-serif;
-	font-size: 300px;
-  display:none;
-}
-.slide.current {
-  display:block;
-
-}

data/assets/css/white.css

@@ -1,28 +0,0 @@
-body {
-  background-color:#fff;
-  color:#000;
-  font-family: sans-serif;
-}
-
-a { color: #66f; text-decoration:none; }
-a:hover {  text-decoration:underline; }
-
-.slide {
-	opacity: 0;
-	-moz-opacity: 0;
-	filter: alpha(opacity=0);
-  -webkit-transition-duration:0.2s;
-}
-.slide.current {
-	opacity: 1;
-	-moz-opacity: 1;
-	filter: alpha(opacity=100);
-}
-
-.slide pre {
-  border: 3px solid #ccc;
-}
-
-code {
-  font-family: monospace;
-}