jekyll 0.2.0 → 0.2.1

data/History.txt

@@ -1,3 +1,10 @@
+== 0.2.1 / 2008-12-15
+  * Major Changes
+    * Use Maruku (pure Ruby) for Markdown by default [github.com/mreid]
+    * Allow use of RDiscount with --rdiscount flag
+  * Minor Enhancements
+    * Don't load directory_watcher unless it's needed [github.com/pjhyett]
+
 == 0.2.0 / 2008-12-14
   * Major Changes
     * related_posts is now found in site.related_posts

data/Manifest.txt

@@ -17,12 +17,12 @@ lib/jekyll/site.rb
 lib/jekyll/tags/highlight.rb
 lib/jekyll/tags/include.rb
 test/helper.rb
-test/source/_includes/sig.textile
+test/source/_includes/sig.markdown
 test/source/_layouts/default.html
 test/source/_layouts/simple.html
 test/source/_posts/2008-10-18-foo-bar.textile
 test/source/_posts/2008-11-21-complex.textile
-test/source/_posts/2008-12-13-include.textile
+test/source/_posts/2008-12-13-include.markdown
 test/source/css/screen.css
 test/source/index.html
 test/source/posts/2008-12-03-permalinked-post.textile

data/README.textile

@@ -79,6 +79,17 @@ The best way to install Jekyll is via RubyGems:
 
   $ sudo gem install mojombo-jekyll -s http://gems.github.com/
 
+Jekyll requires the gems `directory_watcher`, `liquid`, `open4`, 
+and `maruku` (for markdown support). These are automatically
+installed by the gem install command.
+
+Maruku comes with optional support for LaTeX to PNG rendering via
+"blahtex":http://gva.noekeon.org/blahtexml/ (Version 0.6) which must be in
+your $PATH along with `dvips`. 
+
+(NOTE: the version of maruku I am using is `remi-maruku` on GitHub as it
+does not assume a fixed location for `dvips`.)
+
 h2. Run
 
   $ cd /path/to/proto/site
@@ -112,6 +123,13 @@ during the conversion:
 
   $ jekyll --pygments
 
+By default, Jekyll uses "Maruku":http://maruku.rubyforge.org (pure Ruby) for
+Markdown support. If you'd like to use RDiscount (faster, but requires
+compilation), you must install it (gem install rdiscount) and then you can
+have it used instead:
+
+  $ jekyll --rdiscount
+
 h2. Data
 
 Jekyll traverses your site looking for files to process. Any files with YAML

data/Rakefile

@@ -5,7 +5,7 @@ require 'lib/jekyll'
 Hoe.new('jekyll', Jekyll::VERSION) do |p|
   p.developer('Tom Preston-Werner', 'tom@mojombo.com')
   p.summary = "Jekyll is a simple, blog aware, static site generator."
-  p.extra_deps = ['RedCloth', 'liquid', 'classifier', 'rdiscount', 'directory_watcher', 'open4']
+  p.extra_deps = ['RedCloth', 'liquid', 'classifier', 'maruku', 'directory_watcher', 'open4']
 end
 
 desc "Open an irb session preloaded with this library"

data/bin/jekyll

@@ -32,6 +32,16 @@ opts = OptionParser.new do |opts|
   opts.on("--pygments", "Use pygments to highlight code") do
     Jekyll.pygments = true
   end
+  
+  opts.on("--rdiscount", "Use rdiscount gem for Markdown") do
+    begin
+      require 'rdiscount'
+      Jekyll.markdown_proc = Proc.new { |x| RDiscount.new(x).to_html }
+      puts 'Using rdiscount for Markdown'
+    rescue LoadError
+      puts 'You must have the rdiscount gem installed first'
+    end
+  end
 end
 
 opts.parse!
@@ -69,6 +79,8 @@ case ARGV.size
 end
 
 if options[:auto]
+  require 'directory_watcher'
+
   puts "Auto-regenerating enabled: #{source} -> #{destination}"
   
   dw = DirectoryWatcher.new(source)

data/jekyll.gemspec

@@ -1,15 +1,15 @@
 Gem::Specification.new do |s|
   s.name = %q{jekyll}
-  s.version = "0.2.0"
+  s.version = "0.2.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Tom Preston-Werner"]
-  s.date = %q{2008-12-14}
+  s.date = %q{2008-12-15}
   s.default_executable = %q{jekyll}
   s.email = ["tom@mojombo.com"]
   s.executables = ["jekyll"]
   s.extra_rdoc_files = ["History.txt", "Manifest.txt"]
