henshin 0.2.2 → 0.3.0

data/lib/henshin/archive.rb

@@ -0,0 +1,161 @@
+module Henshin
+  
+  class Archive
+    
+    attr_accessor :config
+    
+    def initialize( site )
+      @archive = Hash.new {|h, k| h[k] = Hash.new {|h, k| h[k] = Hash.new {|h, k| h[k] = []} }}
+      @site = site
+      @config = site.config
+    end
+  
+    def add_post( post )
+      date = post.date
+      @archive[date.year.to_s][date.month.to_s][date.day.to_s] << post.to_hash
+    end
+    
+    # Turns the whole archive into a hash. Probably the least efficient thing in the world, but it works
+    def to_hash
+      if @hashed
+        @hashed
+      else
+        @hashed = Hash.new do |h, k| 
+          h[k] = Hash.new do |h, k| # years
+            if k == 'posts'
+              h[k] = []
+            else
+              h[k] = Hash.new do |h, k| # months
+                if k == 'posts'
+                  h[k] = []
+                else
+                  h[k] = Hash.new do |h, k| # days
+                    if k == 'posts'
+                      h[k] = []
+                    else
+                      h[k] = {}
+                    end
+                  end # /days
+                end
+              end # /months
+            end
+          end # /years
+        end 
+        @archive.each do |y, month|
+          month.each do |m, date|
+            date.each do |d, p|            
+              @hashed[y]['posts'] << p
+              @hashed[y][m]['posts'] << p
+              @hashed[y][m][d]['posts'] << p
+              
+              @hashed[y]['posts'].flatten!
+              @hashed[y][m]['posts'].flatten!
+              @hashed[y][m][d]['posts'].flatten!
+            end
+          end
+        end
+        
+      end
+    end
+    
+    # Creates a hash with posts separated by year, month then date
+    def to_date_hash
+      r = Hash.new {|h, k| h[k] = Hash.new {|h, k| h[k] = Hash.new {|h, k| h[k] = []} }}
+      @archive.each do |year, m|
+        m.each do |month, d|
+          d.each do |date, p|
+            r[year][month][date] << p
+            r[year][month][date].flatten!
+          end
+        end
+      end
+      r
+    end
+    
+    # Creates a hash with posts separated by year then month
+    def to_month_hash
+      r = Hash.new {|h, k| h[k] = Hash.new {|h, k| h[k] = []} }
+      @archive.each do |year, m|
+        m.each do |month, d|
+          d.each do |date, p|
+            r[year][month] << p
+            r[year][month].flatten!
+          end
+        end
+      end
+      r
+    end
+    
+    # Creates a hash with posts separated by year
+    def to_year_hash
+      r = Hash.new {|h, k| h[k] = []}
+      @archive.each do |year, m|
+        m.each do |month, d|
+          d.each do |date, p|
+            r[year] << p
+            r[year].flatten!
+          end
+        end
+      end
+      r
+    end
+    
+    ##
+    # Writes the archive pages
+    def write
+      self.write_years if @site.layouts['archive_year']
+      self.write_months if @site.layouts['archive_month']
+      self.write_dates if @site.layouts['archive_date']
+    end
+    
+    def write_years
+      years = self.to_year_hash
+      years.each do |year, posts|
+        write_path = File.join( @config[:root], year, 'index.html' )
+        # date should give the full date, as a Time object!! and the others
+        t = Time.parse("#{year}/01/01")
+        payload = {:name => 'archive', :payload => {'date' => t, 'posts' => years[year]} }
+        page = Gen.new( write_path, @site, payload )
+        page.layout = @site.layouts['archive_year']
+        
+        page.render
+        page.write
+      end
+    end
+    
+    def write_months
+      months = self.to_month_hash
+      months.each do |year, posts|
+        posts.each do |month, posts|
+          write_path = File.join( @config[:root], year, month, 'index.html' )
+          t = Time.parse("#{year}/#{month}/01")
+          payload = {:name => 'archive', :payload => {'date' => t, 'posts' => months[year][month]} }
+          page = Gen.new( write_path, @site, payload )
+          page.layout = @site.layouts['archive_month']
+          
+          page.render
+          page.write
+        end
+      end
+    end
+    
+    def write_dates
+      dates = self.to_date_hash
+      dates.each do |year, posts|
+        posts.each do |month, posts|
+          posts.each do |date, posts|
+            write_path = File.join( @config[:root], year, month, date, 'index.html' )
+            t = Time.parse("#{year}/#{month}/#{date}")
+            payload = {:name => 'archive', :payload => {'date' => t, 'posts' => dates[year][month][date]} }
+            page = Gen.new( write_path, @site, payload )
+            page.layout = @site.layouts['archive_date']
+            
+            page.render
+            page.write
+          end
+        end
+      end
+    end
+    
+  end
+end

