henshin 0.0.1 → 0.1.2

data/lib/henshin/post.rb

@@ -10,6 +10,9 @@ module Henshin
       @config = site.config
       @extension = path.extension
       @layout = site.layouts[ site.config[:layout] ]
+      @author = @config[:author]
+      @tags = []
+      @date = Time.now
     end
     
     
@@ -45,9 +48,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(/-/, ' ')
+            override[:title] = data.gsub(/-/, ' ').titlize
           else
-            override[:title] = data
+            override[:title] = data.titlize
           end
         elsif data_order[i].include? 'date'
           override[:date] = data
@@ -75,13 +78,19 @@ module Henshin
     #
     # @param [Hash] override data to override settings with
     def override( override )
-      @title ||= override[:title]
-      @layout ||= @site.layouts[ override[:layout] ]
-      @date ||= Time.parse( override[:date] ) unless override[:date].nil?
-      @tags ||= override[:tags]
-      @category ||= override[:category]
-      @author ||= override[:author]
-      @extension ||= override[:extension]
+      @title     = override[:title]                   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]
+      @category  = override[:category]                if override[:category]
+      @author    = override[:author]                  if override[:author]
+      @extension = override[:extension]               if override[:extension]
+      @category  = override[:category]                if override[:category]
+      
+      if override[:tags]
+        @tags << override[:tags].split(', ')
+        @tags.flatten!
+      end
     end
     
     
@@ -92,14 +101,25 @@ module Henshin
       { 
         'yield' => @content,
         'site' => @site.payload['site'],
-        'post' => {'title' => @title,
-                   'author' => @author,
-                   'date' => @date,
-                   'tags' => @tags,
-                   'category' => @category}
+        'post' => self.to_hash
       }
     end
     
+    # Turns all of the post data into a hash
+    #
+    # @return [Hash]
+    def to_hash
+      { 
+        'title'      => @title,
+        'author'     => @author,
+        'url'        => self.permalink,
+        'date'       => @date,
+        'category'   => @category,
+        'tags'       => @tags,
+        'content'    => @content 
+      }
+    end
+
     
     ##
     # Writes the file to the correct place
@@ -122,6 +142,10 @@ module Henshin
       end
     end
     
+    def inspect
+      "#<Post:#{@path}>"
+    end
+    
   end
   
 end

data/lib/henshin/site.rb

@@ -2,7 +2,7 @@ module Henshin
 
   class Site
   
-    attr_accessor :posts, :gens, :statics, :archives, :tags, :categories, :plugins
+    attr_accessor :posts, :gens, :statics, :archive, :tags, :categories, :plugins
     attr_accessor :layouts, :config
     
     def initialize( config )
@@ -15,9 +15,9 @@ module Henshin
       @posts = []
       @gens = []
       @statics = []
-      @archives = {}
-      @tags = {}
-      @categories = {}
+      @archive = {}
+      @tags = Hash.new { |h, k| h[k] = Tag.new(k) }
+      @categories = Hash.new { |h, k| h[k] = Category.new(k) }
       @layouts = {}
     end
     
@@ -44,7 +44,6 @@ module Henshin
     def read_posts
       path = File.join(config[:root], 'posts')
       Dir.glob(path + '/*.*').each do |post|
-        # should really create a new post object but I haven't made one yet
         @posts << Post.new(post, self)
       end
     end
@@ -53,25 +52,28 @@ module Henshin
     def read_others
       path = File.join(config[:root], '**', '*.*')
       items = Dir.glob(path)
-      items = items.select {|i| !i.include?(config[:root] + '/_site')}
       
-      items -= ["#{config[:root]}/options.yaml"]
+      ['/_site', '/plugins'].each do |r|
+        items = items.select {|i| !i.include?( File.join(config[:root], r) )}
+      end
+      
+      ignored = ['/options.yaml'] + config[:exclude]
+      ignored.each do |r|
+        items -= [File.join(config[:root], r)]
+        items -= items.select {|i| i.include?( File.join(config[:root], r) )}
+      end
+      
       items -= @posts.collect {|i| i.path}
       items -= @layouts.collect {|k, v| v}
       
       gens = items.select {|i| config[:extensions].include?(i.extension) }
