qrush-jekyll 0.4.1 → 0.5.0

data/lib/jekyll/converters/mephisto.rb

@@ -13,7 +13,7 @@ require File.join(File.dirname(__FILE__),"csv.rb")
 # installed, running the following commands should work:
 # $ sudo gem install sequel
 # $ sudo gem install mysql -- --with-mysql-config=/usr/local/mysql/bin/mysql_config
- 
+
 module Jekyll
   module Mephisto
     #Accepts a hash with database config variables, exports mephisto posts into a csv
@@ -38,24 +38,24 @@ module Jekyll
     # through the created posts to make sure nothing is accidently published.
 
     QUERY = "SELECT id, permalink, body, published_at, title FROM contents WHERE user_id = 1 AND type = 'Article' AND published_at IS NOT NULL ORDER BY published_at"
- 
+
     def self.process(dbname, user, pass, host = 'localhost')
       db = Sequel.mysql(dbname, :user => user, :password => pass, :host => host)
-      
+
       FileUtils.mkdir_p "_posts"
-            
+
       db[QUERY].each do |post|
         title = post[:title]
         slug = post[:permalink]
         date = post[:published_at]
         content = post[:body]
 #         more_content = ''
-        
+
         # Be sure to include the body and extended body.
 #         if more_content != nil
 #           content = content + " \n" + more_content
 #         end
-        
+
         # Ideally, this script would determine the post format (markdown, html
         # , etc) and create files with proper extensions. At this point it
         # just assumes that markdown will be acceptable.
@@ -66,14 +66,14 @@ module Jekyll
            'title' => title.to_s,
            'mt_id' => post[:entry_id],
          }.delete_if { |k,v| v.nil? || v == ''}.to_yaml
- 
+
         File.open("_posts/#{name}", "w") do |f|
           f.puts data
           f.puts "---"
           f.puts content
         end
       end
- 
+
     end
   end
 end

data/lib/jekyll/converters/mt.rb

@@ -11,31 +11,31 @@ require 'fileutils'
 # installed, running the following commands should work:
 # $ sudo gem install sequel
 # $ sudo gem install mysql -- --with-mysql-config=/usr/local/mysql/bin/mysql_config
- 
+
 module Jekyll
   module MT
     # This query will pull blog posts from all entries across all blogs. If
     # you've got unpublished, deleted or otherwise hidden posts please sift
     # through the created posts to make sure nothing is accidently published.
     QUERY = "SELECT entry_id, entry_basename, entry_text, entry_text_more, entry_created_on, entry_title FROM mt_entry"
- 
+
     def self.process(dbname, user, pass, host = 'localhost')
       db = Sequel.mysql(dbname, :user => user, :password => pass, :host => host)
-      
+
       FileUtils.mkdir_p "_posts"
-            
+
       db[QUERY].each do |post|
         title = post[:entry_title]
         slug = post[:entry_basename]
         date = post[:entry_created_on]
         content = post[:entry_text]
         more_content = post[:entry_text_more]
-        
+
         # Be sure to include the body and extended body.
         if more_content != nil
           content = content + " \n" + more_content
         end
-        
+
         # Ideally, this script would determine the post format (markdown, html
         # , etc) and create files with proper extensions. At this point it
         # just assumes that markdown will be acceptable.
@@ -46,14 +46,14 @@ module Jekyll
            'title' => title.to_s,
            'mt_id' => post[:entry_id],
          }.delete_if { |k,v| v.nil? || v == ''}.to_yaml
- 
+
         File.open("_posts/#{name}", "w") do |f|
           f.puts data
           f.puts "---"
           f.puts content
         end
       end
- 
+
     end
   end
 end

data/lib/jekyll/converters/textpattern.rb

@@ -18,20 +18,20 @@ module Jekyll
 
     def self.process(dbname, user, pass, host = 'localhost')
       db = Sequel.mysql(dbname, :user => user, :password => pass, :host => host)
-      
+
       FileUtils.mkdir_p "_posts"
-            
+
       db[QUERY].each do |post|
         # Get required fields and construct Jekyll compatible name
         title = post[:Title]
         slug = post[:url_title]
         date = post[:Posted]
         content = post[:Body]
-        
+
         name = [date.strftime("%Y-%m-%d"), slug].join('-') + ".textile"
 
         # Get the relevant fields as a hash, delete empty fields and convert
