awestructx 0.4.0 → 0.4.1.x1

data/lib/awestruct/handler_chains.rb

@@ -1,48 +1,31 @@
 require 'awestruct/handler_chain'
 require 'awestruct/handlers/file_handler'
-require 'awestruct/handlers/front_matter_handler'
-require 'awestruct/handlers/interpolation_handler'
 require 'awestruct/handlers/markdown_handler'
+require 'awestruct/handlers/orgmode_handler'
+require 'awestruct/handlers/asciidoc_handler'
+require 'awestruct/handlers/restructuredtext_handler'
 require 'awestruct/handlers/textile_handler'
+require 'awestruct/handlers/erb_handler'
 require 'awestruct/handlers/haml_handler'
 require 'awestruct/handlers/sass_handler'
 require 'awestruct/handlers/scss_handler'
-require 'awestruct/handlers/layout_handler'
+require 'awestruct/handlers/coffeescript_handler'
 
 module Awestruct
 
   class HandlerChains
 
-
     DEFAULTS = [
-      HandlerChain.new( /\.md$/, 
-        Awestruct::Handlers::FileHandler,
-        Awestruct::Handlers::FrontMatterHandler,
-        Awestruct::Handlers::InterpolationHandler,
-        Awestruct::Handlers::MarkdownHandler,
-        Awestruct::Handlers::LayoutHandler
-      ),
-      HandlerChain.new( /\.textile$/,
-        Awestruct::Handlers::FileHandler,
-        Awestruct::Handlers::FrontMatterHandler,
-        Awestruct::Handlers::InterpolationHandler,
-        Awestruct::Handlers::TextileHandler,
-        Awestruct::Handlers::LayoutHandler
-      ),
-      HandlerChain.new( /\.haml$/, 
-        Awestruct::Handlers::FileHandler,
-        Awestruct::Handlers::FrontMatterHandler,
-        Awestruct::Handlers::HamlHandler,
-        Awestruct::Handlers::LayoutHandler
-      ),
-      HandlerChain.new( /\.sass$/,
-        Awestruct::Handlers::FileHandler,
-        Awestruct::Handlers::SassHandler
-      ),
-      HandlerChain.new( /\.scss$/,
-        Awestruct::Handlers::FileHandler,
-        Awestruct::Handlers::ScssHandler
-      ),
+      Awestruct::Handlers::MarkdownHandler::CHAIN,
+      Awestruct::Handlers::TextileHandler::CHAIN,
+      Awestruct::Handlers::ErbHandler::CHAIN,
+      Awestruct::Handlers::OrgmodeHandler::CHAIN,
+      Awestruct::Handlers::AsciidocHandler::CHAIN,
+      Awestruct::Handlers::RestructuredtextHandler::CHAIN,
+      Awestruct::Handlers::HamlHandler::CHAIN,
+      Awestruct::Handlers::SassHandler::CHAIN,
+      Awestruct::Handlers::ScssHandler::CHAIN,
+      Awestruct::Handlers::CoffeescriptHandler::CHAIN,
       HandlerChain.new( /.*/, Awestruct::Handlers::FileHandler )
     ]
 

data/lib/awestruct/handlers/asciidoc_handler.rb

