jekyll 0.12.1 → 1.0.0.beta1

data/test/test_rdiscount.rb

@@ -8,7 +8,7 @@ class TestRdiscount < Test::Unit::TestCase
         'markdown' => 'rdiscount',
         'rdiscount' => { 'extensions' => ['smart', 'generate_toc'], 'toc_token' => '{:toc}' }
       }
-      @markdown = MarkdownConverter.new config
+      @markdown = Converters::Markdown.new config
     end
 
     should "pass rdiscount extensions" do

data/test/test_redcarpet.rb

@@ -7,7 +7,7 @@ class TestRedcarpet < Test::Unit::TestCase
         'redcarpet' => { 'extensions' => ['smart', 'strikethrough', 'filter_html'] },
         'markdown' => 'redcarpet'
       }
-      @markdown = MarkdownConverter.new config
+      @markdown = Converters::Markdown.new config
     end
 
     should "pass redcarpet options" do

data/test/test_redcloth.rb

@@ -4,7 +4,7 @@ class TestRedCloth < Test::Unit::TestCase
 
   context "RedCloth default (no explicit config) hard_breaks enabled" do
     setup do
-      @textile = TextileConverter.new
+      @textile = Converters::Textile.new
     end
     
     should "preserve single line breaks in HTML output" do 
@@ -17,7 +17,7 @@ class TestRedCloth < Test::Unit::TestCase
       config = {
         'redcloth'      => {}
         }
-      @textile = TextileConverter.new config
+      @textile = Converters::Textile.new config
     end
     
     should "preserve single line breaks in HTML output" do 
@@ -32,7 +32,7 @@ class TestRedCloth < Test::Unit::TestCase
           'hard_breaks' => true # default
         }
       }
-      @textile = TextileConverter.new config
+      @textile = Converters::Textile.new config
     end
     
     should "preserve single line breaks in HTML output" do 
@@ -47,7 +47,7 @@ class TestRedCloth < Test::Unit::TestCase
           'hard_breaks' => false
         }
       }
-      @textile = TextileConverter.new config
+      @textile = Converters::Textile.new config
     end
 
     should "not generate break tags in HTML output" do
@@ -62,7 +62,7 @@ class TestRedCloth < Test::Unit::TestCase
           'no_span_caps' => false
         }
       }
-      @textile = TextileConverter.new config
+      @textile = Converters::Textile.new config
     end
     should "generate span tags around capitalized words" do
       assert_equal "<p><span class=\"caps\">NSC</span></p>", @textile.convert("NSC").strip
@@ -76,7 +76,7 @@ class TestRedCloth < Test::Unit::TestCase
           'no_span_caps' => true
         }
       }
-      @textile = TextileConverter.new config
+      @textile = Converters::Textile.new config
     end
 
     should "not generate span tags around capitalized words" do

data/test/test_site.rb

@@ -7,6 +7,11 @@ class TestSite < Test::Unit::TestCase
       assert_equal [File.join(Dir.pwd, '_plugins')], site.plugins
     end
 
+    should "look for plugins under the site directory by default" do
+      site = Site.new(Jekyll::DEFAULTS.merge({'source' => File.expand_path(source_dir)}))
+      assert_equal [File.join(source_dir, '_plugins')], site.plugins
+    end
+
     should "have an array for plugins if passed as a string" do
       site = Site.new(Jekyll::DEFAULTS.merge({'plugins' => '/tmp/plugins'}))
       assert_equal ['/tmp/plugins'], site.plugins
@@ -26,6 +31,7 @@ class TestSite < Test::Unit::TestCase
       site = Site.new(Jekyll::DEFAULTS.merge({'plugins' => nil}))
       assert_equal [], site.plugins
     end
+
   end
   context "creating sites" do
     setup do
@@ -154,25 +160,61 @@ class TestSite < Test::Unit::TestCase
       excludes = %w[README TODO]
       files = %w[index.html site.css .htaccess]
 
-      @site.exclude = excludes
-      assert_equal files, @site.filter_entries(excludes + files)
+      @site.exclude = excludes + ["exclude*"]
+      assert_equal files, @site.filter_entries(excludes + files + ["excludeA"])
     end
     
     should "not filter entries within include" do