-  s.files = ["History.txt", "Manifest.txt", "README.textile", "Rakefile", "bin/jekyll", "jekyll.gemspec", "lib/jekyll.rb", "lib/jekyll/albino.rb", "lib/jekyll/converters/csv.rb", "lib/jekyll/converters/mephisto.rb", "lib/jekyll/convertible.rb", "lib/jekyll/filters.rb", "lib/jekyll/layout.rb", "lib/jekyll/page.rb", "lib/jekyll/post.rb", "lib/jekyll/site.rb", "lib/jekyll/tags/highlight.rb", "lib/jekyll/tags/include.rb", "test/helper.rb", "test/source/_includes/sig.textile", "test/source/_layouts/default.html", "test/source/_layouts/simple.html", "test/source/_posts/2008-10-18-foo-bar.textile", "test/source/_posts/2008-11-21-complex.textile", "test/source/_posts/2008-12-13-include.textile", "test/source/css/screen.css", "test/source/index.html", "test/source/posts/2008-12-03-permalinked-post.textile", "test/suite.rb", "test/test_jekyll.rb", "test/test_post.rb", "test/test_site.rb"]
+  s.files = ["History.txt", "Manifest.txt", "README.textile", "Rakefile", "bin/jekyll", "jekyll.gemspec", "lib/jekyll.rb", "lib/jekyll/albino.rb", "lib/jekyll/converters/csv.rb", "lib/jekyll/converters/mephisto.rb", "lib/jekyll/convertible.rb", "lib/jekyll/filters.rb", "lib/jekyll/layout.rb", "lib/jekyll/page.rb", "lib/jekyll/post.rb", "lib/jekyll/site.rb", "lib/jekyll/tags/highlight.rb", "lib/jekyll/tags/include.rb", "test/helper.rb", "test/source/_includes/sig.markdown", "test/source/_layouts/default.html", "test/source/_layouts/simple.html", "test/source/_posts/2008-10-18-foo-bar.textile", "test/source/_posts/2008-11-21-complex.textile", "test/source/_posts/2008-12-13-include.markdown", "test/source/css/screen.css", "test/source/index.html", "test/source/posts/2008-12-03-permalinked-post.textile", "test/suite.rb", "test/test_jekyll.rb", "test/test_post.rb", "test/test_site.rb"]
   s.has_rdoc = true
   s.rdoc_options = ["--main", "README.txt"]
   s.require_paths = ["lib"]
@@ -26,7 +26,7 @@ Gem::Specification.new do |s|
       s.add_runtime_dependency(%q<RedCloth>, [">= 0"])
       s.add_runtime_dependency(%q<liquid>, [">= 0"])
       s.add_runtime_dependency(%q<classifier>, [">= 0"])
-      s.add_runtime_dependency(%q<rdiscount>, [">= 0"])
+      s.add_runtime_dependency(%q<maruku>, [">= 0"])
       s.add_runtime_dependency(%q<directory_watcher>, [">= 0"])
       s.add_runtime_dependency(%q<open4>, [">= 0"])
       s.add_development_dependency(%q<hoe>, [">= 1.8.0"])
@@ -34,7 +34,7 @@ Gem::Specification.new do |s|
       s.add_dependency(%q<RedCloth>, [">= 0"])
       s.add_dependency(%q<liquid>, [">= 0"])
       s.add_dependency(%q<classifier>, [">= 0"])
-      s.add_dependency(%q<rdiscount>, [">= 0"])
+      s.add_dependency(%q<maruku>, [">= 0"])
       s.add_dependency(%q<directory_watcher>, [">= 0"])
       s.add_dependency(%q<open4>, [">= 0"])
       s.add_dependency(%q<hoe>, [">= 1.8.0"])
@@ -43,7 +43,7 @@ Gem::Specification.new do |s|
     s.add_dependency(%q<RedCloth>, [">= 0"])
     s.add_dependency(%q<liquid>, [">= 0"])
     s.add_dependency(%q<classifier>, [">= 0"])
-    s.add_dependency(%q<rdiscount>, [">= 0"])
+    s.add_dependency(%q<maruku>, [">= 0"])
     s.add_dependency(%q<directory_watcher>, [">= 0"])
     s.add_dependency(%q<open4>, [">= 0"])
     s.add_dependency(%q<hoe>, [">= 1.8.0"])

data/lib/jekyll.rb

@@ -13,11 +13,21 @@ require 'time'
 require 'liquid'
 require 'redcloth'
 begin