@@ -0,0 +1,57 @@
+
+require 'awestruct/handler_chain'
+require 'awestruct/handlers/base_handler'
+require 'awestruct/handlers/file_handler'
+require 'awestruct/handlers/front_matter_handler'
+require 'awestruct/handlers/interpolation_handler'
+require 'awestruct/handlers/layout_handler'
+
+module Awestruct
+  module Handlers
+    class AsciidocHandler < BaseHandler
+
+      CHAIN = Awestruct::HandlerChain.new( /\.(adoc|asciidoc)$/,
+        Awestruct::Handlers::FileHandler,
+        Awestruct::Handlers::FrontMatterHandler,
+        Awestruct::Handlers::InterpolationHandler,
+        Awestruct::Handlers::AsciidocHandler,
+        Awestruct::Handlers::LayoutHandler
+      )
+
+      def initialize(site, delegate)
+        super( site, delegate )
+      end
+
+      def simple_name
+        p = File.basename( relative_source_path )
+        File.basename( p, File.extname( p ) )
+      end
+
+      def output_filename
+        simple_name + output_extension
+      end
+
+      def output_extension
+        '.html' 
+      end
+
+      def content_syntax
+        :asciidoc
+      end
+
+      def rendered_content(context, with_layouts=true)
+        content = delegate.rendered_content( context, with_layouts )
+        imagesdir = site.config.images_dir
+        iconsdir = File.join(imagesdir, 'icons')
+        conffile = File.join(site.config.config_dir, 'asciidoc.conf')
+        confopt = File.exist?(conffile) ? '-f ' + conffile : ''
+        content = execute_shell( [ "asciidoc -s -b html5 -a pygments -a icons",
+                                   "-a iconsdir='#{iconsdir}'",
+                                   "-a imagesdir='#{imagesdir}'",
+                                   "#{confopt} -o - -" ].join( ' ' ),
+                                 content)
+        content.gsub( "\r", '' )
+      end
+    end
+  end
+end

data/lib/awestruct/handlers/base_handler.rb

@@ -1,5 +1,6 @@
 
 require 'hashery/open_cascade'
+require 'open3'
 
 module Awestruct
   module Handlers
@@ -39,12 +40,16 @@ module Awestruct
       end
 
       def output_path
-        File.join( File.dirname( relative_source_path ), output_filename )
+        ( p = relative_source_path ) if relative_source_path
+        ( of = output_filename ) if output_filename
+        return File.join( File.dirname( p ), output_filename ) if ( p && of )
+        nil
       end
 
       def output_extension
-        return @delegate.output_extension if @delegate
-        File.extname( output_filename )
+        return @delegate.output_extension if @delegate 
+        return File.extname( output_filename ) unless output_filename.nil?
+        nil
       end
 
       def path
@@ -78,7 +83,12 @@ module Awestruct
       end
 
       def inherit_front_matter(page)
-        @delegate.inherit_front_matter(page) if @delegate
+        return @delegate.inherit_front_matter(page) if @delegate
+      end
+
+      def dependencies
+        return @delegate.dependencies if @delegate
+        []
       end
 
       def to_chain
@@ -87,6 +97,15 @@ module Awestruct
         chain.flatten
       end
 
+      def execute_shell(command, input=nil)
+        Open3.popen3(command) do |stdin, stdout, _|
+          stdin.puts input unless input.nil?
+          out = stdout.read
+        end
+      rescue Errno::EPIPE
+        ""
+      end
+
     end
   end
 end

data/lib/awestruct/handlers/coffeescript_handler.rb

@@ -0,0 +1,48 @@
+
+require 'awestruct/handler_chain'
+require 'awestruct/handlers/base_handler'
+require 'awestruct/handlers/file_handler'
+require 'awestruct/handlers/front_matter_handler'
+require 'awestruct/handlers/interpolation_handler'
+
+require 'coffee-script'
+
+module Awestruct
+  module Handlers
+    class CoffeescriptHandler < BaseHandler
+
+
+      CHAIN = Awestruct::HandlerChain.new( /\.coffee$/,
+        Awestruct::Handlers::FileHandler,
+        Awestruct::Handlers::FrontMatterHandler,
+        Awestruct::Handlers::InterpolationHandler,
+        Awestruct::Handlers::CoffeescriptHandler
+      )
+
+      def initialize(site, delegate)
+        super( site, delegate )
+      end
+
+      def simple_name
+        File.basename( relative_source_path, '.coffee' ) 
+      end
+
+      def output_filename
+        File.basename( relative_source_path, '.coffee' ) + '.js'
+      end
+
+      def output_extension
+        '.js'
+      end
+
+      def content_syntax
+        :coffeescript
+      end
+
+      def rendered_content(context, with_layouts=true)
+        CoffeeScript.compile( delegate.rendered_content( context, with_layouts ) )
+      end
+
+    end
+  end
+end

data/lib/awestruct/handlers/erb_handler.rb

