awestruct 0.1.9 → 0.2.0

data/bin/awestruct

@@ -104,14 +104,23 @@ unless options.init
   site_yaml      = YAML.load( File.read( site_yaml_file ) )
   if site_yaml
     @profiles_data  = site_yaml['profiles'] || {}
-    @profile_data   = @profiles_data.nil? ? nil : @profiles_data[options.profile]
+    @profile_data = if @profiles_data.nil?
+      nil
+    else
+      if options.profile
+        @profiles_data[options.profile]
+      else
+        # if no profile given, pick the first with deploy config
+        options.profile, profile_data = @profiles_data.select { |k,v| v['deploy'] }.first
+        profile_data
+      end
+    end
   end
 end
 
 config = Awestruct::Config.new(Dir.pwd)
 # config.input_dir = File.join(Dir.pwd, '_root')
 
-
 if ( options.init )
   if ( options.generate || options.auto || options.server )
     $stderr.puts "--init may not be used with --generate, --auto or --server"
@@ -122,6 +131,31 @@ if ( options.init )
   exit
 end
 
+default_base_url = 'http://localhost:4242'
+
+def camelize(str)
+  str.to_s.gsub(/\/(.?)/) { "::#{$1.upcase}" }.gsub(/(?:^|_)(.)/) { $1.upcase }
+end
+
+if ( options.script )
+  puts "Running #{options.script} and exiting"  
+  require "awestruct/scripts/#{options.script}"
+  script_class = eval "Awestruct::Scripts::#{camelize(options.script)}"
+  script = script_class.new(*ARGV)
+  script.run
+  exit
+end
+
+if ( options.server )
+  hostname = ( options.bind_addr == '0.0.0.0' ? 'localhost' : options.bind_addr )
+  default_base_url = "http://#{hostname}:#{options.port}"
+end
+
+if ( options.generate )
+  cmd = Awestruct::Commands::Generate.new( config, options.profile, options.base_url, default_base_url, options.force )
+  cmd.run
+end
+
 if ( options.deploy )
   if ( options.auto || options.server )
     $stderr.puts "--deploy may not be used with --auto or --server"
@@ -133,13 +167,11 @@ if ( options.deploy )
     exit
   end
 
-
   if ( @profiles_data.nil? )
     $stderr.puts "_config/site.yml must define a 'profiles' section"
     exit
   end
 
-
   if ( @profile_data.nil? )
     $stderr.puts "Unknown profile '#{options.profile}'"
     exit
@@ -156,39 +188,15 @@ if ( options.deploy )
     exit
   end
 
+  puts "deploying to '#{options.profile}'"
   cmd = Awestruct::Commands::Deploy.new( site_path, deploy_data )
-
   cmd.run
-  exit
-end
-
-default_base_url = 'http://localhost:4242'
-
-def camelize(str)
-  str.to_s.gsub(/\/(.?)/) { "::#{$1.upcase}" }.gsub(/(?:^|_)(.)/) { $1.upcase }
-end
-
-if ( options.script )
-  puts "Running #{options.script} and exiting"  
-  require "awestruct/scripts/#{options.script}"
-  script_class = eval "Awestruct::Scripts::#{camelize(options.script)}"
-  script = script_class.new(*ARGV)
-  script.run
+  puts "deploy finished"
   exit
 end
 
 threads = []
 
