awestructx 0.4.0 → 0.4.1.x1

data/lib/awestruct/page.rb

@@ -2,6 +2,7 @@
 require 'awestruct/context'
 
 require 'awestruct/handlers/no_op_handler'
+require 'awestruct/handlers/page_delegating_handler'
 require 'hashery/open_cascade'
 require 'ostruct'
 require 'awestruct/astruct'
@@ -12,13 +13,19 @@ module Awestruct
 
     attr_accessor :site
     attr_accessor :handler
-
-    attr_reader :dependencies
+    attr_reader   :dependencies
 
     def initialize(site, handler=nil)
       @site          = site
-      @handler       = handler || Awestruct::Handlers::NoOpHandler.new( site )
-      @dependencies  = []
+      case (handler)
+        when Page
+          @handler = Awestruct::Handlers::LayoutHandler.new( site, Awestruct::Handlers::PageDelegatingHandler.new( site, handler ) )
+        when nil
+          @handler = Awestruct::Handlers::NoOpHandler.new( site )
+        else
+          @handler = handler
+      end
+      @dependencies = Awestruct::Dependencies.new( self )
     end
 
     def prepare!
@@ -59,25 +66,24 @@ module Awestruct
       (@output_path || handler.output_path).to_s
     end
 
-    def output_extension
-      handler.output_extension
-    end
-
     def output_path=(path)
       case ( path )
-        when Pathname:
-          @output_path = path
-        else
-          @output_path = Pathname.new( path )
+        when Pathname then @output_path = path
+        else @output_path = Pathname.new( path )
       end
     end
 
+    def output_extension
+      handler.output_extension
+    end
+
+
     def source_path
       handler.path.to_s
     end
 
     def stale?
-      handler.stale? || @dependencies.any?(&:stale?) 
+      handler.stale? || @dependencies.dependencies.any?(&:stale?) 
     end
 
     def stale_output?(output_path)
@@ -102,6 +108,10 @@ module Awestruct
       t 
     end
 
+    def all_dependencies
+      @dependencies + handler.dependencies
+    end
+
     def content_syntax
       handler.content_syntax
     end
@@ -111,7 +121,10 @@ module Awestruct
     end
 
     def rendered_content(context=create_context(), with_layouts=true)
-      handler.rendered_content( context, with_layouts )
+      Awestruct::Dependencies.push_page( self ) if context.site.config.track_dependencies
+      c = handler.rendered_content( context, with_layouts )
+      Awestruct::Dependencies.pop_page if context.site.config.track_dependencies
+      site.engine.pipeline.apply_transformers( site, self, c )
     end
 
     def content(with_layouts=false)

data/lib/awestruct/page_loader.rb

@@ -24,23 +24,27 @@ module Awestruct
       pages = []
       root_dir.find do |path|
         if ( path == root_dir )
+          #puts "skip #{path}"
           next
         end
         basename = File.basename( path )
         if ( basename == '.htaccess' )
           #special case
         elsif ( basename =~ /^[_.]/ )
+          #puts "skip #{path} and prune"
           Find.prune
           next
         end
         relative_path = path.relative_path_from( root_dir ).to_s
         if ignore?(relative_path)
+          #puts "skip ignored #{path} and prune"
           Find.prune
           next
         end
         unless path.directory?
           page = load_page( path, prepare )
           if ( page )
+            #puts "loaded! #{path} and added to site"
             #inherit_front_matter( page )
             site.send( @target ) << page
             pages << page
@@ -54,16 +58,22 @@ module Awestruct
 
     def load_page(path,prepare=:inline)
       pathname = case( path )
-        when Pathname:
-          pathname = path
-        else
-          pathname = Pathname.new( path )
+        when Pathname then pathname = path
+        else pathname = Pathname.new( path )
       end
       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.prepare! if prepare == :inline
+      if ( @target == :layouts )
+        p.__is_layout = true
+      else
+        p.__is_layout = false
+      end
+      p.track_dependencies!
+      if prepare == :inline
+        p.prepare! 
+      end
       p
     end
 

data/lib/awestruct/pipeline.rb

@@ -37,6 +37,13 @@ module Awestruct
       end
     end
 
+    def apply_transformers(site, page, rendered)
+      @transformers.each do |t|
+        rendered = t.transform( site, page, rendered )
+      end
+      rendered
+    end
+
     def mixin_helpers(context)
       context.extend( Awestruct::ContextHelper )
       @helpers.each do |h|

data/lib/awestruct/version.rb

@@ -1,4 +1,4 @@
 
 module Awestruct
-  VERSION='0.4.0'
+  VERSION='0.4.1.x1'
 end

data/lib/guard/awestruct.rb

@@ -25,7 +25,7 @@ module Guard
 
     def run_on_change(paths)
       paths.each do |path|
-        unless ( path =~ /_site/ )
+        unless ( path =~ %r(#{File.basename( @engine.config.output_dir) }) || path =~ /.awestruct/ )
           @engine.generate_page_by_output_path( path )
         end
       end