henshin 0.2.2 → 0.3.0

data/lib/henshin/plugins/maruku.rb

@@ -3,14 +3,13 @@ require 'maruku'
 
 class MarukuPlugin < Henshin::Generator
   
-  attr_accessor :extensions, :config
-  
-  Defaults = {}
+  attr_accessor :extensions, :config, :priority
   
   def initialize( override={} )
     @extensions = {:input => ['markdown', 'mkdwn', 'md'],
                    :output => 'html'}
-    @config = Defaults.merge(override)
+    @config = {}
+    @priority = 5
   end
   
   def generate( content )

data/lib/henshin/plugins/sass.rb

@@ -3,7 +3,7 @@ require 'sass'
 
 class SassPlugin < Henshin::Generator
   
-  attr_accessor :extensions, :config, :opts_name
+  attr_accessor :extensions, :config, :priority
   
   Defaults = {:ignore_layouts => true,
               :style => :nested}
@@ -11,17 +11,18 @@ class SassPlugin < Henshin::Generator
   def initialize
     @extensions = {:input => ['sass', 'scss'],
                    :output => 'css'}
-    @opts_name = :sass
+    @config = {:ignore_layouts => true,
+               :style => :nested}
+    @priority = 5
   end
   
   def configure( override )
-    override ? @config = Defaults.merge(override) : @config = Defaults
+    @config.merge!(override) if override
   end
   
   def generate( content )
-    engine = Sass::Engine.new(content, config)
-    output = engine.render
+    Sass::Engine.new(content, @config).render
   end
   
-  Henshin.register! self
+  Henshin.register! self, :sass
 end

data/lib/henshin/plugins/textile.rb

@@ -3,14 +3,13 @@ require 'redcloth'
 
 class TextilePlugin < Henshin::Generator
   
-  attr_accessor :extensions, :config
-  
-  Defaults = {}
+  attr_accessor :extensions, :config, :priority
   
   def initialize( override={} )
     @extensions = {:input => ['textile'],
                    :output => 'html'}
-    @config = Defaults.merge(override)
+    @config = {}
+    @priority = 5
   end
   
   def generate( content )

data/lib/henshin/post.rb

@@ -60,9 +60,9 @@ module Henshin
       file_data.each_with_index do |data, i|      
         if data_order[i].include? 'title'
           if data_order[i].include? 'dashes'
-            override[:title] = data.gsub(/-/, ' ').titlize
+            override[:title] = data.gsub(/-/, ' ')
           else
-            override[:title] = data.titlize
+            override[:title] = data
           end
         elsif data_order[i].include? 'date'
           override[:date] = data
@@ -92,7 +92,7 @@ module Henshin
     #
     # @param [Hash] override data to override settings with
     def override( override )
-      @title     = override[:title]                   if override[:title]
+      @title     = override[:title].titlecase         if override[:title]
       @layout    = @site.layouts[ override[:layout] ] if override[:layout]
       @date      = Time.parse( override[:date] )      if override[:date]
       @tags      = override[:tags].split(', ')        if override[:tags]
@@ -112,17 +112,24 @@ module Henshin
     #
     # @return [Hash] the payload for the layout engine
     def payload