-if ( options.server )
-  hostname = ( options.bind_addr == '0.0.0.0' ? 'localhost' : options.bind_addr )
-  default_base_url = "http://#{hostname}:#{options.port}"
-end
-
-if ( options.generate )
-  cmd = Awestruct::Commands::Generate.new( config, options.profile, options.base_url, default_base_url, options.force )
-  cmd.run
-end
-
 if ( options.auto )
   threads << Thread.new {
     generate_cmd = Awestruct::Commands::Generate.new( config, options.profile, options.base_url, default_base_url )
@@ -210,6 +218,3 @@ end
 threads.each do |thr|
   thr.join
 end
-
-
-

data/lib/awestruct/blueclothable.rb

@@ -6,7 +6,13 @@ module Awestruct
     def render(context)
       rendered = ''
       begin
-        doc = BlueCloth.new( context.interpolate_string( raw_page_content ) )
+        bluecloth_options = { :smartypants => true }
+
+        unless self.options.nil?
+          bluecloth_options.merge!({ :smartypants => false }) if self.options[:html_entities] == false
+        end
+
+        doc = BlueCloth.new( context.interpolate_string( raw_page_content ), bluecloth_options )
         rendered = doc.to_html
       rescue => e
         puts e

data/lib/awestruct/commands/deploy.rb

@@ -12,19 +12,28 @@ module Awestruct
 
       def run
         cmd = "rsync -r -l -i --no-p --no-g --chmod=Dg+s,ug+w --delete #{@site_path} #{@host}:#{@path}"
-        puts "running #{cmd}"
-        Open3.popen3( cmd ) do |stdin, stdout, stderr| 
+        Open3.popen3( cmd ) do |stdin, stdout, stderr|
           stdin.close
           threads = []
           threads << Thread.new(stdout) do |i|
             while ( ! i.eof? )
-              line = i.readline 
-              puts line
+              line = i.readline
+              case line[0,9]
+              when '<f.sT....'
+                puts " updating #{line[10..-1]}"
+              when '<f+++++++'
+                puts " adding #{line[10..-1]}"
+              when '<f..T....'
+                # ignoring unchanged files
+                # puts " no change to #{line[10..-1]}"
+              else
+                puts line
+              end
             end
           end
           threads << Thread.new(stderr) do |i|
             while ( ! i.eof? )
-              line = i.readline 
+              line = i.readline
               puts line
             end
           end

data/lib/awestruct/commands/generate.rb

@@ -14,7 +14,12 @@ module Awestruct
       end
 
       def run()
-        @engine.generate( @profile, @base_url, @default_base_url, @force )
+        begin
+          @engine.generate( @profile, @base_url, @default_base_url, @force )
+        rescue =>e
+          puts e
+          puts e.backtrace
+        end
       end
     end
   end

data/lib/awestruct/config.rb

@@ -8,8 +8,8 @@ module Awestruct
     attr_accessor :extension_dir
     attr_accessor :input_dir
     attr_accessor :output_dir
-    attr_accessor :tmp_dir
     attr_accessor :skin_dir
+    attr_accessor :tmp_dir
     attr_accessor :ignore
 
     def initialize(dir)

data/lib/awestruct/context_helper.rb

@@ -11,13 +11,35 @@ module Awestruct
       str.gsub( / /, ' ' )
     end
   
-    def summarize(text, numwords=20)
-      text.split()[0, numwords].join(' ')
+    def without_images(str)
+      str.gsub(/<img[^>]+>/,'').gsub(/<a[^>]+>([^<]*)<\/a>/, '\1')
     end
-  
+
+    def close_tags(s)
+      stack = []
+      s.scan(/<\/?[^>]+>/).each do |tag|
+        if tag[1] != '/'
+          tag = tag[1..-1].scan(/\w+/).first
+          stack = [ tag ] + stack
+        else
+          tag = tag[2..-1].scan(/\w+/).first
+          if stack[0] == tag
+            stack = stack.drop(1)
+          else
+            raise "Malformed HTML expected #{tag[0]} but got #{tag} '#{s}'"
+          end
+        end
+      end
+      stack.inject(s) { |memo,tag| memo += "</#{tag}>" }
+    end
+
+    def summarize(text, numwords=20, ellipsis='...')
+      close_tags(text.split()[0, numwords].join(' ') + ellipsis)
+    end
+
     def fully_qualify_urls(base_url, text)
       doc = Hpricot( text )
-   
+
       doc.search( "//a" ).each do |a|
         a['href'] = fix_url( base_url, a['href'] )
       end
@@ -29,7 +51,7 @@ module Awestruct
       end
       return doc.to_s
     end
-  
+
     def fix_url(base_url, url)
       return url unless ( url =~ /^\// )
       "#{base_url}#{url}"

data/lib/awestruct/engine.rb

@@ -22,7 +22,6 @@ require 'awestruct/context_helper'
 
 require 'awestruct/extensions/pipeline'
 require 'awestruct/extensions/posts'
-require 'awestruct/extensions/collection'
 require 'awestruct/extensions/indexifier'
 require 'awestruct/extensions/data_dir'
 require 'awestruct/extensions/paginator'
@@ -70,8 +69,8 @@ module Awestruct
       load_layouts
       load_pages
       load_extensions
-      set_urls
-      configure_compass 
+      set_urls(site.pages)
+      configure_compass
       generate_files(force)
     end
 
@@ -83,39 +82,39 @@ module Awestruct
       dir_pathname = Pathname.new( dir )
       path_name = Pathname.new( candidates[0] )
       relative_path = path_name.relative_path_from( dir_pathname ).to_s
-      load_page( candidates[0], relative_path )
+      load_page( candidates[0], :relative_path => relative_path )
     end
 
     def load_site_page(relative_path)
       load_page( File.join( dir, relative_path ) )
     end
 
-    def load_page(path, relative_path=nil)
+    def load_page(path, options = {})
       page = nil
-      if ( relative_path.nil? )
+      if ( options[:relative_path].nil? )
         #dir_pathname = Pathname.new( dir )
         #path_name = Pathname.new( path )
         #relative_path = path_name.relative_path_from( dir_pathname ).to_s
       end
 
-      fixed_relative_path = ( relative_path.nil? ? nil : File.join( '', relative_path ) )
+      fixed_relative_path = ( options[:relative_path].nil? ? nil : File.join( '', options[:relative_path] ) )
 
       if ( path =~ /\.haml$/ )
-        page = HamlFile.new( site, path, fixed_relative_path )
+        page = HamlFile.new( site, path, fixed_relative_path, options )
       elsif ( path =~ /\.erb$/ )
-        page = ErbFile.new( site, path, fixed_relative_path )
+        page = ErbFile.new( site, path, fixed_relative_path, options )
       elsif ( path =~ /\.textile$/ )
-        page = TextileFile.new( site, path, fixed_relative_path )
+        page = TextileFile.new( site, path, fixed_relative_path, options )
       elsif ( path =~ /\.md$/ )
-        page = MarukuFile.new( site, path, fixed_relative_path )
+        page = MarukuFile.new( site, path, fixed_relative_path, options )
       elsif ( path =~ /\.sass$/ )
-        page = SassFile.new( site, path, fixed_relative_path )
+        page = SassFile.new( site, path, fixed_relative_path, options )
       elsif ( path =~ /\.scss$/ )
-        page = ScssFile.new( site, path, fixed_relative_path )
+        page = ScssFile.new( site, path, fixed_relative_path, options )
       elsif ( path =~ /\.org$/ )
-        page = OrgModeFile.new( site, path, fixed_relative_path )
+        page = OrgModeFile.new( site, path, fixed_relative_path, options )
       elsif ( File.file?( path ) )
-        page = VerbatimFile.new( site, path, fixed_relative_path )
+        page = VerbatimFile.new( site, path, fixed_relative_path, options )
       end
       page
     end
@@ -133,17 +132,32 @@ module Awestruct
           str = str.gsub( /\\/, '\\\\\\\\' )
           str = str.gsub( /\\\\#/, '\\#' )
           str = str.gsub( '@', '\@' )
+          str = str.gsub( '#{', '\#\{' )
           str = "%@#{str}@"
           result = instance_eval( str )
           result
         end
         def evaluate_erb(erb)
-          erb.result( binding ) 
+          erb.result( binding )
         end
       end
       context
     end
 
+  def set_urls(pages)
+      pages.each do |page|
+        page_path = page.output_path
+        if ( page_path =~ /^\// )
+          page.url = page_path
+        else
+          page.url = "/#{page_path}"
+        end
+        if ( page.url =~ /^(.*\/)index.html$/ )
+          page.url = $1
+        end
+      end
+    end
+
     private
 
     def configure_compass
@@ -161,30 +175,16 @@ module Awestruct
       end
 
       if ( site.base_url.nil? )
-        site.base_url = @default_base_url 
+        site.base_url = @default_base_url
       end
 
-      if ( site.base_url ) 
+      if ( site.base_url )
         if ( site.base_url =~ /^(.*)\/$/ )
           site.base_url = $1
         end
       end
     end
 
-    def set_urls
-      site.pages.each do |page|
-        page_path = page.output_path
-        if ( page_path =~ /^\// )
-          page.url = page_path
-        else
-          page.url = "/#{page_path}"
-        end
-        if ( page.url =~ /^(.*\/)index.html$/ )
-          page.url = $1
-        end
-      end
-    end
-
     def generate_files(force)
       site.pages.each do |page|
         generate_page( page, force )
@@ -203,7 +203,7 @@ module Awestruct
       end
     end
 
-    def requires_generation?(page,force)
+    def requires_generation?(page, force)
       return true if force
       generated_path = File.join( config.output_dir, page.output_path )
       return true unless File.exist?( generated_path )
@@ -241,6 +241,9 @@ module Awestruct
           end
         end
       end
+      @transformers.each do |transformer|
+        rendered = transformer.transform(site, page, rendered)
+      end
       rendered
     end
 
@@ -251,7 +254,7 @@ module Awestruct
         layout_pathname = Pathname.new( layout_path )
         relative_path = layout_pathname.relative_path_from( dir_pathname ).to_s
         name = File.basename( layout_path, '.haml' )
-        site.layouts[ name ] =  load_page( layout_path, relative_path )
+        site.layouts[ name ] =  load_page( layout_path, :relative_path => relative_path )
       end
       if ( skin_dir )
         skin_dir_pathname = Pathname.new( skin_dir )
@@ -260,7 +263,7 @@ module Awestruct
           relative_path = layout_pathname.relative_path_from( skin_dir_pathname ).to_s
           name = File.basename( layout_path, '.haml' )
           unless ( site.layouts.key?( name ) )
-            site.layouts[ name ] =  load_page( layout_path, relative_path )
+            site.layouts[ name ] =  load_page( layout_path, :relative_path => relative_path )
           end
         end
       end
@@ -320,7 +323,7 @@ module Awestruct
         unless ( site.has_page?( path ) )
           file_pathname = Pathname.new( path )
           relative_path = file_pathname.relative_path_from( dir_pathname ).to_s
-          page = load_page( path, relative_path )
+          page = load_page( path, :relative_path => relative_path )
           if ( page )
             site.pages << page
           end
@@ -341,7 +344,7 @@ module Awestruct
           unless ( site.has_page?( path ) )
             file_pathname = Pathname.new( path )
             relative_path = file_pathname.relative_path_from( skin_dir_pathname ).to_s
-            page = load_page( path, relative_path )
+            page = load_page( path, :relative_path => relative_path )
             if ( page )
               site.pages << page
             end
@@ -378,9 +381,10 @@ module Awestruct
         $LOAD_PATH << ext_dir
       end
       pipeline_file = File.join( ext_dir, 'pipeline.rb' )
-      if ( File.exists?( pipeline_file ) ) 
+      if ( File.exists?( pipeline_file ) )
         pipeline = eval File.read( pipeline_file )
         @helpers = pipeline.helpers || []
+        @transformers = pipeline.transformers || []
       end
 
       if ( skin_dir )
@@ -392,6 +396,7 @@ module Awestruct
         if ( File.exists?( skin_pipeline_file ) )
           skin_pipeline = eval File.read( skin_pipeline_file )
           @helpers = ( @helpers + skin_pipeline.helpers || [] ).flatten
+          @transformers = ( @transformers + skin_pipeline.transformers || [] ).flatten
         end
       end
 

data/lib/awestruct/erb_file.rb

@@ -8,8 +8,8 @@ module Awestruct
 
     include Erbable
 
-    def initialize(site, source_path, relative_source_path)
-      super(site, source_path, relative_source_path)
+    def initialize(site, source_path, relative_source_path, options = {})
+      super(site, source_path, relative_source_path, options)
     end
 
     def output_filename

data/lib/awestruct/extensions/atomizer.rb

@@ -12,15 +12,28 @@ module Awestruct
         unless ( @num_entries == :all )
           entries = entries[0, @num_entries]
         end
+
+        atom_pages = []
+
+        entries.each do |entry|
+          feed_entry = site.engine.load_page(entry.source_path, :relative_path => entry.relative_source_path, :html_entities => false)
+
+          feed_entry.output_path = entry.output_path
+          feed_entry.date = feed_entry.timestamp.nil? ? entry.date : feed_entry.timestamp
+
+          atom_pages << feed_entry
+        end
+
+        site.engine.set_urls(atom_pages)
+
         input_page = File.join( File.dirname(__FILE__), 'template.atom.haml' )
         page = site.engine.load_page( input_page )
         page.date = page.timestamp unless page.timestamp.nil?
         page.output_path = @output_path
-        page.entries = entries
+        page.entries = atom_pages
         page.title = site.title || site.base_url
         site.pages << page
       end
-
     end
   end
 end

data/lib/awestruct/extensions/disqus.rb

@@ -12,7 +12,8 @@ module Awestruct
           %Q{
             <div id="disqus_thread"></div>
             <script type="text/javascript">
-            var disqus_url = "#{self.url}";
+            var disqus_shortname = '#{site.disqus}';
+            var disqus_url = "#{site.base_url}/#{self.url}";
             #{developer}
             (function() {
               var dsq = document.createElement("script"); dsq.type = "text/javascript"; dsq.async = true;
@@ -31,7 +32,7 @@ module Awestruct
         def disqus_comments_count()
           %Q{
             <script type="text/javascript">
-            var disqus = "#{site.disqus}";
+            var disqus_shortname = '#{site.disqus}';
             (function () {
               var s = document.createElement('script'); s.async = true;
               s.src = "http://disqus.com/forums/#{site.disqus}/count.js";

data/lib/awestruct/extensions/google_analytics.rb

@@ -20,18 +20,17 @@ module Awestruct
       def google_analytics_async()
         html = ''
         html += %Q(<script type="text/javascript">\n)
-        html += %Q(var _gaq = [['_setAccount','#{site.google_analytics}"'],)
+        html += %Q(var _gaq = _gaq || [];\n)
+        html += %Q(_gaq.push(['_setAccount','#{site.google_analytics}']);\n)
         if site.google_analytics_anonymize
-          html += %Q(['_gat._anonymizeIp'],)
+          html += %Q(_gaq.push(['_gat._anonymizeIp']);\n)
         end
-        html += %Q(['_trackPageview']];\n)
-        html += %Q[(function(d, t) {\n]
-        html += %Q( var g = d.createElement(t),\n)
-        html += %Q(     s = d.getElementsByTagName(t)[0];\n)
-        html += %Q( g.async = true;\n)
-        html += %Q( g.src = ('https:' == location.protocol ? 'https://ssl' : 'http://www') + '.google-analytics.com/ga.js';\n)
-        html += %Q( s.parentNode.insertBefore(g, s);\n)
-        html += %Q[})(document, 'script');\n]
+        html += %Q(_gaq.push(['_trackPageview']);\n)
+        html += %Q[(function() {\n]
+        html += %Q( var ga = document.createElement('script'); ga.type = 'text/javascript'; ga.async = true;\n)
+        html += %Q( ga.src = ('https:' == document.location.protocol ? 'https://ssl' : 'http://www') + '.google-analytics.com/ga.js';\n)
+        html += %Q( var s = document.getElementsByTagName('script')[0]; s.parentNode.insertBefore(ga, s);\n)
+        html += %Q[})();\n</script>\n]
         html
       end
     end

data/lib/awestruct/extensions/pipeline.rb

@@ -7,10 +7,12 @@ module Awestruct
       attr_reader :extensions
       attr_reader :after_extensions
       attr_reader :helpers
+      attr_reader :transformers
 
       def initialize(&block)
         @extensions = []
         @helpers    = []
+        @transformers  = []
         instance_eval &block if block
       end
 
@@ -22,6 +24,10 @@ module Awestruct
         @helpers << helper
       end
 
+      def transformer(transformer)
+        @transformers << transformer
+      end
+
       def execute(site)
         extensions.each do |ext|
           ext.execute( site )

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

@@ -2,26 +2,35 @@
 ---
 !!! XML
 
-%feed{ 'xml:base'=>site.base_url, 'xml:lang'=>'en-US', :xmlns=>'http://www.w3.org/2005/Atom' }
-  %id #{site.base_url}
+%feed{ 'xml:lang'=>'en-US', :xmlns=>'http://www.w3.org/2005/Atom' }
+  %id= "#{site.base_url}/"
   %title #{page.title}
+  - if ( defined?( site.author ) )
+    %author
+      - if ( defined?( site.author.name ) )
+        %name= site.author.name
+        - if ( site.author.email )
+          %email= site.author.email
+      - else
+        %name= site.author
   - unless page.entries.empty?
     %updated= page.entries.first.date.xmlschema
-    %link{:rel=>"alternate", :type=>"text/html",            :href=>site.base_url}
     %link{:rel=>"self",      :type=>"application/atom+xml", :href=>"#{site.base_url}#{page.url}" }
+    %link{:rel=>"alternate", :type=>"text/html",            :href=>"#{site.base_url}/" }
     - for entry in page.entries
       %entry
         %id #{site.base_url}#{entry.url}
         %title= escape_once( entry.title )
         %updated= entry.date.xmlschema
         %link{:rel=>"alternate", :type=>"text/html", :href=>"#{site.base_url}#{entry.url}" }
-        %author
-          - if ( defined?( entry.author.name ) )
-            %name= entry.author.name
-            - if ( entry.author.email )
-              %name= entry.author.email
-          - else
-            %name= entry.author
+        - if ( defined?( entry.author ) )
+          %author
+            - if ( defined?( entry.author.name ) )
+              %name= entry.author.name
+              - if ( entry.author.email )
+                %email= entry.author.email
+            - else
+              %name= entry.author
         %summary
           #{summarize( html_to_text( entry.content ), 100 )}...
         %content{:type=>'html'}

data/lib/awestruct/front_matter_file.rb

@@ -6,8 +6,8 @@ module Awestruct
     attr_reader :raw_page_content
     attr_reader :front_matter
 
-    def initialize(site, source_path, relative_source_path)
-      super( site, source_path, relative_source_path )
+    def initialize(site, source_path, relative_source_path, options = {})
+      super( site, source_path, relative_source_path, options )
       @raw_page_content = ''
       load_page
     end
@@ -45,7 +45,7 @@ module Awestruct
         @front_matter.each do |k,v| 
           self.send( "#{k}=", v )
         end
-      rescue=>e
+      rescue => e
         puts "error reading #{self}: #{e}"
       end
     end

data/lib/awestruct/haml_file.rb

@@ -8,8 +8,8 @@ module Awestruct
 
     include Hamlable
 
-    def initialize(site, source_path, relative_source_path)
-      super(site, source_path, relative_source_path)
+    def initialize(site, source_path, relative_source_path, options = {})
+      super(site, source_path, relative_source_path, options)
     end
 
     def output_filename

data/lib/awestruct/hamlable.rb

@@ -4,7 +4,8 @@ module Awestruct
     def render(context)
       rendered = ''
       begin
-        haml_engine = Haml::Engine.new( raw_page_content )
+        options = (site.haml || {}).inject({}){|h,(k,v)| h[k.to_sym] = v.to_sym; h } 
+        haml_engine = Haml::Engine.new( raw_page_content, options )
         rendered = haml_engine.render( context )
       rescue => e
         puts e

data/lib/awestruct/maruku_file.rb

@@ -9,8 +9,8 @@ module Awestruct
     #include Marukuable
     include Blueclothable
 
-    def initialize(site, source_path, relative_source_path)
-      super(site, source_path, relative_source_path)
+    def initialize(site, source_path, relative_source_path, options = {})
+      super(site, source_path, relative_source_path, options)
     end
 
     def output_filename

data/lib/awestruct/org_mode_file.rb

@@ -8,8 +8,8 @@ module Awestruct
 
     include OrgModeable
 
-    def initialize(site, source_path, relative_source_path)
-      super( site, source_path, relative_source_path )
+    def initialize(site, source_path, relative_source_path, options = {})
+      super( site, source_path, relative_source_path, options )
     end
 
     def output_filename

data/lib/awestruct/renderable_file.rb

@@ -4,10 +4,11 @@ require 'awestruct/renderable'
 module Awestruct
   class RenderableFile < Renderable
 
-    def initialize(site, source_path, relative_source_path)
+    def initialize(site, source_path, relative_source_path, options = {})
       super( site )
       self.source_path          = source_path
       self.relative_source_path = relative_source_path
+      self.options              = options
       unless ( relative_source_path.nil? )
         dir_name = File.dirname( relative_source_path )
         if ( dir_name == '.' )
@@ -18,10 +19,6 @@ module Awestruct
       end
     end
 
-    def to_root
-      '../' * ( self.output_path.count('/') - 1 )
-    end
-
     def raw_page_content
       File.read( self.source_path )
     end

data/lib/awestruct/sass_file.rb

@@ -8,8 +8,8 @@ module Awestruct
 
     include Sassable
 
-    def initialize(site, source_path, relative_source_path)
-      super( site, source_path, relative_source_path )
+    def initialize(site, source_path, relative_source_path, options = {})
+      super( site, source_path, relative_source_path, options )
     end
  
     def output_filename

data/lib/awestruct/sassable.rb

@@ -2,6 +2,13 @@ require 'sass'
 
 require 'compass'
 
+module Sass::Script::Functions
+  def site(path)
+    site = options[:custom]
+    Sass::Script::String.new(site.send(path.value.to_s).to_s)
+  end
+end
+
 module Awestruct
   module Sassable
 
@@ -11,8 +18,9 @@ module Awestruct
       Compass::Frameworks::ALL.each do |framework|
         sass_opts[:load_paths] << framework.stylesheets_directory
       end
-      sass_opts[:load_paths] << File.dirname( self.source_path ) 
+      sass_opts[:load_paths] << File.dirname( self.source_path )
       sass_opts[:syntax] = syntax()
+      sass_opts[:custom] = site
       sass_engine = Sass::Engine.new( raw_page_content, sass_opts )
       sass_engine.render
     end

data/lib/awestruct/scss_file.rb

@@ -8,8 +8,8 @@ module Awestruct
 
     include Sassable
 
-    def initialize(site, source_path, relative_source_path)
-      super( site, source_path, relative_source_path )
+    def initialize(site, source_path, relative_source_path, options = {})
+      super( site, source_path, relative_source_path, options )
     end
  
     def output_filename

data/lib/awestruct/site.rb

@@ -5,20 +5,20 @@ module Awestruct
 
     attr_reader :dir
     attr_reader :output_dir
+    attr_reader :tmp_dir
 
     attr_reader   :layouts
     attr_accessor :pages
 
-    attr_accessor :config
-
     def initialize(config)
       super({})
 
       @dir = config.input_dir
       @output_dir = config.output_dir
-      @config = config
+      @tmp_dir = config.tmp_dir
 
       FileUtils.mkdir_p( @output_dir )
+      FileUtils.mkdir_p( @tmp_dir )
 
       @pages   = []
       @layouts = {}

data/lib/awestruct/textile_file.rb

@@ -7,8 +7,8 @@ module Awestruct
 
     include Textilable
 
-    def initialize(site, source_path, relative_source_path)
-      super(site, source_path, relative_source_path)
+    def initialize(site, source_path, relative_source_path, options = {})
+      super(site, source_path, relative_source_path, options)
     end
 
     def output_filename

data/lib/awestruct/verbatim_file.rb

@@ -4,8 +4,8 @@ module Awestruct
 
   class VerbatimFile < RenderableFile
 
-    def initialize(site, source_path, relative_source_path)
-      super( site, source_path, relative_source_path )
+    def initialize(site, source_path, relative_source_path, options = {})
+      super( site, source_path, relative_source_path, options )
     end
 
   end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: awestruct
 version: !ruby/object:Gem::Version 
-  hash: 9
+  hash: 23
   prerelease: 
   segments: 
   - 0
-  - 1
-  - 9
-  version: 0.1.9
+  - 2
+  - 0
+  version: 0.2.0
 platform: ruby
 authors: 
 - Bob McWhirter
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-04-20 00:00:00 Z
+date: 2011-06-13 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: hpricot
@@ -167,7 +167,6 @@ files:
 - lib/awestruct/erb_file.rb
 - lib/awestruct/erbable.rb
 - lib/awestruct/extensions/atomizer.rb
-- lib/awestruct/extensions/collection.rb
 - lib/awestruct/extensions/data_dir.rb
 - lib/awestruct/extensions/disqus.rb
 - lib/awestruct/extensions/google_analytics.rb

data/lib/awestruct/extensions/collection.rb

@@ -1,52 +0,0 @@
-
-module Awestruct
-  module Extensions
-    class Collection
-
-      def initialize(assign_to, path_prefix = nil, default_layout = nil)
-        @assign_to      = assign_to
-        @path_prefix    = path_prefix || '_' + assign_to.to_s
-        @default_layout = default_layout || assign_to.to_s.singularize
-      end
-
-      def execute(site)
-        posts = []
-
-        Dir[ "#{@path_prefix}/*" ].each do |entry|
-          if entry =~ /^#{@path_prefix}\/(20[01][0-9])-([01][0-9])-([0123][0-9])-([^.]+)\..*$/
-            if ( File.directory?( entry ) )
-              # TODO deal with dirs
-            else
-              page = site.engine.load_page( entry )
-              year  = $1
-              month = $2
-              day   = $3
-              slug  = $4
-              page.date = Time.utc( year.to_i, month.to_i, day.to_i )
-              page.slug = slug
-              page.output_path = "/#{year}/#{month}/#{day}/#{slug}/index.html"
-              page.layout ||= @default_layout
-
-              posts << page
-              site.pages << page
-            end
-          end
-        end
-
-        posts = posts.sort_by{|each| [each.date, each.sequence || 0, File.mtime( each.source_path ), each.slug ] }.reverse
-
-        last = nil
-        singular = @assign_to.to_s.singularize
-        posts.each do |e|
-          if ( last != nil )
-             e.send( "next_#{singular}=", last )
-             last.send( "previous_#{singular}=", e )
-          end
-          last = e
-        end
-
-        site.send( "#{@assign_to}=", posts )
-      end
-    end
-  end
-end