henshin 0.0.1 → 0.1.2

data/.gitignore

@@ -17,5 +17,7 @@ tmtags
 coverage
 rdoc
 pkg
+.yardoc
 
 ## PROJECT::SPECIFIC
+test/site/_site/

data/VERSION

@@ -1 +1 @@
-0.0.1
+0.1.2

data/bin/henshin

@@ -25,7 +25,13 @@ end
 config = Henshin.configure(override)
 site = Henshin::Site.new(config)
 
+puts "Reading files..."
 site.read
+
 site.process
 site.render
-site.write
+
+puts "Writing files..."
+site.write
+
+puts "Site created in #{config[:target]}"

data/henshin.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{henshin}
-  s.version = "0.0.1"
+  s.version = "0.1.2"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["hawx"]
-  s.date = %q{2010-05-20}
+  s.date = %q{2010-05-26}
   s.default_executable = %q{henshin}
   s.description = %q{Henshin is a static site generator, with a plugin system and more}
   s.email = %q{m@hawx.me}
@@ -20,159 +20,14 @@ Gem::Specification.new do |s|
   ]
   s.files = [
     ".gitignore",
-     ".yardoc/checksums",
-     ".yardoc/objects/Hash.dat",
-     ".yardoc/objects/Hash/to_options_i.dat",
-     ".yardoc/objects/Henshin.dat",
-     ".yardoc/objects/Henshin/CSSGenerator.dat",
-     ".yardoc/objects/Henshin/CSSGenerator/generate_i.dat",
-     ".yardoc/objects/Henshin/Defaults.dat",
-     ".yardoc/objects/Henshin/Gen.dat",
-     ".yardoc/objects/Henshin/Gen/config_3D_i.dat",
-     ".yardoc/objects/Henshin/Gen/config_i.dat",
-     ".yardoc/objects/Henshin/Gen/content_3D_i.dat",
-     ".yardoc/objects/Henshin/Gen/content_i.dat",
-     ".yardoc/objects/Henshin/Gen/date_3D_i.dat",
-     ".yardoc/objects/Henshin/Gen/date_i.dat",
-     ".yardoc/objects/Henshin/Gen/extension_3D_i.dat",
-     ".yardoc/objects/Henshin/Gen/extension_i.dat",
-     ".yardoc/objects/Henshin/Gen/initialize_i.dat",
-     ".yardoc/objects/Henshin/Gen/layout_3D_i.dat",
-     ".yardoc/objects/Henshin/Gen/layout_i.dat",
-     ".yardoc/objects/Henshin/Gen/override_i.dat",
-     ".yardoc/objects/Henshin/Gen/path_3D_i.dat",
-     ".yardoc/objects/Henshin/Gen/path_i.dat",
-     ".yardoc/objects/Henshin/Gen/payload_i.dat",
-     ".yardoc/objects/Henshin/Gen/process_i.dat",
-     ".yardoc/objects/Henshin/Gen/read_yaml_i.dat",
-     ".yardoc/objects/Henshin/Gen/render_i.dat",
-     ".yardoc/objects/Henshin/Gen/site_3D_i.dat",
-     ".yardoc/objects/Henshin/Gen/site_i.dat",
-     ".yardoc/objects/Henshin/Gen/title_3D_i.dat",
-     ".yardoc/objects/Henshin/Gen/title_i.dat",
-     ".yardoc/objects/Henshin/Gen/write_i.dat",
-     ".yardoc/objects/Henshin/HTMLGenerator.dat",
-     ".yardoc/objects/Henshin/HTMLGenerator/generate_i.dat",
-     ".yardoc/objects/Henshin/JSGenerator.dat",
-     ".yardoc/objects/Henshin/JSGenerator/generate_i.dat",
-     ".yardoc/objects/Henshin/LayoutParser.dat",
-     ".yardoc/objects/Henshin/LayoutParser/generate_i.dat",
-     ".yardoc/objects/Henshin/Post.dat",
-     ".yardoc/objects/Henshin/Post/author_3D_i.dat",
-     ".yardoc/objects/Henshin/Post/author_i.dat",
-     ".yardoc/objects/Henshin/Post/category_3D_i.dat",
-     ".yardoc/objects/Henshin/Post/category_i.dat",
-     ".yardoc/objects/Henshin/Post/date_3D_i.dat",
-     ".yardoc/objects/Henshin/Post/date_i.dat",
-     ".yardoc/objects/Henshin/Post/initialize_i.dat",
-     ".yardoc/objects/Henshin/Post/override_i.dat",
-     ".yardoc/objects/Henshin/Post/payload_i.dat",
-     ".yardoc/objects/Henshin/Post/permalink_i.dat",
-     ".yardoc/objects/Henshin/Post/process_i.dat",
-     ".yardoc/objects/Henshin/Post/read_name_i.dat",
-     ".yardoc/objects/Henshin/Post/read_yaml_i.dat",
-     ".yardoc/objects/Henshin/Post/tags_3D_i.dat",
-     ".yardoc/objects/Henshin/Post/tags_i.dat",
-     ".yardoc/objects/Henshin/Post/title_3D_i.dat",
-     ".yardoc/objects/Henshin/Post/title_i.dat",
-     ".yardoc/objects/Henshin/Post/write_i.dat",
-     ".yardoc/objects/Henshin/Site.dat",
-     ".yardoc/objects/Henshin/Site/archives_3D_i.dat",
-     ".yardoc/objects/Henshin/Site/archives_i.dat",
-     ".yardoc/objects/Henshin/Site/categories_3D_i.dat",
-     ".yardoc/objects/Henshin/Site/categories_i.dat",
-     ".yardoc/objects/Henshin/Site/config_3D_i.dat",
-     ".yardoc/objects/Henshin/Site/config_i.dat",
-     ".yardoc/objects/Henshin/Site/gens_3D_i.dat",
-     ".yardoc/objects/Henshin/Site/gens_i.dat",
-     ".yardoc/objects/Henshin/Site/initialize_i.dat",
-     ".yardoc/objects/Henshin/Site/layouts_3D_i.dat",
-     ".yardoc/objects/Henshin/Site/layouts_i.dat",
-     ".yardoc/objects/Henshin/Site/payload_i.dat",
-     ".yardoc/objects/Henshin/Site/plugins_3D_i.dat",
-     ".yardoc/objects/Henshin/Site/plugins_i.dat",
-     ".yardoc/objects/Henshin/Site/posts_3D_i.dat",
-     ".yardoc/objects/Henshin/Site/posts_i.dat",
-     ".yardoc/objects/Henshin/Site/process_i.dat",
-     ".yardoc/objects/Henshin/Site/read_i.dat",
-     ".yardoc/objects/Henshin/Site/read_layouts_i.dat",
-     ".yardoc/objects/Henshin/Site/read_others_i.dat",
-     ".yardoc/objects/Henshin/Site/read_posts_i.dat",
-     ".yardoc/objects/Henshin/Site/render_i.dat",
-     ".yardoc/objects/Henshin/Site/reset_i.dat",
-     ".yardoc/objects/Henshin/Site/statics_3D_i.dat",
-     ".yardoc/objects/Henshin/Site/statics_i.dat",
-     ".yardoc/objects/Henshin/Site/tags_3D_i.dat",
-     ".yardoc/objects/Henshin/Site/tags_i.dat",
-     ".yardoc/objects/Henshin/Site/write_i.dat",
-     ".yardoc/objects/Henshin/StandardPlugin.dat",
-     ".yardoc/objects/Henshin/configure_c.dat",
-     ".yardoc/objects/Henshin/extensions_c.dat",
-     ".yardoc/objects/Henshin/load_plugins_c.dat",
-     ".yardoc/objects/LiquidPlugin.dat",
-     ".yardoc/objects/LiquidPlugin/extensions_3D_i.dat",
-     ".yardoc/objects/LiquidPlugin/extensions_i.dat",
-     ".yardoc/objects/LiquidPlugin/generate_i.dat",
-     ".yardoc/objects/LiquidPlugin/initialize_i.dat",
-     ".yardoc/objects/LiquidPlugin/read_i.dat",
-     ".yardoc/objects/MarukuPlugin.dat",
-     ".yardoc/objects/MarukuPlugin/extensions_3D_i.dat",
-     ".yardoc/objects/MarukuPlugin/extensions_i.dat",
-     ".yardoc/objects/MarukuPlugin/generate_i.dat",
-     ".yardoc/objects/MarukuPlugin/initialize_i.dat",
-     ".yardoc/objects/PygmentsPlugin.dat",
-     ".yardoc/objects/PygmentsPlugin/extensions_3D_i.dat",
-     ".yardoc/objects/PygmentsPlugin/extensions_i.dat",
-     ".yardoc/objects/PygmentsPlugin/generate_i.dat",
-     ".yardoc/objects/PygmentsPlugin/initialize_i.dat",
-     ".yardoc/objects/SassPlugin.dat",
-     ".yardoc/objects/SassPlugin/extensions_3D_i.dat",
-     ".yardoc/objects/SassPlugin/extensions_i.dat",
-     ".yardoc/objects/SassPlugin/generate_i.dat",
-     ".yardoc/objects/SassPlugin/initialize_i.dat",
-     ".yardoc/objects/String.dat",
-     ".yardoc/objects/String/directory_i.dat",
-     ".yardoc/objects/String/extension_i.dat",
-     ".yardoc/objects/String/file_name_i.dat",
-     ".yardoc/objects/String/slugify_i.dat",
-     ".yardoc/objects/root.dat",
-     ".yardoc/proxy_types",
      "LICENSE",
      "README.markdown",
      "Rakefile",
      "VERSION",
      "bin/henshin",
-     "doc/Hash.html",
-     "doc/Henshin.html",
-     "doc/Henshin/CSSGenerator.html",
-     "doc/Henshin/Gen.html",
-     "doc/Henshin/HTMLGenerator.html",
-     "doc/Henshin/JSGenerator.html",
-     "doc/Henshin/LayoutParser.html",
-     "doc/Henshin/Post.html",
-     "doc/Henshin/Site.html",
-     "doc/Henshin/StandardPlugin.html",
-     "doc/LiquidPlugin.html",
-     "doc/MarukuPlugin.html",
-     "doc/PygmentsPlugin.html",
-     "doc/SassPlugin.html",
-     "doc/String.html",
-     "doc/_index.html",
-     "doc/class_list.html",
-     "doc/css/common.css",
-     "doc/css/full_list.css",
-     "doc/css/style.css",
-     "doc/file.README.html",
-     "doc/file_list.html",
-     "doc/frames.html",
-     "doc/index.html",
-     "doc/js/app.js",
-     "doc/js/full_list.js",
-     "doc/js/jquery.js",
-     "doc/method_list.html",
-     "doc/top-level-namespace.html",
      "henshin.gemspec",
      "lib/henshin.rb",
+     "lib/henshin/categories.rb",
      "lib/henshin/ext.rb",
      "lib/henshin/gen.rb",
      "lib/henshin/plugin.rb",
@@ -183,11 +38,11 @@ Gem::Specification.new do |s|
      "lib/henshin/post.rb",
      "lib/henshin/site.rb",
      "lib/henshin/static.rb",
+     "lib/henshin/tags.rb",
      "test/helper.rb",
      "test/site/_site/2010/10/20-testing-stuff/index.html",
      "test/site/_site/2010/5/15-lorem-ipsum/index.html",
      "test/site/_site/css/print.css",
-     "test/site/_site/css/screen.css",
      "test/site/_site/index.html",
      "test/site/_site/static.html",
      "test/site/css/screen.css",
@@ -195,6 +50,7 @@ Gem::Specification.new do |s|
      "test/site/layouts/main.html",
      "test/site/layouts/post.html",
      "test/site/options.yaml",
+     "test/site/plugins/test.rb",
      "test/site/posts/Testing-Stuff.markdown",
      "test/site/posts/lorem-ipsum.markdown",
      "test/site/sass/print.sass",
@@ -208,6 +64,7 @@ Gem::Specification.new do |s|
   s.summary = %q{Henshin is a static site generator}
   s.test_files = [
     "test/helper.rb",
+     "test/site/plugins/test.rb",
      "test/test_henshin.rb"
   ]
 

data/lib/henshin.rb

@@ -12,6 +12,8 @@ require 'henshin/gen'
 require 'henshin/post'
 require 'henshin/static'
 
+require 'henshin/tags'
+require 'henshin/categories'
 require 'henshin/ext'
 
 
@@ -27,19 +29,28 @@ module Henshin
               :permalink => '/{year}/{month}/{date}/{title}.html',
               :plugins => ['maraku', 'liquid'],
               :root => '.',
-              :target => '_site' }
+              :target => '_site',
+              :plugin_options => {},
+              :exclude => [] }
   
   
   # Creates the configuration hash by merging defaults, supplied options and options read from the 'options.yaml' file. Then loads the plugins
   #
   # @param [Hash] override to override other set options
   # @return [Hash] the merged configuration hash