@@ -0,0 +1,44 @@
+
+require 'awestruct/handlers/base_handler'
+require 'awestruct/handlers/file_handler'
+require 'awestruct/handlers/front_matter_handler'
+require 'awestruct/handlers/layout_handler'
+
+module Awestruct
+  module Handlers
+    class ErbHandler < BaseHandler
+
+      CHAIN = Awestruct::HandlerChain.new( /\.erb$/,
+        Awestruct::Handlers::FileHandler,
+        Awestruct::Handlers::FrontMatterHandler,
+        Awestruct::Handlers::ErbHandler,
+        Awestruct::Handlers::LayoutHandler
+      )
+
+      def initialize(site, delegate)
+        super( site, delegate )
+      end
+
+      def simple_name
+        File.basename( File.basename( relative_source_path, '.erb' ), output_extension )
+      end
+
+      def output_filename
+        File.basename( relative_source_path, '.erb' )
+      end
+
+      def output_extension
+        File.extname( output_filename )
+      end
+
+      def content_syntax
+        :erb
+      end
+
+      def rendered_content(context, with_layouts=true)
+        erb = ERB.new( delegate.rendered_content( context, with_layouts) )
+        erb.result( context.send( :binding ) )
+      end
+    end
+  end
+end

data/lib/awestruct/handlers/file_handler.rb

@@ -23,9 +23,12 @@ module Awestruct
       def relative_source_path
         begin
           p = path.relative_path_from( site.dir ) 
-          return nil if !! ( %r(^\.\.) =~ p )
-          File.join( '', p )
-        rescue
+          if !! ( %r(^\.\.) =~ p.to_s )
+            return nil 
+          end
+          r = File.join( '', p )
+          return r
+        rescue Exception=>e
           nil
         end
       end

data/lib/awestruct/handlers/front_matter_handler.rb

@@ -21,6 +21,11 @@ module Awestruct
         @raw_content
       end
 
+      def rendered_content(context, with_layouts)
+        parse_parts()
+        @raw_content
+      end
+
       def content_line_offset
         parse_parts()
         @content_line_offset

data/lib/awestruct/handlers/haml_handler.rb

@@ -1,5 +1,9 @@
 
+require 'awestruct/handler_chain'
 require 'awestruct/handlers/base_handler'
+require 'awestruct/handlers/file_handler'
+require 'awestruct/handlers/front_matter_handler'
+require 'awestruct/handlers/layout_handler'
 
 require 'haml'
 
@@ -7,6 +11,13 @@ module Awestruct
   module Handlers
     class HamlHandler < BaseHandler
 
+      CHAIN = Awestruct::HandlerChain.new( /\.haml$/,
+        Awestruct::Handlers::FileHandler,
+        Awestruct::Handlers::FrontMatterHandler,
+        Awestruct::Handlers::HamlHandler,
+        Awestruct::Handlers::LayoutHandler
+      )
+
       def initialize(site, delegate)
         super( site, delegate )
       end
@@ -16,7 +27,8 @@ module Awestruct
       end
 
       def output_filename
-        File.basename( relative_source_path, '.haml' )
+        return File.basename( relative_source_path, '.haml' ) unless relative_source_path.nil?
+        nil
       end
 
       def output_extension
@@ -30,7 +42,7 @@ module Awestruct
           hash
         }
         options[:relative_source_path] = context.page.relative_source_path
-        options[:filename] = delegate.path
+        options[:filename] = delegate.path.to_s
         options[:line]     = delegate.content_line_offset + 1
         options[:site] = context.site
         haml_engine = Haml::Engine.new( delegate.raw_content, options )

data/lib/awestruct/handlers/layout_handler.rb

@@ -33,9 +33,11 @@ module Awestruct
       end
 
       def for_layout_chain(page, &block)
+        # puts "for_layout_chain #{page.inspect}" 
         current_page = page 
         while ( ! ( current_page.nil? || current_page.layout.nil? ) )
           current_page = site.layouts.find_matching( current_page.layout, current_page.output_extension )
+          # puts "layout #{current_page.inspect}" 
           if ( ! current_page.nil? )
             block.call( current_page )
           end
@@ -49,8 +51,8 @@ module Awestruct
           for_layout_chain(context.__effective_page || context.page) do |layout|
             context.content = content
             context.__effective_page = layout
