awestruct 0.5.7.RC2 → 0.5.7

data/lib/awestruct/extensions/atomizer.rb

@@ -8,7 +8,11 @@ module Awestruct
         @num_entries = opts[:num_entries] || 50
         @content_url = opts[:content_url]
         @feed_title = opts[:feed_title]
-        @template = opts[:template] || File.join( File.dirname(__FILE__), 'template.atom.haml' )
+        if opts[:template] && Pathname.new(opts[:template]).relative?
+          @template = Pathname.new(::Awestruct::Engine.instance.site.config.dir).join(opts[:template])
+        else
+          @template = File.join( File.dirname(__FILE__), 'template.atom.haml' )
+        end
       end
 
       def execute(site)

data/lib/awestruct/extensions/google_analytics.rb

@@ -51,9 +51,9 @@ module Awestruct
 
         html = ''
         html += %Q(<script>\n)
-        html += %Q( (function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){\n
-                    (i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new Date();a=s.createElement(o),\n
-                    m=s.getElementsByTagName(o)[0];a.async=1;a.src=g;m.parentNode.insertBefore(a,m)\n
+        html += %Q( (function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){
+                    (i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new Date();a=s.createElement(o),
+                    m=s.getElementsByTagName(o)[0];a.async=1;a.src=g;m.parentNode.insertBefore(a,m)
                     })(window,document,'script','//www.google-analytics.com/analytics.js','ga');\n )
         html += %Q(\n)
         html += %Q(ga('create', '#{options[:account]}', 'auto');\n)

data/lib/awestruct/extensions/partial.rb

@@ -3,7 +3,7 @@ module Awestruct
     module Partial
 
       def partial(path, params = {})
-        filename = File.join( '_partials', path )
+        filename = File.join( ::Awestruct::Engine.instance.config.dir, '_partials', path )
 
         if !File.exists?( filename )
           $LOG.error "Could not find #{filename}" if $LOG.error?

data/lib/awestruct/extensions/pipeline.rb

@@ -42,8 +42,6 @@ module Awestruct
 
       def extension(ext)
         @extensions << ext if ext.respond_to?(:execute)
-        # TC: why? transformer and extension?
-        transformer(ext) if ext.respond_to?(:transform)
 
         @before_all_extensions << ext if ext.respond_to?(:before_extensions)
         @after_all_extensions << ext if ext.respond_to?(:after_extensions)

data/lib/awestruct/extensions/posts.rb

@@ -2,7 +2,7 @@ module Awestruct
   module Extensions
     class Posts
 
-      attr_accessor :path_prefix, :assign_to, :archive_template, :archive_path, :default_layout
+      attr_accessor :path_prefix, :assign_to, :archive_template, :archive_path, :default_layout, :wp_compat
 
       def initialize(path_prefix='', assign_to=:posts, archive_template=nil, archive_path=nil, opts={})
         @archive_template = archive_template
@@ -10,6 +10,7 @@ module Awestruct
         @path_prefix      = path_prefix
         @assign_to        = assign_to
         @default_layout   = opts[:default_layout] || 'post'
+        @wp_compat        = opts.has_key?(:wp_compat) ? opts[:wp_compat] : false
       end
 
       def execute(site)
@@ -54,7 +55,11 @@ module Awestruct
               page.layout ||= @default_layout if @default_layout
               page.slug ||= slug
               context = page.create_context
-              page.output_path = "#{@path_prefix}/#{year}/#{month}/#{day}/#{page.slug}.html"
+              if (@wp_compat)
+                page.output_path = "#{@path_prefix}/#{year}/#{month}/#{page.slug}.html"
+              else
+                page.output_path = "#{@path_prefix}/#{year}/#{month}/#{day}/#{page.slug}.html"
+              end
               posts << page
             end
           end

data/lib/awestruct/extensions/tag_cloud.rb

@@ -7,7 +7,11 @@ module Awestruct
         @output_path = output_path
         @layout = opts[:layout].to_s
         @title  = opts[:title] || 'Tags'
-        @template = opts[:template] || File.join( File.dirname( __FILE__ ), 'tag_cloud.html.haml' )
+        if opts[:template] && Pathname.new(opts[:template]).relative?
+          @template = Pathname.new(::Awestruct::Engine.instance.site.config.dir).join(opts[:template])
+        else
+          @template = File.join( File.dirname(__FILE__), 'tag_cloud.html.haml' )
+        end
       end
 
       def execute(site)

data/lib/awestruct/handlers/base_tilt_handler.rb

@@ -14,7 +14,7 @@ module Awestruct
       def match(path)
         matcher = ::Tilt[File.basename(path)]
         if matcher.nil?
-          $LOG.warn(%(Copying #{path})) if $LOG.warn? && Awestruct::Engine.instance.config.verbose
+          $LOG.debug(%(Copying #{path})) if Awestruct::Engine.instance.config.verbose
           return false
         end
 
@@ -134,19 +134,23 @@ module Awestruct
           return template.render(context)
         rescue LoadError => e
           error_page = context[:page]
-          ExceptionHelper.log_message "Could not load template library required for rendering #{File.join site.dir, error_page.source_path}."
-          ExceptionHelper.log_message "Please see #{File.join site.dir, error_page.output_path} for more information"
+          ExceptionHelper.log_message "Could not load template library required for rendering #{error_page.source_path}."
+          ExceptionHelper.log_message "Please see #{error_page.output_path} for more information"
           return ExceptionHelper.html_error_report e, error_page.source_path
         rescue => e
           error_page = context[:page]
-          if error_page[:__is_layout] == true
-            ExceptionHelper.log_message "An error during rendering layout file #{File.join site.dir, error_page.source_path} occurred."
+          if error_page[:__is_layout] == true || context[:__is_layout] == true
+            ExceptionHelper.log_message "An error during rendering layout file #{context[:__effective_page].relative_source_path} for #{error_page.relative_source_path} occurred."
             ExceptionHelper.log_building_error e, error_page.source_path
+
+          elsif error_page.is_partial?
+            ExceptionHelper.log_message "An error during rendering partial file #{error_page.relative_source_path} for #{error_page[:real_page].relative_source_path} occurred."
+            ExceptionHelper.log_building_error e, error_page[:real_page].source_path
           else
-            ExceptionHelper.log_message "An error during rendering #{File.join site.dir, error_page.source_path} occurred."
+            ExceptionHelper.log_message "An error during rendering #{error_page.relative_source_path} occurred."
             ExceptionHelper.log_building_error e, error_page.source_path
           end
-          ExceptionHelper.log_message "Please see #{File.join site.dir, error_page.output_path} for more information"
+          ExceptionHelper.log_message "Please see .awestruct/error.log for more information"
           return ExceptionHelper.html_error_report e, error_page.source_path
         end
       end

data/lib/awestruct/handlers/file_handler.rb

@@ -22,12 +22,7 @@ module Awestruct
 
       def relative_source_path
         begin
-          p = path.relative_path_from( site.dir ) 
-          if !! ( %r(^\.\.) =~ p.to_s )
-            return nil 
-          end
-          r = File.join( '', p )
-          return r
+          "/#{Pathname.new path.relative_path_from( site.dir )}"
         rescue Exception=>e
           nil
         end

data/lib/awestruct/handlers/layout_handler.rb

@@ -43,7 +43,7 @@ module Awestruct
       end
 
       def rendered_content(context, with_layouts=true)
-        $LOG.debug "rendering content with layout #{with_layouts} for #{context}" if $LOG.debug?
+        $LOG.debug "rendering content with layout #{with_layouts} for #{context.page.output_path}" if $LOG.debug?
         content = delegate.rendered_content( context, with_layouts )
 
         if ( with_layouts )
@@ -51,11 +51,12 @@ module Awestruct
           for_layout_chain(context.__effective_page || context.page) do |layout|
             context.content = content
             context.__effective_page = layout
+            context[:__is_layout] = true
             content = layout.rendered_content( context, false )
-           end
+          end
         end
 
-        $LOG.debug "finished rendering content for #{context}" if $LOG.debug?
+        $LOG.debug "finished rendering content for #{context.page.output_path}" if $LOG.debug?
         content
       end
 

data/lib/awestruct/page.rb

@@ -42,9 +42,9 @@ module Awestruct
     end
 
     def inherit_front_matter_from(hash)
-      $LOG.debug "inherit_front_matter_from for #{self.inspect}"  if $LOG.debug?
+      $LOG.debug "inherit_front_matter_from for #{self.inspect}"
       hash.each do |k,v|
-        $LOG.debug "#{output_path} overwrite key: #{k}:#{self[k]} -> #{v}" if ( key?( k ) and !self[k].nil? and !self[k].eql? v) if $LOG.debug?
+        $LOG.debug "#{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
@@ -139,7 +139,7 @@ module Awestruct
       c = nil
 
       begin
-        $LOG.debug "calling rendered_content on handler for page #{self.output_path}" if $LOG.debug?
+        $LOG.debug "calling rendered_content on handler for page #{self.output_path}"
         c = handler.rendered_content( context, with_layouts )
         # c = site.engine.pipeline.apply_transformers( context.site, self, c )
       rescue StandardError => e

data/lib/awestruct/page_loader.rb

@@ -11,7 +11,7 @@ module Awestruct
 
       @root_dir = site.config.dir
       if ( @target == :layouts )
-        @root_dir = Pathname.new( File.join( root_dir, '_layouts/' ) )
+        @root_dir = site.config.layouts_dir
       end
     end
 
@@ -24,25 +24,25 @@ module Awestruct
       pages = []
       root_dir.find do |path|
         if ( path == root_dir )
-          $LOG.debug "skip #{path}" if (site.config.verbose) if $LOG.debug?
+          $LOG.debug "skip #{path}" if site.config.verbose
           next
         end
         basename = File.basename( path )
         if ( basename == '.htaccess' )
           #special case
         elsif ( basename =~ /^[_.]/ )
-          $LOG.debug "skip #{path} and prune" if (site.config.verbose) if $LOG.debug?
+          $LOG.debug "skip #{path} and prune" if (site.config.verbose && $LOG.debug?)
           Find.prune
           next
         end
         relative_path = path.relative_path_from( root_dir ).to_s
         if ignore?(relative_path)
-          $LOG.debug "skip ignored #{path} and prune" if (site.config.verbose) if $LOG.debug?
+          $LOG.debug "skip ignored #{path} and prune" if site.config.verbose
           Find.prune
           next
         end
         unless path.directory?
-          $LOG.debug "loading #{relative_path}" if (site.config.verbose) if $LOG.debug?
+          $LOG.debug "loading #{relative_path}" if site.config.verbose
           page = load_page( path, prepare )
           if ( page )
             next if (page.draft && !(@site.show_drafts || @site.profile == 'development'))
@@ -66,7 +66,7 @@ module Awestruct
       chain = site.engine.pipeline.handler_chains[ path ]
       return nil if chain.nil?
       handler = chain.create(site, Pathname.new(path))
-      p = Page.new( site, handler )
+      p = ::Awestruct::Page.new( site, handler )
       if ( @target == :layouts )
         p.__is_layout = true
       else

data/lib/awestruct/pipeline.rb

@@ -13,7 +13,7 @@ module Awestruct
     attr_reader :transformers
     attr_reader :after_generation_extensions
 
-    def initialize()
+    def initialize
       @handler_chains = HandlerChains.new
       @before_all_extensions       = []
       @extensions                  = []
@@ -29,8 +29,6 @@ module Awestruct
 
     def extension(e)
       @extensions << e
-      # TC: why? transformer and extension?
-      e.transform(@transformers) if e.respond_to?(:transform)
     end
 
     def add_after_extension(e)
@@ -55,43 +53,73 @@ module Awestruct
 
     def execute_extensions(site, on_reload)
       @before_all_extensions.each do |e|
-        e.on_reload(site) if (on_reload && e.respond_to?(:on_reload))
-        if (e.respond_to? :execute)
+        $LOG.verbose "Executing before all extension #{e.class}"
+
+        if on_reload && e.respond_to?
+          start_time = DateTime.now
+          e.on_reload(site) if (on_reload && e.respond_to?(:on_reload))
+          $LOG.trace "Total time in #{e.class}.on_reload #{DateTime.now.to_time - start_time.to_time} seconds"
+        end
+
+        start_time = DateTime.now
+        if e.respond_to? :execute
           e.execute(site)
         else
           e.before_extensions(site)
         end
+        $LOG.trace "Total time in #{e.class}.before_extensions #{DateTime.now.to_time - start_time.to_time} seconds"
       end
 
       @extensions.each do |e|
-        e.on_reload(site) if (on_reload && e.respond_to?(:on_reload))
+        $LOG.verbose "Executing extension #{e.class}"
+        if on_reload && e.respond_to?(:on_reload)
+          start_time = DateTime.now
+          e.on_reload(site)
+          $LOG.trace "Total time in #{e.class}.on_reload #{DateTime.now.to_time - start_time.to_time} seconds"
+        end
+        start_time = DateTime.now
         e.execute(site)
+        $LOG.trace "Total time in #{e.class}.execute #{DateTime.now.to_time - start_time.to_time} seconds"
       end
 
       @after_all_extensions.each do |e|
-        e.on_reload(site) if (on_reload && e.respond_to?(:on_reload))
+        $LOG.verbose "Executing after all extension #{e.class}"
+        if on_reload && e.respond_to?(:on_reload)
+          start_time = DateTime.now
+          e.on_reload(site)
+          $LOG.trace "Total time in #{e.class}.on_reload #{DateTime.now.to_time - start_time.to_time} seconds"
+        end
+
+        start_time = DateTime.now
         if e.respond_to? :execute
           e.execute(site)
         else
           e.after_generation(site)
         end
+        $LOG.trace "Total time in #{e.class}.after_generation #{DateTime.now.to_time - start_time.to_time} seconds"
       end
     end
 
     def apply_transformers(site, page, rendered)
       @transformers.each do |t|
+        $LOG.debug "Applying transformer #{t.class} for page #{page}" if site.config.verbose
+        start_time = DateTime.now
         rendered = t.transform( site, page, rendered )
+        $LOG.trace "Total time in #{t.class}.transform #{DateTime.now.to_time - start_time.to_time} seconds" if site.config.verbose
       end
       rendered
     end
 
     def execute_after_generation(site)
       @after_generation_extensions.each do |e|
+        $LOG.verbose "Executing after generation #{e.class}"
+        start_time = DateTime.now
         if e.respond_to? :execute
           e.execute(site)
         else
           e.after_generation(site)
         end
+        $LOG.trace "Total time in #{e.class}.after_generation #{DateTime.now.to_time - start_time.to_time} seconds"
       end
     end
 

data/lib/awestruct/rack/debug.rb

@@ -28,20 +28,24 @@ module Awestruct
 
           if debug_exp.size == 0
             html = IO.read(File.join(File.dirname(__FILE__), 'trace.html'))
-            return [200,
-              {'Content-Type'.freeze => 'text/html', 'Content-Length'.freeze => html.size.to_s},
-              [html] ]
+            return [
+                200,
+                {'Content-Type'.freeze => 'text/html', 'Content-Length'.freeze => html.size.to_s},
+                [html]
+            ]
           else
             json = ''
             begin
-              json = dump(introspect(page, {}, debug_exp))
+              json = dump(introspect(page, {}, debug_exp)).freeze
             rescue Exception => e
-              json += e.message
+              json += "#{e.message.freeze} \n#{e.backtrace.freeze}"
             end
 
-            return [200,
-            {'Content-Type'.freeze => 'application/json', 'Content-Length'.freeze => json.size.to_s},
-            [json] ]
+            return [
+                200,
+                {'Content-Type'.freeze => 'application/json', 'Content-Length'.freeze => json.size.to_s},
+                [json]
+            ]
           end
         else
           source_call = @app.call(env)
@@ -77,33 +81,44 @@ module Awestruct
             return target_arr
           else
             target_arr = []
-            source.each{ |var| target_arr << introspect(var, {}, exp, depth+1)}
+            source.each do |var|
+              if var.respond_to? :to_h
+                target_arr << introspect(var, {}, ['*'], depth+1)
+              else
+                target_arr << introspect(var, {}, exp, depth+1)
+              end
+            end
             return target_arr
           end
         end
 
-        return target if exp_curr.nil?
+        return source if source.is_a? String
+
+        if exp_curr.nil?
+          return source if target.empty?
+          return target
+        end
 
         data = nil
 
         if source.is_a? Awestruct::Page
-          data = source.original_entries
+          data = source.original_entries.freeze
         elsif source.is_a? Hash
           data = source
         elsif source.is_a? OpenStruct
-          data = source.to_h
+          data = source.to_h.freeze
         end
 
         return source.to_s if data.nil?
 
         data.each do |key, value|
           if key.to_s == exp_curr or exp_curr == '*'
-            if value.is_a? Hash or value.is_a? OpenStruct or value.is_a? Awestruct::Page
-              target[key] = introspect(value, {}, exp_all_curr, depth+1)
-            elsif value.is_a? Array
+            if value.is_a? Hash or value.is_a? OpenStruct or value.is_a? Awestruct::Page or value.is_a? Array
               target[key] = introspect(value, {}, exp_all_curr, depth+1)
+            elsif value.respond_to? :to_h
+              target[key] = introspect(value.to_h.freeze, {}, exp_all_curr, depth+1)
             else
-              target[key] = value
+              target[key] = value.to_s
             end
           elsif exp_curr[/^-?\d+$/]
             if value.is_a? Array
@@ -118,8 +133,8 @@ module Awestruct
       end
 
       def dump(value)
-        value = value.to_h if value.is_a? OpenStruct
-        JSON.pretty_generate(value)
+        value = value.to_h.freeze if value.respond_to? :to_h
+        "#{JSON.dump(value)} \n\n "
       end
     end
   end

data/lib/awestruct/rack/trace.html

@@ -541,6 +541,10 @@ var prettyPrint = (function() {
                 return typeDealer['array'](obj, depth, key, true);
             },
             object: function(obj, depth, key) {
+                if (Object.keys(obj).length === 0) {
+                    return '{}';
+                }
+
                 obj_stack.push(key);
                 console.log("object push " + key)
 

data/lib/awestruct/util/exception_helper.rb

@@ -6,20 +6,20 @@ module Awestruct
     @@failed = false
 
     def self.log_message message
-      $LOG.error message if $LOG.error?
+      $LOG.error message
     end
 
     def self.log_error exception
       mark_failed
-      $LOG.error "An error occurred: #{exception.message}" if $LOG.error?
+      $LOG.error "An error occurred: #{exception.message}"
     end
 
     def self.log_backtrace exception
-      $LOG.error "#{exception.backtrace.join("\n")}" if $LOG.error?
+      $LOG.error "#{exception.backtrace.join("\n")}"
     end
     
     def self.log_building_error exception, relative_source_path
-      $LOG.error "While processing file #{relative_source_path}" if $LOG.error?
+      $LOG.error "While processing file #{relative_source_path}"
       self.log_error exception
       self.log_backtrace exception
     end