awestruct 0.5.0.cr → 0.5.0

data/lib/awestruct/cli/init.rb

@@ -10,8 +10,9 @@ module Awestruct
         mkdir( '_layouts' )
         mkdir( '_ext' )
         copy_file( '_ext/pipeline.rb', File.join( File.dirname(__FILE__), '/../frameworks/base_pipeline.rb' ) )
+        copy_file( '.awestruct_ignore', File.join( File.dirname(__FILE__), '/../frameworks/base_awestruct_ignore' ) )
+        copy_file( 'Rakefile', File.join( File.dirname(__FILE__), '/../frameworks/base_Rakefile' ) )
         mkdir( 'stylesheets' )
-        touch_file( '.awestruct_ignore' )
       }
 
       def initialize(dir=Dir.pwd,framework='compass',scaffold=true)

data/lib/awestruct/cli/manifest.rb

@@ -20,13 +20,15 @@ class Compass::AppIntegration::StandAlone::Installer
 
       Now you're awestruct!
 
-      To generate your site continuous during development, simply run:
+      To generate and run your site in development mode, execute:
 
         awestruct -d
 
-      and visit your site at
+      or, simply:
 
-        http://localhost:4242/
+        rake
+
+      then visit your site at: http://localhost:4242
 
     END
   end

data/lib/awestruct/config/default-site.yml

@@ -1,3 +1,5 @@
+encoding: UTF-8
+
 content_syntax:
   coffee: coffeescript
   md: markdown

data/lib/awestruct/dependencies.rb

@@ -139,7 +139,13 @@ module Awestruct
 
     def clear
       @dependencies.clear
-      @dependents.each{|d| d.remove_dependent( page ) }
+      @dependents.each do |d| 
+        if (d.instance_of? Awestruct::Dependencies) 
+          d.remove_dependent( page ) 
+        else 
+          d.dependencies.remove_dependent( page ) 
+        end 
+      end
     end
 
     def persist!

data/lib/awestruct/engine.rb

@@ -148,18 +148,19 @@ module Awestruct
 
     def merge_data(existing, new)
       if existing.kind_of? Hash
-        existing.inject({}) do |merged, (k,v)|
+        result = existing.inject({}) do |merged, (k,v)|
           if new.has_key? k
             if v.kind_of? Hash
-              merged[k] = v.merge new[k]
+              merged[k] = merge_data(v, new.delete(k))
             else
-              merged[k] = new[k]
+              merged[k] = new.delete(k)
             end
           else
             merged[k] = v
           end
           merged
         end
+        result.merge new
       else
         new
       end
@@ -244,6 +245,25 @@ module Awestruct
       Compass.configuration.fonts_dir       = 'fonts'
       Compass.configuration.line_comments   = include_line_comments?
       Compass.configuration.output_style    = compress_css?
+
+      # port old style configuration to new Tilt-based configuration
+      # TODO consider deprecating the old config mechanism and move to default-site.yml
+      [:scss, :sass].each do |sass_ext|
+        if !site.key? sass_ext
+          sass_config = {}
+          site[sass_ext] = sass_config
+        else
+          sass_config = site[sass_ext]
+        end
+
+        if !sass_config.has_key?(:line_numbers) || site.profile.eql?('production')
+          sass_config[:line_numbers] = Compass.configuration.line_comments
+        end
+
+        if !sass_config.has_key?(:style) || site.profile.eql?('production')
+          sass_config[:style] = Compass.configuration.output_style
+        end
+      end
     end
 
     def include_line_comments?

data/lib/awestruct/extensions/pipeline.rb

@@ -3,7 +3,9 @@ Dir[ File.join( File.dirname(__FILE__), '*.rb' ) ].each do |f|
   begin
     require f
   rescue LoadError => e
-    puts "WARNING: Missing required dependency to activate optional built in extension #{File.basename(f)} -> #{e}" 
+    puts "WARNING: Missing required dependency to activate optional built in extension #{File.basename(f)}\n  #{e}"
+  rescue StandardError => e
+    puts "WARNING: Missing runtime configuration to activate optional built in extension #{File.basename(f)}\n  #{e}"
   end
 end
 

data/lib/awestruct/extensions/posts.rb

