jberkel-jekyll 0.5.4 → 0.5.7

data/test/test_site.rb

@@ -19,11 +19,17 @@ class TestSite < Test::Unit::TestCase
       before_posts = @site.posts.length
       before_layouts = @site.layouts.length
       before_categories = @site.categories.length
+      before_tags = @site.tags.length
+      before_pages = @site.pages.length
+      before_static_files = @site.static_files.length
 
       @site.process
       assert_equal before_posts, @site.posts.length
       assert_equal before_layouts, @site.layouts.length
       assert_equal before_categories, @site.categories.length
+      assert_equal before_tags, @site.tags.length
+      assert_equal before_pages, @site.pages.length
+      assert_equal before_static_files, @site.static_files.length
     end
 
     should "read layouts" do
@@ -52,10 +58,10 @@ class TestSite < Test::Unit::TestCase
     should "filter entries" do
       ent1 = %w[foo.markdown bar.markdown baz.markdown #baz.markdown#
               .baz.markdow foo.markdown~]
-      ent2 = %w[.htaccess _posts bla.bla]
+      ent2 = %w[.htaccess _posts _pages bla.bla]
 
       assert_equal %w[foo.markdown bar.markdown baz.markdown], @site.filter_entries(ent1)
-      assert_equal ent2, @site.filter_entries(ent2)
+      assert_equal %w[.htaccess bla.bla], @site.filter_entries(ent2)
     end
 
     should "filter entries with exclude" do

data/test/test_tags.rb

@@ -49,7 +49,7 @@ CONTENT
     end
 
     should "render markdown with pygments line handling" do
-      assert_match %{<pre>test\n</pre>}, @result
+      assert_match %{<pre><code class='text'>test\n</code></pre>}, @result
     end
   end
 
@@ -59,7 +59,7 @@ CONTENT
     end
 
     should "render markdown with pygments line handling" do
-      assert_match %{<pre>Æ\n</pre>}, @result
+      assert_match %{<pre><code class='text'>Æ\n</code></pre>}, @result
     end
   end
 

metadata

@@ -1,7 +1,12 @@
 --- !ruby/object:Gem::Specification 
 name: jberkel-jekyll
 version: !ruby/object:Gem::Version 
-  version: 0.5.4
+  prerelease: false
+  segments: 
+  - 0
+  - 5
+  - 7
+  version: 0.5.7
 platform: ruby
 authors: 
 - Tom Preston-Werner
@@ -9,69 +14,93 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-02-17 00:00:00 +01:00
+date: 2010-03-14 00:00:00 +01:00
 default_executable: jekyll
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: RedCloth
-  type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id001 !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        segments: 
+        - 4
+        - 2
+        - 1
         version: 4.2.1
-    version: 
+  type: :runtime
+  version_requirements: *id001
 - !ruby/object:Gem::Dependency 
   name: liquid
-  type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id002 !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        segments: 
+        - 1
+        - 9
+        - 0
         version: 1.9.0
-    version: 
+  type: :runtime
+  version_requirements: *id002
 - !ruby/object:Gem::Dependency 
   name: classifier
-  type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id003 !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        segments: 
+        - 1
+        - 3
+        - 1
         version: 1.3.1
-    version: 
+  type: :runtime
+  version_requirements: *id003
 - !ruby/object:Gem::Dependency 
   name: maruku
-  type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id004 !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        segments: 
+        - 0
+        - 5
+        - 9
         version: 0.5.9
-    version: 
+  type: :runtime
+  version_requirements: *id004
 - !ruby/object:Gem::Dependency 
   name: directory_watcher
-  type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id005 !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        segments: 
+        - 1
+        - 1
+        - 1
         version: 1.1.1
-    version: 
+  type: :runtime
+  version_requirements: *id005
 - !ruby/object:Gem::Dependency 
   name: open4
-  type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id006 !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        segments: 
+        - 0
+        - 9
+        - 6
         version: 0.9.6
-    version: 
+  type: :runtime
+  version_requirements: *id006
 description: Jekyll is a simple, blog aware, static site generator.
 email: tom@mojombo.com
 executables: 
@@ -89,6 +118,7 @@ files:
 - bin/jekyll
 - features/create_sites.feature
 - features/embed_filters.feature
+- features/markdown.feature
 - features/pagination.feature
 - features/permalinks.feature
 - features/post_data.feature
@@ -100,7 +130,6 @@ files:
 - lib/jekyll.rb
 - lib/jekyll/albino.rb
 - lib/jekyll/converters/csv.rb
-- lib/jekyll/converters/marley.rb
 - lib/jekyll/converters/mephisto.rb
 - lib/jekyll/converters/mt.rb
 - lib/jekyll/converters/textpattern.rb