-  def self.configure( override={} )
+  def self.configure( override={} )  
     config_file = (override[:root] || Defaults[:root]) + '/options.yaml'
     config = YAML.load_file( config_file ).to_options
     
     settings = Defaults.merge(config).merge(override)
-    settings[:plugins] = Henshin.load_plugins( settings[:plugins] )
+    
+    settings.each do |k, v|
+      if settings[:plugins].include? k.to_s
+        settings[:plugin_options][k] = v.to_options
+      end
+    end
+    
+    settings[:plugins] = Henshin.load_plugins( settings[:plugins], settings[:root], settings[:plugin_options] )
     settings[:extensions] = Henshin.extensions( settings[:plugins] )
     settings
   end
@@ -49,11 +60,16 @@ module Henshin
   #
   # @param [Array] plugins list of plugins to load
   # @return [Array] list of loaded plugin instances
-  def self.load_plugins( to_load )
+  def self.load_plugins( to_load, root, options )
     plugins = []
     to_load.each do |l|
-      require 'henshin/plugins/' + l
-      plugins << eval( l.capitalize + 'Plugin.new' )
+      p 
+      begin
+        require 'henshin/plugins/' + l
+      rescue LoadError
+        require File.join(root, 'plugins/', l)
+      end
+      plugins << eval("#{l.capitalize}Plugin.new( #{options[l.to_sym]} )")
     end
     plugins
   end