@@ -9,7 +9,7 @@ module Awestruct
         @archive_path     = archive_path
         @path_prefix      = path_prefix
         @assign_to        = assign_to
-        @default_layout   = opts[:default_layout] || nil
+        @default_layout   = opts[:default_layout] || 'posts'
       end
 
       def execute(site)

data/lib/awestruct/handlers/asciidoctor_handler.rb

@@ -55,6 +55,9 @@ module Awestruct
           hash[k.to_s] = v if not k.to_s.start_with?('__') and types.detect { |t| v.kind_of? t }
           hash
         end)
+        if with_layouts && !context.page.layout
+          @front_matter['header_footer'] = true
+        end
         super
       end
 
@@ -67,6 +70,9 @@ module Awestruct
         end
         opts[:attributes]['awestruct'] = true
         opts[:attributes]['awestruct-version'] = Awestruct::VERSION
+        if @front_matter['header_footer']
+          opts[:header_footer] = true
+        end
         opts
       end
 

data/lib/awestruct/handlers/base_tilt_handler.rb

@@ -55,9 +55,9 @@ module Awestruct
       def content_syntax
         # Check configuration for override, else convert extension to sym
         extension = input_extension[1..-1]
-        if !site[:content_syntax].nil?
+        if ( !site[:content_syntax].nil? && !site[:content_syntax].empty?) 
           syntax = site[:content_syntax][extension]
-          return syntax.to_sym unless syntax.nil?
+          return syntax.to_sym unless syntax.nil? or syntax.empty?
         end
 
         return extension.to_sym

data/lib/awestruct/handlers/front_matter_handler.rb

@@ -42,7 +42,10 @@ module Awestruct
         return if ( @parsed_parts && ! delegate.stale? )
 
         full_content = delegate.raw_content
-        full_content.force_encoding(site.encoding) if site.encoding
+
+        #if force_encoding is supported then set to charset defined in site config
+        full_content.force_encoding(site.encoding) if (full_content.respond_to?(:force_encoding) && site.encoding)
+
         yaml_content = ''
 
         dash_lines = 0

data/lib/awestruct/handlers/redirect_handler.rb

@@ -38,7 +38,12 @@ module Awestruct
 
       def rendered_content(context, with_layouts=false)
         url = delegate.rendered_content( context, with_layouts ).strip
-        %{<head><meta http-equiv="location" content="URL=#{url}" /></head>}
+        # should we auto-qualify the URL?
+        # they can use #{site.base_url}/path currently
+        #if url.start_with? '/'
+        #  url = File.join(@site.base_url, url)
+        #end
+        %{<!DOCTYPE html><html><head><meta http-equiv="refresh" content="0;url=#{url}"></head></html>}
       end
 
     end

data/lib/awestruct/page.rb

@@ -146,7 +146,7 @@ module Awestruct
           end
         end
         lineinfo = lineno ? " at line #{lineno}" : ''
-        raise StandardError, %(Failed to render #{self.relative_source_path}#{lineinfo}\n#{e.class}: #{e.message.rstrip}), e.backtrace.join("\n")
+        raise StandardError, "ERROR: Failed to render: #{self.relative_source_path}#{lineinfo}\n#{e.class}: #{e.message.rstrip}\n" + e.backtrace.join("\n")
       end
 
       if context.site.config.track_dependencies

data/lib/awestruct/rack/app.rb

@@ -14,8 +14,8 @@ module Awestruct
         if ( File.directory?( fs_path ) )
           if ( ! ( path =~ %r(/$) ) )
             return [ 301,
-                     { :location=>path + '/' },
-                     "Redirecting to: #{path}" ]
+                     { 'location'=>File.join(path, '') },
+                     ["Redirecting to: #{path}"] ]
           elsif ( File.exist?( File.join( fs_path, 'index.html' ) ) )
             fs_path = File.join( fs_path, 'index.html' )
           end

data/lib/awestruct/version.rb

@@ -1,4 +1,4 @@
 
 module Awestruct
-  VERSION='0.5.0.cr'
+  VERSION='0.5.0'
 end

data/spec/engine_spec.rb

@@ -12,6 +12,8 @@ describe Awestruct::Engine do
     engine.load_default_site_yaml
 
     engine.site.asciidoctor.backend.should == 'html5'
