awestruct 0.5.4.2 → 0.5.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3395e26727ea024244aa5f9fc19fb31ba13ddd6d
-  data.tar.gz: 0beaba554f25c504f48dde6a931ce3dc6377d5ec
+  metadata.gz: 42707b3e65d935704a6a4b4e70950897dbe43c26
+  data.tar.gz: e51aab1ecb9a80daf22f5cad51a01150a4b546e9
 SHA512:
-  metadata.gz: 0cf85e4674ff4b16893ec8a7d386cae463d6569ba03f9cdcdbc14e26ab8c5d34e2083aeb658e3dfda0233627db38443b2f1092456338933f013a9a02db9781be
-  data.tar.gz: a9e1803a461f21be4bdd838358bc81d03825398a4fa49b3004da43dc641954027771673c0926946714b5710d55113646634f9f308ca866cd87767d3da7de802f
+  metadata.gz: 910fb313268c6b32697d557cf7864ed609027a53231df08859dce06e8e8667613286d0360341668b5a90f4a0ad2417b47f68fe7a2ee19aa89713bb9663e3881a
+  data.tar.gz: 0136ae84bbea1d15b311f0c627d40e7f810446cad2a64b2f98dc0dd280515ee521e3abfe5d08739958b549ae093d1b03125d07bf6596b18f213f386fbf3e214a

data/awestruct.gemspec

@@ -4,7 +4,7 @@ require 'awestruct/version'
 spec = Gem::Specification.new do |s|
   s.name          = 'awestruct'
   s.version       = Awestruct::VERSION
-  s.date          = '2014-04-09'
+  s.date          = '2014-04-23'
 
   s.authors       = ['Bob McWhirter', 'Jason Porter', 'Lance Ball', 'Dan Allen', 'Torsten Curdt', 'other contributors']
   s.email         = ['bob@mcwhirter.org', 'lightguard.jp@gmail.com', 'lball@redhat.com', 'dan.j.allen@gmail.com', 'tcurdt@vafer.org']

data/lib/awestruct/cli/auto.rb

@@ -2,6 +2,7 @@ require 'awestruct/util/exception_helper'
 
 require 'listen'
 require 'guard/livereload'
+require 'compass'
 
 module Awestruct
   module CLI
@@ -29,8 +30,9 @@ module Awestruct
           modified.each do |path| # path is absolute path
             engine = ::Awestruct::Engine.instance
 
