awestruct 0.2.7 → 0.2.8

data/bin/awestruct

@@ -216,6 +216,14 @@ if ( options.auto )
         puts "Triggered regeneration #{base} #{relative}"
         generate_cmd.run
         puts "Done"
+        if relative == '.'
+          # It's necessary to restart the monitor on individual files
+          # after a change is handled
+          monitor.file(base) do
+            update &call_generate
+            create &call_generate
+          end
+        end
       end
     end
 

data/lib/awestruct/commands/frameworks/960/base_layout.html.haml

@@ -1,3 +1,4 @@
+!!!
 %html
   %head
     %title

data/lib/awestruct/commands/frameworks/blueprint/base_layout.html.haml

@@ -1,3 +1,4 @@
+!!!
 %html
   %head
     %title

data/lib/awestruct/engine.rb

@@ -1,4 +1,3 @@
-
 require 'ostruct'
 require 'find'
 require 'compass'
@@ -54,6 +53,7 @@ module Awestruct
 
       @helpers = []
       @max_site_mtime = nil
+      adjust_load_path
     end
 
     def skin_dir
@@ -148,7 +148,7 @@ module Awestruct
       context
     end
 
-  def set_urls(pages)
+    def set_urls(pages)
       pages.each do |page|
         page_path = page.output_path
         if ( page_path =~ /^\// )
@@ -164,6 +164,19 @@ module Awestruct
 
     private
 
+    def adjust_load_path
+      ext_dir = File.join( config.extension_dir ) 
+      if ( $LOAD_PATH.index( ext_dir ).nil? )
+        $LOAD_PATH << ext_dir
+      end
+      if ( skin_dir )
+        skin_ext_dir = File.join( skin_dir, config.extension_dir )
+        if ( $LOAD_PATH.index( skin_ext_dir ).nil? )
+          $LOAD_PATH << skin_ext_dir
+        end
+      end
+    end
+
     def configure_compass
       Compass.configuration.project_type    = :standalone
       Compass.configuration.project_path    = dir
@@ -214,8 +227,20 @@ module Awestruct
       now = Time.now
       generated_mtime = File.mtime( generated_path )
       return true if ( ( @max_site_mtime || Time.at(0) ) > generated_mtime )
-      source_mtime = File.mtime( page.source_path )
-      return true if ( source_mtime > generated_mtime ) && ( source_mtime + 1 < now )
+
+      while true
+        now = Time.now
+        source_mtime = File.mtime( page.source_path )
+        if ( now - source_mtime > 1 )
+          if ( source_mtime - generated_mtime >= 0 )
+            return true
+          else
+            break
+          end
+        end
+        sleep 0.1
+      end
+
       ext = page.output_extension
       layout_name = page.layout
       while ( ! layout_name.nil? )
@@ -313,6 +338,16 @@ module Awestruct
       site.send( "#{name}=", massage_yaml( data ) )
     end
 
+    def inherit_front_matter( page )
+      layout = page.layout
+      while ( layout )
+        layout_name = layout.to_s + page.output_extension
+        current = site.layouts[ layout_name ]
+        current.front_matter.each { |k,v| page.send( "#{k}=", v ) unless page.send( "#{k}" ) } if current
+        layout = current.layout
+      end
+    end
+
     def load_pages()
       site.pages.clear
       dir_pathname = Pathname.new( dir )
@@ -330,6 +365,7 @@ module Awestruct
           relative_path = file_pathname.relative_path_from( dir_pathname ).to_s
           page = load_page( path, :relative_path => relative_path )
           if ( page )
+            inherit_front_matter( page )
             site.pages << page
           end
         end
@@ -351,6 +387,7 @@ module Awestruct
             relative_path = file_pathname.relative_path_from( skin_dir_pathname ).to_s
             page = load_page( path, :relative_path => relative_path )
             if ( page )
+              inherit_front_matter( page )
               site.pages << page
             end
           end
@@ -382,9 +419,6 @@ module Awestruct
       skin_pipeline = nil
 
       ext_dir = File.join( config.extension_dir ) 
-      if ( $LOAD_PATH.index( ext_dir ).nil? )
-        $LOAD_PATH << ext_dir
-      end
       pipeline_file = File.join( ext_dir, 'pipeline.rb' )
       if ( File.exists?( pipeline_file ) )
         pipeline = eval File.read( pipeline_file )

data/lib/awestruct/extensions/sitemap.rb

@@ -0,0 +1,66 @@
+# Generates a sitemap for search engines.  Defaults to /sitemap.xml
+# Ignores images, css, robots, atoms, javascript files.
+# Add a sitemap.yml file to add files that for one reason or 
+# another won't be hanging off of site (e.g. they're in .htaccess)
+require 'ostruct'
+
+module Awestruct
+  module Extensions
+    class Sitemap
+
+      def execute( site )
+
+        # Go through all of the site's pages and add sitemap metadata
+        sitemap_pages = []
+        entries = site.pages
+        entries.each { |entry| sitemap_pages << set_sitemap_data( entry ) if valid_sitemap_entry( entry ) } if entries
+
+        # Generate sitemap pages for stuff in _config/sitemap.yml
+        site.sitemap.pages.each do |entry| 
+          page = Awestruct::Renderable.new( site )
+          page.output_path = entry.url 
+          page.date = entry.date( nil ) 
+          page.priority = entry.priority( nil )
+          page.change_frequency = entry.change_frequency( nil )
+          sitemap_pages << page
+        end if site.sitemap
+
+        # Generate the correct urls for each page in the sitemap
+        site.engine.set_urls( sitemap_pages )
+
+        # Create a sitemap.xml file from our template 
+        sitemap = File.join( File.dirname(__FILE__), 'sitemap.xml.haml' )
+        page                 = site.engine.load_page( sitemap )
+        page.output_path     = 'sitemap.xml'
+        page.sitemap_entries = sitemap_pages
+
+        # Add the sitemap to our site
+        site.pages << page
+      end
+
+      protected
+      def set_sitemap_data( page )
+        site = page.site
+        page.date             ||= Time.now
+        page.priority         ||= (site.priority or 0.1)
+        page.change_frequency ||= (site.change_frequency or 'never')
+        page
+      end
+
+      def valid_sitemap_entry( page )
+        page.output_filename != '.htaccess'     &&
+          page.output_filename  != 'screen.css' &&
+          page.output_filename  != 'print.css'  &&
+          page.output_filename  != 'ie.css'     &&
+          page.output_filename  != 'robots.txt' &&
+          page.output_extension != '.atom'      &&
+          page.output_extension != '.scss'      &&
+          page.output_extension != '.css'       &&
+          page.output_extension != '.png'       &&
+          page.output_extension != '.jpg'       &&
+          page.output_extension != '.gif'       &&
+          page.output_extension != '.js'
+      end
+    end
+  end
+end

data/lib/awestruct/extensions/sitemap.xml.haml

@@ -0,0 +1,16 @@
+---
+---
+!!! XML
+
+%urlset{ :xmlns=>'http://www.sitemaps.org/schemas/sitemap/0.9' }
+  - unless page.sitemap_entries.empty?
+    - for entry in page.sitemap_entries
+      %url
+        %loc= "#{entry.site.base_url}#{entry.url}"
+        - if entry.date
+          %lastmod= entry.date
+        - if entry.priority
+          %priority= entry.priority
+        - if entry.change_frequency
+          %changefreq= entry.change_frequency
+  

data/lib/awestruct/extensions/tag_cloud.html.haml

@@ -4,5 +4,4 @@
 .tag-cloud
   - for tag in page.tags
     %span.tag{:class=>"tag-#{tag.group}"}
-      %a{:href=>tag.primary_page.url}
-        = tag.to_s
+      %a{:href=>tag.primary_page.url}= tag

data/lib/awestruct/extensions/tagger.rb

@@ -17,6 +17,14 @@ module Awestruct
         end
       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)