-      includes = %w[_index.html .htaccess]
-      files = %w[index.html _index.html .htaccess]
+      includes = %w[_index.html .htaccess include*]
+      files = %w[index.html _index.html .htaccess includeA]
 
       @site.include = includes
       assert_equal files, @site.filter_entries(files)
     end
 
+    should "filter symlink entries when safe mode enabled" do
+      stub(Jekyll).configuration do
+        Jekyll::DEFAULTS.merge({'source' => source_dir, 'destination' => dest_dir, 'safe' => true})
+      end
+      site = Site.new(Jekyll.configuration)
+      stub(File).symlink?('symlink.js') {true}
+      files = %w[symlink.js]
+      assert_equal [], site.filter_entries(files)
+    end
+
+    should "not filter symlink entries when safe mode disabled" do
+      stub(File).symlink?('symlink.js') {true}
+      files = %w[symlink.js]
+      assert_equal files, @site.filter_entries(files)
+    end
+
+    context 'error handling' do
+      should "raise if destination is included in source" do
+        stub(Jekyll).configuration do
+          Jekyll::DEFAULTS.merge({'source' => source_dir, 'destination' => source_dir})
+        end
+
+        assert_raise Jekyll::FatalException do
+          site = Site.new(Jekyll.configuration)
+        end
+      end
+
+      should "raise if destination is source" do
+        stub(Jekyll).configuration do
+          Jekyll::DEFAULTS.merge({'source' => source_dir, 'destination' => File.join(source_dir, "..")})
+        end
+
+        assert_raise Jekyll::FatalException do
+          site = Site.new(Jekyll.configuration)
+        end
+      end
+    end
+
     context 'with orphaned files in destination' do
       setup do
         clear_dest
         @site.process
         # generate some orphaned files:
-        # hidden file
-        File.open(dest_dir('.htpasswd'), 'w')
         # single file
         File.open(dest_dir('obsolete.html'), 'w')
         # single file in sub directory
@@ -180,23 +222,46 @@ class TestSite < Test::Unit::TestCase
         File.open(dest_dir('qux/obsolete.html'), 'w')
         # empty directory
         FileUtils.mkdir(dest_dir('quux'))
+        FileUtils.mkdir(dest_dir('.git'))
+        FileUtils.mkdir(dest_dir('.svn'))
+        FileUtils.mkdir(dest_dir('.hg'))
+        # single file in repository
+        File.open(dest_dir('.git/HEAD'), 'w')
+        File.open(dest_dir('.svn/HEAD'), 'w')
+        File.open(dest_dir('.hg/HEAD'), 'w')
       end
       
       teardown do
-        FileUtils.rm_f(dest_dir('.htpasswd'))
         FileUtils.rm_f(dest_dir('obsolete.html'))
         FileUtils.rm_rf(dest_dir('qux'))
         FileUtils.rm_f(dest_dir('quux'))
+        FileUtils.rm_rf(dest_dir('.git'))
+        FileUtils.rm_rf(dest_dir('.svn'))
+        FileUtils.rm_rf(dest_dir('.hg'))
       end
       
       should 'remove orphaned files in destination' do
         @site.process
-        assert !File.exist?(dest_dir('.htpasswd'))
         assert !File.exist?(dest_dir('obsolete.html'))
         assert !File.exist?(dest_dir('qux'))
         assert !File.exist?(dest_dir('quux'))
+        assert File.exist?(dest_dir('.git'))
+        assert File.exist?(dest_dir('.git/HEAD'))
       end
 
+      should 'remove orphaned files in destination - keep_files .svn' do
+        config = Jekyll::DEFAULTS.merge({'source' => source_dir, 'destination' => dest_dir, 'keep_files' => ['.svn']})
+        @site = Site.new(config)
+        @site.process
+        assert !File.exist?(dest_dir('.htpasswd'))
+        assert !File.exist?(dest_dir('obsolete.html'))
+        assert !File.exist?(dest_dir('qux'))
+        assert !File.exist?(dest_dir('quux'))
+        assert !File.exist?(dest_dir('.git'))
+        assert !File.exist?(dest_dir('.git/HEAD'))
+        assert File.exist?(dest_dir('.svn'))
+        assert File.exist?(dest_dir('.svn/HEAD'))
+      end
     end
     
     context 'with an invalid markdown processor in the configuration' do