+    engine.site.asciidoctor.safe.should == 1
+    engine.site.asciidoctor.attributes['imagesdir'].should == '/images'
   end
 
   it "should be able to override default with site" do
@@ -21,21 +23,28 @@ describe Awestruct::Engine do
     engine.load_default_site_yaml
     engine.load_site_yaml( 'development' )
 
-    engine.site.asciidoctor.attributes['backend'].should == 'html4'
+    engine.site.asciidoctor.safe.should == 0
+    engine.site.asciidoctor.eruby.should == 'erubis'
+    engine.site.asciidoctor.attributes['imagesdir'].should == '/assets/images'
+    engine.site.asciidoctor.attributes['idprefix'].should == ''
   end
 
   it "should be able to load site.yml with the correct profile" do
     config = Awestruct::Config.new( File.dirname(__FILE__) + '/test-data/engine' )
 
     engine = Awestruct::Engine.new(config)
+    engine.load_default_site_yaml
     engine.load_site_yaml( 'development' )
     engine.site.cook.should == 'microwave'
     engine.site.title.should == 'Awestruction!'
 
     engine = Awestruct::Engine.new(config)
+    engine.load_default_site_yaml
     engine.load_site_yaml( 'production' )
     engine.site.cook.should == 'oven'
     engine.site.title.should == 'Awestruction!'
+    engine.site.asciidoctor.eruby.should == 'erb'
+    engine.site.asciidoctor.attributes['imagesdir'].should == '/img'
   end
 
   it "should be able to load arbitrary _config/*.yml files" do
@@ -56,26 +65,21 @@ describe Awestruct::Engine do
     engine.site.other.tags.should == [ 'a', 'b', 'c' ]
   end
 
-  it "should exclude line comments in compass by default in production mode" do
-    compass = compass_config
-    config = Awestruct::Config.new( File.dirname(__FILE__) + '/test-data/engine' )
-    engine = Awestruct::Engine.new(config)
-    engine.load_site_yaml( 'production' )
-    Compass.stub(:configuration).and_return(compass)
-    compass.should_receive(:line_comments=).with(false)
-    compass.should_receive(:output_style=).with(:compressed)
-    engine.configure_compass
-  end
-
-  it "should exclude minify in compass by default in production mode" do
+  it "should exclude line comments and minify in compass by default in production mode" do
     compass = compass_config
     config = Awestruct::Config.new( File.dirname(__FILE__) + '/test-data/engine' )
     engine = Awestruct::Engine.new(config)
     engine.load_site_yaml( 'production' )
     Compass.stub(:configuration).and_return(compass)
     compass.should_receive(:line_comments=).with(false)
+    compass.stub(:line_comments).and_return(false)
     compass.should_receive(:output_style=).with(:compressed)
+    compass.stub(:output_style).and_return(:compressed)
     engine.configure_compass
+    engine.site.sass.line_numbers.should == false
+    engine.site.sass.style.should == :compressed
+    engine.site.scss.line_numbers.should == false
+    engine.site.scss.style.should == :compressed
   end
 
   it "should include line comments in compass by default in development mode" do
@@ -85,19 +89,31 @@ describe Awestruct::Engine do
     engine.load_site_yaml( 'development' )
     Compass.stub(:configuration).and_return(compass)
     compass.should_receive(:line_comments=).with(true)
+    compass.stub(:line_comments).and_return(true)
     compass.should_receive(:output_style=).with(:expanded)
+    compass.stub(:output_style).and_return(:expanded)
     engine.configure_compass
+    engine.site.sass.line_numbers.should == true
+    engine.site.sass.style.should == :expanded
+    engine.site.scss.line_numbers.should == true
+    engine.site.scss.style.should == :expanded
   end
 
-  it "should accept site.compass_line_comments to configure behavior" do
+  it "wip should accept site.compass_line_comments and site.compass_output_style to configure behavior" do
     compass = compass_config
     config = Awestruct::Config.new( File.dirname(__FILE__) + '/test-data/engine' )
     engine = Awestruct::Engine.new(config)
     engine.load_site_yaml( 'staging' )
     Compass.stub(:configuration).and_return(compass)
     compass.should_receive(:line_comments=).with(false)
