ruhoh 0.2.1 → 0.3.0

data/Gemfile

@@ -3,9 +3,8 @@ gemspec
 
 gem 'rack', "~> 1.4"
 gem 'directory_watcher', "~> 1.4"
-gem 'kramdown', "~> 0.13"
-gem 'maruku', "~> 0.6"
 gem 'psych', "~> 1.3"
+gem 'redcarpet', "~> 2.1"
 
 group :development do
   gem 'rspec'

data/README.md

@@ -8,13 +8,6 @@
     $ gem install ruhoh
     $ ruhoh help
 
-
-- Ruhoh.setup                       :after_setup
-- Ruhoh::DB.update\_all             :after_db_update
-- @page = Ruhoh::Page.new           :after_page_initialize
-  - templater
-  - converter
-  
   
 - setup
 - database

data/history.json

@@ -1,4 +1,14 @@
 [
+  {
+    "version" : "0.3.0",
+    "date" : "13.5.2012",
+    "changes" : [
+      "Change markdown parser from maruku to redcarpet. Adds support for fenced code blocks and autolinking."
+    ],
+    "features" : [
+      "Add plugin architecture for custom mustache helpers, custom converters, and custom compile tasks."
+    ]
+  },
   {
     "version" : "0.2.1",
     "date" : "9.5.2012",

data/lib/ruhoh/client/client.rb

@@ -121,7 +121,8 @@ class Ruhoh
     
     # Public: Compile to static website.
     def compile
-      Ruhoh::Compiler.new(@args[1]).compile
+      Ruhoh::DB.update_all
+      Ruhoh::Compiler.compile(@args[1])
     end
     
     # Public: Create a new blog at the directory provided.

data/lib/ruhoh/compiler.rb

@@ -1,60 +1,66 @@
 class Ruhoh
-  
-  class Compiler
-    
-    def initialize(target_directory)
-      Ruhoh.config.env ||= 'production'
-      Ruhoh::Friend.say { plain "Compiling for environment: '#{Ruhoh.config.env}'" }
+  module Compiler
 
-      Ruhoh::DB.update_all
-      @target = target_directory || "./#{Ruhoh.folders.compiled}"
-      @page = Ruhoh::Page.new
-    end
-    
     # TODO: seems rather dangerous to delete the incoming target directory?
-    def compile
-      FileUtils.rm_r @target if File.exist?(@target)
-      FileUtils.mkdir_p @target
-      self.theme
-      self.pages
-      self.media
-      self.syntax
+    def self.compile(target_directory = nil, page = nil)
+      Ruhoh.config.env ||= 'production'
+      Ruhoh::Friend.say { plain "Compiling for environment: '#{Ruhoh.config.env}'" }
+      target = target_directory || "./#{Ruhoh.folders.compiled}"
+      page = page || Ruhoh::Page.new
+      
+      FileUtils.rm_r target if File.exist?(target)
+      FileUtils.mkdir_p target
+      
+      self.constants.each {|c|
+        task = self.const_get(c)
+        next unless task.respond_to?(:run)
+        task.run(target, page)
+      }  
       true
     end
     
-    def pages
-      FileUtils.cd(@target) {
-        Ruhoh::DB.all_pages.each_value do |p|
-          @page.change(p['id'])
+    module Defaults
 
-          FileUtils.mkdir_p File.dirname(@page.compiled_path)
-          File.open(@page.compiled_path, 'w:UTF-8') { |p| p.puts @page.render }
+      def self.run(target, page)
+        self.pages(target, page)
+        self.theme(target, page)
+        self.media(target, page)
+        self.syntax(target, page)
+      end
+      
+      def self.pages(target, page)
+        FileUtils.cd(target) {
+          Ruhoh::DB.all_pages.each_value do |p|
+            page.change(p['id'])
 
-          Ruhoh::Friend.say { green "processed: #{p['id']}" }
-        end
-      }
+            FileUtils.mkdir_p File.dirname(page.compiled_path)
+            File.open(page.compiled_path, 'w:UTF-8') { |p| p.puts page.render }
+
+            Ruhoh::Friend.say { green "processed: #{p['id']}" }
+          end
+        }
+      end
+
+      def self.theme(target, page)
+        return unless FileTest.directory? Ruhoh.paths.theme
+        FileUtils.mkdir_p File.join(target, Ruhoh.config.theme_path)
+        FileUtils.cp_r Ruhoh.paths.theme, File.join(target, Ruhoh.folders.templates, Ruhoh.folders.themes)
+      end
+
+      def self.media(target, page)
+        return unless FileTest.directory? Ruhoh.paths.media
+        FileUtils.mkdir_p File.join(target, Ruhoh.folders.media)
+        FileUtils.cp_r Ruhoh.paths.media, target
+      end
+
+      def self.syntax(target, page)
+        return unless FileTest.directory? Ruhoh.paths.syntax
+        syntax_path = File.join(target, Ruhoh.folders.templates, Ruhoh.folders.syntax)
+        FileUtils.mkdir_p syntax_path
+        FileUtils.cp_r "#{Ruhoh.paths.syntax}/.", syntax_path
+      end
+      
+    end #Defaults
 
-    end
-    
-    def theme
-      return unless FileTest.directory? Ruhoh.paths.theme
-      FileUtils.mkdir_p File.join(@target, Ruhoh.config.theme_path)
-      FileUtils.cp_r Ruhoh.paths.theme, File.join(@target, Ruhoh.folders.templates, Ruhoh.folders.themes)
-    end
-    
-    def media
-      return unless FileTest.directory? Ruhoh.paths.media
-      FileUtils.mkdir_p File.join(@target, Ruhoh.folders.media)
-      FileUtils.cp_r Ruhoh.paths.media, @target 
-    end
-    
-    def syntax
-      return unless FileTest.directory? Ruhoh.paths.syntax
-      syntax_path = File.join(@target, Ruhoh.folders.templates, Ruhoh.folders.syntax)
-      FileUtils.mkdir_p syntax_path
-      FileUtils.cp_r "#{Ruhoh.paths.syntax}/.", syntax_path
-    end
-    
   end #Compiler
-  
 end #Ruhoh

data/lib/ruhoh/converters/converter.rb

@@ -1,44 +1,19 @@
-require 'kramdown'
-
 class Ruhoh
-
   module Converter
     
-    MarkdownExtensions = ['.md', '.markdown']
-    TextileExtensions = ['.textile']
-    
     def self.convert(page)
-      self.__send__ self.which_converter(page.data['id']), page
-    end
-    
-    def self.which_converter(filename)
-      extension = File.extname(filename).downcase
+      extension = File.extname(page.data['id']).downcase
+      
+      Ruhoh::Converter.constants.each {|c|
+        converter = Ruhoh::Converter.const_get(c)
+        next unless converter.respond_to?(:convert)
+        next unless converter.respond_to?(:extensions)
+        next unless Array(converter.extensions).include?(extension) 
+        return converter.convert(page)
+      }
 
-      if MarkdownExtensions.include? extension
-        :markdown
-      elsif TextileExtensions.include? extension
-        :textile
-      else
-        :none
-      end
-    end
-    
-    # Markdown
-    def self.markdown(page)
-      Kramdown::Document.new(page.content).to_html
-    end
-    
-    # Textile
-    # sample implementation
-    def self.textile(page)
-      'textile not supported yet =('
-    end
-    
-    # No converter
-    def self.none(page)
       page.content
     end
     
   end #Converter
-  
 end #Ruhoh

data/lib/ruhoh/converters/markdown.rb

@@ -0,0 +1,19 @@
+class Ruhoh
+  module Converter
+    module Markdown
+
+      def self.extensions
+        ['.md', '.markdown']
+      end
+      
+      def self.convert(page)
+        require 'redcarpet'
+        markdown = Redcarpet::Markdown.new(Redcarpet::Render::HTML.new(:with_toc_data => true),
+          :autolink => true, 
+          :fenced_code_blocks => true, 
+        )
+        markdown.render(page.content)
+      end
+    end
+  end
+end

data/lib/ruhoh/version.rb

@@ -1,4 +1,4 @@
 class Ruhoh
-  Version = VERSION = '0.2.1'
+  Version = VERSION = '0.3.0'
   RuhohSpec = '0.2'
 end

data/lib/ruhoh.rb

@@ -24,6 +24,7 @@ require 'ruhoh/db'
 require 'ruhoh/templaters/helpers'
 require 'ruhoh/templaters/rmustache'
 require 'ruhoh/templaters/base'
+require 'ruhoh/converters/markdown'
 require 'ruhoh/converters/converter'
 require 'ruhoh/page'
 require 'ruhoh/previewer'
@@ -31,7 +32,7 @@ require 'ruhoh/watch'
 require 'ruhoh/program'
 
 class Ruhoh
-
+  
   class << self
     attr_accessor :log
     attr_reader :folders, :files, :config, :paths, :filters
@@ -40,13 +41,13 @@ class Ruhoh
   @log = Ruhoh::Logger.new
 
   Root      = File.expand_path(File.join(File.dirname(__FILE__), '..'))
-  Folders   = Struct.new(:database, :pages, :posts, :templates, :themes, :layouts, :partials, :media, :syntax, :compiled)
+  Folders   = Struct.new(:database, :pages, :posts, :templates, :themes, :layouts, :partials, :media, :syntax, :compiled, :plugins)
   Files     = Struct.new(:site, :config, :dashboard)
   Filters   = Struct.new(:posts, :pages, :static)
   Config    = Struct.new(:permalink, :pages_permalink, :theme, :theme_path, :media_path, :syntax_path, :exclude, :env)
   Paths     = Struct.new(
                 :site_source, :database, :pages, :posts, :theme, :layouts, :partials, :global_partials, :media, :syntax,
-                :compiled, :dashboard)
+                :compiled, :dashboard, :plugins)
   
   
   # Public: Setup Ruhoh utilities relative to the current application directory.
@@ -55,12 +56,17 @@ class Ruhoh
     @log.log_file = opts[:log_file] if opts[:log_file]
     self.reset
     @site_source = opts[:source] if opts[:source]
-
-    !!(self.setup_config && self.setup_paths && self.setup_filters)
+    
+    if (self.setup_config && self.setup_paths && self.setup_filters)
+      self.setup_plugins unless opts[:enable_plugins] == false
+      true
+    else
+      false
+    end
   end
   
   def self.reset
-    @folders     = Folders.new('_database', '_pages', '_posts', '_templates', 'themes', 'layouts', 'partials', "_media", "syntax", '_compiled')
+    @folders     = Folders.new('_database', '_pages', '_posts', '_templates', 'themes', 'layouts', 'partials', "_media", "syntax", '_compiled', '_plugins')
     @files       = Files.new('_site.yml', '_config.yml', 'dash.html')
     @filters     = Filters.new
     @config      = Config.new
@@ -111,6 +117,7 @@ class Ruhoh
     @paths.syntax           = self.absolute_path(@folders.templates, @folders.syntax)
     @paths.compiled         = self.absolute_path(@folders.compiled)
     @paths.dashboard        = self.absolute_path(@files.dashboard)
+    @paths.plugins          = self.absolute_path(@folders.plugins)
     @paths
   end
   
@@ -121,6 +128,11 @@ class Ruhoh
     @filters
   end
   
+  def self.setup_plugins
+    plugins = Dir[File.join(self.paths.plugins, "**/*.rb")]
+    plugins.each {|f| require f } unless plugins.empty?
+  end
+  
   def self.absolute_path(*args)
     File.__send__ :join, args.unshift(self.paths.site_source)
   end

data/ruhoh.gemspec

@@ -17,7 +17,7 @@ Gem::Specification.new do |s|
   s.add_dependency 'rack', "~> 1.4"
   s.add_dependency 'mustache', "~> 0.99"
   s.add_dependency 'directory_watcher', "~> 1.4"
-  s.add_dependency 'maruku', "~> 0.6"
+  s.add_dependency 'redcarpet', "~> 2.1"
   s.add_dependency 'psych', "~> 1.3"
   
   # = MANIFEST =
@@ -33,6 +33,7 @@ Gem::Specification.new do |s|
     lib/ruhoh/client/help.yml
     lib/ruhoh/compiler.rb
     lib/ruhoh/converters/converter.rb
+    lib/ruhoh/converters/markdown.rb
     lib/ruhoh/db.rb
     lib/ruhoh/deployers/s3.rb
     lib/ruhoh/friend.rb

data/spec/setup_spec.rb

@@ -7,6 +7,7 @@ module Setup
         Ruhoh.should_receive(:setup_config).and_return(true)
         Ruhoh.should_receive(:setup_paths).and_return(true)
         Ruhoh.should_receive(:setup_filters).and_return(true)
+        Ruhoh.should_receive(:setup_plugins).and_return(true)
         Ruhoh.setup
       end
     end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ruhoh
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.3.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-05-09 00:00:00.000000000 Z
+date: 2012-05-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rack
-  requirement: &70126524196260 !ruby/object:Gem::Requirement
+  requirement: &70215904076860 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,10 +21,10 @@ dependencies:
         version: '1.4'
   type: :runtime
   prerelease: false
-  version_requirements: *70126524196260
+  version_requirements: *70215904076860
 - !ruby/object:Gem::Dependency
   name: mustache
-  requirement: &70126524225960 !ruby/object:Gem::Requirement
+  requirement: &70215904075600 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -32,10 +32,10 @@ dependencies:
         version: '0.99'
   type: :runtime
   prerelease: false
-  version_requirements: *70126524225960
+  version_requirements: *70215904075600
 - !ruby/object:Gem::Dependency
   name: directory_watcher
-  requirement: &70126524225500 !ruby/object:Gem::Requirement
+  requirement: &70215904074300 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -43,21 +43,21 @@ dependencies:
         version: '1.4'
   type: :runtime
   prerelease: false
-  version_requirements: *70126524225500
+  version_requirements: *70215904074300
 - !ruby/object:Gem::Dependency
-  name: maruku
-  requirement: &70126524225040 !ruby/object:Gem::Requirement
+  name: redcarpet
+  requirement: &70215904072340 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '0.6'
+        version: '2.1'
   type: :runtime
   prerelease: false
-  version_requirements: *70126524225040
+  version_requirements: *70215904072340
 - !ruby/object:Gem::Dependency
   name: psych
-  requirement: &70126524224580 !ruby/object:Gem::Requirement
+  requirement: &70215904071680 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -65,7 +65,7 @@ dependencies:
         version: '1.3'
   type: :runtime
   prerelease: false
-  version_requirements: *70126524224580
+  version_requirements: *70215904071680
 description: Ruhoh is a Universal API for your static blog.
 email: plusjade@gmail.com
 executables:
@@ -84,6 +84,7 @@ files:
 - lib/ruhoh/client/help.yml
 - lib/ruhoh/compiler.rb
 - lib/ruhoh/converters/converter.rb
+- lib/ruhoh/converters/markdown.rb
 - lib/ruhoh/db.rb
 - lib/ruhoh/deployers/s3.rb
 - lib/ruhoh/friend.rb
@@ -142,12 +143,18 @@ required_ruby_version: !ruby/object:Gem::Requirement
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+      segments:
+      - 0
+      hash: 90005056232513636
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+      segments:
+      - 0
+      hash: 90005056232513636
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.17