cypher-jekyll 0.5.2 → 0.5.3

data/features/support/env.rb

@@ -0,0 +1,18 @@
+require 'fileutils'
+require 'rr'
+require 'test/unit'
+
+World do
+  include Test::Unit::Assertions
+end
+
+TEST_DIR    = File.join('/', 'tmp', 'jekyll')
+JEKYLL_PATH = File.join(ENV['PWD'], 'bin', 'jekyll')
+
+def run_jekyll(opts = {})
+  if opts[:bg]
+    bg = '&'
+  end
+
+  system "#{JEKYLL_PATH} >> /dev/null"
+end

data/jekyll.gemspec

@@ -0,0 +1,120 @@
+# -*- encoding: utf-8 -*-
+
+Gem::Specification.new do |s|
+  s.name = %q{jekyll}
+  s.version = "0.5.3"
+
+  s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
+  s.authors = ["Tom Preston-Werner", "Henrik Nyh", "Markus Prinz"]
+  s.date = %q{2009-07-11}
+  s.default_executable = %q{jekyll}
+  s.description = %q{Jekyll is a simple, blog aware, static site generator.}
+  s.email = %q{tom@mojombo.com}
+  s.executables = ["jekyll"]
+  s.extra_rdoc_files = [
+    "README.textile"
+  ]
+  s.files = [
+    ".gitignore",
+     "History.txt",
+     "README.textile",
+     "Rakefile",
+     "TODO",
+     "VERSION.yml",
+     "bin/jekyll",
+     "features/create_sites.feature",
+     "features/embed_filters.feature",
+     "features/permalinks.feature",
+     "features/post_data.feature",
+     "features/site_configuration.feature",
+     "features/site_data.feature",
+     "features/step_definitions/jekyll_steps.rb",
+     "features/support/env.rb",
+     "jekyll.gemspec",
+     "lib/jekyll.rb",
+     "lib/jekyll/albino.rb",
+     "lib/jekyll/converters/csv.rb",
+     "lib/jekyll/converters/mephisto.rb",
+     "lib/jekyll/converters/mt.rb",
+     "lib/jekyll/converters/textpattern.rb",
+     "lib/jekyll/converters/typo.rb",
+     "lib/jekyll/converters/wordpress.rb",
+     "lib/jekyll/convertible.rb",
+     "lib/jekyll/core_ext.rb",
+     "lib/jekyll/filters.rb",
+     "lib/jekyll/haml_helpers.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-02-02-not-published.textile",
+     "test/source/_posts/2008-02-02-published.textile",
+     "test/source/_posts/2008-10-18-foo-bar.textile",
+     "test/source/_posts/2008-11-21-complex.textile",
+     "test/source/_posts/2008-12-03-permalinked-post.textile",
+     "test/source/_posts/2008-12-13-include.markdown",
+     "test/source/_posts/2009-01-27-array-categories.textile",
+     "test/source/_posts/2009-01-27-categories.textile",
+     "test/source/_posts/2009-01-27-category.textile",
+     "test/source/category/_posts/2008-9-23-categories.textile",
+     "test/source/css/screen.css",
+     "test/source/foo/_posts/bar/2008-12-12-topical-post.textile",
+     "test/source/index.html",
+     "test/source/z_category/_posts/2008-9-23-categories.textile",
+     "test/suite.rb",
+     "test/test_filters.rb",
+     "test/test_generated_site.rb",
+     "test/test_post.rb",
+     "test/test_site.rb",
+     "test/test_tags.rb"
+  ]
+  s.homepage = %q{http://github.com/mojombo/jekyll}
+  s.rdoc_options = ["--charset=UTF-8"]
+  s.require_paths = ["lib"]
+  s.rubyforge_project = %q{jekyll}
+  s.rubygems_version = %q{1.3.4}
+  s.summary = %q{Jekyll is a simple, blog aware, static site generator.}
+  s.test_files = [
+    "test/helper.rb",
+     "test/suite.rb",
+     "test/test_filters.rb",
+     "test/test_generated_site.rb",
+     "test/test_post.rb",
+     "test/test_site.rb",
+     "test/test_tags.rb"
+  ]
+
+  if s.respond_to? :specification_version then
+    current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
+    s.specification_version = 3
+
+    if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
+      s.add_runtime_dependency(%q<RedCloth>, [">= 4.0.4"])
+      s.add_runtime_dependency(%q<liquid>, [">= 1.9.0"])
+      s.add_runtime_dependency(%q<classifier>, [">= 1.3.1"])
+      s.add_runtime_dependency(%q<maruku>, [">= 0.5.9"])
+      s.add_runtime_dependency(%q<directory_watcher>, [">= 1.1.1"])
+      s.add_runtime_dependency(%q<open4>, [">= 0.9.6"])
+    else
+      s.add_dependency(%q<RedCloth>, [">= 4.0.4"])
+      s.add_dependency(%q<liquid>, [">= 1.9.0"])
+      s.add_dependency(%q<classifier>, [">= 1.3.1"])
+      s.add_dependency(%q<maruku>, [">= 0.5.9"])
+      s.add_dependency(%q<directory_watcher>, [">= 1.1.1"])
+      s.add_dependency(%q<open4>, [">= 0.9.6"])
+    end
+  else
+    s.add_dependency(%q<RedCloth>, [">= 4.0.4"])
+    s.add_dependency(%q<liquid>, [">= 1.9.0"])
+    s.add_dependency(%q<classifier>, [">= 1.3.1"])
+    s.add_dependency(%q<maruku>, [">= 0.5.9"])
+    s.add_dependency(%q<directory_watcher>, [">= 1.1.1"])
+    s.add_dependency(%q<open4>, [">= 0.9.6"])
+  end
+end

data/lib/jekyll/filters.rb

@@ -22,11 +22,7 @@ module Jekyll
     end
 
     def xml_escape(input)
-      CGI.escapeHTML(input)
-    end
-
-    def cgi_escape(input)
-      CGI::escape(input)
+      input.gsub("&", "&amp;").gsub("<", "&lt;").gsub(">", "&gt;")
     end
 
     def number_of_words(input)

data/lib/jekyll/post.rb

@@ -136,7 +136,7 @@ module Jekyll
         "year"       => date.strftime("%Y"),
         "month"      => date.strftime("%m"),
         "day"        => date.strftime("%d"),
-        "title"      => CGI.escape(slug),
+        "title"      => slug,
         "categories" => categories.sort.join('/')
       }.inject(template) { |result, token|
         result.gsub(/:#{token.first}/, token.last)
@@ -233,8 +233,7 @@ module Jekyll
     def write(dest)
       FileUtils.mkdir_p(File.join(dest, dir))
 
-      # The url needs to be unescaped in order to preserve the correct filename
-      path = File.join(dest, CGI.unescape(self.url))
+      path = File.join(dest, self.generated_path)
 
       if template[/\.html$/].nil?
         FileUtils.mkdir_p(path)

data/lib/jekyll/site.rb

@@ -1,8 +1,8 @@
 module Jekyll
 
   class Site
-    attr_accessor :config, :layouts, :posts, :categories, :exclude, :collated_posts, :tags
-    attr_accessor :source, :dest, :lsi, :pygments, :permalink_style, :pygments_cache
+    attr_accessor :config, :layouts, :posts, :collated_posts, :categories, :tags
+    attr_accessor :source, :dest, :lsi, :pygments, :pygments_cache, :permalink_style,
                   :sass, :post_defaults
 
     # Initialize the site
@@ -18,7 +18,6 @@ module Jekyll
       self.pygments        = config['pygments']
       self.pygments_cache  = config['pygments_cache']
       self.permalink_style = config['permalink'].to_sym
-      self.exclude         = config['exclude'] || []
       self.post_defaults   = config['post_defaults'] || {}
 
       self.reset
@@ -51,12 +50,13 @@ module Jekyll
         begin
           require 'haml'
           require 'jekyll/haml_helpers'
-          helpers = File.join(source, '_helpers.rb')
-          require helpers if File.exist?(helpers)
           puts 'Enabled Haml'
         rescue LoadError
           puts 'You must have the haml gem installed first'
         end
+        # Load helpers if available
+        helpers = File.join(source, '_helpers.rb')
+        require helpers if File.exist?(helpers)
       end
       
       if self.pygments_cache
@@ -75,6 +75,7 @@ module Jekyll
               RDiscount.new(content).to_html
             end
 
+            puts 'Using rdiscount for Markdown'
           rescue LoadError
             puts 'You must have the rdiscount gem installed first'
           end
@@ -290,9 +291,11 @@ module Jekyll
     def filter_entries(entries)
       entries = entries.reject do |e|
         unless ['_posts', '.htaccess'].include?(e)
-          ['.', '_', '#'].include?(e[0..0]) || e[-1..-1] == '~' || self.exclude.include?(e)
+          # Reject backup/hidden
+          ['.', '_', '#'].include?(e[0..0]) or e[-1..-1] == '~'
         end
       end
     end
+
   end
 end

data/test/helper.rb

@@ -1,6 +1,3 @@
-require 'rubygems'
-gem 'RedCloth', '= 4.1.0'
-
 require File.join(File.dirname(__FILE__), *%w[.. lib jekyll])
 
 require 'test/unit'

data/test/test_filters.rb

@@ -37,13 +37,5 @@ class TestFilters < Test::Unit::TestCase
       assert_equal "AT&amp;T", @filter.xml_escape("AT&T")
       assert_equal "&lt;code&gt;command &amp;lt;filename&amp;gt;&lt;/code&gt;", @filter.xml_escape("<code>command &lt;filename&gt;</code>")
     end
-
-    should "escape space as plus" do
-      assert_equal "my+things", @filter.cgi_escape("my things")
-    end
-
-    should "escape special characters" do
-      assert_equal "hey%21", @filter.cgi_escape("hey!")
-    end
   end
 end

data/test/test_post.rb

@@ -52,13 +52,6 @@ class TestPost < Test::Unit::TestCase
         assert_equal "/2008/10/19/foo-bar.html", @post.url
       end
 
-      should "CGI escape urls" do
-        @post.categories = []
-        @post.process("2009-03-12-hash-#1.markdown")
-        assert_equal "/2009/03/12/hash-%231.html", @post.url
-        assert_equal "/2009/03/12/hash-#1", @post.id
-      end
-
       should "respect permalink in yaml front matter" do
         file = "2008-12-03-permalinked-post.textile"
         @post.process(file)

data/test/test_site.rb

@@ -53,13 +53,5 @@ class TestSite < Test::Unit::TestCase
       assert_equal %w[foo.markdown bar.markdown baz.markdown], @site.filter_entries(ent1)
       assert_equal ent2, @site.filter_entries(ent2)
     end
-
-    should "filter entries with exclude" do
-      excludes = %w[README TODO]
-      includes = %w[index.html site.css]
-
-      @site.exclude = excludes
-      assert_equal includes, @site.filter_entries(excludes + includes)
-    end
   end
 end

data/test/test_tags.rb

@@ -2,29 +2,13 @@ require File.dirname(__FILE__) + '/helper'
 
 class TestTags < Test::Unit::TestCase
 
-  def create_post(content, override = {}, markdown = true)
+  def create_post(code)
     stub(Jekyll).configuration do
-      Jekyll::DEFAULTS.merge({'pygments' => true}).merge(override)
+      Jekyll::DEFAULTS.merge({'pygments' => true})
     end
     site = Site.new(Jekyll.configuration)
     info = { :filters => [Jekyll::Filters], :registers => { :site => site } }
 
-    if markdown
-      payload = {"content_type" => "markdown"}
-    else
-      payload = {"content_type" => "textile"}
-    end
-
-    @result = Liquid::Template.parse(content).render(payload, info)
-
-    if markdown
-      @result = site.markdown(@result)
-    else
-      @result = site.textile(@result)
-    end
-  end
-
-  def fill_post(code, override = {})
     content = <<CONTENT
 ---
 title: This is a test
@@ -36,12 +20,14 @@ This document results in a markdown error with maruku
 #{code}
 {% endhighlight %}
 CONTENT
-    create_post(content, override)
+
+    @result = Liquid::Template.parse(content).render({}, info)
+    @result = site.markdown(@result)
   end
 
   context "post content has highlight tag" do
     setup do
-      fill_post("test")
+      create_post("test")
     end
 
     should "not cause a markdown error" do
@@ -55,62 +41,11 @@ CONTENT
 
   context "post content has highlight tag with UTF character" do
     setup do
-      fill_post("Æ")
+      create_post("Æ")
     end
 
     should "render markdown with pygments line handling" do
       assert_match %{<pre>Æ\n</pre>}, @result
     end
   end
-
-  context "simple post with markdown and pre tags" do
-    setup do
-      @content = <<CONTENT
----
-title: Maruku vs. RDiscount
----
-
-_FIGHT!_
-
-{% highlight ruby %}
-puts "3..2..1.."
-{% endhighlight %}
-
-*FINISH HIM*
-CONTENT
-    end
-
-    context "using Textile" do
-      setup do
-        create_post(@content, {}, false)
-      end
-
-      # Broken in RedCloth 4.1.9
-      should "not textilize highlight block" do
-        assert_no_match %r{3\.\.2\.\.1\.\.&quot;</span><br />}, @result
-      end
-    end
-
-    context "using Maruku" do
-      setup do
-        create_post(@content)
-      end
-
-      should "parse correctly" do
-        assert_match %r{<em>FIGHT!</em>}, @result
-        assert_match %r{<em>FINISH HIM</em>}, @result
-      end
-    end
-
-    context "using RDiscount" do
-      setup do
-        create_post(@content, 'markdown' => 'rdiscount')
-      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,16 +1,17 @@
 --- !ruby/object:Gem::Specification 
 name: cypher-jekyll
 version: !ruby/object:Gem::Version 
-  version: 0.5.2
+  version: 0.5.3
 platform: ruby
 authors: 
 - Tom Preston-Werner
 - Henrik Nyh
+- Markus Prinz
 autorequire: 
 bindir: bin
 cert_chain: []
 
-date: 2009-04-27 00:00:00 -07:00
+date: 2009-07-11 00:00:00 -07:00
 default_executable: jekyll
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -19,9 +20,9 @@ dependencies:
   version_requirement: 
   version_requirements: !ruby/object:Gem::Requirement 
     requirements: 
-    - - "="
+    - - ">="
       - !ruby/object:Gem::Version 
-        version: 4.1.0
+        version: 4.0.4
     version: 
 - !ruby/object:Gem::Dependency 
   name: liquid
@@ -82,11 +83,22 @@ extensions: []
 extra_rdoc_files: 
 - README.textile
 files: 
+- .gitignore
 - History.txt
 - README.textile
 - Rakefile
+- TODO
 - VERSION.yml
 - bin/jekyll
+- features/create_sites.feature
+- features/embed_filters.feature
+- features/permalinks.feature
+- features/post_data.feature
+- features/site_configuration.feature
+- features/site_data.feature
+- features/step_definitions/jekyll_steps.rb
+- features/support/env.rb
+- jekyll.gemspec
 - lib/jekyll.rb
 - lib/jekyll/albino.rb
 - lib/jekyll/converters/csv.rb
@@ -118,7 +130,6 @@ files:
 - test/source/_posts/2009-01-27-array-categories.textile
 - test/source/_posts/2009-01-27-categories.textile
 - test/source/_posts/2009-01-27-category.textile
-- test/source/_posts/2009-03-12-hash-#1.markdown
 - test/source/category/_posts/2008-9-23-categories.textile
 - test/source/css/screen.css
 - test/source/foo/_posts/bar/2008-12-12-topical-post.textile
@@ -130,7 +141,7 @@ files:
 - test/test_post.rb
 - test/test_site.rb
 - test/test_tags.rb
-has_rdoc: true
+has_rdoc: false
 homepage: http://github.com/mojombo/jekyll
 post_install_message: 
 rdoc_options: 
@@ -154,7 +165,7 @@ requirements: []
 rubyforge_project: jekyll
 rubygems_version: 1.2.0
 signing_key: 
-specification_version: 2
+specification_version: 3
 summary: Jekyll is a simple, blog aware, static site generator.
 test_files: 
 - test/helper.rb