awestruct 0.2.18 → 0.4.2.x1

data/lib/awestruct/extensions/atomizer.rb

@@ -2,14 +2,16 @@ module Awestruct
   module Extensions
     class Atomizer
 
-      def initialize(entries_name, output_path, opts={})
-        @entries_name = entries_name
+      def initialize(entries, output_path, opts={})
+        @entries = entries
         @output_path = output_path
         @num_entries = opts[:num_entries] || 50
+        @content_url = opts[:content_url]
+        @feed_title = opts[:feed_title]
       end
 
       def execute(site)
-        entries = site.send( @entries_name ) || []
+        entries = @entries.is_a?(Array) ? @entries : site.send( @entries ) || []
         unless ( @num_entries == :all )
           entries = entries[0, @num_entries]
         end
@@ -32,7 +34,8 @@ module Awestruct
         page.date = page.timestamp unless page.timestamp.nil?
         page.output_path = @output_path
         page.entries = atom_pages
-        page.title = site.title || site.base_url
+        page.title = @feed_title || site.title || site.base_url
+        page.content_url = @content_url || site.base_url
         site.pages << page
       end
 

data/lib/awestruct/extensions/coffeescripttransform.rb

@@ -0,0 +1,42 @@
+require 'coffee-script'
+require 'nokogiri'
+
+##
+# Awestruct:Extensions:CoffeeScript is a transformer that compiles inline CoffeeScript in HTML files as JavaScript.
+
+module Awestruct
+  module Extensions
+    class CoffeeScriptTransform
+
+      def transform(site, page, input)
+        ext = File.extname(page.output_path)[1..-1].to_sym
+        case ext
+        when :html
+          encoding = 'UTF-8'
+          encoding = site.encoding unless site.encoding.nil?
+
+          return compile(input, encoding)
+        end
+        return input
+      end
+
+      private
+
+      def compile(input, encoding)
+        html = Nokogiri::HTML(input, nil, encoding);
+        html.search('script').each  do |script|
+          next unless 'text/coffeescript'.eql? script.attr('type')
+
+          if script.attr('src') =~ /\.coffee$/
+            script.set_attribute('src', File.basename( script.attr('src'), '.coffee' ) + '.js')
+          else
+            script.inner_html = CoffeeScript.compile script.inner_html
+          end
+          script.set_attribute('type', 'text/javascript')
+
+        end
+        return html.to_html
+      end
+    end
+  end
+end

data/lib/awestruct/extensions/minify.rb

@@ -12,10 +12,10 @@ require 'fileutils'
 #
 # These commands must be available on your PATH in order to use them.
 #
-# This class is loaded as a transformer in the Awestruct pipeline. The
+# This class is loaded as a transformer into the Awestruct pipeline. The
 # constructor accepts an array of symbols representing the file types to minimize.
 #
-#   extension Awestruct::Extensions::Minify.new
+#   transformer Awestruct::Extensions::Minify.new
 #
 # This transform recognizes the following symbols:
 #
@@ -57,30 +57,28 @@ module Awestruct
 
       def transform(site, page, input)
         if site.minify
-          ext = File.extname(page.output_path)[1..-1].to_sym
-          if @types.include?(ext)
-            case ext
-            when :html
-              print "minifying html #{page.output_path}"
-              htmlcompressor(page, input, site.minify_html_opts)
-            when :css
-              print "minifying css #{page.output_path}"
-              yuicompressor(page, input, :css)
-            when :js
-              print "minifying js #{page.output_path}"
-              yuicompressor(page, input, :js)
-            when :png
-              print "minifying png #{page.output_path}"
-              pngcrush(page, input)
-            else
-              input
+          ext = File.extname(page.output_path)
+          if !ext.empty?
+            ext_sym = ext[1..-1].to_sym
+            if @types.include?(ext_sym)
+              case ext_sym
+              when :html
+                print "minifying html #{page.output_path}"
+                input = htmlcompressor(page, input, site.minify_html_opts)
+              when :css
+                print "minifying css #{page.output_path}"
+                input = yuicompressor(page, input, :css)
+              when :js
+                print "minifying js #{page.output_path}"
+                input = yuicompressor(page, input, :js)
+              when :png
+                print "minifying png #{page.output_path}"
+                input = pngcrush(page, input)
+              end
             end
-          else
-            input
           end
-        else
-          input
         end
+        input
       end
 
       private

