nirvdrum-jekyll 0.6.1 → 0.7.0

data/jekyll.gemspec

@@ -1,6 +1,3 @@
-# Generated by jeweler
-# DO NOT EDIT THIS FILE DIRECTLY
-# Instead, edit Jeweler::Tasks in Rakefile, and run the gemspec command
 # -*- encoding: utf-8 -*-
 
 Gem::Specification.new do |s|
@@ -9,7 +6,7 @@ Gem::Specification.new do |s|
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Tom Preston-Werner"]
-  s.date = %q{2010-02-11}
+  s.date = %q{2009-07-14}
   s.default_executable = %q{jekyll}
   s.description = %q{Jekyll is a simple, blog aware, static site generator.}
   s.email = %q{tom@mojombo.com}
@@ -71,15 +68,15 @@ Gem::Specification.new do |s|
      "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/_stylesheets/nested/override.less",
-     "test/source/_stylesheets/simple.less",
+     "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",
      "test/source/css/screen.css",
      "test/source/foo/_posts/bar/2008-12-12-topical-post.textile",
      "test/source/index.html",
-     "test/source/sitemap.xml",
      "test/source/win/_posts/2009-05-24-yaml-linebreak.markdown",
      "test/source/z_category/_posts/2008-9-23-categories.textile",
      "test/suite.rb",
@@ -97,7 +94,6 @@ Gem::Specification.new do |s|
   s.rdoc_options = ["--charset=UTF-8"]
   s.require_paths = ["lib"]
   s.rubyforge_project = %q{jekyll}