data/test/test_tags.rb

@@ -4,7 +4,7 @@ require 'helper'
 
 class TestTags < Test::Unit::TestCase
 
-  def create_post(content, override = {}, converter_class = Jekyll::MarkdownConverter)
+  def create_post(content, override = {}, converter_class = Jekyll::Converters::Markdown)
     stub(Jekyll).configuration do
       Jekyll::DEFAULTS.deep_merge({'pygments' => true}).deep_merge(override)
     end
@@ -32,13 +32,14 @@ title: This is a test
 This document results in a markdown error with maruku
 
 {% highlight text %}#{code}{% endhighlight %}
+{% highlight text linenos %}#{code}{% endhighlight %}
 CONTENT
     create_post(content, override)
   end
 
   context "language name" do
     should "match only the required set of chars" do
-      r = Jekyll::HighlightBlock::SYNTAX
+      r = Jekyll::Tags::HighlightBlock::SYNTAX
       assert_match r, "ruby"
       assert_match r, "c#"
       assert_match r, "xml+cheetah"
@@ -54,20 +55,20 @@ CONTENT
 
   context "initialized tag" do
     should "work" do
-      tag = Jekyll::HighlightBlock.new('highlight', 'ruby ', ["test", "{% endhighlight %}", "\n"])
+      tag = Jekyll::Tags::HighlightBlock.new('highlight', 'ruby ', ["test", "{% endhighlight %}", "\n"])
       assert_equal({}, tag.instance_variable_get(:@options))
 
-      tag = Jekyll::HighlightBlock.new('highlight', 'ruby linenos ', ["test", "{% endhighlight %}", "\n"])
-      assert_equal({'O' => "linenos=inline"}, tag.instance_variable_get(:@options))
+      tag = Jekyll::Tags::HighlightBlock.new('highlight', 'ruby linenos ', ["test", "{% endhighlight %}", "\n"])
+      assert_equal({ 'linenos' => 'inline' }, tag.instance_variable_get(:@options))
 
-      tag = Jekyll::HighlightBlock.new('highlight', 'ruby linenos=table ', ["test", "{% endhighlight %}", "\n"])
-      assert_equal({'O' => "linenos=table"}, tag.instance_variable_get(:@options))
+      tag = Jekyll::Tags::HighlightBlock.new('highlight', 'ruby linenos=table ', ["test", "{% endhighlight %}", "\n"])
+      assert_equal({ 'linenos' => 'table' }, tag.instance_variable_get(:@options))
 
-      tag = Jekyll::HighlightBlock.new('highlight', 'ruby linenos=table nowrap', ["test", "{% endhighlight %}", "\n"])
-      assert_equal({'O' => "linenos=table,nowrap=true"}, tag.instance_variable_get(:@options))
+      tag = Jekyll::Tags::HighlightBlock.new('highlight', 'ruby linenos=table nowrap', ["test", "{% endhighlight %}", "\n"])
+      assert_equal({ 'linenos' => 'table', 'nowrap' => true }, tag.instance_variable_get(:@options))
 
-      tag = Jekyll::HighlightBlock.new('highlight', 'ruby linenos=table cssclass=hl', ["test", "{% endhighlight %}", "\n"])
-      assert_equal({'O' => "cssclass=hl,linenos=table"}, tag.instance_variable_get(:@options))
+      tag = Jekyll::Tags::HighlightBlock.new('highlight', 'ruby linenos=table cssclass=hl', ["test", "{% endhighlight %}", "\n"])
+      assert_equal({ 'cssclass' => 'hl', 'linenos' => 'table' }, tag.instance_variable_get(:@options))
     end
   end
 
