tomafro-jekyll 0.5.3.2 → 0.5.3.3

data/lib/jekyll/filters.rb

@@ -28,19 +28,6 @@ module Jekyll
     def number_of_words(input)
       input.split.length
     end
-    
-    def ordinalize(number)
-      if (11..13).include?(number.to_i % 100)
-        "#{number}th"
-      else
-        case number.to_i % 10
-          when 1; "#{number}st"
-          when 2; "#{number}nd"
-          when 3; "#{number}rd"
-          else    "#{number}th"
-        end
-      end
-    end
 
     def array_to_sentence_string(array)
       connector = "and"
@@ -55,6 +42,20 @@ module Jekyll
         "#{array[0...-1].join(', ')}, #{connector} #{array[-1]}"
       end
     end
-
+    
+    # Stolen from ActiveSupport
+    
+    def ordinalize(number)
+      if (11..13).include?(number.to_i % 100)
+        "#{number}th"
+      else
+        case number.to_i % 10
+          when 1; "#{number}st"
+          when 2; "#{number}nd"
+          when 3; "#{number}rd"
+          else    "#{number}th"
+        end
+      end
+    end
   end
 end

data/lib/jekyll/page.rb

@@ -87,15 +87,19 @@ module Jekyll
     def write(dest_prefix, dest_suffix = nil)
       dest = File.join(dest_prefix, @dir)
       dest = File.join(dest, dest_suffix) if dest_suffix
-      FileUtils.mkdir_p(dest)
-
+      
       # The url needs to be unescaped in order to preserve the correct filename
       path = File.join(dest, CGI.unescape(self.url))
       if self.ext == '.html' && self.url[/\.html$/].nil?
-        FileUtils.mkdir_p(path)
-        path = File.join(path, "index.html")
+        if site.pretty_style == :html_extension
+          path = path + ".html"
+        else
+          path = File.join(path, "index.html")
+        end
       end
 
+      FileUtils.mkdir_p(File.dirname(path))
+
       File.open(path, 'w') do |f|
         f.write(self.output)
       end

data/lib/jekyll/post.rb

@@ -200,7 +200,8 @@ module Jekyll
       path = File.join(dest, CGI.unescape(self.url))
 
       if template[/\.html$/].nil?
-        path = "#{path}.html"
+        FileUtils.mkdir_p(path)
+        path = File.join(path, "index.html")
       end
 
       File.open(path, 'w') do |f|

data/lib/jekyll/site.rb

@@ -2,7 +2,7 @@ module Jekyll
 
   class Site
     attr_accessor :config, :layouts, :posts, :categories, :exclude,
-                  :source, :dest, :lsi, :pygments, :permalink_style, :tags
+                  :source, :dest, :lsi, :pygments, :permalink_style, :pretty_style, :tags
 
     # Initialize the site
     #   +config+ is a Hash containing site configurations details
@@ -17,7 +17,7 @@ module Jekyll
       self.pygments        = config['pygments']
       self.permalink_style = config['permalink'].to_sym
       self.exclude         = config['exclude'] || []
-
+      self.pretty_style     = (config['pretty_style'] && config['pretty_style'].to_sym) || :index_page
       self.reset
       self.setup
     end

data/test/test_filters.rb

@@ -45,11 +45,17 @@ class TestFilters < Test::Unit::TestCase
     should "escape special characters" do
       assert_equal "hey%21", @filter.cgi_escape("hey!")
     end
-    
+
     should "ordinalize numbers" do
       assert_equal "1st", @filter.ordinalize(1)
-      assert_equal "113th", @filter.ordinalize(113)
-      assert_equal "502nd", @filter.ordinalize(502)
+      assert_equal "22nd", @filter.ordinalize(22)
+      assert_equal "423rd", @filter.ordinalize(423)
+    end
+
+    should "ordinalize numbers in strings" do
+      assert_equal "1st", @filter.ordinalize("1")
+      assert_equal "22nd", @filter.ordinalize("22")
+      assert_equal "423rd", @filter.ordinalize("423")
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: tomafro-jekyll
 version: !ruby/object:Gem::Version 
-  version: 0.5.3.2
+  version: 0.5.3.3
 platform: ruby
 authors: 
 - Tom Preston-Werner