awestruct 0.1.0 → 0.1.1

data/lib/awestruct/config.rb

@@ -7,6 +7,7 @@ module Awestruct
     attr_accessor :config_dir
     attr_accessor :extension_dir
     attr_accessor :output_dir
+    attr_accessor :skin_dir
     attr_accessor :ignore
 
     def initialize()
@@ -14,6 +15,7 @@ module Awestruct
       @config_dir     = '_config'
       @output_dir     = '_site'
       @extension_dir  = '_ext'
+      @skin_dir       = '_skin'
       @ignore         = [ ]
     end
 

data/lib/awestruct/engine.rb

@@ -27,6 +27,7 @@ require 'awestruct/extensions/tagger'
 require 'awestruct/extensions/tag_cloud'
 require 'awestruct/extensions/intense_debate'
 require 'awestruct/extensions/google_analytics'
+require 'awestruct/extensions/partial'
 
 require 'awestruct/util/inflector'
 require 'awestruct/util/default_inflections'
@@ -51,6 +52,10 @@ module Awestruct
       @max_yaml_mtime = nil
     end
 
+    def skin_dir
+      @site.skin_dir
+    end
+
     def generate(profile=nil, base_url=nil, default_base_url=nil, force=false)
       @base_url         = base_url
       @default_base_url = default_base_url
@@ -235,9 +240,19 @@ 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 ] =  HamlFile.new( site, layout_path, relative_path )
         site.layouts[ name ] =  load_page( layout_path, relative_path )
       end
+      if ( skin_dir )
+        skin_dir_pathname = Pathname.new( skin_dir )
+        Dir[ File.join( skin_dir, config.layouts_dir, '*.haml' ) ].each do |layout_path|
+          layout_pathname = Pathname.new( layout_path )
+          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 )
+          end
+        end
+      end
     end
 
     def load_site_yaml(profile)
@@ -280,8 +295,8 @@ module Awestruct
     end
 
     def load_pages()
-      dir_pathname = Pathname.new( dir )
       site.pages.clear
+      dir_pathname = Pathname.new( dir )
       Find.find( dir ) do |path|
         next if path == dir
         basename = File.basename( path )
@@ -300,6 +315,28 @@ module Awestruct
           end
         end
       end
+
+      if ( skin_dir )
+        skin_dir_pathname = Pathname( skin_dir )
+        Find.find( skin_dir ) do |path|
+          next if path == skin_dir
+          basename = File.basename( path )
+          if ( basename == '.htaccess' )
+            #special case
+          elsif ( config.ignore.include?( basename ) || ( basename =~ /^[_.]/ ) )
+            Find.prune
+            next
+          end
+          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 )
+            if ( page )
+              site.pages << page
+            end
+          end
+        end
+      end
     end
 
     def massage_yaml(obj)
@@ -321,14 +358,34 @@ module Awestruct
     end
 
     def load_extensions
+
+      pipeline = nil
+      skin_pipeline = nil
+
       ext_dir = File.join( dir, config.extension_dir ) 
-      pipeline_file = File.join( ext_dir, 'pipeline.rb' )
       if ( $LOAD_PATH.index( ext_dir ).nil? )
         $LOAD_PATH << ext_dir
       end
-      pipeline = eval File.read( pipeline_file )
-      pipeline.execute( site )
-      @helpers = pipeline.helpers || []
+      pipeline_file = File.join( ext_dir, 'pipeline.rb' )
+      if ( File.exists?( pipeline_file ) ) 
+        pipeline = eval File.read( pipeline_file )
+        @helpers = pipeline.helpers || []
+      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
+        skin_pipeline_file = File.join( skin_ext_dir, 'pipeline.rb' )
+        if ( File.exists?( skin_pipeline_file ) )
+          skin_pipeline = eval File.read( skin_pipeline_file )
+          @helpers = skin_pipeline.helpers || []
+        end
+      end
+
+      pipeline.execute( site ) if pipeline
+      skin_pipeline.execute( site ) if skin_pipeline
     end
 
     def camelize(lower_case_and_underscored_word, first_letter_in_uppercase = true)

data/lib/awestruct/extensions/partial.rb

@@ -0,0 +1,14 @@
+
+module Awestruct
+  module Extensions
+    module Partial
+
+      def partial(path)
+        page = site.engine.load_site_page( File.join( '_partials', path ) )
+        page.content if ( page )
+      end
+
+    end
+  end
+
+end

data/lib/awestruct/extensions/pipeline.rb

@@ -3,7 +3,9 @@ module Awestruct
 
     class Pipeline
 
+      attr_reader :before_extensions
       attr_reader :extensions
+      attr_reader :after_extensions
       attr_reader :helpers
 
       def initialize(&block)

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: awestruct
 version: !ruby/object:Gem::Version 
-  hash: 27
+  hash: 25
   prerelease: false
   segments: 
   - 0
   - 1
-  - 0
-  version: 0.1.0
+  - 1
+  version: 0.1.1
 platform: ruby
 authors: 
 - Bob McWhirter
@@ -143,6 +143,7 @@ files:
 - lib/awestruct/extensions/indexifier.rb
 - lib/awestruct/extensions/intense_debate.rb
 - lib/awestruct/extensions/paginator.rb
+- lib/awestruct/extensions/partial.rb
 - lib/awestruct/extensions/pipeline.rb
 - lib/awestruct/extensions/posts.rb
 - lib/awestruct/extensions/tag_cloud.rb