@@ -80,9 +81,13 @@ CONTENT
       assert_no_match /markdown\-html\-error/, @result
     end
 
-    should "render markdown with pygments line handling" do
+    should "render markdown with pygments" do
       assert_match %{<pre><code class='text'>test\n</code></pre>}, @result
     end
+
+    should "render markdown with pygments with line numbers" do
+      assert_match %{<pre><code class='text'><span class='lineno'>1</span> test\n</code></pre>}, @result
+    end
   end
 
   context "post content has highlight with file reference" do
@@ -124,7 +129,7 @@ CONTENT
 
     context "using Textile" do
       setup do
-        create_post(@content, {}, Jekyll::TextileConverter)
+        create_post(@content, {}, Jekyll::Converters::Textile)
       end
 
       # Broken in RedCloth 4.1.9
@@ -198,4 +203,22 @@ CONTENT
       assert_match %r{/2008/11/21/complex/}, @result
     end
   end
+  
+  context "simple gist inclusion" do
+    setup do
+      @gist = 358471
+      content = <<CONTENT
+---
+title: My Cool Gist
+---
+
+{% gist #{@gist} %}
+CONTENT
+      create_post(content, {'permalink' => 'pretty', 'source' => source_dir, 'destination' => dest_dir, 'read_posts' => true})
+    end
+    
+    should "write script tag" do
+      assert_match %r{<script src='https://gist.github.com/#{@gist}.js'>\s</script>}, @result
+    end
+  end
 end

metadata

@@ -1,15 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: jekyll
 version: !ruby/object:Gem::Version
-  version: 0.12.1
-  prerelease: 
+  version: 1.0.0.beta1
+  prerelease: 6
 platform: ruby
 authors:
 - Tom Preston-Werner
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-02-19 00:00:00.000000000 Z
+date: 2013-03-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: liquid
@@ -107,6 +107,38 @@ dependencies:
     - - ~>
       - !ruby/object:Gem::Version
         version: 0.3.2
+- !ruby/object:Gem::Dependency
+  name: commander
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 4.1.3
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 4.1.3
+- !ruby/object:Gem::Dependency
+  name: safe_yaml
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.7.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.7.0
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -251,6 +283,54 @@ dependencies:
     - - ~>
       - !ruby/object:Gem::Version
         version: 2.2.2
+- !ruby/object:Gem::Dependency
+  name: launchy
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 2.1.2
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 2.1.2
+- !ruby/object:Gem::Dependency
+  name: simplecov
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '0.7'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '0.7'
+- !ruby/object:Gem::Dependency
+  name: simplecov-gem-adapter
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 1.0.1
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 1.0.1
 description: Jekyll is a simple, blog aware, static site generator.
 email: tom@mojombo.com
 executables:
@@ -260,6 +340,7 @@ extra_rdoc_files:
 - README.textile
 - LICENSE
 files:
+- CONTRIBUTING.md
 - Gemfile
 - History.txt
 - LICENSE
@@ -268,6 +349,7 @@ files:
 - bin/jekyll
 - cucumber.yml
 - features/create_sites.feature
+- features/drafts.feature
 - features/embed_filters.feature
 - features/markdown.feature
 - features/pagination.feature
@@ -279,40 +361,85 @@ files:
 - features/support/env.rb
 - jekyll.gemspec
 - lib/jekyll.rb
+- lib/jekyll/command.rb
+- lib/jekyll/commands/build.rb
+- lib/jekyll/commands/serve.rb
 - lib/jekyll/converter.rb
 - lib/jekyll/converters/identity.rb
 - lib/jekyll/converters/markdown.rb
 - lib/jekyll/converters/textile.rb
 - lib/jekyll/convertible.rb
 - lib/jekyll/core_ext.rb
+- lib/jekyll/draft.rb
 - lib/jekyll/errors.rb
 - lib/jekyll/filters.rb
 - lib/jekyll/generator.rb
 - lib/jekyll/generators/pagination.rb
 - lib/jekyll/layout.rb
-- lib/jekyll/migrators/csv.rb
-- lib/jekyll/migrators/drupal.rb
-- lib/jekyll/migrators/enki.rb
-- lib/jekyll/migrators/joomla.rb
-- lib/jekyll/migrators/marley.rb
-- lib/jekyll/migrators/mephisto.rb
-- lib/jekyll/migrators/mt.rb
-- lib/jekyll/migrators/posterous.rb
-- lib/jekyll/migrators/rss.rb
-- lib/jekyll/migrators/textpattern.rb
-- lib/jekyll/migrators/tumblr.rb
-- lib/jekyll/migrators/typo.rb
-- lib/jekyll/migrators/wordpress.rb
-- lib/jekyll/migrators/wordpressdotcom.rb
+- lib/jekyll/mime.types
 - lib/jekyll/page.rb
 - lib/jekyll/plugin.rb
 - lib/jekyll/post.rb
 - lib/jekyll/site.rb
 - lib/jekyll/static_file.rb
+- lib/jekyll/tags/gist.rb
 - lib/jekyll/tags/highlight.rb
 - lib/jekyll/tags/include.rb
 - lib/jekyll/tags/post_url.rb
+- script/bootstrap
+- site/.gitignore
+- site/CNAME
+- site/README
+- site/_config.yml
+- site/_includes/analytics.html
+- site/_includes/docs_contents.html
+- site/_includes/footer.html
+- site/_includes/header.html
+- site/_includes/section_nav.html
+- site/_includes/top.html
+- site/_layouts/default.html
+- site/_layouts/docs.html
+- site/_posts/2012-07-01-configuration.md
+- site/_posts/2012-07-01-contributing.md
+- site/_posts/2012-07-01-deployment-methods.md
+- site/_posts/2012-07-01-extras.md
+- site/_posts/2012-07-01-frontmatter.md
+- site/_posts/2012-07-01-github-pages.md
+- site/_posts/2012-07-01-heroku.md
+- site/_posts/2012-07-01-home.md
+- site/_posts/2012-07-01-installation.md
+- site/_posts/2012-07-01-migrations.md
+- site/_posts/2012-07-01-pages.md
+- site/_posts/2012-07-01-pagination.md
+- site/_posts/2012-07-01-permalinks.md
+- site/_posts/2012-07-01-plugins.md
+- site/_posts/2012-07-01-posts.md
+- site/_posts/2012-07-01-resources.md
+- site/_posts/2012-07-01-sites.md
+- site/_posts/2012-07-01-structure.md
+- site/_posts/2012-07-01-templates.md
+- site/_posts/2012-07-01-troubleshooting.md
+- site/_posts/2012-07-01-usage.md
+- site/_posts/2012-07-01-variables.md
+- site/css/grid.css
+- site/css/normalize.css
+- site/css/pygments.css
+- site/css/style.css
+- site/docs/index.html
+- site/favicon.png
+- site/img/article-footer.png
+- site/img/footer-arrow.png
+- site/img/footer-logo.png
+- site/img/logo-2x.png
+- site/img/octojekyll.png
+- site/img/tube.png
+- site/img/tube1x.png
+- site/index.html
+- site/js/modernizr-2.5.3.min.js
 - test/fixtures/broken_front_matter1.erb
+- test/fixtures/broken_front_matter2.erb
+- test/fixtures/broken_front_matter3.erb
+- test/fixtures/exploit_front_matter.erb
 - test/fixtures/front_matter.erb
 - test/helper.rb
 - test/source/.htaccess
@@ -344,9 +471,13 @@ files:
 - 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/_posts/2013-01-12-nil-layout.textile
+- test/source/_posts/2013-01-12-no-layout.textile
 - test/source/about.html
 - test/source/category/_posts/2008-9-23-categories.textile
 - test/source/contacts.html
+- test/source/contacts/bar.html
+- test/source/contacts/index.html
 - test/source/css/screen.css
 - test/source/deal.with.dots.html
 - test/source/foo/_posts/bar/2008-12-12-topical-post.textile
@@ -386,9 +517,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
-  - - ! '>='
+  - - ! '>'
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubyforge_project: jekyll
 rubygems_version: 1.8.23