jekyll 0.10.0 → 0.11.0

data/test/test_rdiscount.rb

@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/helper'
+require 'helper'
 
 class TestRdiscount < Test::Unit::TestCase
 

data/test/test_redcarpet.rb

@@ -0,0 +1,21 @@
+require File.dirname(__FILE__) + '/helper'
+
+class TestRedcarpet < Test::Unit::TestCase
+  context "redcarpet" do
+    setup do
+      config = {
+        'redcarpet' => { 'extensions' => ['smart'] },
+        'markdown' => 'redcarpet'
+      }
+      @markdown = MarkdownConverter.new config
+    end
+
+    should "pass redcarpet options" do
+      assert_equal "<h1>Some Header</h1>", @markdown.convert('# Some Header #').strip
+    end
+    
+    should "pass redcarpet extensions" do
+      assert_equal "<p>&ldquo;smart&rdquo;</p>", @markdown.convert('"smart"').strip
+    end
+  end
+end

data/test/test_site.rb

@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/helper'
+require 'helper'
 
 class TestSite < Test::Unit::TestCase
   context "creating sites" do

data/test/test_tags.rb

@@ -1,4 +1,6 @@
-require File.dirname(__FILE__) + '/helper'
+# coding: utf-8
+
+require 'helper'
 
 class TestTags < Test::Unit::TestCase
 
@@ -123,5 +125,16 @@ CONTENT
         assert_match %r{<em>FINISH HIM</em>}, @result
       end
     end
+    
+    context "using Redcarpet" do
+      setup do
+        create_post(@content, 'markdown' => 'redcarpet')
+      end
+
+      should "parse correctly" do
+        assert_match %r{<em>FIGHT!</em>}, @result
+        assert_match %r{<em>FINISH HIM</em>}, @result
+      end
+    end
   end
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: jekyll
 version: !ruby/object:Gem::Version 
-  hash: 55
+  hash: 51
   prerelease: false
   segments: 
   - 0
-  - 10
+  - 11
   - 0
-  version: 0.10.0
+  version: 0.11.0
 platform: ruby
 authors: 
 - Tom Preston-Werner
@@ -15,8 +15,8 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-12-16 00:00:00 -08:00
-default_executable: jekyll
+date: 2011-07-10 00:00:00 -07:00
+default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: liquid
@@ -83,73 +83,105 @@ dependencies:
   type: :runtime
   version_requirements: *id004
 - !ruby/object:Gem::Dependency 
-  name: redgreen
+  name: kramdown
   prerelease: false
   requirement: &id005 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 53
+        hash: 47
         segments: 
-        - 4
+        - 0
+        - 13
         - 2
-        - 1
-        version: 4.2.1
-  type: :development
+        version: 0.13.2
+  type: :runtime
   version_requirements: *id005
 - !ruby/object:Gem::Dependency 
-  name: shoulda
+  name: albino
   prerelease: false
   requirement: &id006 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 53
+        hash: 31
         segments: 
-        - 4
-        - 2
         - 1
-        version: 4.2.1
-  type: :development
+        - 3
+        - 2
+        version: 1.3.2
+  type: :runtime
   version_requirements: *id006
 - !ruby/object:Gem::Dependency 
-  name: rr
+  name: redgreen
   prerelease: false
   requirement: &id007 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 53
+        hash: 27
         segments: 
-        - 4
-        - 2
         - 1
-        version: 4.2.1
+        - 2
+        - 2
+        version: 1.2.2
   type: :development
   version_requirements: *id007
 - !ruby/object:Gem::Dependency 
-  name: cucumber
+  name: shoulda
   prerelease: false
   requirement: &id008 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 53
+        hash: 37
         segments: 
-        - 4
         - 2
-        - 1
-        version: 4.2.1
+        - 11
+        - 3
+        version: 2.11.3
   type: :development
   version_requirements: *id008
 - !ruby/object:Gem::Dependency 
-  name: RedCloth
+  name: rr
   prerelease: false
   requirement: &id009 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 19
