mdslide 2.0.0 → 2.1.0

data/README.rdoc

@@ -13,11 +13,14 @@ Mdslide is an slide generator for presentation based on Markdown (RedCarpet). It
 
 == REQUIREMENTS:
 
-* ArgsParser 
-* RedCarpet
+* Ruby + Rubygems
 
-  gem install ArgsParser
-  gem install redcarpet
+== DIPENDENCIES:
+
+* args_parser
+* kramdown
+
+Those will be installed with mdslide through rubygems, automatically
 
 == USAGE:
 
@@ -41,9 +44,9 @@ If you want to get HTML, CSS and Javascript files for your web server, use -o op
 
   $ mdslide -i foo.md -o bar.md
 
-Viewing only, Web server feature is useful
+Viewing only, Web server feature is useful. Without -o option, starting web server on port 3000 on your PC and you can preview on http://localhost:3000/
 
-  $ mdslide -i foo.md -s
+  $ mdslide -i foo.md 
   # you can see your slides at http://localhost:3000/
   # and if you want in other theme, go http://localhost:3000/black
 

data/Rakefile

@@ -20,9 +20,9 @@ $hoe = Hoe.spec 'mdslide' do
   ]
 end
 
-require 'newgem/tasks'
 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]
+#task :default => [:spec, :features]

data/assets/css/base.css

@@ -1,6 +1,7 @@
 body {
 	color: #000;
 	background-color:#fff;
+	overflow: hidden;
 }
 .slide {
 	position:absolute;
@@ -34,7 +35,7 @@ body {
 }
 .slide ul, .slide ol, .slide dl{
 	text-align:left;
-	padding: 0 2em;
+	padding: 0 1em 0 2em;
 }
 .slide pre{
 	width:80%;

data/assets/js/slides.coffee

@@ -105,8 +105,9 @@ jQuery ->
         zoom = h/sh
         t.css 'width', sw / zoom
         t.css TRANSFORM, "scale(#{zoom})"
-      else if sh < h
-        t.css 'top', h/2 - sh/2
+        sh = t.height() * zoom
+      #else if sh < h
+      t.css 'top', h/2 - sh/2
 
   jQuery(window).bind('resize',resize)
   resize()

data/assets/js/slides.js

@@ -124,10 +124,10 @@
         if (sh > h) {
           zoom = h / sh;
           t.css('width', sw / zoom);
-          return t.css(TRANSFORM, "scale(" + zoom + ")");
-        } else if (sh < h) {
-          return t.css('top', h / 2 - sh / 2);
+          t.css(TRANSFORM, "scale(" + zoom + ")");
+          sh = t.height() * zoom;
         }
+        return t.css('top', h / 2 - sh / 2);
       });
     };
     jQuery(window).bind('resize', resize);

data/lib/mdslide.rb

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

data/lib/mdslide/command.rb

@@ -1,4 +1,5 @@
 #coding:UTF-8
+require 'rubygems'
 require 'args_parser'
 require 'mdslide'
 require 'yaml'
@@ -62,7 +63,7 @@ module Mdslide
 
       creator.set_theme default_theme
       input = nil
-      File.open(file_path,'r'){|r| input = r.read.force_encoding(Encoding::UTF_8) }
+      File.open(file_path,'r'){|r| input = r.read }
       File.open(output_path,'w'){|f| f.puts creator.convert_markdown(input)}
 
       output_js  = !parser[:"without-assets-dir"] and !parser[:"without-js-dir"]
@@ -110,7 +111,7 @@ module Mdslide
           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) }
+          File.open(file_path,'r'){|r| input = r.read }
 
           res.body = creator.convert_markdown(input)
           res['Content-Type'] = 'text/html'

data/lib/mdslide/creator.rb

@@ -1,3 +1,4 @@
+require 'rubygems'
 require 'kramdown'
 require 'erb'
 
@@ -28,6 +29,7 @@ module Mdslide
         theme[:css] && @theme_stylesheets.replace(theme[:css])
         theme[:js]  && @theme_scripts.replace(theme[:js])
       end
+      return theme
     end
 
     def get_binding

data/spec/mdslide_spec.rb

@@ -4,7 +4,10 @@ require File.dirname(__FILE__) + '/spec_helper.rb'
 # http://rspec.info/
 describe "Mdslide" do
   it 'has some themes' do
-    Mdslide::Themes.should have_key('white')
+    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
@@ -18,13 +21,12 @@ describe "Mdslide" do
     end
     it "can be set theme" do
       @creator.set_theme('black').should be_true
-      @creator.stylesheets.should have_at_least(2).items
+      @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/spec/spec.opts

@@ -1 +1 @@
---colour
+-c

data/tasks/rspec.rake

@@ -1,21 +0,0 @@
-begin
-  require 'rspec'
-rescue LoadError
-  require 'rubygems' unless ENV['NO_RUBYGEMS']
-  require 'rspec'
-end
-begin
-  require 'rspec/core/rake_task'
-rescue LoadError
-  puts <<-EOS
-To use rspec for testing you must install rspec gem:
-    gem install rspec
-EOS
-  exit(0)
-end
-
-desc "Run the specs under spec/models"
-RSpec::Core::RakeTask.new do |t|
-  t.rspec_opts = ['--options', "spec/spec.opts"]
-  t.pattern = 'spec/**/*_spec.rb'
-end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mdslide
 version: !ruby/object:Gem::Version
-  version: 2.0.0
+  version: 2.1.0
   prerelease: 
 platform: ruby
 authors:
@@ -13,7 +13,7 @@ date: 2012-05-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: args_parser
-  requirement: &83751840 !ruby/object:Gem::Requirement
+  requirement: &71539710 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: 0.0.1
   type: :runtime
   prerelease: false
-  version_requirements: *83751840
+  version_requirements: *71539710
 - !ruby/object:Gem::Dependency
   name: kramdown
-  requirement: &83751450 !ruby/object:Gem::Requirement
+  requirement: &71539090 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: 0.13.6
   type: :runtime
   prerelease: false
-  version_requirements: *83751450
+  version_requirements: *71539090
 - !ruby/object:Gem::Dependency
   name: rdoc
-  requirement: &83711870 !ruby/object:Gem::Requirement
+  requirement: &71538710 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -43,10 +43,10 @@ dependencies:
         version: '3.10'
   type: :development
   prerelease: false
-  version_requirements: *83711870
+  version_requirements: *71538710
 - !ruby/object:Gem::Dependency
   name: newgem
-  requirement: &83711120 !ruby/object:Gem::Requirement
+  requirement: &71538160 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: 1.5.3
   type: :development
   prerelease: false
-  version_requirements: *83711120
+  version_requirements: *71538160
 - !ruby/object:Gem::Dependency
   name: hoe
-  requirement: &83709570 !ruby/object:Gem::Requirement
+  requirement: &71537670 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -65,7 +65,7 @@ dependencies:
         version: '3.0'
   type: :development
   prerelease: false
-  version_requirements: *83709570
+  version_requirements: *71537670
 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