-            content = layout.rendered_content( context, true )
-          end
+            content = layout.rendered_content( context, false )
+           end
         end
 
         content

data/lib/awestruct/handlers/markdown_handler.rb

@@ -1,11 +1,25 @@
 
+require 'awestruct/handler_chain'
 require 'awestruct/handlers/base_handler'
+require 'awestruct/handlers/file_handler'
+require 'awestruct/handlers/front_matter_handler'
+require 'awestruct/handlers/interpolation_handler'
+require 'awestruct/handlers/layout_handler'
 require 'rdiscount'
 
 module Awestruct
   module Handlers
     class MarkdownHandler < BaseHandler
 
+
+      CHAIN = Awestruct::HandlerChain.new( /\.md$/,
+        Awestruct::Handlers::FileHandler,
+        Awestruct::Handlers::FrontMatterHandler,
+        Awestruct::Handlers::InterpolationHandler,
+        Awestruct::Handlers::MarkdownHandler,
+        Awestruct::Handlers::LayoutHandler
+      )
+
       def initialize(site, delegate)
         super( site, delegate )
       end

data/lib/awestruct/handlers/orgmode_handler.rb

@@ -0,0 +1,48 @@
+
+require 'awestruct/handler_chain'
+require 'awestruct/handlers/base_handler'
+require 'awestruct/handlers/file_handler'
+require 'awestruct/handlers/front_matter_handler'
+require 'awestruct/handlers/interpolation_handler'
+require 'awestruct/handlers/layout_handler'
+require 'org-ruby'
+
+module Awestruct
+  module Handlers
+    class OrgmodeHandler < BaseHandler
+
+      CHAIN = Awestruct::HandlerChain.new( /\.org$/,
+        Awestruct::Handlers::FileHandler,
+        Awestruct::Handlers::FrontMatterHandler,
+        Awestruct::Handlers::InterpolationHandler,
+        Awestruct::Handlers::OrgmodeHandler,
+        Awestruct::Handlers::LayoutHandler
+      )
+
+      def initialize(site, delegate)
+        super( site, delegate )
+      end
+
+      def simple_name
+        File.basename( relative_source_path, '.org' ) 
+      end
+
+      def output_filename
+        File.basename( relative_source_path, '.org' ) + '.html'
+      end
+
+      def output_extension
+        '.html'
+      end
+
+      def content_syntax
+        :orgmode
+      end
+
+      def rendered_content(context, with_layouts=true)
+        Orgmode::Parser.new(super( context, with_layouts) ).to_html
+      end
+
+    end
+  end
+end

data/lib/awestruct/handlers/page_delegating_handler.rb

@@ -0,0 +1,54 @@
+
+require 'awestruct/handlers/base_handler'
+
+module Awestruct
+  module Handlers
+    class PageDelegatingHandler < BaseHandler
+
+      attr_accessor :page
+
+      def initialize(site, page)
+        super( site )
+        @page = page
+      end
+
+      def path
+        page.source_path
+      end
+
+      def inherit_front_matter(outer_page)
+        #page.prepare!
+        #page.handler.inherit_front_matter( outer_page )
+      end
+
+      def output_path
+        page.output_path
+      end
+
+      def relative_source_path
+        page.relative_source_path
+      end
+
+      def output_extension
+        page.output_extension
+      end
+
+      def stale?
+        page.stale?
+      end
+
+      def input_mtime(ignored)
+        page.input_mtime
+      end
+
+      def raw_content
+        page.raw_content
+      end
+
+      def rendered_content(context_ignored, with_layouts_ignored=true)
+        page.content( true )
+      end
+
+    end
+  end
+end

data/lib/awestruct/handlers/restructuredtext_handler.rb