data/lib/henshin/categories.rb

@@ -0,0 +1,19 @@
+module Henshin
+  class Category
+  
+    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/lib/henshin/ext.rb

@@ -1,4 +1,37 @@
+require 'thread'
+
+module Enumerable
+  
+  # Like an each loop but runs each task in parallel
+  # Which will probably be very useful for writing and rendering
+  # from http://t-a-w.blogspot.com/2010/05/very-simple-parallelization-with-ruby.html
+  def each_parallel( n=10 )
+    todo = Queue.new
+    ts = (1..n).map do
+      Thread.new do 
+        while x = todo.deq
+          Exception.ignoring_exceptions { yield(x[0]) }
+        end
+      end
+    end
+    each {|x| todo << [x] }
+    n.times { todo << nil }
+    ts.each {|t| t.join }
+  end
+  
+end
+
+def Exception.ignoring_exceptions
+  begin
+    yield
+  rescue Exception => e
+    STDERR.puts e.message
+  end
+end
+
+
 class Hash
+
   # stripped straight out of rails
   # converts string keys to symbol keys
   # from http://api.rubyonrails.org/classes/ActiveSupport/CoreExtensions/Hash/Keys.html
@@ -8,8 +41,10 @@ class Hash
       options
     end
   end
+  
 end
 