data/lib/henshin/categories.rb

@@ -11,10 +11,15 @@ module Henshin
     def to_hash
       hash = {
         'name' => @name,
-        'posts' => @posts.collect {|i| i.to_hash}
+        'posts' => @posts.sort.collect {|i| i.to_hash},
+        'url' => self.url
       }
     end
     
+    def url
+      "/categories/#{@name.slugify}/"
+    end
+    
     
     def inspect
       "#<Category:#{@name}>"

data/lib/henshin/ext.rb

@@ -25,7 +25,7 @@ def Exception.ignoring_exceptions
   begin
     yield
   rescue Exception => e
-    STDERR.puts e.message
+    STDERR.puts e
   end
 end
 
@@ -58,19 +58,10 @@ class String
     slug
   end
   
-  # Capitalizes the string using Gruber's guidelines
-  def titlize
-    self
-  end
-  
   # Gets the extension from a string
   def extension
     parts = self.split('.')
-    if parts.size == 2
-      return parts[1]
-    elsif parts.size == 3
-      return parts[2]
-    end
+    parts[parts.size-1]
   end
   
   # Gets the directory from a string
@@ -84,46 +75,4 @@ class String
     self.dup.gsub(/([a-zA-Z0-9_-]+\/)/, '')
   end
   
-  
-  
-  # Methods to determine whether the file at the path is a post, layout, gen or static
-  
-  # @param [Hash] config
-  # @return [Bool]
-  # @todo see #ignored?
-  def static?( config )
-    !( self.layout? || self.post? || self.gen?(config) || self.ignored?(config) )
-  end
-  
-  # @return [Bool]
-  def layout?
-    self.include? 'layouts/'
-  end
-  
-  # @return [Bool]
-  def post?
-    self.include? 'posts/'
-  end
-  
-  # @param [Hash] config
-  # @return [Bool]
-  # @todo see #ignored?
-  def gen?( config )
-    return true if config[:plugins][:generators].has_key? self.extension 
-    return true if File.open(self, "r").read(3) == "---"
-    false
-  end
-  
-  # @param [Hash] config
-  # @return [Bool]
-  # @todo Find a way around having to pass the config in
-  def ignored?( config )
-    ignored = ['/options.yaml'] + config[:exclude]
-    ignored.collect! {|i| File.join(config[:root], i)}
-    ignored.each do |i|
-      return true if self.include? i
-    end
-    false
-  end
-  
 end

data/lib/henshin/gen.rb

@@ -3,7 +3,7 @@ module Henshin
   # This is the main class for all pages, posts, sass, etc, that need to be run through a plugin
   class Gen
     
-    attr_accessor :path, :extension, :content, :layout, :date, :title
+    attr_accessor :path, :extension, :content, :layout, :title
     attr_accessor :site, :config, :renderer, :data, :output
     
     def initialize( path, site, data=nil )
@@ -40,7 +40,6 @@ module Henshin
     def override( override )
       @title  = override[:title]                    if override[:title]
       @layout = @site.layouts[ override[:layout] ]  if override[:layout]
-      @date   = Time.parse( override[:date].to_s )  if override[:date]
     end
     
     
@@ -48,18 +47,26 @@ module Henshin
     # Renders the files content
     def render
       ignore_layout = false
+      plugins = []
+     
+      config[:plugins][:generators].each do |k, v|
+        if k == @extension || k == '*'
+          plugins << v
+        end
+      end
+      plugins.sort!
       
-      if config[:plugins][:generators].has_key? @extension
-        plugin = config[:plugins][:generators][@extension]
-        @content = plugin.generate( @content )
-        @output = plugin.extensions[:output]
+      plugins.each do |plugin|
+        @content = plugin.generate(@content)
+        @output = plugin.extensions[:output] if plugin.extensions[:output]
         ignore_layout = true if plugin.config[:ignore_layouts]
       end
-
+      
       @layout ||= site.layouts[ site.config[:layout] ]
       unless ignore_layout || @layout.nil?
         config[:plugins][:layout_parsers].each do |plugin|
           @content = plugin.generate( @layout, self.payload )
+          @content = plugin.generate( @content, self.payload )
         end
       end
       
@@ -87,7 +94,6 @@ module Henshin
         'title'      => @title,
         'permalink'  => self.permalink,
         'url'        => self.url,