-    compass.should_receive(:output_style=).with(:expanded)
+    compass.stub(:line_comments).and_return(false)
+    compass.should_receive(:output_style=).with(:compact)
+    compass.stub(:output_style).and_return(:compact)
     engine.configure_compass
+    engine.site.sass.line_numbers.should == false
+    engine.site.sass.style.should == :compact
+    engine.site.scss.line_numbers.should == false
+    engine.site.scss.style.should == :compact
   end
 
 end

data/spec/file_handler_spec.rb

@@ -1,11 +1,11 @@
 require 'fileutils'
-
+require 'hashery'
 require 'awestruct/handlers/file_handler'
 
 describe Awestruct::Handlers::FileHandler do
 
   before :all do
-    @site = OpenCascade.new :encoding=>false, :dir=>Pathname.new( File.dirname( __FILE__ ) + '/test-data' )
+    @site = Hashery::OpenCascade[ { :encoding=>false, :dir=>Pathname.new( File.dirname( __FILE__ ) + '/test-data' ) } ]
   end
 
   it "should be able to read a valid absolute file handler" do

data/spec/front_matter_handler_spec.rb

@@ -2,11 +2,12 @@ require 'fileutils'
 
 require 'awestruct/handlers/file_handler'
 require 'awestruct/handlers/front_matter_handler'
+require 'hashery'
 
 describe Awestruct::Handlers::FrontMatterHandler do
 
   before :all do
-    @site = OpenCascade.new :encoding=>false
+    @site = Hashery::OpenCascade[ {  :encoding=>false } ]
   end
 
   before :each do

data/spec/handler_chain_spec.rb

@@ -1,7 +1,6 @@
 
 require 'awestruct/handler_chain'
-
-require 'hashery/open_cascade'
+require 'hashery'
 
 describe Awestruct::HandlerChain do
 
@@ -18,7 +17,7 @@ describe Awestruct::HandlerChain do
 
 
   before :all do
-    @site = OpenCascade.new :encoding=>false
+    @site = Hashery::OpenCascade[ { :encoding => false } ]
   end
 
   it "should use a regexp to match" do

data/spec/interpolation_handler_spec.rb

@@ -1,17 +1,17 @@
-require 'hashery/open_cascade'
+require 'hashery'
 require 'awestruct/handlers/string_handler'
 require 'awestruct/handlers/interpolation_handler'
 
 describe Awestruct::Handlers::InterpolationHandler do
 
   before :all do
-    @site = OpenCascade.new :encoding=>false
+    @site = Hashery::OpenCascade[ { :encoding=>false } ]
   end
 
   it "should interpolate content when rendered" do 
     handler = build_handler( 'This is #{cheese}' )
 
-    context = OpenCascade.new :cheese=>'swiss' 
+    context = Hashery::OpenCascade[ { :cheese=>'swiss' } ] 
     content = handler.rendered_content( context )
     content.should == 'This is swiss'
   end
