jsjohnst-jekyll 0.4.1.999.4 → 0.4.1.999.6

data/lib/jekyll.rb

@@ -17,17 +17,6 @@ require 'redcloth'
 require 'hpricot'
 begin
   require 'maruku'
-  require 'maruku/ext/math'
-  # Switch off MathML output
-  MaRuKu::Globals[:html_math_output_mathml] = false
-  MaRuKu::Globals[:html_math_engine] = 'none'
-
-  # Turn on math to PNG support with blahtex
-  # Resulting PNGs stored in `images/latex`
-  MaRuKu::Globals[:html_math_output_png] = true
-  MaRuKu::Globals[:html_png_engine] =  'blahtex'
-  MaRuKu::Globals[:html_png_dir] = 'images/latex'
-  MaRuKu::Globals[:html_png_url] = '/images/latex/'
 rescue LoadError
   puts "The maruku gem is required for markdown support!"
 end

data/lib/jekyll/albino.rb

@@ -44,7 +44,7 @@
 require 'open4'
 
 class Albino
-  @@bin = Rails.development? ? 'pygmentize' : '/usr/bin/pygmentize' rescue 'pygmentize'
+  @@bin = '/usr/local/bin/pygmentize'
 
   def self.bin=(path)
     @@bin = path
@@ -54,7 +54,7 @@ class Albino
     new(*args).colorize
   end
 
-  def initialize(target, lexer = :text, format = :html)
+  def initialize(target, lexer = :text, format = :html )
     @target  = File.exists?(target) ? File.read(target) : target rescue target
     @options = { :l => lexer, :f => format }
   end
@@ -64,7 +64,13 @@ class Albino
     Open4.popen4(command) do |pid, stdin, stdout, stderr|
       stdin.puts @target
       stdin.close
+
       output = stdout.read.strip
+
+#     puts "pid        : #{ pid }"
+#     puts "stdout     : #{ stdout.read.strip }"
+#     puts "stderr     : #{ stderr.read.strip }"   
+
     end
     
     # rdiscount wants the closing pre on a line by itself

data/lib/jekyll/filters.rb

@@ -13,6 +13,10 @@ module Jekyll
       date.strftime("%d %b %Y")
     end
 
+    def archivedate_to_string(date)
+      Time.parse("01-" + date).strftime("%B %Y")
+    end
+
     def date_to_long_string(date)
       date.strftime("%d %B %Y")
     end

data/lib/jekyll/page.rb

@@ -38,6 +38,8 @@ module Jekyll
     #
     # Returns nothing
     def add_layout(layouts, site_payload)
+      self.data['url'] = @dir
+      self.data['topleveldir'] = @dir.split("/")[1]
       payload = {"page" => self.data}.deep_merge(site_payload)
       do_layout(payload, layouts)
     end

data/lib/jekyll/post.rb

@@ -20,7 +20,7 @@ module Jekyll
     
     attr_accessor :date, :slug, :ext, :categories, :topics, :published
     attr_accessor :data, :content, :output
-    attr_accessor :previous, :next
+    attr_accessor :previous, :next, :numericid, :archivedate
     
     # Initialize this Post instance.
     #   +base+ is the String path to the dir containing the post file
@@ -31,7 +31,9 @@ module Jekyll
     def initialize(source, dir, name)
       @base = File.join(source, dir, '_posts')
       @name = name
-      
+
+      self.numericid = 0
+ 
       self.categories = dir.split('/').reject { |x| x.empty? }
       
       parts = name.split('/')
@@ -46,36 +48,32 @@ module Jekyll
         self.published = true
       end
 
-      self.data['topics'] = if self.topics.empty?
-        if self.data.has_key?('topic')
-          self.topics << self.data['topic']
-        elsif self.data.has_key?('topics')
-          if self.data['topics'].kind_of? Array
-            self.topics = self.topics['topics']
-          elsif self.data['topics'].kind_of? String
-            self.topics = self.data['topics'].split
-          else
-            self.topics = []
-          end
+      if self.data.has_key?('topic')
+        self.topics << self.data['topic']
+      elsif self.data.has_key?('topics')
+        if self.data['topics'].kind_of? Array
+          self.topics = self.data['topics']
+        elsif self.data['topics'].kind_of? String
+          self.topics = self.data['topics'].split
+        else
+          self.topics = []
         end
       end