+        end
+      end
+
       def initialize(tagged_items_property, input_path, output_path='tags', pagination_opts={})
         @tagged_items_property = tagged_items_property
         @input_path  = input_path
@@ -42,6 +50,7 @@ module Awestruct
 
         all.each do |page|
           page.tags = (page.tags||[]).collect{|t| @tags[t]}
+          page.extend( TagLinker )
         end
 
         ordered_tags = @tags.values

data/lib/awestruct/version.rb

@@ -1,4 +1,4 @@
 
 module Awestruct
-  VERSION='0.2.7'
+  VERSION='0.2.8'
 end

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 2
-  - 7
-  version: 0.2.7
+  - 8
+  version: 0.2.8
 platform: ruby
 authors: 
 - Bob McWhirter
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-10-31 00:00:00 -04:00
+date: 2011-11-17 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -187,6 +187,7 @@ files:
 - lib/awestruct/extensions/partial.rb
 - lib/awestruct/extensions/pipeline.rb
 - lib/awestruct/extensions/posts.rb
+- lib/awestruct/extensions/sitemap.rb
 - lib/awestruct/extensions/tag_cloud.rb
 - lib/awestruct/extensions/tagger.rb
 - lib/awestruct/front_matter_file.rb
@@ -212,6 +213,7 @@ files:
 - lib/awestruct/commands/frameworks/960/base_layout.html.haml
 - lib/awestruct/commands/frameworks/base_index.html.haml
 - lib/awestruct/commands/frameworks/blueprint/base_layout.html.haml
+- lib/awestruct/extensions/sitemap.xml.haml
 - lib/awestruct/extensions/tag_cloud.html.haml
 - lib/awestruct/extensions/template.atom.haml
 has_rdoc: true