@@ -0,0 +1,67 @@
+
+require 'awestruct/handler_chain'
+require 'awestruct/handlers/base_handler'
+require 'awestruct/handlers/file_handler'
+require 'awestruct/handlers/front_matter_handler'
+require 'awestruct/handlers/interpolation_handler'
+require 'awestruct/handlers/layout_handler'
+
+require 'hpricot'
+
+module Awestruct
+  module Handlers
+    class RestructuredtextHandler < BaseHandler
+
+      CHAIN = Awestruct::HandlerChain.new( /\.(adoc|asciidoc)$/,
+        Awestruct::Handlers::FileHandler,
+        Awestruct::Handlers::FrontMatterHandler,
+        Awestruct::Handlers::InterpolationHandler,
+        Awestruct::Handlers::RestructuredtextHandler,
+        Awestruct::Handlers::LayoutHandler
+      )
+
+      def initialize(site, delegate)
+        super( site, delegate )
+      end
+
+      def simple_name
+        File.basename( relative_source_path, '.rst' )
+      end
+
+      def output_filename
+        simple_name + output_extension
+      end
+
+      def output_extension
+        '.html' 
+      end
+
+      def content_syntax
+        :rst
+      end
+
+      def rendered_content(context, with_layouts=true)
+        content = delegate.rendered_content( context, with_layouts )
+
+        hl = 1
+        if front_matter['initial_header_level'].to_s =~ /^[1-6]$/
+          hl = front_matter['initial_header_level']
+        end
+        rendered = ''
+        begin
+          doc = execute_shell( [ "rst2html",
+                                 "--strip-comments",
+                                 "--no-doc-title",
+                                 " --initial-header-level=#{hl}" ].join(' '), 
+                                 content )
+          content = Hpricot( doc ).at( '/html/body/div[@class="document"]' ).inner_html.strip
+          content = content.gsub( "\r", '' )
+        rescue => e
+          puts e
+          puts e.backtrace
+        end
+        content
+      end
+    end
+  end
+end

data/lib/awestruct/handlers/sass_handler.rb

@@ -1,10 +1,17 @@
 
+require 'awestruct/handler_chain'
 require 'awestruct/handlers/base_sass_handler'
+require 'awestruct/handlers/file_handler'
 
 module Awestruct
   module Handlers
     class SassHandler < BaseSassHandler
 
+      CHAIN = Awestruct::HandlerChain.new( /\.sass$/,
+        Awestruct::Handlers::FileHandler,
+        Awestruct::Handlers::SassHandler
+      )
+
       def initialize(site, delegate)
         super( site, delegate, :sass )
       end

data/lib/awestruct/handlers/scss_handler.rb

@@ -1,10 +1,17 @@
 
+require 'awestruct/handler_chain'
 require 'awestruct/handlers/base_sass_handler'
+require 'awestruct/handlers/file_handler'
 
 module Awestruct
   module Handlers
     class ScssHandler < BaseSassHandler
 
+      CHAIN = Awestruct::HandlerChain.new( /\.scss$/,
+        Awestruct::Handlers::FileHandler,
+        Awestruct::Handlers::ScssHandler
+      )
+
       def initialize(site, delegate)
         super( site, delegate, :scss )
       end

data/lib/awestruct/handlers/textile_handler.rb

@@ -1,11 +1,26 @@
 
+require 'awestruct/handler_chain'
 require 'awestruct/handlers/base_handler'
+require 'awestruct/handlers/file_handler'
+require 'awestruct/handlers/front_matter_handler'
+require 'awestruct/handlers/interpolation_handler'
+require 'awestruct/handlers/layout_handler'
 require 'redcloth'
 
 module Awestruct
   module Handlers
     class TextileHandler < BaseHandler
 
+      CHAIN = Awestruct::HandlerChain.new( /\.textile$/,
+        Awestruct::Handlers::FileHandler,
+        Awestruct::Handlers::FrontMatterHandler,
+        Awestruct::Handlers::InterpolationHandler,
+        Awestruct::Handlers::TextileHandler,
+        Awestruct::Handlers::LayoutHandler
+      )
+
+
+
       def initialize(site, delegate)
         super( site, delegate )
       end

data/lib/awestruct/layouts.rb

@@ -4,6 +4,7 @@ module Awestruct
   class Layouts < Array
 
     def find_matching(simple_name, output_extension)
+      # puts "find matching ( #{simple_name}, #{output_extension} )"
       self.find{|e| 
         ( e.simple_name == simple_name ) && ( e.output_extension == output_extension )
       }