-        # to YAML for the header        
+        # to YAML for the header
         data = {
            'layout' => 'post',
            'title' => title.to_s,

data/lib/jekyll/converters/typo.rb

@@ -2,22 +2,22 @@
 require 'fileutils'
 require 'rubygems'
 require 'sequel'
- 
+
 module Jekyll
   module Typo
-    # this SQL *should* work for both MySQL and PostgreSQL, but I haven't 
+    # this SQL *should* work for both MySQL and PostgreSQL, but I haven't
     # tested PostgreSQL yet (as of 2008-12-16)
     SQL = <<-EOS
     SELECT c.id id,
-           c.title title, 
-           c.permalink slug, 
+           c.title title,
+           c.permalink slug,
            c.body body,
-           c.published_at date, 
+           c.published_at date,
            c.state state,
            COALESCE(tf.name, 'html') filter
-      FROM contents c 
+      FROM contents c
            LEFT OUTER JOIN text_filters tf
-                        ON c.text_filter_id = tf.id 
+                        ON c.text_filter_id = tf.id
     EOS
 
     def self.process dbname, user, pass, host='localhost'
@@ -30,7 +30,7 @@ module Jekyll
                  sprintf("%.02d", post[:date].month),
                  sprintf("%.02d", post[:date].day),
                  post[:slug].strip ].join('-')
-        # Can have more than one text filter in this field, but we just want 
+        # Can have more than one text filter in this field, but we just want
         # the first one for this
         name += '.' + post[:filter].split(' ')[0]
 

data/lib/jekyll/converters/wordpress.rb

@@ -15,7 +15,7 @@ module Jekyll
     # post in wp_posts that has post_status = 'publish'.
     # This restriction is made because 'draft' posts are not guaranteed to
     # have valid dates.
-    QUERY = "select * from wp_posts where post_status = 'publish' and post_type = 'post'"
+    QUERY = "select post_title, post_name, post_date, post_content, post_excerpt, ID, guid from wp_posts where post_status = 'publish' and post_type = 'post'"
 
     def self.process(dbname, user, pass, host = 'localhost')
       db = Sequel.mysql(dbname, :user => user, :password => pass, :host => host)
@@ -28,7 +28,6 @@ module Jekyll
         slug = post[:post_name]
         date = post[:post_date]
         content = post[:post_content]
-
         name = "%02d-%02d-%02d-%s.markdown" % [date.year, date.month, date.day,
                                                slug]
 

data/lib/jekyll/convertible.rb

@@ -1,10 +1,15 @@
+# Convertible provides methods for converting a pagelike item
+# from a certain type of markup into actual content
+#
+# Requires
+#   self.site -> Jekyll::Site
 module Jekyll
   module Convertible
     # Return the contents as a string
     def to_s
       self.content || ''
     end
-    
+
     # Read the YAML frontmatter
     #   +base+ is the String path to the dir containing the file
     #   +name+ is the String filename of the file
@@ -12,58 +17,64 @@ module Jekyll
     # Returns nothing
     def read_yaml(base, name)
       self.content = File.read(File.join(base, name))
-      
+
       if self.content =~ /^(---\s*\n.*?)\n---\s*\n/m
         self.content = self.content[($1.size + 5)..-1]
-        
+
         self.data = YAML.load($1)
       end
     end
-    
+
     # Transform the contents based on the file extension.
     #
     # Returns nothing
     def transform
-      case Jekyll.content_type
-      when :textile
+      case self.content_type
+      when 'textile'
         self.ext = ".html"
-        self.content = RedCloth.new(self.content).to_html
-      when :markdown
+        self.content = self.site.textile(self.content)
+      when 'markdown'
         self.ext = ".html"
-        self.content = Jekyll.markdown_proc.call(self.content)
+        self.content = self.site.markdown(self.content)
       end
     end
-    
-    def determine_content_type
+
+    # Determine which formatting engine to use based on this convertible's
+    # extension
+    #
+    # Returns one of :textile, :markdown or :unknown
+    def content_type
       case self.ext[1..-1]
       when /textile/i
-        return :textile
+        return 'textile'
       when /markdown/i, /mkdn/i, /md/i
-        return :markdown
-      end      
-      return :unknown
+        return 'markdown'
+      end
+      return 'unknown'
     end
-    
+
     # Add any necessary layouts to this convertible document
     #   +layouts+ is a Hash of {"name" => "layout"}
     #   +site_payload+ is the site payload hash
     #
     # Returns nothing
     def do_layout(payload, layouts)
+      info = { :filters => [Jekyll::Filters], :registers => { :site => self.site } }
+
       # render and transform content (this becomes the final content of the object)
-      Jekyll.content_type = self.determine_content_type
-      self.content = Liquid::Template.parse(self.content).render(payload, [Jekyll::Filters])
+      payload["content_type"] = self.content_type
+      self.content = Liquid::Template.parse(self.content).render(payload, info)
       self.transform