-            unless ( path =~ %r(#{File.basename( engine.config.output_dir) }) || path =~ /.awestruct/ )
+            unless ( path =~ %r(#{File.basename( engine.config.output_dir) }) || path =~ /.awestruct/ || path =~ /sass-cache/ )
               begin
+                $LOG.info "Change detected for file #{path}" if $LOG.info?
                 if path.eql? current_path
                   unless generate_thread.nil?
                     $LOG.info "Same path triggered, stopping previous generation" if generate_thread.alive? && $LOG.info?
@@ -43,25 +45,29 @@ module Awestruct
 
                 generate_thread = Thread.new {
                   begin
-
-                    # TODO: Have to figure something out for extensions and other files without an output path
-                    #       Probably add another method in engin to to do the regen w/o mucking with site.pages and run through things again
-                    page = engine.page_by_output_path(path)
-                    if ( page )
-                      pages = engine.generate_page_and_dependencies( page )
-
-                      if ( guard )
-                        urls = pages.map do |p|
-                          @base_url + p.url.to_s
+                    if ( File.extname(path) == '.sass' || File.extname(path) == '.scss' )
+                      ::Compass::Commands::UpdateProject.new(engine.site.dir, {}).perform
+                    else
+                      page = engine.page_by_output_path(path)
+                      pages = []
+                      if ( page )
+                        pages = engine.generate_page_and_dependencies( page )
+                      else
+                        if File.exist? path
+                        # chances are this is an extension or yaml file
+                          pages = engine.run_auto_for_non_page(path)
                         end
-
-                        guard.run_on_modifications(urls)
                       end
+                    end
 
-                      $LOG.info "Regeneration finished." if $LOG.info?
+                    $LOG.info "Regeneration finished." if $LOG.info?
 
-                    else
-                      $LOG.error "Failed to find page from path #{path}"
+                    if ( guard )
+                      urls = pages.map do |p|
+                        @base_url + p.url.to_s
+                      end
+
+                      guard.run_on_modifications(urls)
                     end
 
                   rescue => e

data/lib/awestruct/cli/invoker.rb

@@ -52,7 +52,13 @@ module Awestruct
           invoke_auto()      if ( options.auto )
 
           wait_for_completion()
-          @success = false if ExceptionHelper.build_failed?
+
+          if ExceptionHelper.build_failed? || @success == false
+            @success = false
+            false
+          else
+            true
+          end
         rescue
           @success = false
           false

data/lib/awestruct/cli/manifest.rb

@@ -8,10 +8,10 @@ require 'compass/commands/registry'
 require 'compass/commands/create_project'
 require 'compass/installers/bare_installer'
 
-module Compass::AppIntegration::StandAlone
+module ::Compass::AppIntegration::StandAlone
 end
 
-class Compass::AppIntegration::StandAlone::Installer
+class ::Compass::AppIntegration::StandAlone::Installer
   def write_configuration_files(config_file = nil)
     # no!
   end
@@ -74,13 +74,15 @@ module Awestruct
 
       def perform(dir)
         parent.perform(dir) if parent
-        steps.each do |step|
-          begin
+        begin
+          steps.each do |step|
             step.perform(dir)
-          rescue => e
-            ExceptionHelper.log_error e
-            ExceptionHelper.log_backtrace e
           end
+          true
+        rescue => e
+          ExceptionHelper.log_error e
+          ExceptionHelper.log_backtrace e
+          false
         end
       end
 
@@ -88,6 +90,7 @@ module Awestruct
         steps.each do |step|
           begin
             step.unperform(dir)
+            true
           rescue => e
             ExceptionHelper.log_error e
             ExceptionHelper.log_backtrace e
@@ -235,11 +238,11 @@ module Awestruct
         end
 
         def perform(dir)
-          Compass.configuration.sass_dir = 'stylesheets'
-          Compass.configuration.css_dir = '_site/stylesheets'
-          Compass.configuration.images_dir = 'images'
+          ::Compass.configuration.sass_dir = 'stylesheets'
+          ::Compass.configuration.css_dir = '_site/stylesheets'
+          ::Compass.configuration.images_dir = 'images'
 
-          cmd = Compass::Commands::CreateProject.new(dir, {
+          cmd = ::Compass::Commands::CreateProject.new(dir, {
               :framework => @framework,
               :project_type => :stand_alone,
               :css_dir => '_site/stylesheets',

data/lib/awestruct/cli/options.rb

@@ -124,6 +124,7 @@ module Awestruct
           #end
           opts.on( '--source-dir DIR', 'Location of sources (default: .' ) do |source_dir|
             self.source_dir = File.expand_path source_dir
+            self.output_dir = File.expand_path File.join(self.source_dir, '_site')
           end
 
           opts.on( '--output-dir DIR', 'Location to output generated site (default: _site' ) do |output_dir|

data/lib/awestruct/engine.rb

@@ -15,6 +15,8 @@ require 'set'
 
 require 'compass'
 
+require 'pry'
+
 class OpenStruct
   def inspect
     "OpenStruct{...}"
@@ -356,17 +358,13 @@ module Awestruct
 
       $LOG.debug "Starting regeneration of content dependent pages:" if regen_pages.size > 0 && $LOG.debug?
 
-      old_site_pages = site.pages
-      site.pages = regen_pages
-
       @pipeline = Pipeline.new
       load_yamls
       load_pipeline
       execute_pipeline
-      @site.pages = old_site_pages
 
       regen_pages.each do |p|
-        puts "Regenerating page #{p.output_path}"
+        puts "Regenerating page #{p.output_path}" unless config.quiet
         generate_page_internal(p)
         pages << p
       end
@@ -374,11 +372,25 @@ module Awestruct
       pages
     end
 
+    def run_auto_for_non_page(file)
+      if File.extname(file) == '.rb'
+        load file
+      end
+      @pipeline = Pipeline.new
+      load_yamls
+      load_pipeline
+      execute_pipeline
+      site.pages.each do |p|
+        generate_page_internal(p)
+      end
+      site.pages
+    end
+
     def generate_page_internal(p)
-        unless ( p.output_path.nil? || p.__is_layout )
-          generated_path = File.join( site.config.output_dir, p.output_path )
-          generate_page( p, generated_path )
-        end
+      unless ( p.output_path.nil? || p.__is_layout || !p.stale_output?(p.output_path) )
+        generated_path = File.join( site.config.output_dir, p.output_path )
+        generate_page( p, generated_path )
+      end
     end
 
     ####

data/lib/awestruct/extensions/google_analytics.rb

@@ -4,6 +4,8 @@
 #  account: UA-something
 #  anonymizeIp: true
 #  bounceTime: 15
+#  demographics: true
+#  linkAttribution: true
 #
 # of course only "account" is required
 
@@ -27,9 +29,18 @@ module Awestruct
         html += %Q(_gaq.push(['_gat._anonymizeIp']);\n) if options[:anonymizeIp]
         html += %Q(_gaq.push(['_trackPageview']);\n)
         html += %Q(setTimeout("_gaq.push(['_trackEvent','#{options[:bounceTime]}_seconds','read'])", #{options[:bounceTime]}000);\n) if options[:bounceTime]
+        html += %Q(_gaq.push(['_require', 'inpage_linkid', '//www.google-analytics.com/plugins/ga/inpage_linkid.js']);\n) if options[:linkAttribution]
         html += %Q[(function() {\n]
         html += %Q( var ga = document.createElement('script'); ga.type = 'text/javascript'; ga.async = true;\n)
-        html += %Q( ga.src = ('https:' == document.location.protocol ? 'https://ssl' : 'http://www') + '.google-analytics.com/ga.js';\n)
+
+
+        if options[:demographics]
+          html += %Q( ga.src = ('https:' == document.location.protocol ? 'https://' : 'http://') + 'stats.g.doubleclick.net/dc.js';\n)
+        else
+          html += %Q( ga.src = ('https:' == document.location.protocol ? 'https://ssl' : 'http://www') + '.google-analytics.com/ga.js';\n)
+        end
+
+
         html += %Q( var s = document.getElementsByTagName('script')[0]; s.parentNode.insertBefore(ga, s);\n)
         html += %Q[})();\n</script>\n]
         html
@@ -48,6 +59,8 @@ module Awestruct
         html += %Q(ga('create', '#{options[:account]}', 'auto');\n)
         html += %Q(ga('send', 'pageview');\n)
         html += %Q(ga('set', 'anonymizeIp', true);\n) if options[:anonymizeIp]
+        html += %Q(ga('require', 'displayfeatures');\n) if options[:demographics]
+        html += %Q(ga('require', 'linkid', 'linkid.js');\n) if options[:linkAttribution]
         html += %Q(setTimeout("ga('send', 'event', 'read', '#{options[:bounceTime]} seconds')", #{options[:bounceTime]}000);\n) if options[:bounceTime]
         html += %Q(\n)
         html += %Q(</script>\n)

data/lib/awestruct/handler_chains.rb

@@ -18,8 +18,6 @@ module Awestruct
       Awestruct::Handlers::RedirectHandler::CHAIN,
       Awestruct::Handlers::RestructuredtextHandler::CHAIN,
       Awestruct::Handlers::JavascriptHandler::CHAIN,
-      # TC: shouldn't the asciidoctor be covered by the tilt handler?
-      # JP: We have some additional asciidoctor integration that the tilt handler doesn't handle (yet, working on it)
       Awestruct::Handlers::AsciidoctorHandler::CHAIN,
       Awestruct::Handlers::TiltHandler::NON_INTERPOLATION_CHAIN,
       Awestruct::Handlers::TiltHandler::INTERPOLATION_CHAIN,

data/lib/awestruct/handlers/base_tilt_handler.rb

@@ -14,10 +14,10 @@ module Awestruct
       def match(path)
         matcher = ::Tilt[File.basename(path)]
         if matcher.nil?
-          $LOG.warn(%(Copying #{path} to generated site without processing; could not load engine for type))
+	  $LOG.warn(%(Copying #{path}))
           return false
         end
-        
+
         # We have our own extra integration with Asciidoctor
         if matcher.name.include? 'Asciidoctor'
           return false
@@ -141,9 +141,9 @@ module Awestruct
         rescue Exception => 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." 
+	    ExceptionHelper.log_message "An error during rendering layout file #{File.join site.dir, error_page.source_path} occurred."
           else
-            ExceptionHelper.log_message "An error during rendering #{File.join site.dir, error_page.source_path} occurred." 
+	    ExceptionHelper.log_message "An error during rendering #{File.join site.dir, error_page.source_path} occurred."
           end
           ExceptionHelper.log_message "Please see #{File.join site.dir, error_page.output_path} for more information"
           return ExceptionHelper.html_error_report e, error_page.source_path

data/lib/awestruct/page.rb

@@ -94,10 +94,16 @@ module Awestruct
       return true if ! File.exist?( output_path )
       return true if input_mtime > File.mtime( output_path )
       return true if stale?
-      # TODO: Add stale callback and execute it
+      return true if @stale_output_callback && @stale_output_callback.call(self)
       false
     end
 
+    # Define a stale check specific for this page. The parameter is expected
+    # to be a lambda or proc and is called with self as the argument.
+    def stale_output_callback= code
+      @stale_output_callback = block
+    end
+
     def input_mtime
       handler.input_mtime( self )
     end

data/lib/awestruct/version.rb

@@ -1,3 +1,3 @@
 module Awestruct
-  VERSION = '0.5.4.2'
+  VERSION = '0.5.5'
 end

data/spec/awestruct/cli/init_spec.rb

@@ -0,0 +1,18 @@
+require 'spec_helper'
+require 'awestruct/cli/init'
+require 'logger'
+
+describe Awestruct::CLI::Init do
+  before(:each) do
+    FileUtils.mkdir_p 'spec/support/clean_init'
+  end
+
+  after(:each) do
+    FileUtils.rm_rf 'spec/support/clean_init'
+  end
+
+  it "should not fail during init" do 
+    init = Awestruct::CLI::Init.new('spec/support/clean_init', 'compass', true)
+    expect(init.run).to eql true
+  end
+end

data/spec/awestruct/cli/invoker_spec.rb

@@ -1,7 +1,15 @@
-
+require 'spec_helper'
+require 'fileutils'
 require 'awestruct/cli/invoker'
 
 describe Awestruct::CLI::Invoker do
+  before(:each) do
+    FileUtils.mkdir_p 'spec/support/clean_init'
+  end
+
+  after(:each) do
+    FileUtils.rm_rf 'spec/support/clean_init'
+  end
 
   it "should invoke generation by default" do
     invoker = Awestruct::CLI::Invoker.new(%w(--source-dir spec/support/test-config/))
@@ -61,7 +69,7 @@ describe Awestruct::CLI::Invoker do
     invoker.should_not_receive( :invoke_auto )
     invoker.should_not_receive( :invoke_server )
     invoker.invoke!
-  end
+  end 
 
   it "should return false on failure" do
     require 'awestruct/cli/generate'

data/spec/awestruct/cli/options_spec.rb

@@ -101,6 +101,12 @@ describe Awestruct::CLI::Options do
       result.source_dir.should eql '/tmp'
       result.output_dir.should eql '/tmp/new-site'
     end
+
+    it 'by default, output_dir should be "_site" under source_dir' do
+      result = Awestruct::CLI::Options.parse!(%w(--source-dir /tmp))
+      result.source_dir.should eql '/tmp'
+      result.output_dir.should eql '/tmp/_site' 
+    end
   end
 
 end

data/spec/awestruct/handlers/file_handler_spec.rb

@@ -3,15 +3,26 @@ require 'hashery'
 require 'awestruct/handlers/file_handler'
 
 describe Awestruct::Handlers::FileHandler do
+  class TestTransformer
+    def transform(site, page, rendered)
+      rendered.gsub( /howdy/, 'adios' )
+    end
+  end 
 
   before :all do
     @site = Hashery::OpenCascade[ { :encoding=>false, :dir=>Pathname.new( test_data_dir '' )}]
+    @site.engine = Hashery::OpenCascade[]
+  end
+
+  before :each do
+    @filename = Pathname.new( test_data_dir 'simple-file.txt' )
+    @handler = Awestruct::Handlers::FileHandler.new( @site, @filename )
+    @page = Awestruct::Page.new( @site, @handler )
+    @site.engine.pipeline = Awestruct::Pipeline.new
   end
 
   it "should be able to read a valid absolute file handler" do
-    filename = Pathname.new( test_data_dir 'simple-file.txt' )
-    handler = Awestruct::Handlers::FileHandler.new( @site, filename )
-    handler.raw_content.strip.should == 'howdy'
+    @handler.raw_content.strip.should == 'howdy'
   end
 
   it "should be able to read a valid relative file handler" do
@@ -22,35 +33,44 @@ describe Awestruct::Handlers::FileHandler do
   end
 
   it "should be stale before being read" do
-    filename = Pathname.new( test_data_dir 'simple-file.txt' )
-    handler = Awestruct::Handlers::FileHandler.new( @site, filename )
-    handler.should be_stale
+    @handler.should be_stale
   end
 
   it "should not be stale after being read" do
-    filename = Pathname.new( test_data_dir 'simple-file.txt' )
-    handler = Awestruct::Handlers::FileHandler.new( @site, filename )
-    handler.raw_content.strip.should == 'howdy'
-    handler.should_not be_stale
+    @handler.raw_content.strip.should == 'howdy'
+    @handler.should_not be_stale
   end
 
   it "should be stale if touched after being read" do
-    filename = Pathname.new( test_data_dir 'simple-file.txt' )
-    handler = Awestruct::Handlers::FileHandler.new( @site, filename )
-    handler.raw_content.strip.should == 'howdy'
-    handler.should_not be_stale
+    @handler.raw_content.strip.should == 'howdy'
+    @handler.should_not be_stale
     sleep(1)
-    FileUtils.touch( filename )
-    handler.should be_stale
+    FileUtils.touch( @filename )
+    @handler.should be_stale
   end
 
   it "should provide reasonable paths" do
-    filename = Pathname.new( test_data_dir 'simple-file.txt' )
-    handler = Awestruct::Handlers::FileHandler.new( @site, filename )
-    handler.relative_source_path.should == '/simple-file.txt'
-    handler.output_filename.should == 'simple-file.txt'
-    handler.output_extension.should == '.txt'
-    handler.output_path.should == '/simple-file.txt'
+    @handler.relative_source_path.should == '/simple-file.txt'
+    @handler.output_filename.should == 'simple-file.txt'
+    @handler.output_extension.should == '.txt'
+    @handler.output_path.should == '/simple-file.txt'
+  end
+
+  it "should be able to create an appropriate context" do
+    context = @page.create_context
+    context.site.should == @site
+    context.page.should == @page
+    context.content.should == ''
+  end
+
+  it "should allow relative_source_path to be assignable" do
+    @page.relative_source_path = '/taco'
+    @page.relative_source_path.should == '/taco'
+  end
+
+  it "should not apply transformers, even if present" do
+     @site.engine.pipeline.transformer TestTransformer.new
+     @page.rendered_content.strip.should == 'howdy'
   end
 
 end

data/spec/awestruct/handlers/tilt_handler_spec.rb

@@ -113,7 +113,7 @@ describe Awestruct::Handlers::TiltHandler do
       @site.dir = Pathname.new( test_data_dir 'handlers' ) 
       path = handler_file( "hello.bogus" )
       expect(Awestruct::Handlers::TiltMatcher.new().match(path)).to be_false
-      expect(log.string).to include('could not load engine for type')
+      expect(log.string).to include('Copying')
 
       # we don't even want to process a file if we cannot load its Tilt template
       #file_handler = Awestruct::Handlers::FileHandler.new( @site, path )

data/spec/{page_loader_spec.rb → awestruct/page_loader_spec.rb}

@@ -60,4 +60,37 @@ describe Awestruct::PageLoader do
 
   end
 
+  context 'with layouts' do
+    before :each do
+      @opts = Awestruct::CLI::Options.new
+      @opts.source_dir = test_data_dir 'page-loader' 
+      @config = Awestruct::Config.new( @opts )
+      @engine = Awestruct::Engine.new
+      @engine.pipeline.handler_chains << :defaults
+      @site   = Awestruct::Site.new( @engine, @config )
+      @loader = Awestruct::PageLoader.new( @site, :layouts )
+    end
+
+    it "should be able to load a site layout" do
+      page = @loader.load_page( File.join( @config.dir, "_layouts", "layout-one.md" ) )
+      page.should_not be_nil
+      page.handler.to_chain.collect{|e| e.class}.should be_include Awestruct::Handlers::TiltHandler
+      page.relative_source_path.to_s.should == "/_layouts/layout-one.md" 
+    end
+
+    it "should be able to load all site layouts" do
+      @loader.load_all
+      @site.layouts.size.should == 2
+
+      @site.layouts.sort!{|l,r| l.relative_source_path <=> r.relative_source_path }
+
+      @site.layouts[0].relative_source_path.should == '/_layouts/layout-one.md'
+      @site.layouts[0].output_path.should          == '/_layouts/layout-one.html'
+
+      @site.layouts[1].relative_source_path.should == '/_layouts/layout-two.html.haml'
+      @site.layouts[1].output_path.should          == '/_layouts/layout-two.html'
+    end
+
+  end
+
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: awestruct
 version: !ruby/object:Gem::Version
-  version: 0.5.4.2
+  version: 0.5.5
 platform: ruby
 authors:
 - Bob McWhirter
@@ -13,7 +13,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-04-09 00:00:00.000000000 Z
+date: 2014-04-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: haml
@@ -362,12 +362,21 @@ files:
 - man/awestruct.1
 - man/awestruct.adoc
 - spec/awestruct/astruct_spec.rb
+- spec/awestruct/cli/init_spec.rb
 - spec/awestruct/cli/invoker_spec.rb
 - spec/awestruct/cli/options_spec.rb
+- spec/awestruct/config_spec.rb
+- spec/awestruct/context_helper_spec.rb
 - spec/awestruct/deploy/base_deploy_spec.rb
 - spec/awestruct/deploy/deploy_spec.rb
 - spec/awestruct/deploy/github_pages_deploy_spec.rb
 - spec/awestruct/deploy/rsync_deploy_spec.rb
+- spec/awestruct/engine_spec.rb
+- spec/awestruct/extensions/disqus_spec.rb
+- spec/awestruct/extensions/minify_spec.rb
+- spec/awestruct/extensions/posts_spec.rb
+- spec/awestruct/handler_chain_spec.rb
+- spec/awestruct/handler_chains_spec.rb
 - spec/awestruct/handlers/asciidoc_handler_spec.rb
 - spec/awestruct/handlers/coffeescript_handler_spec.rb
 - spec/awestruct/handlers/erb_handler_spec.rb
@@ -390,21 +399,11 @@ files:
 - spec/awestruct/handlers/textile_handler_spec.rb
 - spec/awestruct/handlers/tilt_handler_spec.rb
 - spec/awestruct/handlers/yaml_handler_spec.rb
+- spec/awestruct/layouts_spec.rb
+- spec/awestruct/page_loader_spec.rb
+- spec/awestruct/pipeline_spec.rb
+- spec/awestruct/rack/app_spec.rb
 - spec/awestruct/scm/git_spec.rb
-- spec/config_spec.rb
-- spec/context_helper_spec.rb
-- spec/disqus_spec.rb
-- spec/engine_spec.rb
-- spec/handler_chain_spec.rb
-- spec/handler_chains_spec.rb
-- spec/layouts_spec.rb
-- spec/minify_spec.rb
-- spec/page_loader_spec.rb
-- spec/page_loader_spec_for_layouts.rb
-- spec/page_spec.rb
-- spec/pipeline_spec.rb
-- spec/posts_archive_spec.rb
-- spec/server_spec.rb
 - spec/spec_helper.rb
 - spec/support/awestruct_setup.rb
 - spec/support/emmet_matchers.rb
@@ -527,12 +526,21 @@ specification_version: 4
 summary: Static site baking and publishing tool
 test_files:
 - spec/awestruct/astruct_spec.rb
+- spec/awestruct/cli/init_spec.rb
 - spec/awestruct/cli/invoker_spec.rb
 - spec/awestruct/cli/options_spec.rb
+- spec/awestruct/config_spec.rb
+- spec/awestruct/context_helper_spec.rb
 - spec/awestruct/deploy/base_deploy_spec.rb
 - spec/awestruct/deploy/deploy_spec.rb
 - spec/awestruct/deploy/github_pages_deploy_spec.rb
 - spec/awestruct/deploy/rsync_deploy_spec.rb
+- spec/awestruct/engine_spec.rb
+- spec/awestruct/extensions/disqus_spec.rb
+- spec/awestruct/extensions/minify_spec.rb
+- spec/awestruct/extensions/posts_spec.rb
+- spec/awestruct/handler_chain_spec.rb
+- spec/awestruct/handler_chains_spec.rb
 - spec/awestruct/handlers/asciidoc_handler_spec.rb
 - spec/awestruct/handlers/coffeescript_handler_spec.rb
 - spec/awestruct/handlers/erb_handler_spec.rb
@@ -555,17 +563,8 @@ test_files:
 - spec/awestruct/handlers/textile_handler_spec.rb
 - spec/awestruct/handlers/tilt_handler_spec.rb
 - spec/awestruct/handlers/yaml_handler_spec.rb
+- spec/awestruct/layouts_spec.rb
+- spec/awestruct/page_loader_spec.rb
+- spec/awestruct/pipeline_spec.rb
+- spec/awestruct/rack/app_spec.rb
 - spec/awestruct/scm/git_spec.rb
-- spec/config_spec.rb
-- spec/context_helper_spec.rb
-- spec/disqus_spec.rb
-- spec/engine_spec.rb
-- spec/handler_chain_spec.rb
-- spec/handler_chains_spec.rb
-- spec/layouts_spec.rb
-- spec/minify_spec.rb
-- spec/page_loader_spec.rb
-- spec/page_spec.rb
-- spec/pipeline_spec.rb
-- spec/posts_archive_spec.rb
-- spec/server_spec.rb

data/spec/page_loader_spec_for_layouts.rb

@@ -1,38 +0,0 @@
-require 'awestruct/engine'
-require 'awestruct/site'
-require 'awestruct/page_loader'
-require 'awestruct/config'
-
-describe Awestruct::PageLoader do
-
-  before :each do
-    @opts = Awestruct::CLI::Options.new
-    @opts.source_dir = test_data_dir 'page-loader' 
-    @config = Awestruct::Config.new( @opts )
-    @engine = Awestruct::Engine.new
-    @engine.pipeline.handler_chains << :defaults
-    @site   = Awestruct::Site.new( @engine, @config )
-    @loader = Awestruct::PageLoader.new( @site, :layouts )
-  end
-
-  it "should be able to load a site layout" do
-    page = @loader.load_page( File.join( @config.dir, "_layouts", "layout-one.md" ) )
-    page.should_not be_nil
-    page.handler.to_chain.collect{|e| e.class}.should be_include Awestruct::Handlers::TiltHandler
-    page.relative_source_path.to_s.should == "/_layouts/layout-one.md" 
-  end
-
-  it "should be able to load all site layouts" do
-    @loader.load_all
-    @site.layouts.size.should == 2
-
-    @site.layouts.sort!{|l,r| l.relative_source_path <=> r.relative_source_path }
-
-    @site.layouts[0].relative_source_path.should == '/_layouts/layout-one.md'
-    @site.layouts[0].output_path.should          == '/_layouts/layout-one.html'
-
-    @site.layouts[1].relative_source_path.should == '/_layouts/layout-two.html.haml'
-    @site.layouts[1].output_path.should          == '/_layouts/layout-two.html'
-  end
-
-end

data/spec/page_spec.rb

@@ -1,66 +0,0 @@
-require 'spec_helper'
-require 'fileutils'
-
-require 'awestruct/page'
-require 'awestruct/pipeline'
-require 'awestruct/handlers/file_handler'
-require 'hashery'
-
-describe Awestruct::Handlers::FileHandler do
-
-  class TestTransformer
-    def transform(site, page, rendered)
-      rendered.gsub( /howdy/, 'adios' )
-    end
-  end
-
-  before :all do
-    @site = Hashery::OpenCascade[ { :encoding=>false } ]
-    @site.engine = Hashery::OpenCascade[]
-  end
-
-  before :each do
-    @filename = Pathname.new( test_data_dir 'simple-file.txt' )
-    @handler = Awestruct::Handlers::FileHandler.new( @site, @filename )
-    @page = Awestruct::Page.new( @site, @handler )
-    @site.engine.pipeline = Awestruct::Pipeline.new
-  end
-
-  it "should be stale before being read" do
-    @page.should be_stale
-  end
-
-  it "should not be stale after being read" do
-    @page.raw_content.strip.should == 'howdy'
-    @page.should_not be_stale
-  end
-
-  it "should be stale if touched after being read" do
-    @page.raw_content.strip.should == 'howdy'
-    @page.should_not be_stale
-    sleep(1)
-    FileUtils.touch( @filename )
-    @page.should be_stale
-  end
-
-  it "should be able to create an appropriate context" do
-    context = @page.create_context
-    context.site.should == @site
-    context.page.should == @page
-    context.content.should == ''
-  end
-
-  it "should allow relative_source_path to be assignable" do
-    @page.relative_source_path.should be_nil
-    @page.relative_source_path = '/taco'
-    @page.relative_source_path.should == '/taco'
-  end
-
-  it "should not apply transformers, even if present" do
-     @site.engine.pipeline.transformer TestTransformer.new
-     @page.rendered_content.strip.should == 'howdy'
-  end
-
-
-end
-