jekyll 1.0.0.beta3 → 1.0.0.beta4

data/site/css/style.css

@@ -406,7 +406,7 @@ pre, code {
   line-height: 1.8em;
 }
 
-.highlight, p > pre, p > code {
+.highlight, p > pre, p > code, p > nobr > code, li > code {
   background: #333;
   color: #fff;
   border-radius: 5px;

data/test/test_filters.rb

@@ -13,6 +13,7 @@ class TestFilters < Test::Unit::TestCase
   context "filters" do
     setup do
       @filter = JekyllFilter.new
+      @sample_time = Time.utc(2013, 03, 27, 11, 22, 33)
     end
 
     should "textilize with simple string" do
@@ -42,6 +43,22 @@ class TestFilters < Test::Unit::TestCase
       assert_equal "chunky, bacon, bits, and pieces", @filter.array_to_sentence_string(["chunky", "bacon", "bits", "pieces"])
     end
 
+    should "format a date with short format" do
+      assert_equal "27 Mar 2013", @filter.date_to_string(@sample_time)
+    end
+
+    should "format a date with long format" do
+      assert_equal "27 March 2013", @filter.date_to_long_string(@sample_time)
+    end
+
+    should "format a time with xmlschema" do
+      assert_equal "2013-03-27T11:22:33Z", @filter.date_to_xmlschema(@sample_time)
+    end
+
+    should "format a time according to RFC-822" do
+      assert_equal "Wed, 27 Mar 2013 11:22:33 -0000", @filter.date_to_rfc822(@sample_time)
+    end
+
     should "escape xml with ampersands" do
       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>")

data/test/test_post.rb

@@ -214,6 +214,18 @@ class TestPost < Test::Unit::TestCase
           end
         end
 
+        context "with ordinal style" do
+          setup do
+            @post.site.permalink_style = :ordinal
+            @post.process(@fake_file)
+          end
+
+          should "process the url correctly" do
+            assert_equal "/:categories/:year/:y_day/:title.html", @post.template
+            assert_equal "/2008/253/foo-bar.html", @post.url
+          end
+        end
+
         context "with custom date permalink" do
           setup do
             @post.site.permalink_style = '/:categories/:year/:i_month/:i_day/:title/'
@@ -225,6 +237,17 @@ class TestPost < Test::Unit::TestCase
           end
         end
 
+        context "with custom abbreviated month date permalink" do
+          setup do
+            @post.site.permalink_style = '/:categories/:year/:short_month/:day/:title/'
+            @post.process(@fake_file)
+          end
+
+          should "process the url correctly" do
+            assert_equal "/2008/Sep/09/foo-bar/", @post.url
+          end
+        end
+
         context "with prefix style and no extension" do
           setup do
             @post.site.permalink_style = "/prefix/:title"

data/test/test_site.rb

@@ -161,6 +161,7 @@ class TestSite < Test::Unit::TestCase
     should "read posts" do
       @site.read_posts('')
       posts = Dir[source_dir('_posts', '*')]
+      posts.delete_if { |post| File.directory?(post) }
       assert_equal posts.size - 1, @site.posts.size
     end
 
@@ -169,9 +170,10 @@ class TestSite < Test::Unit::TestCase
       @site.process
 
       posts = Dir[source_dir("**", "_posts", "*")]
+      posts.delete_if { |post| File.directory?(post) }
       categories = %w(bar baz category foo z_category publish_test win).sort
 
-      assert_equal posts.size - 1, @site.posts.size
+      assert_equal posts.size, @site.posts.size
       assert_equal categories, @site.categories.keys.sort
       assert_equal 4, @site.categories['foo'].size
     end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: jekyll
 version: !ruby/object:Gem::Version
-  version: 1.0.0.beta3
+  version: 1.0.0.beta4
   prerelease: 6
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-04-04 00:00:00.000000000 Z
+date: 2013-04-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: liquid
@@ -98,7 +98,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.3.2
+        version: 0.4.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -106,7 +106,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.3.2
+        version: 0.4.2
 - !ruby/object:Gem::Dependency
   name: commander
   requirement: !ruby/object:Gem::Requirement
@@ -227,6 +227,9 @@ dependencies:
     - - ~>
       - !ruby/object:Gem::Version
         version: 1.2.1
+    - - ! '!='
+      - !ruby/object:Gem::Version
+        version: 1.2.4
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -235,6 +238,9 @@ dependencies:
     - - ~>
       - !ruby/object:Gem::Version
         version: 1.2.1
+    - - ! '!='
+      - !ruby/object:Gem::Version
+        version: 1.2.4
 - !ruby/object:Gem::Dependency
   name: RedCloth
   requirement: !ruby/object:Gem::Requirement
@@ -485,6 +491,7 @@ files:
 - test/source/_posts/2013-01-02-post-excerpt.markdown
 - test/source/_posts/2013-01-12-nil-layout.textile
 - test/source/_posts/2013-01-12-no-layout.textile
+- test/source/_posts/2013-03-19-not-a-post.markdown/.gitkeep
 - test/source/about.html
 - test/source/category/_posts/2008-9-23-categories.textile
 - test/source/contacts.html