-      
+
       # output keeps track of what will finally be written
       self.output = self.content
-      
+
       # recursively render layouts
       layout = layouts[self.data["layout"]]
       while layout
         payload = payload.deep_merge({"content" => self.output, "page" => layout.data})
-        self.output = Liquid::Template.parse(layout.content).render(payload, [Jekyll::Filters])
-        
+        self.output = Liquid::Template.parse(layout.content).render(payload, info)
+
         layout = layouts[layout.data["layout"]]
       end
     end

data/lib/jekyll/core_ext.rb

@@ -1,22 +1,22 @@
 class Hash
   # Merges self with another hash, recursively.
-  # 
+  #
   # This code was lovingly stolen from some random gem:
   # http://gemjack.com/gems/tartan-0.1.1/classes/Hash.html
-  # 
+  #
   # Thanks to whoever made it.
   def deep_merge(hash)
     target = dup
-    
+
     hash.keys.each do |key|
       if hash[key].is_a? Hash and self[key].is_a? Hash
         target[key] = target[key].deep_merge(hash[key])
         next
       end
-      
+
       target[key] = hash[key]
     end
-    
+
     target
   end
 end

data/lib/jekyll/filters.rb

@@ -1,6 +1,10 @@
 module Jekyll
-  
+
   module Filters
+    def textilize(input)
+      RedCloth.new(input).to_html
+    end
+
     def date_to_string(date)
       date.strftime("%d %b %Y")
     end
@@ -8,19 +12,19 @@ module Jekyll
     def date_to_long_string(date)
       date.strftime("%d %B %Y")
     end
-    
+
     def date_to_xmlschema(date)
       date.xmlschema
     end
-    
+
     def xml_escape(input)
       input.gsub("&", "&amp;").gsub("<", "&lt;").gsub(">", "&gt;")
     end
-    
+
     def number_of_words(input)
       input.split.length
     end
-    
+
     def array_to_sentence_string(array)
       connector = "and"
       case array.length
@@ -35,5 +39,5 @@ module Jekyll
       end
     end
 
-  end  
+  end
 end

data/lib/jekyll/layout.rb

@@ -2,25 +2,28 @@ module Jekyll
 
   class Layout
     include Convertible
-    
+
+    attr_accessor :site
     attr_accessor :ext
     attr_accessor :data, :content
-    
+
     # Initialize a new Layout.
+    #   +site+ is the Site
     #   +base+ is the String path to the <source>
     #   +name+ is the String filename of the post file
     #
     # Returns <Page>
-    def initialize(base, name)
+    def initialize(site, base, name)
+      @site = site
       @base = base
       @name = name
-      
+
       self.data = {}
-      
+
       self.process(name)
       self.read_yaml(base, name)
     end
-    
+
     # Extract information from the layout filename
     #   +name+ is the String filename of the layout file
     #

data/lib/jekyll/page.rb

@@ -2,28 +2,31 @@ module Jekyll
 
   class Page
     include Convertible
-    
+
+    attr_accessor :site
     attr_accessor :ext
     attr_accessor :data, :content, :output
-    
+
     # Initialize a new Page.
+    #   +site+ is the Site
     #   +base+ is the String path to the <source>
     #   +dir+ is the String path between <source> and the file
     #   +name+ is the String filename of the file
     #
     # Returns <Page>
-    def initialize(base, dir, name)
+    def initialize(site, base, dir, name)
+      @site = site
       @base = base
       @dir = dir
       @name = name
-      
+
       self.data = {}
-      
+
       self.process(name)
       self.read_yaml(File.join(base, dir), name)
       #self.transform
     end
-    
+
     # Extract information from the page filename
     #   +name+ is the String filename of the page file
     #
@@ -31,7 +34,7 @@ module Jekyll
     def process(name)
       self.ext = File.extname(name)
     end
-    
+
     # Add any necessary layouts to this post
     #   +layouts+ is a Hash of {"name" => "layout"}
     #   +site_payload+ is the site payload hash
@@ -41,19 +44,19 @@ module Jekyll
       payload = {"page" => self.data}.deep_merge(site_payload)
       do_layout(payload, layouts)
     end
-    
+
     # Write the generated page file to the destination directory.
     #   +dest+ is the String path to the destination dir
     #
     # Returns nothing
     def write(dest)
       FileUtils.mkdir_p(File.join(dest, @dir))
-      
+
       name = @name
       if self.ext != ""
         name = @name.split(".")[0..-2].join('.') + self.ext
       end
-      
+
       path = File.join(dest, @dir, name)
       File.open(path, 'w') do |f|
         f.write(self.output)