+
 class String
   
   # Turns the string to a slug
@@ -23,14 +58,24 @@ class String
     slug
   end
   
+  # Capitalizes the string using Gruber's guidelines
+  def titlize
+    self
+  end
+  
   # Gets the extension from a string
   def extension
-    self.split('.')[1]
+    parts = self.split('.')
+    if parts.size == 2
+      return parts[1]
+    elsif parts.size == 3
+      return parts[2]
+    end
   end
   
   # Gets the directory from a string
   def directory
-    self =~ /((\/?[a-zA-Z0-9 _-]+\/)+)/
+    self =~ /((\.?\/?[a-zA-Z0-9 _-]+\/)+)/
     $1
   end
   

data/lib/henshin/gen.rb

@@ -11,7 +11,6 @@ module Henshin
       @site = site
       @config = site.config
       @extension = path.extension
-      @layout = site.layouts[ site.config[:layout] ]
     end
     
     
@@ -53,14 +52,14 @@ module Henshin
           @renderer = plugin
         end
       end
+      @renderer ||= StandardPlugin.new
       
-      if @renderer
-        unless @renderer.config[:ignore_layouts]
-          # do the layout
-          config[:plugins].each do |plugin|
-            if plugin.is_a?( LayoutParser )
-              @content = plugin.generate( @layout, self.payload )
-            end
+      @layout ||= site.layouts[ site.config[:layout] ]
+      unless @renderer.config[:ignore_layouts]
+        # do the layout
+        config[:plugins].each do |plugin|
+          if plugin.is_a?( LayoutParser )
+            @content = plugin.generate( @layout, self.payload )
           end
         end
       end
@@ -94,9 +93,7 @@ module Henshin
         # files should have different extension
         write_path.gsub!(".#{@extension}", ".#{render_type}")
       end
-      
-      p write_path
-      
+
       FileUtils.mkdir_p File.join( write_path.directory )
       file = File.new( File.join( write_path ), "w" )
       file.puts( @content )

data/lib/henshin/plugin.rb

@@ -5,6 +5,15 @@ module Henshin
     #   class MyPlugin < NoName::StandardPlugin
     #
     # or it can inherit a subclass from below
+    
+    # This is quite useful if a dummy plugin is needed
+    
+    attr_accessor :extensions, :config
+    
+    def initialize
+      @extensions = []
+      @config = {}
+    end
   end
   
   class HTMLGenerator < StandardPlugin

data/lib/henshin/plugins/liquid.rb

@@ -6,7 +6,7 @@ class LiquidPlugin < Henshin::LayoutParser
   attr_accessor :extensions
   
   def initialize
-    @extensions = ['html']
+    @extensions = []
   end
   
   def generate( layout, data )