-      gens = gens.select do |i|
-        if i.extension == "html"
-          File.open(i, "r").read(3) == "---"
-        else
-          true
-        end
-      end
-
+      gens += items.select {|i| File.open(i, "r").read(3) == "---" }
+      
       gens.each do |g|
         @gens << Gen.new(g, self)
       end
       
+      
       static = items - @gens.collect {|i| i.path}
       static.each do |s|
         @statics << Static.new(s, self)
@@ -82,36 +84,73 @@ module Henshin
     ## 
     # Processes all of the necessary files
     def process
-      @posts.each {|p| p.process}
-      @gens.each {|g| g.process}
+      @posts.each_parallel {|p| p.process}
+      @gens.each_parallel {|g| g.process}
+      
+      self.build_tags
+      self.build_categories
+      self.build_archive
     end
     
-    # Creates the data to be sent to the layout engine
-    #
     # @return [Hash] the payload for the layout engine
     def payload
-      {'site' => {'author' => self.config[:author],
-                  'title' => self.config[:title],
-                  'description' => self.config[:description],
-                  'time_zone' => self.config[:time_zone],
-                  'created_at' => Time.now} }
+      {
+        'site' => {
+          'author' => @config[:author],
+          'title' => @config[:title],
+          'description' => @config[:description],
+          'time_zone' => @config[:time_zone],
+          'created_at' => Time.now,
+          '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
+        } 
+      }
+    end
+    
+    # Creates tags from posts and adds them to @tags
+    def build_tags
+      @posts.each do |p|
+        p.tags.each do |t|
+          @tags[t].posts << p
+        end
+      end
     end
     
+    # Create categories from posts and add to @categories
+    def build_categories
+      @posts.each do |p|
+        @categories[p.category].posts << p unless p.category.nil?
+      end
+    end
+    
+    # @return [Hash] archive hash
+    def build_archive
+      {
+        '2010' => {
+          '01' => [
+            {'post' => 'hash'},
+            {'post' => 'hash'}
+          ]
+        }
+      }
+    end
     
     ##
     # Renders the files
     def render
-      @posts.each {|p| p.render}
-      @gens.each {|g| g.render}
+      @posts.each_parallel {|p| p.render}
+      @gens.each_parallel {|g| g.render}
     end
     
     
     ##
     # Writes the files
     def write
-      @posts.each {|p| p.write}
-      @gens.each {|g| g.write}
-      @statics.each {|s| s.write}
+      @posts.each_parallel {|p| p.write}
+      @gens.each_parallel {|g| g.write}
+      @statics.each_parallel {|s| s.write}
     end
   
   end

data/lib/henshin/tags.rb

@@ -0,0 +1,19 @@
+module Henshin
+  class Tag
+  
+    attr_accessor :name, :posts
+    
+    def initialize( name )
+      @name = name
+      @posts = []
+    end
+    
+    def to_hash
+      hash = {
+        'name' => @name,
+        'posts' => @posts.collect {|i| i.to_hash}
+      }
+    end
+  
+  end
+end

data/test/site/_site/2010/10/20-testing-stuff/index.html

@@ -2,23 +2,31 @@
 <html lang="en">  
   <head>  
     <meta charset="utf-8" />  
-    <title></title>  
+    <title>Testing Stuff</title>  
     <link rel="stylesheet" href="" type="text/css" />  
   </head>  
   <body>
   
   <header>
-    <h1>Testing Stuff</h1>
+    <h1>Testing Stuff</h1><span>in test</span>
     <time>2010-10-20 17:33:23 +0100</time>
+    
     <ul>
-      <li>tags</li>
-      <li>should</li>
-      <li>be loopable</li>
+      
+        <li>test</li>
+      
+        <li>nolorem</li>
+      
+        <li>test</li>
+      
+        <li>nolorem</li>
+      
     </ul>
+    
   </header>
   
   <p>So Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum.</p>
   
-  <span>Copyright &copy; </span>
+  <span>Copyright &copy; Joshua Hawxwell</span>
   </body>  
 </html> 

data/test/site/_site/2010/5/15-lorem-ipsum/index.html

@@ -2,23 +2,31 @@
 <html lang="en">  
   <head>  
     <meta charset="utf-8" />  
-    <title></title>  
+    <title>Lorem Ipsum</title>  
     <link rel="stylesheet" href="" type="text/css" />  
   </head>  
   <body>
   
   <header>