-        'date'       => @date,
         'content'    => @content 
       }
     end
@@ -122,13 +128,8 @@ module Henshin
     
     
     # Needed to sort the posts by date, newest first
-    def <=>( val )
-      s = self.date <=> val.date
-      if s == 0
-        return self.permalink <=> val.permalink
-      else
-        return -1 * s
-      end
+    def <=>( other )
+      self.permalink <=> other.permalink
     end
     
     def inspect

data/lib/henshin/plugin.rb

@@ -8,20 +8,33 @@ module Henshin
     
     attr_accessor :extensions, :config
     
+    # Defaults = {}
+    
     def initialize
       # inputs are the file types it will take
       # output should be the type it creates
       @extensions = {:input => [],
                      :output => ''}
-      @config = {}
     end
     
-    # def configure( override )
-      # setup the plugin
-    # end
+    def configure( override )
+      if Defaults
+        if override 
+          @config = Defaults.merge(override) 
+        else
+          @config = Defaults
+        end
+      elsif override
+        @config = override
+      end
+    end
+    
+    def <=>(other)
+      self.priority <=> other.priority
+    end
     
     # Uncomment to have the plugin loaded
-    # Henshin.register! self
+    # Henshin.register! self, :standard_plugin
   end
   
   class Generator < StandardPlugin
@@ -32,7 +45,7 @@ module Henshin
     end
     
     # Uncomment to have the plugin loaded
-    # Henshin.register! self
+    # Henshin.register! self, :generator
   end
   
   class LayoutParser < StandardPlugin
@@ -44,7 +57,7 @@ module Henshin
     end
     
     # Uncomment to have the plugin loaded
-    # Henshin.register! self
+    # Henshin.register! self, :generator
   end
   
 end

data/lib/henshin/plugins/highlight.rb

@@ -0,0 +1,31 @@
+require 'henshin/plugin'
+require 'simplabs/highlight'
+
+class HighlightPlugin < Henshin::Generator
+  
+  attr_accessor :priority, :config, :extensions
+  
+  def initialize
+    @extensions = {:input => ['*']}
+    @config = {}
+    @priority = 1
+  end
+  
+  def configure( override )
+    @config.merge!(override) if override
+  end
+  
+  def generate( content )
+    content =~ /(\$highlight)\s+(.+)((\n.*)+)(\$end)/
+    if $1
+      lang = $2.to_sym
+      code = $3[1..-1] # removes first new line
+      insert = '<pre><code>' + Simplabs::Highlight.highlight(lang, code) + '</code></pre>'
+      content.gsub(/(\$highlight.*\$end)/m, insert)
+    else
+      content
+    end
+  end
+  
+  Henshin.register! self
+end

data/lib/henshin/plugins/liquid.rb

@@ -3,27 +3,61 @@ require 'liquid'
 
 class LiquidPlugin < Henshin::LayoutParser
 
-  attr_accessor :extensions
+  attr_accessor :config
   
   def initialize
-    @extensions = {:input => [],
-                   :output => ''}
+    @config = {}
+  end
+  
+  def configure( override )
+    @config.merge!(override) if override
   end
   
   def generate( layout, data )
-    t = Liquid::Template.parse( read(layout) )
-    t.render(data)
+    reg = {:include_dir => @config['include_dir']}
+    Liquid::Template.parse(layout).render(data, :registers => reg)
+  end
+  
+  module Filters
+    def date_to_string(dt)
+      dt.strftime "%d %b %Y"
+    end
+    
+    def date_to_long(dt)
+      dt.strftime "%d %B %Y at %H:%M"
+    end
+  
+    def time_to_string(dt)
+      dt.strtime "%H:%M"
+    end
+    
+    def titlecase(str)
+      str.upcase
+    end
+    
+    def escape(str)
+      CGI::escape str
+    end
+    
+    def escape_html(str)
+      CGI::escapeHTML str
+    end
   end
+  Liquid::Template.register_filter(Filters)
   
-  # returns the layout as a string
-  def read( file )
-    f = File.open(file, "r")
-    r = ""
-    f.each do |l|
-      r << l
-    end
-    r
+  class Include < Liquid::Tag
+    def initialize(tag_name, file, tokens)
+      super
+      @file = file.strip
+    end
+    
+    def render(context)
+      include = File.join(context.registers[:include_dir], @file)
+      File.open(include, 'r') {|f| f.read}
+    end
   end
+  Liquid::Template.register_tag('include', Include)
   
-  Henshin.register! self
+  Henshin.register! self, :liquid
 end
+