awestruct 0.2.18 → 0.4.2.x1

data/lib/awestruct/page_loader.rb

@@ -0,0 +1,82 @@
+
+module Awestruct
+
+  class PageLoader
+
+    attr_reader :site
+    attr_reader :root_dir
+
+    def initialize(site, target=:pages)
+      @site   = site 
+      @target = target
+
+      @root_dir = site.config.dir
+      if ( @target == :layouts )
+        @root_dir = Pathname.new( File.join( root_dir, '_layouts/' ) )
+      end
+    end
+
+    def ignore?(path)
+      site.config.ignore.include?( path ) 
+    end
+
+    def load_all(prepare=:inline)
+      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
+          end
+        end
+      end
+      if ( prepare == :post )
+        pages.each{|p| p.prepare!} 
+      end
+    end
+
+    def load_page(path,prepare=:inline)
+      pathname = case( 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 )
+      if ( @target == :layouts )
+        p.__is_layout = true
+      else
+        p.__is_layout = false
+      end
+      p.track_dependencies!
+      if prepare == :inline
+        p.prepare! 
+      end
+      p
+    end
+
+  end
+
+end

data/lib/awestruct/pipeline.rb

@@ -0,0 +1,56 @@
+
+require 'awestruct/handler_chains'
+require 'awestruct/context_helper'
+
+module Awestruct
+
+  class Pipeline
+
+    attr_reader :handler_chains
+
+    def initialize()
+      @handler_chains = HandlerChains.new
+      @extensions     = []
+      @helpers        = []
+      @transformers   = []
+    end
+
+    def extension(e)
+      @extensions << e
+    end
+
+    def helper(h)
+      @helpers << h
+    end
+
+    def transformer(t)
+      @transformers << t
+    end
+
+    def execute(site)
+      execute_extensions(site)
+    end
+
+    def execute_extensions(site)
+      @extensions.each do |e|
+        e.execute(site)
+      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|
+        context.extend(h)
+      end
+    end
+
+  end
+
+end

data/lib/awestruct/site.rb

@@ -1,57 +1,51 @@
-require 'ostruct'
+
+#require 'hashery/open_cascade'
+require 'awestruct/layouts'
+require 'awestruct/astruct'
 
 module Awestruct
-  class Site < OpenStruct
+
+  class Site < Awestruct::AStruct
 
     attr_reader :dir
     attr_reader :output_dir
     attr_reader :tmp_dir
 
-    attr_reader   :layouts
-    attr_accessor :pages
-
-    def initialize(config)
-      super({})
+    attr_reader :pages
+    attr_reader :layouts
 
-      @dir = config.input_dir
-      @output_dir = config.output_dir
-      @tmp_dir = config.tmp_dir
+    attr_reader :config
+    attr_reader :engine
 
-      FileUtils.mkdir_p( @output_dir )
-      FileUtils.mkdir_p( @tmp_dir )
+    def initialize(engine, config)
+      @engine = engine
+      @pages = []
+      @layouts = Layouts.new
+      @config = config
+      self.encoding = false
+    end
 
-      @pages   = []
-      @layouts = {}
+    def inspect
+      "Site{:dir=>#{dir}}"
     end
 
-    def has_page?(path)
-      ! pages.find{|e| e.source_path == path}.nil?
+    def dir
+      @config.dir
     end
 
-    def output_path(path, ext=nil)
-      path = File.join( @output_dir, path[ @dir.size..-1] )
-      unless ( ext.nil? )
-        path = File.join( File.dirname( path ), File.basename( path, ext ) )
-      end
-      path 
+    def output_dir
+      @config.output_dir
     end
 
-    def url_path(path, ext=nil)
-      url_path = output_path( path, ext )[ @output_dir.size .. -1 ]
+    def tmp_dir
+      @config.tmp_dir
     end
 
-    def apply_plugins
-      Dir[ File.join( @dir, '_plugins', '*.rb' ) ].each do |rb_path|
-        site_root = @dir
-        output_root = @output_dir
-        begin
-          eval File.read( rb_path )
-        rescue => e
-          puts e
-          puts e.backtrace
-        end
-      end
+    def load_page(path)
+      engine.load_path( self, path )
     end
 
+
   end
+
 end

data/lib/awestruct/version.rb

@@ -1,4 +1,4 @@
 
 module Awestruct
-  VERSION='0.2.18'
+  VERSION='0.4.2.x1'
 end

data/lib/guard/awestruct.rb