data/lib/awestruct/extensions/paginator.rb

@@ -82,10 +82,12 @@ module Awestruct
 
         prev_page = nil
         paginated_pages.each_with_index do |page,i|
-          page.send( @prop_name ).current_page       = page
-          page.send( @prop_name ).current_page_index = i
-          page.send( @prop_name ).pages              = paginated_pages
-          page.send( @prop_name ).window             = 1
+          slice = page.send( @prop_name )
+          
+          slice.current_page       = page
+          slice.current_page_index = i
+          slice.pages              = paginated_pages
+          slice.window             = 1
 
           if ( prev_page != nil )
             prev_page.send( @prop_name ).next_page = page

data/lib/awestruct/extensions/partial.rb

@@ -6,7 +6,6 @@ module Awestruct
         filename = File.join( '_partials', path )
 
         if !File.exists?( filename )
-          puts "no file #{filename} to include"
           return nil
         end
 

data/lib/awestruct/extensions/pipeline.rb

@@ -1,3 +1,8 @@
+
+Dir[ File.join( File.dirname(__FILE__), '*.rb' ) ].each do |f|
+  require f
+end
+
 module Awestruct
   module Extensions
     class Pipeline

data/lib/awestruct/extensions/posts.rb

@@ -20,28 +20,29 @@ module Awestruct
               day   = $3
               slug  = $4
               page.date = Time.utc( year.to_i, month.to_i, day.to_i )
-            elsif (page.date)
+            elsif (page.date?)
               page.relative_source_path =~ /^#{@path_prefix}\/(.*)\..*$/
               date = page.date;
               if date.kind_of? String
                 date = Time.parse page.date
               end
               year = date.year
-              month = date.month
-              day = date.day
+              month = sprintf( "%02d", date.month )
+              day = sprintf( "%02d", date.day )
               page.date = Time.utc(year, month, day)
               slug = $1
             end
 
             # if a date was found create a post
             if( year and month and day)
-              page.slug = slug
-              context = OpenStruct.new({
-                :site=>site,
-                :page=>page,
-              })
+              page.slug ||= slug
+              #context = OpenStruct.new({
+                #:site=>site,
+                #:page=>page,
+              #})
+              context = page.create_context
               #page.body = page.render( context )
-              page.output_path = "#{@path_prefix}/#{year}/#{month}/#{day}/#{slug}.html"
+              page.output_path = "#{@path_prefix}/#{year}/#{month}/#{day}/#{page.slug}.html"
               #page.layout = 'post'
               posts << page
             end
@@ -61,6 +62,7 @@ module Awestruct
         end
 
         site.send( "#{@assign_to}=", posts )
+
       end
 
     end

data/lib/awestruct/extensions/sitemap.rb

@@ -17,7 +17,7 @@ module Awestruct
 
         # Generate sitemap pages for stuff in _config/sitemap.yml
         site.sitemap.pages.each do |entry|
-          page = Awestruct::Renderable.new( site )
+          page = Awestruct::Page.new( site )
           page.output_path = entry.url
           page.date = entry.date( nil )
           page.priority = entry.priority( nil )
@@ -33,6 +33,7 @@ module Awestruct
         page                 = site.engine.load_page( sitemap )
         page.output_path     = 'sitemap.xml'
         page.sitemap_entries = sitemap_pages
+        page.do_not_track_dependencies = true
 
         # Add the sitemap to our site
         site.pages << page

data/lib/awestruct/extensions/tagger.rb

@@ -1,4 +1,3 @@
-require 'awestruct/extensions/extend_string'
 
 module Awestruct
   module Extensions
@@ -19,7 +18,6 @@ module Awestruct
       end
 
       module TagLinker