-  s.rubygems_version = %q{1.3.5}
   s.summary = %q{Jekyll is a simple, blog aware, static site generator.}
   s.test_files = [
     "test/helper.rb",
@@ -141,4 +137,3 @@ Gem::Specification.new do |s|
     s.add_dependency(%q<open4>, [">= 0.9.6"])
   end
 end
-

data/lib/jekyll.rb

@@ -27,6 +27,7 @@ require 'jekyll/filters'
 require 'jekyll/tags/highlight'
 require 'jekyll/tags/include'
 require 'jekyll/albino'
+require 'jekyll/static_file'
 
 module Jekyll
   # Default options. Overriden by values in _config.yml or command-line opts.
@@ -68,10 +69,10 @@ module Jekyll
     begin
       config = YAML.load_file(config_file)
       raise "Invalid configuration - #{config_file}" if !config.is_a?(Hash)
-      STDOUT.puts "Configuration from #{config_file}"
+      $stdout.puts "Configuration from #{config_file}"
     rescue => err
-      STDERR.puts "WARNING: Could not read configuration. Using defaults (and options)."
-      STDERR.puts "\t" + err.to_s
+      $stderr.puts "WARNING: Could not read configuration. Using defaults (and options)."
+      $stderr.puts "\t" + err.to_s
       config = {}
     end
 

data/lib/jekyll/convertible.rb

@@ -3,6 +3,10 @@
 #
 # Requires
 #   self.site -> Jekyll::Site
+#   self.content=
+#   self.data=
+#   self.ext=
+#   self.output=
 module Jekyll
   module Convertible
     # Return the contents as a string
@@ -18,7 +22,7 @@ module Jekyll
     def read_yaml(base, name)
       self.content = File.read(File.join(base, name))
       
-      if self.content =~ /^(---\s*\n.*?\n?)(---.*?\n)/m
+      if self.content =~ /^(---\s*\n.*?\n?)^(---\s*$\n?)/m
         self.content = self.content[($1.size + $2.size)..-1]
       
         self.data = YAML.load($1)
@@ -52,7 +56,7 @@ module Jekyll
       case self.ext[1..-1]
       when /textile/i
         return 'textile'
-      when /markdown/i, /mkdn/i, /md/i
+      when /markdown/i, /mkdn/i, /md/i, /mkd/i
         return 'markdown'
       when /less/i
         return 'less'  

data/lib/jekyll/core_ext.rb

@@ -19,6 +19,28 @@ class Hash
 
     target
   end
+
+  # Read array from the supplied hash favouring the singular key
+  # and then the plural key, and handling any nil entries.
+  #   +hash+ the hash to read from
+  #   +singular_key+ the singular key
+  #   +plural_key+ the singular key
+  #
+  # Returns an array
+  def pluralized_array(singular_key, plural_key)
+    hash = self
+    if hash.has_key?(singular_key)
+      array = [hash[singular_key]] if hash[singular_key]
+    elsif hash.has_key?(plural_key)
+      case hash[plural_key]
+      when String
+        array = hash[plural_key].split
+      when Array
+        array = hash[plural_key].compact
+      end
+    end
+    array || []
+  end
 end
 
 # Thanks, ActiveSupport!

data/lib/jekyll/page.rb

@@ -4,7 +4,7 @@ module Jekyll
     include Convertible
 
     attr_accessor :site
-    attr_accessor :name, :ext, :basename
+    attr_accessor :name, :ext, :basename, :dir
     attr_accessor :data, :content, :output
 
     # Initialize a new Page.
@@ -101,6 +101,10 @@ module Jekyll
       end
     end
 
+    def inspect
+      "#<Jekyll:Page @name=#{self.name.inspect}>"
+    end
+
     private
 
       def index?

data/lib/jekyll/pager.rb

@@ -4,7 +4,7 @@ module Jekyll
     
     def self.calculate_pages(all_posts, per_page)
       num_pages = all_posts.size / per_page.to_i
-      num_pages.abs + 1 if all_posts.size % per_page.to_i != 0
+      num_pages = num_pages + 1 if all_posts.size % per_page.to_i != 0
       num_pages
     end
     

data/lib/jekyll/post.rb

@@ -18,12 +18,9 @@ module Jekyll
       name =~ MATCHER
     end
 
-    attr_accessor :site, :date, :slug, :ext, :published, :data, :content, :output, :tags
-    attr_writer :categories
-
-    def categories
-      @categories ||= []
-    end
+    attr_accessor :site
+    attr_accessor :data, :content, :output, :ext
+    attr_accessor :date, :slug, :published, :tags, :categories
 
     # Initialize this Post instance.
     #   +site+ is the Site
@@ -41,32 +38,23 @@ module Jekyll
       self.process(name)
       self.read_yaml(@base, name)
 
+      #If we've added a date and time to the yaml, use that instead of the filename date
+      #Means we'll sort correctly.
+      if self.data.has_key?('date')
+        # ensure Time via to_s and reparse
+        self.date = Time.parse(self.data["date"].to_s)
+      end
+
       if self.data.has_key?('published') && self.data['published'] == false
         self.published = false
       else
         self.published = true
       end
 
-      if self.data.has_key?("tag")
-        self.tags = [self.data["tag"]]
-      elsif self.data.has_key?("tags")
-        self.tags = self.data['tags']
-      else
-        self.tags = []
-      end
+      self.tags = self.data.pluralized_array("tag", "tags")
 
       if self.categories.empty?
-        if self.data.has_key?('category')
-          self.categories << self.data['category']
-        elsif self.data.has_key?('categories')
-          # Look for categories in the YAML-header, either specified as
-          # an array or a string.
-          if self.data['categories'].kind_of? String
-            self.categories = self.data['categories'].split
-          else
-            self.categories = self.data['categories']
-          end
-        end
+        self.categories = self.data.pluralized_array('category', 'categories')
       end
     end
 
@@ -136,7 +124,7 @@ module Jekyll
         "month"      => date.strftime("%m"),
         "day"        => date.strftime("%d"),
         "title"      => CGI.escape(slug),
-        "categories" => categories.sort.join('/')
+        "categories" => categories.join('/')
       }.inject(template) { |result, token|
         result.gsub(/:#{token.first}/, token.last)
       }.gsub(/\/\//, "/")

data/lib/jekyll/site.rb

@@ -1,7 +1,7 @@
 module Jekyll
 
   class Site
-    attr_accessor :config, :layouts, :posts, :categories, :exclude,
+    attr_accessor :config, :layouts, :stylesheets, :posts, :pages, :static_files, :categories, :exclude,
                   :source, :dest, :lsi, :pygments, :permalink_style, :tags
 
     # Initialize the site
@@ -11,7 +11,7 @@ module Jekyll
     def initialize(config)
       self.config          = config.clone
 
-      self.source          = config['source']
+      self.source          = File.expand_path(config['source'])
       self.dest            = config['destination']
       self.lsi             = config['lsi']
       self.pygments        = config['pygments']
@@ -24,7 +24,10 @@ module Jekyll
 
     def reset
       self.layouts         = {}
+      self.stylesheets     = []
       self.posts           = []
+      self.pages           = []
+      self.static_files    = []
       self.categories      = Hash.new { |hash, key| hash[key] = [] }
       self.tags            = Hash.new { |hash, key| hash[key] = [] }
     end
@@ -97,22 +100,29 @@ module Jekyll
     end
 
     # Do the actual work of processing the site and generating the
-    # real deal.
+    # real deal.  Now has 4 phases; reset, read, render, write.  This allows
+    # rendering to have full site payload available.
     #
     # Returns nothing
     def process
       self.reset
-      self.read_layouts
-      self.transform_stylesheets
-      self.transform_pages
-      self.write_posts
+      self.read
+      self.render
+      self.write
     end
 
-    # Read all the files in <source>/_layouts into memory for later use.
+    def read
+      self.read_layouts # existing implementation did this at top level only so preserved that
+      self.read_directories
+    end
+
+    # Read all the files in <source>/<dir>/_layouts and create a new Layout
+    # object with each one.
     #
     # Returns nothing
-    def read_layouts
-      base = File.join(self.source, "_layouts")
+    def read_layouts(dir = '')
+      base = File.join(self.source, dir, "_layouts")
+      return unless File.exists?(base)
       entries = []
       Dir.chdir(base) { entries = filter_entries(Dir['*.*']) }
 
@@ -120,17 +130,16 @@ module Jekyll
         name = f.split(".")[0..-2].join(".")
         self.layouts[name] = Layout.new(self, base, f)
       end
-    rescue Errno::ENOENT => e
-      # ignore missing layout dir
     end
 
-    # Read all the files in <base>/_posts and create a new Post object with each one.
+    # Read all the files in <source>/<dir>/_posts and create a new Post
+    # object with each one.
     #
     # Returns nothing
     def read_posts(dir)
       base = File.join(self.source, dir, '_posts')
-      entries = []
-      Dir.chdir(base) { entries = filter_entries(Dir['**/*']) }
+      return unless File.exists?(base)
+      entries = Dir.chdir(base) { filter_entries(Dir['**/*']) }
 
       # first pass processes, but does not yet render post content
       entries.each do |f|
@@ -146,87 +155,86 @@ module Jekyll
       end
 
       self.posts.sort!
+    end
+    
+    def read_stylesheets(dir)
+      base = File.join(self.source, dir, '_stylesheets')
+      return unless File.exists?(base)
+      
+      entries = []
+      Dir.chdir(base) { entries = filter_entries(Dir['**/*.*']) }
+      
+      entries.each do |f|
+        stylesheet = Stylesheet.new(self, base, dir, f)
+        stylesheet.render()
+        stylesheet.write(self.dest)        
+      end
+    end
 
-      # second pass renders each post now that full site payload is available
+    def render
       self.posts.each do |post|
         post.render(self.layouts, site_payload)
       end
 
+      self.pages.dup.each do |page|
+        if Pager.pagination_enabled?(self.config, page.name)
+          paginate(page)
+        else
+          page.render(self.layouts, site_payload)
+        end
+      end
+
       self.categories.values.map { |ps| ps.sort! { |a, b| b <=> a} }
       self.tags.values.map { |ps| ps.sort! { |a, b| b <=> a} }
     rescue Errno::ENOENT => e
       # ignore missing layout dir
     end
 
-    # Write each post to <dest>/<year>/<month>/<day>/<slug>
+    # Write static files, pages and posts
     #
     # Returns nothing
-    def write_posts
+    def write
       self.posts.each do |post|
         post.write(self.dest)
       end
+      self.pages.each do |page|
+        page.write(self.dest)
+      end
+      self.static_files.each do |sf|
+        sf.write(self.dest)
+      end
     end
 
-    # Copy all regular files from <source> to <dest>/ ignoring
-    # any files/directories that are hidden or backup files (start
-    # with "." or "#" or end with "~") or contain site content (start with "_")
-    # unless they are "_posts" directories or web server files such as
-    # '.htaccess'
+    # Reads the directories and finds posts, pages and static files that will 
+    # become part of the valid site according to the rules in +filter_entries+.
     #   The +dir+ String is a relative path used to call this method
     #            recursively as it descends through directories
     #
     # Returns nothing
-    def transform_pages(dir = '')
+    def read_directories(dir = '')
       base = File.join(self.source, dir)
       entries = filter_entries(Dir.entries(base))
-      directories = entries.select { |e| File.directory?(File.join(base, e)) }
-      files = entries.reject { |e| File.directory?(File.join(base, e)) }
-
-      # we need to make sure to process _posts *first* otherwise they
-      # might not be available yet to other templates as {{ site.posts }}
-      if directories.include?('_posts')
-        directories.delete('_posts')
-        read_posts(dir)
-      end
-      
-      [directories, files].each do |entries|
-        entries.each do |f|
-          if File.directory?(File.join(base, f))
-            next if self.dest.sub(/\/$/, '') == File.join(base, f)
-            transform_pages(File.join(dir, f))
-          elsif Pager.pagination_enabled?(self.config, f)
-            paginate_posts(f, dir)
-          else
-            first3 = File.open(File.join(self.source, dir, f)) { |fd| fd.read(3) }
-
-            if first3 == "---"
-              # file appears to have a YAML header so process it as a page
-              page = Page.new(self, self.source, dir, f)
-              page.render(self.layouts, site_payload)
-              page.write(self.dest)
-            else
-              # otherwise copy the file without transforming it
-              FileUtils.mkdir_p(File.join(self.dest, dir))
-              FileUtils.cp(File.join(self.source, dir, f), File.join(self.dest, dir, f))
-            end
-          end
-        end
-      end
-    end
 
-    def transform_stylesheets
-      dir = "_stylesheets"
-      base = File.join(self.source, dir)
-      entries = []
-      Dir.chdir(base) { entries = filter_entries(Dir['**/*.*']) }
+      self.read_posts(dir)
+      self.read_stylesheets(dir)
 
       entries.each do |f|
-        stylesheet = Stylesheet.new(self, self.source, dir, f)
-        stylesheet.render()
-        stylesheet.write(self.dest)
+        f_abs = File.join(base, f)
+        f_rel = File.join(dir, f)
+        if File.directory?(f_abs)
+          next if self.dest.sub(/\/$/, '') == f_abs
+          read_directories(f_rel)
+        elsif !File.symlink?(f_abs)
+          first3 = File.open(f_abs) { |fd| fd.read(3) }
+          if first3 == "---"
+            # file appears to have a YAML header so process it as a page
+            pages << Page.new(self, self.source, dir, f)
+          else
+            # otherwise treat it as a static file
+            static_files << StaticFile.new(self, self.source, dir, f)
+          end
+        end
       end
-    rescue Errno::ENOENT => e
-      # ignore missing stylesheet dir
     end
 
     # Constructs a hash map of Posts indexed by the specified Post attribute
@@ -255,19 +263,21 @@ module Jekyll
     end
 
     # Filter out any files/directories that are hidden or backup files (start
-    # with "." or "#" or end with "~") or contain site content (start with "_")
-    # unless they are "_posts" directories or web server files such as
-    # '.htaccess'
+    # with "." or "#" or end with "~"), or contain site content (start with "_"),
+    # or are excluded in the site configuration, unless they are web server
+    # files such as '.htaccess'
     def filter_entries(entries)
       entries = entries.reject do |e|
-        unless ['_posts', '.htaccess'].include?(e)
+        unless ['.htaccess'].include?(e)
           ['.', '_', '#'].include?(e[0..0]) || e[-1..-1] == '~' || self.exclude.include?(e)
         end
       end
     end
 
-    # Paginates the blog's posts. Renders the index.html file into paginated directories, ie: page2, page3...
-    # and adds more wite-wide data
+    # Paginates the blog's posts. Renders the index.html file into paginated
+    # directories, ie: page2/index.html, page3/index.html, etc and adds more
+    # site-wide data.
+    #   +page+ is the index.html Page that requires pagination
     #
     # {"paginator" => { "page" => <Number>,
     #                   "per_page" => <Number>,
@@ -276,16 +286,19 @@ module Jekyll
     #                   "total_pages" => <Number>,
     #                   "previous_page" => <Number>,
     #                   "next_page" => <Number> }}
-    def paginate_posts(file, dir)
-      all_posts = self.posts.sort { |a,b| b <=> a }
+    def paginate(page)
+      all_posts = site_payload['site']['posts']
       pages = Pager.calculate_pages(all_posts, self.config['paginate'].to_i)
-      pages += 1
       (1..pages).each do |num_page|
         pager = Pager.new(self.config, num_page, all_posts, pages)
-        page = Page.new(self, self.source, dir, file)
-        page.render(self.layouts, site_payload.merge({'paginator' => pager.to_hash}))
-        suffix = "page#{num_page}" if num_page > 1
-        page.write(self.dest, suffix)
+        if num_page > 1
+          newpage = Page.new(self, self.source, page.dir, page.name)
+          newpage.render(self.layouts, site_payload.merge({'paginator' => pager.to_hash}))
+          newpage.dir = File.join(page.dir, "page#{num_page}")
+          self.pages << newpage
+        else
+          page.render(self.layouts, site_payload.merge({'paginator' => pager.to_hash}))
+        end
       end
     end
   end