-      { 
+      r = { 
         'yield' => @content,
         'site'  => @site.payload['site'],
         'post'  => self.to_hash
       }
+      r['post']['next'] = self.next.to_hash if self.next
+      r['post']['prev'] = self.prev.to_hash if self.prev
+      r
     end
     
     # Turns all of the post data into a hash
     #
     # @return [Hash]
     def to_hash
+      tags = []
+      @site.tags.select{ |t| @tags.include?(t) }.each do |k, tag|
+        tags << {'name' => tag.name, 'url' => tag.url}
+      end
       { 
         'title'      => @title,
         'author'     => @author,
@@ -130,18 +137,44 @@ module Henshin
         'url'        => self.url,
         'date'       => @date,
         'category'   => @category,
-        'tags'       => @tags,
-        'content'    => @content 
+        'tags'       => tags,
+        'content'    => @content
       }
     end
+    
+    # Gets the post after this one
+    #
+    # @return [Post] next post
+    def next
+      if i = @site.posts.index(self)
+        if i < @site.posts.size - 1
+          @site.posts[i+1]
+        else
+          nil
+        end
+      end
+    end
+    
+    # Gets the post before this one
+    #
+    # @return [Post] previous post
+    def prev
+      if i = @site.posts.index(self)
+        if i > 0
+          @site.posts[i-1]
+        else
+          nil
+        end
+      end
+    end
 
     
     ##
     # Writes the file to the correct place
     def write
       write_path = File.join( config[:root], config[:target], permalink )
-      FileUtils.mkdir_p File.join( write_path.directory )
-      file = File.new( File.join( write_path ), "w" )
+      FileUtils.mkdir_p write_path.directory
+      file = File.new( write_path, "w" )
       file.puts( @content )
     end
     
@@ -158,6 +191,15 @@ module Henshin
       end
     end
     
+    def <=>(other)
+      s = self.date <=> other.date
+      if s == 0
+        self.permalink <=> other.permalink
+      else
+        s
+      end
+    end
+    
     def inspect
       "#<Post:#{@path}>"
     end

data/lib/henshin/site.rb

@@ -16,7 +16,7 @@ module Henshin
       @gens = []
       @statics = []
       
-      @archive = {}
+      @archive = Archive.new( self )
       @tags = Hash.new { |h, k| h[k] = Tag.new(k) }
       @categories = Hash.new { |h, k| h[k] = Category.new(k) }
       
@@ -40,45 +40,43 @@ module Henshin
     def read
       self.read_layouts
       self.read_posts
-      self.read_others
+      self.read_gens
+      self.read_statics
     end
     
     # Adds all items in 'layouts' to the layouts array
     def read_layouts
-      path = File.join(config[:root], 'layouts')
+      path = File.join(@config[:root], 'layouts')
       Dir.glob(path + '/*.*').each do |layout|
         layout =~ /([a-zA-Z0-9 _-]+)\.([a-zA-Z0-9-]+)/
-        @layouts[$1] = layout
+        @layouts[$1] = File.open(layout, 'r') {|f| f.read}
       end
     end
     
     # Adds all items in 'posts' to the posts array
     def read_posts
-      path = File.join(config[:root], 'posts')
+      path = File.join(@config[:root], 'posts')
       Dir.glob(path + '/**/*.*').each do |post|
         @posts << Post.new(post, self)
       end
     end
     
-    # Gets all other items, and determines whether it's static or needs to be converted
-    def read_others
-      path = File.join(config[:root], '**', '*.*')
-      items = Dir.glob(path)
-      
-      ['/_site', '/plugins'].each do |r|
-        items = items.select {|i| !i.include?( File.join(config[:root], r) )}
-      end
-      
-      gens = items.select {|i| i.gen?(self.config)}
+    # Adds all files that need to be run through a plugin in an array
+    def read_gens
+      files = Dir.glob( File.join(@config[:root], '**', '*.*') )
+      gens = files.select {|i| gen?(i) }
       gens.each do |g|
         @gens << Gen.new(g, self)
       end
-      
-      static = items.select {|i| i.static?(self.config)}
+    end
+    
+    # Adds all static files to an array
+    def read_statics
+      files = Dir.glob( File.join(@config[:root], '**', '*.*') )
+      static = files.select {|i| static?(i) }
       static.each do |s|
         @statics << Static.new(s, self)
       end
-
     end
 
     
@@ -103,11 +101,11 @@ module Henshin
           'description' => @config[:description],
           'time_zone' => @config[:time_zone],
           'created_at' => Time.now,
-          'posts' => @posts.collect {|i| i.to_hash},
+          'posts' => @posts.collect{|i| i.to_hash},
           'tags' => @tags.collect {|k, t| t.to_hash},
           'categories' => @categories.collect {|k, t| t.to_hash},
-          'archive' => @archive
-        } 
+          'archive' => @archive.to_hash
+        }
       }
     end
     
@@ -129,21 +127,14 @@ module Henshin
     
     # @return [Hash] archive hash
     def build_archive
-      {
-        '2010' => {
-          '01' => [
-            {'post' => 'hash'},
-            {'post' => 'hash'}
-          ]
-        }
-      }
+      @posts.each {|p| @archive.add_post(p)}
     end
     
     ##
     # Renders the files
     def render
       @posts.each_parallel {|p| p.render}
-      @gens.each_parallel {|g| g.render}
+      @gens.each {|g| g.render}
     end
     
     
@@ -154,6 +145,7 @@ module Henshin
       @gens.each_parallel {|g| g.write}
       @statics.each_parallel {|s| s.write}
       
+      @archive.write
       self.write_tags
       self.write_categories
     end
@@ -161,7 +153,7 @@ module Henshin
     # Writes the necessary pages for tags, but only if the correct layouts are present
     def write_tags
       if @layouts['tag_index']
-        write_path = File.join( config[:root], 'tags', 'index.html' )
+        write_path = File.join( @config[:root], 'tags', 'index.html' )
       
         tag_index = Gen.new(write_path, self)
         tag_index.layout = @layouts['tag_index']
@@ -172,7 +164,7 @@ module Henshin
       
       if @layouts['tag_page']
         @tags.each do |n, tag|
-          write_path = File.join( config[:root], 'tags', tag.name, 'index.html' )
+          write_path = File.join( @config[:root], 'tags', tag.name, 'index.html' )
           
           payload = {:name => 'tag', :payload => tag.to_hash}
           tag_page = Gen.new(write_path, self, payload)