+        segments: 
+        - 1
+        - 0
+        - 2
+        version: 1.0.2
+  type: :development
+  version_requirements: *id009
+- !ruby/object:Gem::Dependency 
+  name: cucumber
+  prerelease: false
+  requirement: &id010 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 49
+        segments: 
+        - 0
+        - 10
+        - 3
+        version: 0.10.3
+  type: :development
+  version_requirements: *id010
+- !ruby/object:Gem::Dependency 
+  name: RedCloth
+  prerelease: false
+  requirement: &id011 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -161,23 +193,39 @@ dependencies:
         - 1
         version: 4.2.1
   type: :development
-  version_requirements: *id009
+  version_requirements: *id011
 - !ruby/object:Gem::Dependency 
-  name: kramdown
+  name: rdiscount
   prerelease: false
-  requirement: &id010 !ruby/object:Gem::Requirement 
+  requirement: &id012 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 47
+        hash: 5
         segments: 
+        - 1
+        - 6
+        - 5
+        version: 1.6.5
+  type: :development
+  version_requirements: *id012
+- !ruby/object:Gem::Dependency 
+  name: redcarpet
+  prerelease: false
+  requirement: &id013 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 51
+        segments: 
+        - 1
+        - 9
         - 0
-        - 12
-        - 0
-        version: 0.12.0
+        version: 1.9.0
   type: :development
-  version_requirements: *id010
+  version_requirements: *id013
 description: Jekyll is a simple, blog aware, static site generator.
 email: tom@mojombo.com
 executables: 
@@ -188,12 +236,21 @@ extra_rdoc_files:
 - README.textile
 - LICENSE
 files: 
+- Gemfile
 - History.txt
 - LICENSE
 - README.textile
 - Rakefile
 - bin/jekyll
 - cucumber.yml
+- doc/output/book.html
+- doc/output/ch00-preface.asc
+- doc/output/ch01-quick-start.asc
+- doc/output/ch02-directory-layout.asc
+- doc/output/stylesheets/handbookish-quirks.css
+- doc/output/stylesheets/handbookish.css
+- doc/output/stylesheets/scribe-quirks.css
+- doc/output/stylesheets/scribe.css
 - features/create_sites.feature
 - features/embed_filters.feature
 - features/markdown.feature
@@ -204,9 +261,9 @@ files:
 - features/site_data.feature
 - features/step_definitions/jekyll_steps.rb
 - features/support/env.rb
+- g.pl
 - jekyll.gemspec
 - lib/jekyll.rb
-- lib/jekyll/albino.rb
 - lib/jekyll/converter.rb
 - lib/jekyll/converters/identity.rb
 - lib/jekyll/converters/markdown.rb
@@ -220,13 +277,16 @@ files:
 - lib/jekyll/layout.rb
 - lib/jekyll/migrators/csv.rb
 - lib/jekyll/migrators/drupal.rb
+- lib/jekyll/migrators/enki.rb
 - lib/jekyll/migrators/marley.rb
 - lib/jekyll/migrators/mephisto.rb
 - lib/jekyll/migrators/mt.rb
+- lib/jekyll/migrators/posterous.rb
 - lib/jekyll/migrators/textpattern.rb
+- lib/jekyll/migrators/tumblr.rb
 - lib/jekyll/migrators/typo.rb
-- lib/jekyll/migrators/wordpress.com.rb
 - lib/jekyll/migrators/wordpress.rb
+- lib/jekyll/migrators/wordpressdotcom.rb
 - lib/jekyll/page.rb
 - lib/jekyll/plugin.rb
 - lib/jekyll/post.rb
@@ -234,6 +294,8 @@ files:
 - lib/jekyll/static_file.rb
 - lib/jekyll/tags/highlight.rb
 - lib/jekyll/tags/include.rb
+- output/stylesheets/scribe-quirks.css
+- output/stylesheets/scribe.css
 - test/helper.rb
 - test/source/.htaccess
 - test/source/_includes/sig.markdown
@@ -262,6 +324,8 @@ files:
 - test/source/_posts/2010-01-09-time-override.textile
 - test/source/_posts/2010-01-09-timezone-override.textile
 - test/source/_posts/2010-01-16-override-data.textile
+- test/source/_posts/2011-04-12-md-extension.md
+- test/source/_posts/2011-04-12-text-extension.text
 - test/source/about.html
 - test/source/category/_posts/2008-9-23-categories.textile
 - test/source/contacts.html
