awestruct 0.4.5 → 0.4.6

data/lib/awestruct/extensions/disqus.rb

@@ -36,7 +36,7 @@ module Awestruct
           if self.disqus_identifier or site.disqus_generate_id
             identifier = %Q{ data-disqus-identifier="#{self.resolve_disqus_identifier()}"}
           end
-          %Q{ <a href="#{self.url}#disqus_thread"#{identifier}>Comments</a> }
+          %Q{ <a href="#{site.base_url}#{self.url}#disqus_thread"#{identifier}>Comments</a> }
         end
 
         def disqus_comments_count()

data/lib/awestruct/extensions/minify.rb

@@ -1,3 +1,4 @@
+require 'shellwords'
 require 'fileutils'
 
 ##
@@ -96,7 +97,7 @@ module Awestruct
             end
           end
         end
-        Open3.popen3(cmd) do |stdin, stdout, stderr|
+        Open3.popen3(Shellwords.escape(cmd)) do |stdin, stdout, stderr|
           threads = []
           threads << Thread.new(stdout) do |o|
             while ( ! o.eof? )
@@ -124,7 +125,7 @@ module Awestruct
 
       def yuicompressor(page, input, type)
         output = ''
-        Open3.popen3("yuicompressor --type #{type}") do |stdin, stdout, stderr|
+        Open3.popen3("yuicompressor --type #{Shellwords.escape(type)}") do |stdin, stdout, stderr|
           threads = []
           threads << Thread.new(stdout) do |o|
             while ( ! o.eof? )
@@ -152,7 +153,7 @@ module Awestruct
 
       def pngcrush(page, input)
         filename = page.source_path
-        cmd = "pngcrush #{filename} /tmp/pngcrush"
+        cmd = Shellwords.escape("pngcrush #{filename} /tmp/pngcrush")
         `#{cmd}`
         if $?.exitstatus != 0
           raise "Failed to execute pngcrush: #{cmd}"

data/lib/awestruct/extensions/posts.rb

@@ -2,25 +2,25 @@ module Awestruct
   module Extensions
     class Posts
 
-      def initialize(path_prefix='', assign_to=:posts)
-        @path_prefix = path_prefix
-        @assign_to   = assign_to
+      attr_accessor :path_prefix, :assign_to, :archive_template, :archive_path
+
+      def initialize(path_prefix='', assign_to=:posts, archive_template=nil, archive_path=nil)
+        @archive_template = archive_template
+        @archive_path     = archive_path
+        @path_prefix      = path_prefix
+        @assign_to        = assign_to
       end
 
       def execute(site)
-        posts = []
+        posts   = []
+        archive = Archive.new
 
         site.pages.each do |page|
           year, month, day, slug = nil
 
           if ( page.relative_source_path =~ /^#{@path_prefix}\// )
-            if ( page.relative_source_path =~ /^#{@path_prefix}\/(20[01][0-9])-([01][0-9])-([0123][0-9])-([^.]+)\..*$/ )
-              year  = $1
-              month = $2
-              day   = $3
-              slug  = $4
-              page.date = Time.utc( year.to_i, month.to_i, day.to_i )
-            elsif (page.date?)
+            # check for a date inside the page first
+            if (page.date?)
               page.relative_source_path =~ /^#{@path_prefix}\/(.*)\..*$/
               date = page.date;
               if date.kind_of? String
@@ -29,21 +29,24 @@ module Awestruct
               year = date.year
               month = sprintf( "%02d", date.month )
               day = sprintf( "%02d", date.day )
-              page.date = Time.utc(year, month, day)
+              page.date = date
               slug = $1
+              if ( page.relative_source_path =~ /^#{@path_prefix}\/(20[01][0-9])-([01][0-9])-([0123][0-9])-([^.]+)\..*$/ )
+                slug = $4
+              end
+            elsif ( page.relative_source_path =~ /^#{@path_prefix}\/(20[01][0-9])-([01][0-9])-([0123][0-9])-([^.]+)\..*$/ )
+              year  = $1
+              month = $2
+              day   = $3
+              slug  = $4
+              page.date = Time.utc( year.to_i, month.to_i, day.to_i )
             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,
-              #})
               context = page.create_context
-              #page.body = page.render( context )
               page.output_path = "#{@path_prefix}/#{year}/#{month}/#{day}/#{page.slug}.html"
-              #page.layout = 'post'
               posts << page
             end
           end
@@ -59,12 +62,46 @@ module Awestruct
              last.send( "previous_#{singular}=", e )
           end
           last = e
+          archive << e
         end
-
+        site.pages.concat( archive.generate_pages( site.engine, archive_template, archive_path ) ) if (archive_template && archive_path)
         site.send( "#{@assign_to}=", posts )
+        site.send( "#{@assign_to}_archive = ", archive )
 
       end
 
+
+      class Archive
+        attr_accessor :posts
+
+        def initialize
+          @posts        = {}
+        end
+
+        def <<( post )
+          posts[post.date.year] ||= {}
+          posts[post.date.year][post.date.month] ||= {}
+          posts[post.date.year][post.date.month][post.date.day] ||= []
+          posts[post.date.year][post.date.month][post.date.day] << post
+        end
+
+        def generate_pages( engine, template, output_path )
+          pages = []
+          posts.keys.sort.each do |year|
+            posts[year].keys.sort.each do |month| 
+              posts[year][month].keys.sort.each do |day|
+                archive_page = engine.find_and_load_site_page( template )
+                archive_page.send( "archive=", posts[year][month][day] )
+                archive_page.output_path = File.join( output_path, year.to_s, month.to_s, day.to_s, File.basename( template ) + ".html" )
+                pages << archive_page
+              end
+            end
+          end
+          pages
+        end
+      end
+
     end
   end
 end
+

data/lib/awestruct/extensions/remotePartial.rb

@@ -1,17 +1,41 @@
 require 'open-uri'
+require 'restclient'
 
 module Awestruct
   module Extensions
     module RemotePartial
 
-      def remotePartial(url)
+      def remote_partial(url)
+        url_tmp = url.sub('http://', '')
+        r = 'remote_partial/' + url_tmp[/(.*)\/[^\/].+$/, 1]
+        tmp = File.join(tmp(site.tmp_dir, r), File.basename(url_tmp))
+        get_or_cache(tmp, url)
+      end
 
-        page = open(url)
-        return nil if !page
-        page.read
+      alias_method :remotePartial, :remote_partial
 
+      def get_or_cache(tmp_file, url)
+        response_body = ""
+        if !File.exist?tmp_file
+          puts url
+          response_body = RestClient.get(url, :cache => false) { |response, request, result, &block|
+            case response.code
+            when 404
+                response
+            else
+              response.return!(request, result, &block)
+            end
+          }.body;
+          File.open(tmp_file, 'w') do |out|
+            out.write response_body
+          end
+        else
+          response_body = File.read(tmp_file)
+        end
+        return response_body
       end
 
+
     end
   end
 end

data/lib/awestruct/extensions/sitemap.rb

@@ -8,8 +8,23 @@ module Awestruct
   module Extensions
     class Sitemap
 
+      def initialize
+        @excluded_files = [ '/.htaccess', '/favicon.ico' ,'/robots.txt', ].to_set
+        @excluded_extensions = ['.atom', '.scss', '.css', '.png', '.jpg', '.gif', '.js' ].to_set
+      end
+
       def execute( site )
 
+        # Add additional excludes from _config/sitemap.yml
+        if site.sitemap
+          if site.sitemap["excluded_files"]
+            @excluded_files.merge(site.sitemap.excluded_files)
+          end
+          if site.sitemap["excluded_extensions"]
+            @excluded_extensions.merge(site.sitemap.excluded_extensions)
+          end
+        end
+
         # Go through all of the site's pages and add sitemap metadata
         sitemap_pages = []
         entries = site.pages
@@ -67,18 +82,7 @@ module Awestruct
       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'
+        !@excluded_files.member?(page.output_path) && !@excluded_extensions.member?(page.output_extension)
       end
 
     end

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

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

data/lib/awestruct/handler_chains.rb

@@ -9,7 +9,9 @@ require 'awestruct/handlers/erb_handler'
 require 'awestruct/handlers/haml_handler'
 require 'awestruct/handlers/sass_handler'
 require 'awestruct/handlers/scss_handler'
+require 'awestruct/handlers/javascript_handler'
 require 'awestruct/handlers/coffeescript_handler'
+require 'awestruct/handlers/redirect_handler'
 
 module Awestruct
 
@@ -25,7 +27,9 @@ module Awestruct
       Awestruct::Handlers::HamlHandler::CHAIN,
       Awestruct::Handlers::SassHandler::CHAIN,
       Awestruct::Handlers::ScssHandler::CHAIN,
+      Awestruct::Handlers::JavascriptHandler::CHAIN,
       Awestruct::Handlers::CoffeescriptHandler::CHAIN,
+      Awestruct::Handlers::RedirectHandler::CHAIN,
       HandlerChain.new( /.*/, Awestruct::Handlers::FileHandler )
     ]
 

data/lib/awestruct/handlers/base_handler.rb

@@ -1,4 +1,5 @@
 require 'awestruct/handler_chain'
+require 'shellwords'
 require 'open3'
 
 module Awestruct
@@ -97,8 +98,9 @@ module Awestruct
       end
 
       def execute_shell(command, input=nil)
-        Open3.popen3(command) do |stdin, stdout, _|
+        Open3.popen3(Shellwords.escape( command )) do |stdin, stdout, _|
           stdin.puts input unless input.nil?
+          stdin.close
           out = stdout.read
         end
       rescue Errno::EPIPE

data/lib/awestruct/handlers/file_handler.rb

@@ -60,7 +60,7 @@ module Awestruct
       end
       
       def open
-      	input_stream = IO.open(IO.sysopen(@path, "rb"), "rb" )
+        input_stream = IO.open(IO.sysopen(@path, "rb"), "rb" )
         result = input_stream.read
         input_stream.close
         return result

data/lib/awestruct/handlers/interpolation_handler.rb

@@ -17,13 +17,24 @@ module Awestruct
 
         content = content.gsub( /\\/, '\\\\\\\\' )
         content = content.gsub( /\\\\#/, '\\#' )
+        content = content.gsub( Regexp.new('#(?!{)'), '\#' ) if ruby_19?
         content = content.gsub( '@', '\@' )
         content = "%@#{content}@"
-        c = context.instance_eval( content )
+        begin
+          c = context.instance_eval( content )
+        rescue Exception => e # Don't barf all over ourselves if an exception is thrown
+          $stderr.puts "Exception thrown interpolating content. #{e.to_s}"
+          $stderr.puts e.backtrace
+          c = delegate.raw_content
+        end
         c
 
       end
 
+      def ruby_19?
+        @is_ruby_19 ||= (::Config::CONFIG['ruby_version'] =~ %r(^1\.9))
+      end
+
     end
   end
 end

data/lib/awestruct/handlers/javascript_handler.rb

@@ -0,0 +1,47 @@
+
+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'
+
+module Awestruct
+  module Handlers
+    class JavascriptHandler < BaseHandler
+
+
+      CHAIN = Awestruct::HandlerChain.new( /\.js$/,
+        Awestruct::Handlers::FileHandler,
+        Awestruct::Handlers::FrontMatterHandler,
+        Awestruct::Handlers::InterpolationHandler,
+        Awestruct::Handlers::JavascriptHandler
+      )
+
+      def initialize(site, delegate)
+        super( site, delegate )
+      end
+
+      def simple_name
+        File.basename( relative_source_path, '.js' ) 
+      end
+
+      def output_filename
+        File.basename( relative_source_path )
+      end
+
+      def output_extension
+        '.js'
+      end
+
+      def content_syntax
+        :javascript
+      end
+
+      def rendered_content(context, with_layouts=false)
+        delegate.rendered_content( context, with_layouts )
+      end
+
+    end
+  end
+end
+

data/lib/awestruct/handlers/page_delegating_handler.rb

@@ -19,6 +19,7 @@ module Awestruct
       def inherit_front_matter(outer_page)
         #page.prepare!
         #page.handler.inherit_front_matter( outer_page )
+        @page.handler.inherit_front_matter(outer_page)
       end
 
       def output_path

data/lib/awestruct/handlers/redirect_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'
+
+module Awestruct
+  module Handlers
+    class RedirectHandler < BaseHandler
+
+
+      CHAIN = Awestruct::HandlerChain.new( /\.redirect$/,
+        Awestruct::Handlers::FileHandler,
+        Awestruct::Handlers::FrontMatterHandler,
+        Awestruct::Handlers::InterpolationHandler,
+        Awestruct::Handlers::RedirectHandler
+      )
+
+      def initialize(site, delegate)
+        super( site, delegate )
+      end
+
+      def simple_name
+        File.basename( relative_source_path, '.redirect' ) 
+      end
+
+      def output_filename
+        simple_name + output_extension
+      end
+
+      def output_extension
+        '.html'
+      end
+
+      def content_syntax
+        :text
+      end
+
+      def rendered_content(context, with_layouts=false)
+        url = delegate.rendered_content( context, with_layouts ).strip
+        %{<head><meta http-equiv="location" content="URL=#{url}" /></head>}
+      end
+
+    end
+  end
+end
+
+

data/lib/awestruct/page.rb

@@ -43,6 +43,7 @@ module Awestruct
 
     def inherit_front_matter_from(hash)
       hash.each do |k,v|
+        #puts "#{self.output_path} overwrite key: #{k}:#{self[k]} -> #{v}" if ( key?( k ) and !self[k].nil? and !self[k].eql? v)
         unless ( key?( k ) )
           self[k.to_sym] = v
         end
@@ -76,6 +77,9 @@ module Awestruct
       handler.output_extension
     end
 
+    def output_filename
+      handler.output_filename
+    end
 
     def source_path
       handler.path.to_s
@@ -120,9 +124,27 @@ module Awestruct
     end
 
     def rendered_content(context=create_context(), with_layouts=true)
-      Awestruct::Dependencies.push_page( self ) if context.site.config.track_dependencies
+      if context.site.config.track_dependencies
+        Awestruct::Dependencies.push_page( self )
+      end
       c = handler.rendered_content( context, with_layouts )
-      Awestruct::Dependencies.pop_page if context.site.config.track_dependencies
+      if context.site.config.track_dependencies
+        Awestruct::Dependencies.pop_page
+
+        # temp disable traqcking when we collect the hash to not dirty the results
+        Awestruct::Dependencies.track_dependencies = false
+        if with_layouts
+          @dependencies.content_hash = Digest::SHA2.hexdigest(c)
+
+          # create a new Page so we can inherit the updated values not reflected in self
+          tmp_page = Awestruct::Page.new @site
+          @handler.inherit_front_matter(tmp_page)
+          string_to_hash = tmp_page.to_a.each{|x| x[0]=x[0].to_s; x[1]=x[1].to_s; x}.sort.to_s
+          hash = Digest::SHA2.hexdigest(string_to_hash)
+          @dependencies.key_hash = hash
+        end
+        Awestruct::Dependencies.track_dependencies = true
+      end
       c
     end