@@ -0,0 +1,38 @@
+require 'guard'
+require 'guard/guard'
+
+require 'awestruct/engine'
+
+module Guard
+  class Awestruct < Guard
+
+    def initialize(watchers=[], options={})
+      super
+    end
+
+    def start
+      @engine = ::Awestruct::Engine.instance
+    end
+
+    def stop
+    end
+
+    def reload
+    end
+
+    def run_all
+    end
+
+    def run_on_change(paths)
+      paths.each do |path|
+        unless ( path =~ %r(#{File.basename( @engine.config.output_dir) }) || path =~ /.awestruct/ )
+          @engine.generate_page_by_output_path( path )
+        end
+      end
+    end
+
+    def run_on_deletion(paths)
+    end
+
+  end
+end

metadata

@@ -1,19 +1,20 @@
 --- !ruby/object:Gem::Specification
 name: awestruct
 version: !ruby/object:Gem::Version
-  version: 0.2.18
-  prerelease: 
+  version: 0.4.2.x1
+  prerelease: 6
 platform: ruby
 authors:
 - Bob McWhirter
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-04-13 00:00:00.000000000Z
+date: 2012-05-03 00:00:00.000000000 -04:00
+default_executable: 
 dependencies:
 - !ruby/object:Gem::Dependency
   name: hpricot
-  requirement: &70188578558160 !ruby/object:Gem::Requirement
+  requirement: &70110198942220 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,10 +22,10 @@ dependencies:
         version: 0.8.6
   type: :runtime
   prerelease: false
-  version_requirements: *70188578558160
+  version_requirements: *70110198942220
 - !ruby/object:Gem::Dependency
   name: versionomy
-  requirement: &70188578556980 !ruby/object:Gem::Requirement
+  requirement: &70110198941280 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -32,10 +33,10 @@ dependencies:
         version: 0.4.3
   type: :runtime
   prerelease: false
-  version_requirements: *70188578556980
+  version_requirements: *70110198941280
 - !ruby/object:Gem::Dependency
   name: haml
-  requirement: &70188578555900 !ruby/object:Gem::Requirement
+  requirement: &70110198939820 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -43,10 +44,10 @@ dependencies:
         version: 3.1.4
   type: :runtime
   prerelease: false
-  version_requirements: *70188578555900
+  version_requirements: *70110198939820
 - !ruby/object:Gem::Dependency
   name: sass
-  requirement: &70188578554480 !ruby/object:Gem::Requirement
+  requirement: &70110198938460 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -54,10 +55,10 @@ dependencies:
         version: 3.1.15
   type: :runtime
   prerelease: false
-  version_requirements: *70188578554480
+  version_requirements: *70110198938460
 - !ruby/object:Gem::Dependency
   name: hashery
-  requirement: &70188578552700 !ruby/object:Gem::Requirement
+  requirement: &70110198937220 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -65,10 +66,10 @@ dependencies:
         version: 1.5.0
   type: :runtime
   prerelease: false
-  version_requirements: *70188578552700
+  version_requirements: *70110198937220
 - !ruby/object:Gem::Dependency
   name: rdiscount
-  requirement: &70188578535700 !ruby/object:Gem::Requirement
+  requirement: &70110198936300 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -76,10 +77,10 @@ dependencies:
         version: 1.6.8
   type: :runtime
   prerelease: false
-  version_requirements: *70188578535700
+  version_requirements: *70110198936300
 - !ruby/object:Gem::Dependency
   name: RedCloth
-  requirement: &70188578534140 !ruby/object:Gem::Requirement
+  requirement: &70110198935540 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -87,10 +88,32 @@ dependencies:
         version: 4.2.9
   type: :runtime
   prerelease: false
-  version_requirements: *70188578534140
+  version_requirements: *70110198935540
+- !ruby/object:Gem::Dependency
+  name: coffee-script
+  requirement: &70110198934560 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 2.2.0
+  type: :runtime
+  prerelease: false
+  version_requirements: *70110198934560
+- !ruby/object:Gem::Dependency
+  name: nokogiri
+  requirement: &70110198933580 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 1.5.2
+  type: :runtime
+  prerelease: false
+  version_requirements: *70110198933580
 - !ruby/object:Gem::Dependency
   name: compass
-  requirement: &70188578532580 !ruby/object:Gem::Requirement
+  requirement: &70110198932820 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -98,10 +121,10 @@ dependencies:
         version: 0.12.1
   type: :runtime
   prerelease: false
-  version_requirements: *70188578532580
+  version_requirements: *70110198932820
 - !ruby/object:Gem::Dependency
   name: compass-960-plugin
-  requirement: &70188578530920 !ruby/object:Gem::Requirement
+  requirement: &70110198932020 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -109,10 +132,10 @@ dependencies:
         version: 0.10.4
   type: :runtime
   prerelease: false
-  version_requirements: *70188578530920
+  version_requirements: *70110198932020
 - !ruby/object:Gem::Dependency
   name: bootstrap-sass
-  requirement: &70188578527980 !ruby/object:Gem::Requirement
+  requirement: &70110198931380 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -120,10 +143,10 @@ dependencies:
         version: 2.0.1
   type: :runtime
   prerelease: false
-  version_requirements: *70188578527980
+  version_requirements: *70110198931380
 - !ruby/object:Gem::Dependency
   name: org-ruby
-  requirement: &70188578525160 !ruby/object:Gem::Requirement
+  requirement: &70110198930600 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -131,21 +154,10 @@ dependencies:
         version: 0.5.3
   type: :runtime
   prerelease: false
-  version_requirements: *70188578525160
-- !ruby/object:Gem::Dependency
-  name: fssm
-  requirement: &70188578524500 !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 0.2.8
-  type: :runtime
-  prerelease: false
-  version_requirements: *70188578524500
+  version_requirements: *70110198930600
 - !ruby/object:Gem::Dependency
   name: json
-  requirement: &70188578523640 !ruby/object:Gem::Requirement
+  requirement: &70110198929820 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -153,10 +165,10 @@ dependencies:
         version: 1.6.6
   type: :runtime
   prerelease: false
-  version_requirements: *70188578523640
+  version_requirements: *70110198929820
 - !ruby/object:Gem::Dependency
   name: notifier
-  requirement: &70188578522960 !ruby/object:Gem::Requirement
+  requirement: &70110198929100 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -164,10 +176,10 @@ dependencies:
         version: 0.1.4
   type: :runtime
   prerelease: false
-  version_requirements: *70188578522960
+  version_requirements: *70110198929100
 - !ruby/object:Gem::Dependency
   name: git
-  requirement: &70188578522120 !ruby/object:Gem::Requirement
+  requirement: &70110198928260 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -175,10 +187,21 @@ dependencies:
         version: 1.2.5
   type: :runtime
   prerelease: false
-  version_requirements: *70188578522120
+  version_requirements: *70110198928260
+- !ruby/object:Gem::Dependency
+  name: guard
+  requirement: &70110198927460 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: *70110198927460
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70188578521460 !ruby/object:Gem::Requirement
+  requirement: &70110198925780 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -186,10 +209,10 @@ dependencies:
         version: '2.9'
   type: :development
   prerelease: false
-  version_requirements: *70188578521460
+  version_requirements: *70110198925780
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &70188578520680 !ruby/object:Gem::Requirement
+  requirement: &70110198925040 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -197,7 +220,7 @@ dependencies:
         version: 0.9.2
   type: :development
   prerelease: false
-  version_requirements: *70188578520680
+  version_requirements: *70110198925040
 description: Awestruct is a framework for creating static HTML sites.
 email: bob@mcwhirter.org
 executables:
@@ -205,23 +228,26 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
-- lib/awestruct/asciidoc_file.rb
-- lib/awestruct/asciidocable.rb
-- lib/awestruct/commands/deploy.rb
-- lib/awestruct/commands/frameworks/base_pipeline.rb
-- lib/awestruct/commands/generate.rb
-- lib/awestruct/commands/git_hub_pages.rb
-- lib/awestruct/commands/init.rb
-- lib/awestruct/commands/manifest.rb
-- lib/awestruct/commands/server.rb
+- lib/awestruct/astruct.rb
+- lib/awestruct/astruct_mixin.rb
+- lib/awestruct/cli/auto.rb
+- lib/awestruct/cli/deploy.rb
+- lib/awestruct/cli/generate.rb
+- lib/awestruct/cli/invoker.rb
+- lib/awestruct/cli/options.rb
+- lib/awestruct/cli/server.rb
 - lib/awestruct/config.rb
+- lib/awestruct/context.rb
 - lib/awestruct/context_helper.rb
+- lib/awestruct/dependencies.rb
+- lib/awestruct/deploy/github_pages_deploy.rb
+- lib/awestruct/deploy/rsync_deploy.rb
+- lib/awestruct/deployers.rb
 - lib/awestruct/engine.rb
-- lib/awestruct/erb_file.rb
-- lib/awestruct/erbable.rb
 - lib/awestruct/extensions/assets.rb
 - lib/awestruct/extensions/atomizer.rb
 - lib/awestruct/extensions/cachebuster.rb
+- lib/awestruct/extensions/coffeescripttransform.rb
 - lib/awestruct/extensions/data_dir.rb
 - lib/awestruct/extensions/disqus.rb
 - lib/awestruct/extensions/extend_string.rb
@@ -241,38 +267,42 @@ files:
 - lib/awestruct/extensions/sitemap.rb
 - lib/awestruct/extensions/tag_cloud.rb
 - lib/awestruct/extensions/tagger.rb
-- lib/awestruct/front_matter_file.rb
-- lib/awestruct/haml/filters/asciidoc.rb
-- lib/awestruct/haml_file.rb
-- lib/awestruct/hamlable.rb
-- lib/awestruct/markdown_file.rb
-- lib/awestruct/markdownable.rb
-- lib/awestruct/orgmode_file.rb
-- lib/awestruct/orgmodeable.rb
-- lib/awestruct/renderable.rb
-- lib/awestruct/renderable_file.rb
-- lib/awestruct/restructuredtext_file.rb
-- lib/awestruct/restructuredtextable.rb
-- lib/awestruct/sass_file.rb
-- lib/awestruct/sassable.rb
-- lib/awestruct/scss_file.rb
+- lib/awestruct/handler_chain.rb
+- lib/awestruct/handler_chains.rb
+- lib/awestruct/handlers/asciidoc_handler.rb
+- lib/awestruct/handlers/base_handler.rb
+- lib/awestruct/handlers/base_sass_handler.rb
+- lib/awestruct/handlers/coffeescript_handler.rb
+- lib/awestruct/handlers/erb_handler.rb
+- lib/awestruct/handlers/file_handler.rb
+- lib/awestruct/handlers/front_matter_handler.rb
+- lib/awestruct/handlers/haml_handler.rb
+- lib/awestruct/handlers/interpolation_handler.rb
+- lib/awestruct/handlers/layout_handler.rb
+- lib/awestruct/handlers/markdown_handler.rb
+- lib/awestruct/handlers/no_op_handler.rb
+- lib/awestruct/handlers/orgmode_handler.rb
+- lib/awestruct/handlers/page_delegating_handler.rb
+- lib/awestruct/handlers/restructuredtext_handler.rb
+- lib/awestruct/handlers/sass_handler.rb
+- lib/awestruct/handlers/scss_handler.rb
+- lib/awestruct/handlers/string_handler.rb
+- lib/awestruct/handlers/textile_handler.rb
+- lib/awestruct/handlers/yaml_handler.rb
+- lib/awestruct/layouts.rb
+- lib/awestruct/page.rb
+- lib/awestruct/page_loader.rb
+- lib/awestruct/pipeline.rb
 - lib/awestruct/site.rb
-- lib/awestruct/textilable.rb
-- lib/awestruct/textile_file.rb
 - lib/awestruct/util/default_inflections.rb
 - lib/awestruct/util/inflector.rb
-- lib/awestruct/verbatim_file.rb
 - lib/awestruct/version.rb
-- lib/awestruct.rb
-- lib/awestruct/commands/frameworks/960/base_layout.html.haml
-- lib/awestruct/commands/frameworks/base_index.html.haml
-- lib/awestruct/commands/frameworks/blueprint/base_layout.html.haml
-- lib/awestruct/commands/frameworks/bootstrap/base_index.html.haml
-- lib/awestruct/commands/frameworks/bootstrap/base_layout.html.haml
+- lib/guard/awestruct.rb
 - lib/awestruct/extensions/sitemap.xml.haml
 - lib/awestruct/extensions/tag_cloud.html.haml
 - lib/awestruct/extensions/template.atom.haml
 - bin/awestruct
+has_rdoc: true
 homepage: http://awestruct.org
 licenses: []
 post_install_message: 
@@ -287,19 +317,16 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 2576924319641069928
+      hash: 98458405648043217
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
-  - - ! '>='
+  - - ! '>'
     - !ruby/object:Gem::Version
-      version: '0'
-      segments:
-      - 0
-      hash: 2576924319641069928
+      version: 1.3.1
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.10
+rubygems_version: 1.6.2
 signing_key: 
 specification_version: 3
 summary: Static site-baking utility