@@ -282,6 +346,7 @@ files:
 - test/test_pager.rb
 - test/test_post.rb
 - test/test_rdiscount.rb
+- test/test_redcarpet.rb
 - test/test_site.rb
 - test/test_tags.rb
 has_rdoc: true
@@ -328,5 +393,6 @@ test_files:
 - test/test_pager.rb
 - test/test_post.rb
 - test/test_rdiscount.rb
+- test/test_redcarpet.rb
 - test/test_site.rb
 - test/test_tags.rb

data/lib/jekyll/albino.rb

@@ -1,120 +0,0 @@
-##
-# Wrapper for the Pygments command line tool, pygmentize.
-#
-# Pygments: http://pygments.org/
-#
-# Assumes pygmentize is in the path.  If not, set its location
-# with Albino.bin = '/path/to/pygmentize'
-#
-# Use like so:
-#
-#   @syntaxer = Albino.new('/some/file.rb', :ruby)
-#   puts @syntaxer.colorize
-#
-# This'll print out an HTMLized, Ruby-highlighted version
-# of '/some/file.rb'.
-#
-# To use another formatter, pass it as the third argument:
-#
-#   @syntaxer = Albino.new('/some/file.rb', :ruby, :bbcode)
-#   puts @syntaxer.colorize
-#
-# You can also use the #colorize class method:
-#
-#   puts Albino.colorize('/some/file.rb', :ruby)
-#
-# Another also: you get a #to_s, for somewhat nicer use in Rails views.
-#
-#   ... helper file ...
-#   def highlight(text)
-#     Albino.new(text, :ruby)
-#   end
-#
-#   ... view file ...
-#   <%= highlight text %>
-#
-# The default lexer is 'text'.  You need to specify a lexer yourself;
-# because we are using STDIN there is no auto-detect.
-#
-# To see all lexers and formatters available, run `pygmentize -L`.
-#
-# Chris Wanstrath // chris@ozmm.org
-#         GitHub // http://github.com
-#
-
-class Albino
-  @@bin = Rails.development? ? 'pygmentize' : '/usr/bin/pygmentize' rescue 'pygmentize'
-
-  def self.bin=(path)
-    @@bin = path
-  end
-
-  def self.colorize(*args)
-    new(*args).colorize
-  end
-
-  def initialize(target, lexer = :text, format = :html)
-    @target  = target
-    @options = { :l => lexer, :f => format, :O => 'encoding=utf-8' }
-  end
-
-  def execute(command)
-    output = ''
-    IO.popen(command, mode='r+') do |p|
-      p.write @target
-      p.close_write
-      output = p.read.strip
-    end
-    output
-  end
-
-  def colorize(options = {})
-    html = execute(@@bin + convert_options(options))
-    # Work around an RDiscount bug: http://gist.github.com/97682
-    html.to_s.sub(%r{</pre></div>\Z}, "</pre>\n</div>")
-  end
-  alias_method :to_s, :colorize
-
-  def convert_options(options = {})
-    @options.merge(options).inject('') do |string, (flag, value)|
-      string + " -#{flag} #{value}"
-    end
-  end
-end
-
-if $0 == __FILE__
-  require 'rubygems'
-  require 'test/spec'
-  require 'mocha'
-  begin require 'redgreen'; rescue LoadError; end
-
-  context "Albino" do
-    setup do
-      @syntaxer = Albino.new(__FILE__, :ruby)
-    end
-
-    specify "defaults to text" do
-      syntaxer = Albino.new(__FILE__)
-      syntaxer.expects(:execute).with('pygmentize -f html -l text').returns(true)
-      syntaxer.colorize
-    end
-
-    specify "accepts options" do
-      @syntaxer.expects(:execute).with('pygmentize -f html -l ruby').returns(true)
-      @syntaxer.colorize
-    end
-
-    specify "works with strings" do
-      syntaxer = Albino.new('class New; end', :ruby)
-      assert_match %r(highlight), syntaxer.colorize
-    end
-
-    specify "aliases to_s" do
-      assert_equal @syntaxer.colorize, @syntaxer.to_s
-    end
-
-    specify "class method colorize" do
-      assert_equal @syntaxer.colorize, Albino.colorize(__FILE__, :ruby)
-    end
-  end
-end