@@ -115,6 +144,7 @@ files:
 - lib/jekyll/pager.rb
 - lib/jekyll/post.rb
 - lib/jekyll/site.rb
+- lib/jekyll/static_file.rb
 - lib/jekyll/tags/highlight.rb
 - lib/jekyll/tags/include.rb
 - test/helper.rb
@@ -130,11 +160,18 @@ 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-01-27-empty-categories.textile
+- test/source/_posts/2009-01-27-empty-category.textile
 - test/source/_posts/2009-03-12-hash-#1.markdown
+- test/source/_posts/2009-05-18-empty-tag.textile
+- test/source/_posts/2009-05-18-empty-tags.textile
 - test/source/_posts/2009-05-18-tag.textile
 - test/source/_posts/2009-05-18-tags.textile
 - test/source/_posts/2009-06-22-empty-yaml.textile
 - test/source/_posts/2009-06-22-no-yaml.textile
+- test/source/_posts/2010-01-08-triple-dash.markdown
+- test/source/_posts/2010-01-09-date-override.textile
+- test/source/_posts/2010-01-09-time-override.textile
 - test/source/about.html
 - test/source/category/_posts/2008-9-23-categories.textile
 - test/source/contacts.html
@@ -146,6 +183,7 @@ files:
 - test/source/z_category/_posts/2008-9-23-categories.textile
 - test/suite.rb
 - test/test_configuration.rb
+- test/test_core_ext.rb
 - test/test_filters.rb
 - test/test_generated_site.rb
 - test/test_page.rb
@@ -166,18 +204,20 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      segments: 
+      - 0
       version: "0"
-  version: 
 required_rubygems_version: !ruby/object:Gem::Requirement 
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      segments: 
+      - 0
       version: "0"
-  version: 
 requirements: []
 
 rubyforge_project: jekyll
-rubygems_version: 1.3.5
+rubygems_version: 1.3.6
 signing_key: 
 specification_version: 3
 summary: Jekyll is a simple, blog aware, static site generator.
@@ -185,6 +225,7 @@ test_files:
 - test/helper.rb
 - test/suite.rb
 - test/test_configuration.rb
+- test/test_core_ext.rb
 - test/test_filters.rb
 - test/test_generated_site.rb
 - test/test_page.rb

data/lib/jekyll/converters/marley.rb

@@ -1,53 +0,0 @@
-require 'yaml'
-require 'fileutils'
-
-module Jekyll
-  module Marley
-
-    def self.regexp
-      { :id    => /^\d{0,4}-{0,1}(.*)$/,
-        :title => /^#\s*(.*)\s+$/,
-        :title_with_date => /^#\s*(.*)\s+\(([0-9\/]+)\)$/,
-        :published_on => /.*\s+\(([0-9\/]+)\)$/,
-        :perex => /^([^\#\n]+\n)$/,
-        :meta  => /^\{\{\n(.*)\}\}\n$/mi # Multiline Regexp 
-      }
-    end
-
-    def self.process(marley_data_dir)
-      raise ArgumentError, "marley dir #{marley_data_dir} not found" unless File.directory?(marley_data_dir)
-
-      FileUtils.mkdir_p "_posts"
-
-      posts = 0
-      Dir["#{marley_data_dir}/**/*.txt"].each do |f|
-        next unless File.exists?(f)
-
-        #copied over from marley's app/lib/post.rb
-        file_content  = File.read(f)
-        meta_content  = file_content.slice!( self.regexp[:meta] )
-        body          = file_content.sub( self.regexp[:title], '').sub( self.regexp[:perex], '').strip
-   
-        title = file_content.scan( self.regexp[:title] ).first.to_s.strip
-        prerex = file_content.scan( self.regexp[:perex] ).first.to_s.strip
-        published_on = DateTime.parse( post[:published_on] ) rescue File.mtime( File.dirname(f) )
-        meta          = ( meta_content ) ? YAML::load( meta_content.scan( self.regexp[:meta]).to_s ) : {}
-        meta['title'] = title
-        meta['layout'] = 'post'
-
-        formatted_date = published_on.strftime('%Y-%m-%d')
-        post_name =  File.dirname(f).split(%r{/}).last.gsub(/\A\d+-/, '')
-
-        name = "#{formatted_date}-#{post_name}" 
-        File.open("_posts/#{name}.markdown", "w") do |f|
-          f.puts meta.to_yaml
-          f.puts "---\n"
-          f.puts "\n#{prerex}\n\n" if prerex
-          f.puts body
-        end
-        posts += 1
-      end
-      "Created #{posts} posts!"
-    end
-  end
-end