@@ -187,7 +179,7 @@ module Henshin
     # Writes the necessary pages for categories, but only if the correct layouts are present
     def write_categories
       if @layouts['category_index']
-        write_path = File.join( config[:root], 'categories', 'index.html' )
+        write_path = File.join( @config[:root], 'categories', 'index.html' )
         
         category_index = Gen.new(write_path, self)
         category_index.layout = @layouts['category_index']
@@ -198,7 +190,7 @@ module Henshin
       
       if @layouts['category_page']
         @categories.each do |n, category|
-          write_path = File.join( config[:root], 'categories', category.name, 'index.html' )
+          write_path = File.join( @config[:root], 'categories', category.name, 'index.html' )
           
           payload = {:name => 'category', :payload => category.to_hash}
           category_page = Gen.new(write_path, self, payload)
@@ -209,6 +201,40 @@ module Henshin
         end
       end
     end
+    
+    
+    # @return [Bool]
+    def static?( path )
+      !( layout?(path) || post?(path) || gen?(path) || ignored?(path) )
+    end
+    
+    # @return [Bool]
+    def layout?( path )
+      path.include?('layouts/') && !ignored?(path)
+    end
+    
+    # @return [Bool]
+    def post?( path )
+      path.include?('posts/') && !ignored?(path)
+    end
+    
+    # @return [Bool]
+    def gen?( path )
+      return false if post?(path) || layout?(path) || ignored?(path)
+      return true if @config[:plugins][:generators].has_key? path.extension 
+      return true if File.open(path, "r").read(3) == "---"
+      false
+    end
+    
+    # @return [Bool]
+    def ignored?( path )
+      ignored = ['/options.yaml'] + @config[:exclude]
+      ignored.collect! {|i| File.join(@config[:root], i)}
+      ignored.each do |i|
+        return true if path.include? i
+      end
+      false
+    end
   
   end
 end

data/lib/henshin/tags.rb

@@ -11,10 +11,14 @@ 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
+      "/tags/#{@name.slugify}/"
+    end
     
     def inspect
       "#<Tag:#{@name}>"

data/test/site/css/{print.sass → includes/reset.sass}

@@ -1,6 +1,3 @@
-// This is to test whether sass files are successfully created 
-// and placed in the css folder (or whatever is defined
-
 body, div, dl, dt, dd, ul, ol, li, h1, h2, h3, h4, h5, h6, pre, form, fieldset, input, textarea, p, blockquote, th, td
   margin: 0
   padding: 0

data/test/site/css/{screen.css → print.css}

@@ -1,5 +1,3 @@
-/* Testing whether static files, eg this, are correctly copied and ignored */
-
 body,div,dl,dt,dd,ul,ol,li,h1,h2,h3,h4,h5,h6,pre,form,fieldset,input,textarea,p,
 blockquote,th,td {margin:0; padding:0; }
 table { border-collapse:collapse; border-spacing:0; }
@@ -9,7 +7,6 @@ ol,ul { list-style:none; }
 caption,th { text-align:left; }
 h1,h2,h3,h4,h5,h6 { font-size:100%; font-weight:normal; }
 q:before,q:after { content:”; }
-abbr,acronym { border:0; }
-html {font-size: 62.5%;}p {font-size: 1.2em;}
+abbr,acronym { border:0; }html {font-size: 62.5%;}p {font-size: 1.2em;}
 h1 {font-size: 2em;}
 a:hover, a:active { outline: none; }

data/test/site/css/screen.sass

@@ -0,0 +1,70 @@
+@import includes/reset.css
+
+body
+  width: 500px
+  margin: 20px
+  background: rgb(254, 254, 254)
+  line-height: 20px
+  font: 
+    family: Helvetica, Arial, sans-serif
+    size: 16px
+  
+h1, h2
+  color: rgb(50, 50, 50)
+  line-height: 32px
+  font: 
+    size: 22px
+    weight: bold
+    
+h2
+  font-size: 18px
+    
+p, ul, ol, pre
+  margin: 16px 0
+  
+a
+  color: rgb(20, 20, 180)
+  
+b, strong
+  font-weight: bold
+
+i, em
+  font-style: italic
+
+pre
+  background: rgb(240, 240, 245)
+  border: 1px solid rgb(200, 200, 202)
+
+code
+  line-height: 13px
+  font: 
+    family: Menlo
+    size: 13px
+  
+ul  
+  time
+    font: 
+      family: Menlo, monospace
+      size: 13px
+      
+  &.tags
+    display: inline
+    li
+      float: left
+      margin: 0 5px
+      
+      
+      
+// code highlighting
+code
+  .k
+    color: red
+    
+  .nb
+    color: blue
+    
+  .nf
+    color: green
+    
+  .s2
+    color: grey