@@ -20,7 +20,7 @@ describe Awestruct::Handlers::InterpolationHandler do
     if RUBY_VERSION >= '1.9'
       input = %q(url = url.replace(/\/?#$/, '');)
       handler = build_handler( input )
-      content = handler.rendered_content( OpenCascade.new )
+      content = handler.rendered_content( Hashery::OpenCascade[] )
       content.should == input
     else
       pending "Cannot yet handle this test case with ruby 1.8"

data/spec/layout_handler_spec.rb

@@ -7,14 +7,14 @@ require 'awestruct/site'
 require 'awestruct/page'
 require 'awestruct/page_loader'
 
-require 'hashery/open_cascade'
+require 'hashery'
 require 'ostruct'
 
 describe Awestruct::Handlers::LayoutHandler do
 
 
   before :all do
-    @config = OpenCascade.new( :dir=>Pathname.new( File.dirname(__FILE__) + '/test-data/handlers' ) )
+    @config = Hashery::OpenCascade[ { :dir=>Pathname.new( File.dirname(__FILE__) + '/test-data/handlers' ) } ]
     @engine = Awestruct::Engine.new
     @site = Awestruct::Site.new( @engine, @config )
     layout_loader = Awestruct::PageLoader.new( @site, :layouts )

data/spec/layouts_spec.rb

@@ -4,13 +4,13 @@ require 'awestruct/page'
 require 'awestruct/handlers/file_handler'
 require 'awestruct/handlers/tilt_handler'
 
-require 'hashery/open_cascade'
+require 'hashery'
 
 describe Awestruct::Layouts do
 
   it "should be able to index layouts by simple name and output extension" do
     dir = Pathname.new( File.dirname( __FILE__ ) + '/test-data/handlers' )
-    site = OpenCascade.new( :dir=>dir )
+    site = Hashery::OpenCascade[ { :dir=>dir } ]
     file_handler = Awestruct::Handlers::FileHandler.new( site, File.join( dir, 'haml-layout.html.haml' ) )
     haml_handler = Awestruct::Handlers::TiltHandler.new( site, file_handler )
     page = Awestruct::Page.new( nil, haml_handler )

data/spec/page_delegating_handler_spec.rb

@@ -3,11 +3,12 @@ require 'awestruct/engine'
 require 'awestruct/site'
 require 'awestruct/page'
 require 'awestruct/handlers/page_delegating_handler'
+require 'hashery'
 
 describe Awestruct::Handlers::PageDelegatingHandler do
 
   before :all do
-    @config = OpenCascade.new( :dir=>Pathname.new( File.dirname(__FILE__) + '/test-data/handlers' ) )
+    @config = Hashery::OpenCascade[ { :dir=>Pathname.new( File.dirname(__FILE__) + '/test-data/handlers' ) } ] 
     @engine = Awestruct::Engine.new( @config )
     @site = @engine.site
     layout_loader = Awestruct::PageLoader.new( @site, :layouts )

data/spec/page_spec.rb

@@ -4,6 +4,7 @@ require 'fileutils'
 require 'awestruct/page'
 require 'awestruct/pipeline'
 require 'awestruct/handlers/file_handler'
+require 'hashery'
 
 describe Awestruct::Handlers::FileHandler do
 
@@ -14,8 +15,8 @@ describe Awestruct::Handlers::FileHandler do
   end
 
   before :all do
-    @site = OpenCascade.new :encoding=>false
-    @site.engine = OpenCascade.new
+    @site = Hashery::OpenCascade[ { :encoding=>false } ]
+    @site.engine = Hashery::OpenCascade[]
   end
 
   before :each do

data/spec/posts_archive_spec.rb

@@ -1,6 +1,6 @@
 require 'awestruct/extensions/posts'
 require 'awestruct/util/inflector'
-require 'hashery/open_cascade'
+require 'hashery'
 
 describe Awestruct::Extensions::Posts do
 
@@ -14,9 +14,9 @@ describe Awestruct::Extensions::Posts do
     extension.assign_to.should == :posts
   end
 
-  it "should have a nil archive template by default" do
+  it "should have 'posts' as a layout by default" do
     extension = Awestruct::Extensions::Posts.new('/posts', :posts)
-    extension.archive_template.should be_nil
+    extension.default_layout.should eql 'posts' 
   end
 
   it "should have a nil archive template by default" do
@@ -53,7 +53,7 @@ describe Awestruct::Extensions::Posts do
 
   it "should assign default layout if specified to post without layout" do
     extension = Awestruct::Extensions::Posts.new( '/posts', :news, nil, nil, :default_layout => 'post' )
-    site = OpenCascade.new :encoding=>false
+    site = Hashery::OpenCascade[ { :encoding=>false } ]
     page = __create_page( 2012, 8, 9, '/posts/mock-post.md' )
     page.stub(:layout).and_return(nil)
     page.should_receive(:layout=).with('post')

data/spec/redirect_handler_spec.rb

@@ -1,10 +1,10 @@
 require 'spec_helper'
 
 verify = lambda { |output|
-  output.should =~ %r(<head><meta http-equiv="location" content="URL=http://google.com" /></head>)
+  output.should =~ %r(<!DOCTYPE html><html><head><meta http-equiv="refresh" content="0;url=http://google.com"></head></html>)
 }
 verify_with_interpol = lambda { |output|
-  output.should =~ %r(<head><meta http-equiv="location" content="URL=http://bacon.com" /></head>)
+  output.should =~ %r(<!DOCTYPE html><html><head><meta http-equiv="refresh" content="0;url=http://mysite/bacon/"></head></html>)
 }
 
 theories =
@@ -26,7 +26,7 @@ theories =
   ]
 
 describe Awestruct::Handlers::TiltHandler.to_s + "-Redirect" do
-  let(:additional_config) { {:interpolate => true, :crunchy => "bacon"} }
+  let(:additional_config) { {:interpolate => true, :crunchy => 'bacon', :base_url => 'http://mysite' } }
   it_should_behave_like "a handler", theories
 
-end
+end

data/spec/server_spec.rb

@@ -15,6 +15,15 @@ describe Awestruct::Rack::App do
     end
   end
 
+  describe "Directory redirect" do
+    it "should redirect to /" do
+      get('/subdir')
+      last_response.headers['location'].should == '/subdir/'
+      last_response.instance_variable_get('@body').should == ['Redirecting to: /subdir']
+      last_response.body.should == 'Redirecting to: /subdir'
+    end
+  end
+
   describe "CSS media type" do
     it "should return text/css" do
       get('/stylesheets/screen.css')

data/spec/support/shared_handler_example.rb

@@ -2,7 +2,7 @@ require 'awestruct/engine'
 require 'awestruct/config'
 require 'rspec'
 
-require 'hashery/open_cascade'
+require 'hashery'
 
 REQUIRED_VARIABLES = [:page, :simple_name, :syntax, :extension]
 ALL_VARIABLES = REQUIRED_VARIABLES + [:format, :matcher, :unless]
@@ -14,7 +14,7 @@ shared_examples "a handler" do |theories|
   end
 
   def create_context
-    OpenCascade.new :site=>@site
+    Hashery::OpenCascade[ { :site=>@site } ]
   end
 
   describe Awestruct::Handlers do

data/spec/test-data/engine/_config/site.yml

@@ -1,14 +1,21 @@
-
 profiles:
   development:
     cook: microwave
   production:
     cook: oven
+    asciidoctor:
+      :eruby: erb
+      :attributes:
+        imagesdir: /img
   staging:
     compass_line_comments: off
+    compass_output_style: :compact
 
 title: Awestruction!
 
 asciidoctor:
+  :safe: 0
+  :eruby: erubis
   :attributes:
-    backend: html4
+    imagesdir: /assets/images
+    idprefix: ''

data/spec/test-data/handlers/redirect-page.redirect

@@ -1 +1 @@
-http://#{site.crunchy}.com
+#{site.base_url}/#{site.crunchy}/

data/spec/test-data/subdir/index.html

@@ -0,0 +1,10 @@
+<!DOCTYPE html>
+<html lang="en" xmlns="http://www.w3.org/1999/xhtml" xml:lang="en">
+  <head>
+    <title>Sample page</title>
+  </head>
+  <body>
+    <h1>Sample page</h1>
+  </body>
+</html>
+

data/spec/tilt_handler_spec.rb

@@ -3,16 +3,14 @@ require 'awestruct/config'
 require 'awestruct/handlers/file_handler'
 require 'awestruct/handlers/tilt_handler'
 
-require 'hashery/open_cascade'
+require 'hashery'
 
 describe Awestruct::Handlers::TiltHandler do
 
   before do
     dir = Pathname.new( File.dirname(__FILE__) + '/test-data/handlers' ) 
 
-    @site = OpenCascade.new :encoding=>false, 
-                            :dir=>dir,
-                            :config=>Awestruct::Config.new( dir )
+    @site = Hashery::OpenCascade[ { :encoding=>false, :dir=>dir, :config=>Awestruct::Config.new( dir ) } ]
   end
 
   def handler_file(path)
@@ -20,7 +18,7 @@ describe Awestruct::Handlers::TiltHandler do
   end
 
   def create_context
-    OpenCascade.new :site=>@site
+    Hashery::OpenCascade[ { :site=>@site } ]
   end
 
   it "should provide default configuration options from site based on output_extension" do
@@ -57,12 +55,12 @@ describe Awestruct::Handlers::TiltHandler do
     file_handler = Awestruct::Handlers::FileHandler.new( @site, handler_file( "asciidoc-page.asciidoc" ) )
     handler = Awestruct::Handlers::TiltHandler.new( @site, file_handler )
 
-    handler.relative_source_path.should be_nil
-    handler.simple_name.should == 'asciidoc-page'
-    handler.content_syntax.should == :asciidoc
-    handler.output_extension.should == '.html'
-    handler.input_extension.should == '.asciidoc'
-    handler.output_filename.should == 'asciidoc-page.html'
+    handler.relative_source_path.should be_nil 
+    handler.simple_name.should eql 'asciidoc-page'
+    handler.content_syntax.should eql :asciidoc
+    handler.output_extension.should eql '.html'
+    handler.input_extension.should eql '.asciidoc'
+    handler.output_filename.should eql 'asciidoc-page.html'
   end
 
   it "should handle non extension dots in source name" do
@@ -71,11 +69,11 @@ describe Awestruct::Handlers::TiltHandler do
     handler = Awestruct::Handlers::TiltHandler.new( @site, file_handler )
 
     handler.relative_source_path.should be_nil
-    handler.simple_name.should == 'warp-1.0.0.Alpha2'
-    handler.content_syntax.should == :textile
-    handler.output_extension.should == '.html'
-    handler.input_extension.should == '.textile'
-    handler.output_filename.should == 'warp-1.0.0.Alpha2.html'
+    handler.simple_name.should eql 'warp-1.0.0.Alpha2'
+    handler.content_syntax.should eql :textile
+    handler.output_extension.should eql '.html'
+    handler.input_extension.should eql '.textile'
+    handler.output_filename.should eql 'warp-1.0.0.Alpha2.html'
 
   end
 end

data/spec/yaml_handler_spec.rb

@@ -1,12 +1,12 @@
 
-require 'hashery/open_cascade'
+require 'hashery'
 require 'awestruct/handlers/file_handler'
 require 'awestruct/handlers/yaml_handler'
 
 describe Awestruct::Handlers::YamlHandler do
 
   before :all do
-    @site = OpenCascade.new :encoding=>false
+    @site = Hashery::OpenCascade[ { :encoding=>false } ]
   end
 
   it "should provide access to the yaml as front-matter" do 

metadata

@@ -1,16 +1,32 @@
 --- !ruby/object:Gem::Specification
 name: awestruct
 version: !ruby/object:Gem::Version
-  version: 0.5.0.cr
-  prerelease: 6
+  version: 0.5.0
+  prerelease: 
 platform: ruby
 authors:
 - Bob McWhirter and other contributors
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-03-15 00:00:00.000000000 Z
+date: 2013-03-28 00:00:00.000000000 Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  name: haml
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 4.0.1
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 4.0.1
 - !ruby/object:Gem::Dependency
   name: nokogiri
   requirement: !ruby/object:Gem::Requirement
@@ -34,7 +50,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.3.4
+        version: 1.3.6
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -42,7 +58,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.3.4
+        version: 1.3.6
 - !ruby/object:Gem::Dependency
   name: compass
   requirement: !ruby/object:Gem::Requirement
@@ -82,7 +98,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 2.3.0.1
+        version: 2.3.1.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -90,7 +106,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 2.3.0.1
+        version: 2.3.1.0
 - !ruby/object:Gem::Dependency
   name: json
   requirement: !ruby/object:Gem::Requirement
@@ -162,7 +178,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.5.0
+        version: 0.7.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -170,7 +186,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.5.0
+        version: 0.7.3
 - !ruby/object:Gem::Dependency
   name: rack
   requirement: !ruby/object:Gem::Requirement
@@ -307,6 +323,7 @@ files:
 - spec/test-data/front-matter-file-no-front.txt
 - spec/test-data/stylesheets/screen.css
 - spec/test-data/out-of-site/page-three.html.haml
+- spec/test-data/subdir/index.html
 - spec/test-data/handlers/scss-page-include.scss
 - spec/test-data/handlers/haml-layout-two.html.haml
 - spec/test-data/handlers/haml-page.xml.haml
@@ -401,15 +418,18 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 219941319770704534
+      hash: 1113133206677710409
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
-  - - ! '>'
+  - - ! '>='
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
+      segments:
+      - 0
+      hash: 1113133206677710409
 requirements:
-- Any markup languages you are using and it's dependencies
+- Any markup languages you are using and its dependencies
 - If LESS is used, or some other fixes within tilt, it is required to use Bundler
   and the :git ref for the tilt gem
 - Haml and markdown filters are touchy things. Rdiscount works well if you're running