-        attr_accessor :tags
         def tag_links(delimiter = ', ', style_class = nil)
           class_attr = (style_class ? ' class="' + style_class + '"' : '')
           tags.map{|tag| %Q{<a#{class_attr} href="#{tag.primary_page.url}">#{tag}</a>}}.join(delimiter)

data/lib/awestruct/extensions/template.atom.haml

@@ -3,7 +3,7 @@
 !!! XML
 
 %feed{ 'xml:lang'=>'en-US', :xmlns=>'http://www.w3.org/2005/Atom' }
-  %id= "#{site.base_url}/"
+  %id= "#{page.content_url}/"
   %title= escape_once( page.title )
   - if ( defined?( site.author ) )
     %author
@@ -16,12 +16,13 @@
   - unless page.entries.empty?
     %updated= page.entries.first.date.xmlschema
     %link{:rel=>"self",      :type=>"application/atom+xml", :href=>"#{site.base_url}#{page.url}" }
-    %link{:rel=>"alternate", :type=>"text/html",            :href=>"#{site.base_url}/" }
+    %link{:rel=>"alternate", :type=>"text/html",            :href=>"#{page.content_url}/" }
     - for entry in page.entries
       %entry
         %id #{site.base_url}#{entry.url}
         %title= escape_once( entry.title )
         %updated= entry.date.xmlschema
+        %published= entry.date.xmlschema
         %link{:rel=>"alternate", :type=>"text/html", :href=>"#{site.base_url}#{entry.url}" }
         - if ( defined?( entry.author ) )
           %author
@@ -32,7 +33,7 @@
             - else
               %name= entry.author
         %summary
-          #{summarize( html_to_text( entry.content ), 100 )}...
+          #{summarize( html_to_text( entry.content ), 100 )}
         %content{:type=>'html'}
           = clean_html( html_escape( fully_qualify_urls( site.base_url, find_and_preserve( entry.content ) ) ) )
   

data/lib/awestruct/handler_chain.rb

@@ -0,0 +1,28 @@
+
+module Awestruct
+
+  class HandlerChain
+
+    attr_reader :matcher
+    attr_reader :handler_classes
+
+    def initialize(matcher, *handler_classes)
+      @matcher         = matcher
+      @handler_classes = handler_classes
+    end
+
+    def matches?(path)
+      @matcher.match( path )
+    end
+
+    def create(site, path)
+      cur = path
+      @handler_classes.each do |cls|
+        cur = cls.new( site, cur )
+      end
+      cur
+    end
+
+  end
+
+end

data/lib/awestruct/handler_chains.rb

@@ -0,0 +1,48 @@
+require 'awestruct/handler_chain'
+require 'awestruct/handlers/file_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/coffeescript_handler'
+
+module Awestruct
+
+  class HandlerChains
+
+    DEFAULTS = [
+      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 )
+    ]
+
+    def initialize(include_defaults=true)
+      @chains = []
+      self << :defaults if include_defaults
+    end
+
+    def[](path)
+      @chains.detect{|e| e.matches?( path.to_s ) }
+    end
+
+    def <<(chain)
+      @chains += DEFAULTS and return if ( chain == :defaults )
+      @chains << chain
+    end
+
+  end
+
+end

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

@@ -0,0 +1,111 @@
+
+require 'hashery/open_cascade'
+require 'open3'
+
+module Awestruct
+  module Handlers
+    class BaseHandler
+
+      attr_reader :site
+      attr_reader :delegate
+
+      def initialize(site, delegate=nil)
+        @site     = site
+        @delegate = delegate
+      end
+
+      def stale?
+        return @delegate.stale? if @delegate
+        false
+      end
+
+      def input_mtime(page)
+        return @delegate.input_mtime(page) if @delegate
+        0
+      end
+
+      def simple_name
+        return @delegate.simple_name if @delegate
+        nil
+      end
+
+      def relative_source_path 
+        return @delegate.relative_source_path if @delegate
+        nil
+      end
+
+      def output_filename
+        return @delegate.output_filename if @delegate
+        nil
+      end
+
+      def output_path
+        ( 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 
+        return File.extname( output_filename ) unless output_filename.nil?
+        nil
+      end
+
+      def path
+        return @delegate.path if @delegate
+        nil
+      end
+
+      def front_matter
+        return @delegate.front_matter if @delegate
+        {}
+      end
+
+      def content_syntax
+        return @delegate.raw_content if @delegate
+        :none
+      end
+
+      def raw_content
+        return @delegate.raw_content if @delegate
+        nil
+      end
+
+      def rendered_content(context, with_layouts=true)
+        return @delegate.rendered_content(context, with_layouts) if @delegate
+        nil
+      end
+
+      def content_line_offset
+        return @delegate.content_line_offset if @delegate
+        0
+      end
+
+      def inherit_front_matter(page)
+        return @delegate.inherit_front_matter(page) if @delegate
+      end
+
+      def dependencies
+        return @delegate.dependencies if @delegate
+        []
+      end
+
+      def to_chain
+        chain = [ self ]
+        chain += @delegate.to_chain if @delegate
+        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