-      
-      
-      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? Array 
-            self.categories = self.data['categories']
-          elsif self.data['categories'].kind_of? String
-            self.categories = self.data['categories'].split
-          else
-            self.categories = []
-          end
+
+      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? Array 
+          self.categories = self.data['categories']
+        elsif self.data['categories'].kind_of? String
+          self.categories = self.data['categories'].split
+        else
+          self.categories = []
         end
       end
+    
     end
     
     # Spaceship is based on Post#date
@@ -92,6 +90,7 @@ module Jekyll
     def process(name)
       m, cats, date, slug, ext = *name.match(MATCHER)
       self.date = Time.parse(date)
+      self.archivedate = self.date.month.to_s + "-" + self.date.year.to_s
       self.slug = slug
       self.ext = ext
     end
@@ -216,8 +215,11 @@ module Jekyll
     def to_liquid
       { "title" => self.data["title"] || self.slug.split('-').select {|w| w.capitalize! || w }.join(' '),
         "url" => self.url,
+	"topleveldir" => self.url.split("/")[1],
         "date" => self.date,
+        "archivedate" => self.archivedate,
         "id" => self.id,
+        "numericid" => self.numericid,
         "topics" => self.topics,
         "folded" => (self.content.match("<hr") ? true : false),
         "content" => self.content,

data/lib/jekyll/site.rb

@@ -101,7 +101,8 @@ module Jekyll
       
       # second pass renders each post now that full site payload is available
       self.posts.each_with_index do |post, idx|
-        post.previous = posts[idx - 1] unless idx - 1 < 0
+        post.numericid = idx+1
+	post.previous = posts[idx - 1] unless idx - 1 < 0
         post.next = posts[idx + 1] unless idx + 1 >= posts.size
         post.render(self.layouts, site_payload)
       end
@@ -188,18 +189,21 @@ module Jekyll
     #                     "topics" => [<Post>] }}
     def site_payload
       all_posts = self.posts.sort { |a,b| b <=> a }
-      latest_posts = all_posts[0..2]
+      latest_post = all_posts[0]
+      recent_posts = all_posts[1..2]
       older_posts = all_posts[3..7]
       rss_posts = all_posts[0..25]
       
       {"site" => self.settings.merge({
         "time" => Time.now, 
         "posts" => all_posts,
-        "latest_posts" => latest_posts,
+        "latest_post" => latest_post,
+        "recent_posts" => recent_posts,
         "older_posts" => older_posts,
         "rss_posts" => rss_posts,
         "categories" => post_attr_hash('categories'),
-        "topics" => post_attr_hash('topics')
+        "topics" => post_attr_hash('topics'),
+        "archives" => post_attr_hash('archivedate')
       })}
     end
 

data/lib/jekyll/tags/highlight.rb

@@ -11,9 +11,9 @@ module Jekyll
         @lang = $1
         if defined? $2
           # additional options to pass to Albino.
-          @options = { 'O' => 'linenos=inline' }
+          @options = { 'O' => 'linenos=table,encoding=utf8,style=native' }
         else
-          @options = {}
+          @options = { 'O' => 'encoding=utf8,style=native' }
         end
       else
         raise SyntaxError.new("Syntax Error in 'highlight' - Valid syntax: highlight <lang> [linenos]")
@@ -32,7 +32,8 @@ module Jekyll
       if Jekyll.content_type == :markdown
         return "\n" + Albino.new(code, @lang).to_s(@options) + "\n"
       else
-        "<notextile>" + Albino.new(code, @lang).to_s(@options) + "</notextile>"
+        content = "\n<notextile>\n" + Albino.new(code, @lang).to_s(@options) + "\n</notextile>\n"
+        content
       end
     end
     

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: jsjohnst-jekyll
 version: !ruby/object:Gem::Version 
-  version: 0.4.1.999.4
+  version: 0.4.1.999.6
 platform: ruby
 authors: 
 - Tom Preston-Werner