-    <h1>lorem ipsum</h1>
+    <h1>Lorem Ipsum</h1><span>in </span>
     <time>2010-05-15 13:23:47 +0100</time>
+    
     <ul>
-      <li>tags</li>
-      <li>should</li>
-      <li>be loopable</li>
+      
+        <li>test</li>
+      
+        <li>lorem</li>
+      
+        <li>test</li>
+      
+        <li>lorem</li>
+      
     </ul>
+    
   </header>
   
   <p>So Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum.</p>
   
-  <span>Copyright &copy; </span>
+  <span>Copyright &copy; Joshua Hawxwell</span>
   </body>  
 </html> 

data/test/site/_site/css/print.css

@@ -1,33 +1,19 @@
-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; }
+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; }
+table { border-collapse: collapse; border-spacing: 0; }
 
-fieldset, img {
-  border: 0; }
+fieldset, img { border: 0; }
 
-address, caption, cite, code, dfn, em, strong, th, var {
-  font-style: normal;
-  font-weight: normal; }
+address, caption, cite, code, dfn, em, strong, th, var { font-style: normal; font-weight: normal; }
 
-ol, ul {
-  list-style: none; }
+ol, ul { list-style: none; }
 
-caption, th {
-  text-align: left; }
+caption, th { text-align: left; }
 
-h1, h2, h3, h4, h5, h6 {
-  font-size: 100%;
-  font-weight: normal; }
+h1, h2, h3, h4, h5, h6 { font-size: 100%; font-weight: normal; }
 
-q:before, q:after {
-  content: ”; }
+q:before, q:after { content: ”; }
 
-abbr, acronym {
-  border: 0; }
+abbr, acronym { border: 0; }
 
-h1 {
-  font-size: 2em; }
+h1 { font-size: 2em; }

data/test/site/_site/index.html

@@ -1,5 +1,86 @@
-<header>
+<!DOCTYPE html>  
+<html lang="en">  
+  <head>  
+    <meta charset="utf-8" />  
+    <title>Test Site</title>
+    <link rel="stylesheet" href="screen.css" type="text/css" />  
+  </head>  
+  <body>
+  
+    <header>
 	<h1>Joshua Hawxwell</h1>
 </header>
 
 <p>Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum.</p>
+
+
+
+    
+    
+    <h2>A List of Posts</h2>
+    <ul>
+      
+        <li><a href="/2010/5/15-lorem-ipsum/index.html">Lorem Ipsum</a> - 2010-05-15 13:23:47 +0100</li>
+      
+        <li><a href="/2010/10/20-testing-stuff/index.html">Testing Stuff</a> - 2010-10-20 17:33:23 +0100</li>
+      
+    </ul>
+    
+    <h2>A List of Tags</h2>
+    <ul>
+      
+        <li>
+          test
+          <ul>
+          
+            <li>Lorem Ipsum - 2010-05-15 13:23:47 +0100</li>
+          
+            <li>Lorem Ipsum - 2010-05-15 13:23:47 +0100</li>
+          
+            <li>Testing Stuff - 2010-10-20 17:33:23 +0100</li>
+          
+            <li>Testing Stuff - 2010-10-20 17:33:23 +0100</li>
+          
+          </ul>
+        </li>
+      
+        <li>
+          lorem
+          <ul>
+          
+            <li>Lorem Ipsum - 2010-05-15 13:23:47 +0100</li>
+          
+            <li>Lorem Ipsum - 2010-05-15 13:23:47 +0100</li>
+          
+          </ul>
+        </li>
+      
+        <li>
+          nolorem
+          <ul>
+          
+            <li>Testing Stuff - 2010-10-20 17:33:23 +0100</li>
+          
+            <li>Testing Stuff - 2010-10-20 17:33:23 +0100</li>
+          
+          </ul>
+        </li>
+      
+    </ul>
+    
+    <h2>A List of Categories</h2>
+    <ul>
+      
+        <li>test</li>
+        <ul>
+        
+          <li>Testing Stuff - 2010-10-20 17:33:23 +0100</li>
+        
+        </ul>
+      
+    </ul>
+    
+    
+    <span>Copyright &copy; Joshua Hawxwell</span>
+  </body>  
+</html>