-  require 'rdiscount'
+  require 'maruku'
+  require 'maruku/ext/math'
+  # Switch off MathML output
+  MaRuKu::Globals[:html_math_output_mathml] = false
+  MaRuKu::Globals[:html_math_engine] = 'none'
+
+  # Turn on math to PNG support with blahtex
+  # Resulting PNGs stored in `images/latex`
+  MaRuKu::Globals[:html_math_output_png] = true
+  MaRuKu::Globals[:html_png_engine] =  'blahtex'
+  MaRuKu::Globals[:html_png_dir] = 'images/latex'
+  MaRuKu::Globals[:html_png_url] = '/images/latex/'
 rescue LoadError
-  puts "The rdiscount gem is required for markdown support!"
+  puts "The maruku gem is required for markdown support!"
 end
-require 'directory_watcher'
 
 # internal requires
 require 'jekyll/site'
@@ -31,14 +41,15 @@ require 'jekyll/tags/include'
 require 'jekyll/albino'
 
 module Jekyll
-  VERSION = '0.2.0'
+  VERSION = '0.2.1'
   
   class << self
-    attr_accessor :source, :dest, :lsi, :pygments
+    attr_accessor :source, :dest, :lsi, :pygments, :markdown_proc
   end
   
   Jekyll.lsi = false
   Jekyll.pygments = false
+  Jekyll.markdown_proc = Proc.new { |x| Maruku.new(x).to_html }
   
   def self.process(source, dest)
     require 'classifier' if Jekyll.lsi

data/lib/jekyll/convertible.rb

@@ -30,7 +30,7 @@ module Jekyll
         self.content = RedCloth.new(self.content).to_html
       when ".markdown":
         self.ext = ".html"
-        self.content = RDiscount.new(self.content).to_html
+        self.content = Jekyll.markdown_proc.call(self.content)
       end
     end
     

data/test/source/_posts/2008-12-13-include.markdown

@@ -0,0 +1,8 @@
+---
+layout: default
+title: Include
+---
+
+{% include sig.markdown %}
+
+This _is_ cool

data/test/test_post.rb

@@ -86,10 +86,10 @@ class TestPost < Test::Unit::TestCase
   
   def test_include
     Jekyll.source = File.join(File.dirname(__FILE__), *%w[source])
-    p = Post.new(File.join(File.dirname(__FILE__), *%w[source _posts]), "2008-12-13-include.textile")
+    p = Post.new(File.join(File.dirname(__FILE__), *%w[source _posts]), "2008-12-13-include.markdown")
     layouts = {"default" => Layout.new(File.join(File.dirname(__FILE__), *%w[source _layouts]), "simple.html")}
     p.add_layout(layouts, {"site" => {"posts" => []}})
     
-    assert_equal "<<< <p>&#8212;<br />\nTom Preston-Werner<br />\ngithub.com/mojombo</p> >>>", p.output
+    assert_equal "<<< <hr />\n<p>Tom Preston-Werner github.com/mojombo</p>\n\n<p>This <em>is</em> cool</p> >>>", p.output
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: jekyll
 version: !ruby/object:Gem::Version 
-  version: 0.2.0
+  version: 0.2.1
 platform: ruby
 authors: 
 - Tom Preston-Werner
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-12-14 00:00:00 -08:00
+date: 2008-12-15 00:00:00 -08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -43,7 +43,7 @@ dependencies:
         version: "0"
     version: 
 - !ruby/object:Gem::Dependency 
-  name: rdiscount
+  name: maruku
   type: :runtime
   version_requirement: 
   version_requirements: !ruby/object:Gem::Requirement 
@@ -112,12 +112,12 @@ files:
 - lib/jekyll/tags/highlight.rb
 - lib/jekyll/tags/include.rb
 - test/helper.rb
-- test/source/_includes/sig.textile
+- test/source/_includes/sig.markdown
 - test/source/_layouts/default.html
 - test/source/_layouts/simple.html
 - test/source/_posts/2008-10-18-foo-bar.textile
 - test/source/_posts/2008-11-21-complex.textile
-- test/source/_posts/2008-12-13-include.textile
+- test/source/_posts/2008-12-13-include.markdown
 - test/source/css/screen.css
 - test/source/index.html
 - test/source/posts/2008-12-03-permalinked-post.textile

data/test/source/_posts/2008-12-13-include.textile

@@ -1,6 +0,0 @@
----
-layout: default
-title: Include
----
-
-{% include sig.textile %}