awestruct 0.5.4.beta1 → 0.5.4.rc

data/spec/erb_handler_spec.rb

@@ -27,14 +27,16 @@ theories =
             :simple_name => 'erb-page',
             :syntax => :erb,
             :extension => '.html',
-            :matcher => verify
+            :matcher => verify,
+            :site_overrides => { :crunchy => 'bacon' }
         },
         {
             :page => 'erb-page.xml.erb',
             :simple_name => 'erb-page',
             :syntax => :erb,
             :extension => '.xml',
-            :matcher => verify_with_xml
+            :matcher => verify_with_xml,
+            :site_overrides => { :crunchy => 'bacon' }
         },
         {
             :page => 'erb-utf-page.html.erb',
@@ -46,9 +48,5 @@ theories =
     ]
 
 describe Awestruct::Handlers::TiltHandler.to_s + '-Erb' do
-  def additional_config
-    { :crunchy => 'bacon' }
-  end
   it_should_behave_like 'a handler', theories
-
 end

data/spec/front_matter_handler_spec.rb

@@ -42,6 +42,20 @@ describe Awestruct::Handlers::FrontMatterHandler do
     handler.raw_content.should be_nil
   end
 
+  it 'should not match front matter in the middle of a file' do
+    handler = Awestruct::Handlers::FrontMatterHandler.new( @site, file_input('front-matter-middle.txt') )
+    handler.front_matter.should_not be_nil
+    handler.front_matter.should be_empty
+    handler.raw_content.should_not be_nil
+  end
+
+  it 'should not mistake horizontal rule for front matter' do
+    handler = Awestruct::Handlers::FrontMatterHandler.new( @site, file_input('front-matter-looking.txt') )
+    handler.front_matter.should_not be_nil
+    handler.front_matter.should be_empty
+    handler.raw_content.should_not be_nil
+  end
+
   it 'should be able to handle UTF-8 characters' do
     handler = Awestruct::Handlers::FrontMatterHandler.new( @site, file_input('front-matter-file-utf8.txt') )
     handler.front_matter.should_not be_nil

data/spec/github_pages_deploy_spec.rb

@@ -1,5 +1,4 @@
 require 'spec_helper'
-require 'awestruct/scm/git'
 require 'awestruct/deploy/github_pages_deploy'
 
 describe Awestruct::Deploy::GitHubPagesDeploy do
@@ -11,6 +10,7 @@ describe Awestruct::Deploy::GitHubPagesDeploy do
     @deploy_config = mock
     @deploy_config.stub(:[]).with('branch').and_return('the-branch')
     @deploy_config.stub(:[]).with('repository').and_return('the-repo')
+    @deploy_config.stub(:[]).with('gzip').and_return('false')
     @deploy_config.stub(:[]).with('scm').and_return('git')
     @deploy_config.stub(:[]).with('source_dir').and_return('.')
     @deploy_config.stub(:[]).with('uncommitted').and_return('false')
@@ -28,35 +28,40 @@ describe Awestruct::Deploy::GitHubPagesDeploy do
   it "should warn and noop if no changes have been committed" do
     git_scm = mock()
     git_scm.stub(:uncommitted_changes?).with('.').and_return true
-    ::Awestruct::Scm::Git.stub(:new).and_return git_scm
+    @deployer.instance_variable_set('@scm', git_scm)
     $LOG.should_receive(:error).with(Awestruct::Deploy::Base::UNCOMMITTED_CHANGES)
-    @deployer.run(@deploy_config)
+    @deployer.run
   end
 
   it "should save and restore the current branch when publishing" do
     git_scm = mock()
     git_scm.stub(:uncommitted_changes?).with('.').and_return false
-    ::Awestruct::Scm::Git.stub(:new).and_return git_scm
+    @deployer.instance_variable_set('@scm', git_scm)
     @git.should_receive(:current_branch).and_return( 'bacon' )
     @git.stub_chain(:branch, :checkout)
     @git.should_receive(:push).with('the-repo', 'the-branch')
     @git.should_receive(:checkout).with( 'bacon' )
 
     @deployer.stub(:add_and_commit_site)
-    @deployer.run(@deploy_config)
+    @deployer.run
   end
 
   it "should save and restore the current detached branch when publishing" do
     git_scm = mock()
     git_scm.stub(:uncommitted_changes?).with('.').and_return false
-    ::Awestruct::Scm::Git.stub(:new).and_return git_scm
+    @deployer.instance_variable_set('@scm', git_scm)
     @git.should_receive(:current_branch).and_return( '(no branch)' )
-    @git.should_receive(:revparse).with( 'HEAD' ).and_return( '0123456789' )
-    @git.stub_chain(:branch, :checkout)
+    @git.stub_chain(:log, :first, :sha).and_return( '0123456789' )
+    @git.should_receive(:branch).with('__awestruct_deploy__').and_return @git
+    @git.should_receive(:checkout)
+    @git.should_receive(:branch).with('the-branch').and_return @git
+    @git.should_receive(:checkout)
     @git.should_receive(:push).with('the-repo', 'the-branch')
     @git.should_receive(:checkout).with( '0123456789' )
+    @git.should_receive(:branch).with('__awestruct_deploy__').and_return @git
+    @git.should_receive(:delete)
 
     @deployer.stub(:add_and_commit_site)
-    @deployer.run(@deploy_config)
+    @deployer.run
   end
 end

data/spec/haml_handler_spec.rb

@@ -82,15 +82,12 @@ theories =
             :simple_name => 'haml-with-variables',
             :syntax => :haml,
             :extension => '.html',
-            :matcher => verify_with_variables
+            :matcher => verify_with_variables,
+            :site_overrides => { :crunchy => 'bacon' }
         }
     ]
 
 
 describe Awestruct::Handlers::TiltHandler.to_s + '-Haml' do
-  def additional_config
-    { :crunchy => 'bacon' }
-  end
-
   it_should_behave_like 'a handler', theories
 end

data/spec/invoker_spec.rb

@@ -64,6 +64,7 @@ describe Awestruct::CLI::Invoker do
   end
 
   it "should return false on failure" do
+    require 'awestruct/cli/generate'
     generator = mock
     Awestruct::CLI::Generate.should_receive( :new ).and_return( generator )
     generator.should_receive( :run ).and_return( false )

data/spec/javascript_handler_spec.rb

@@ -12,15 +12,12 @@ theories =
             :simple_name => 'javascript-page',
             :syntax => :javascript,
             :extension => '.js',
-            :matcher => verify
+            :matcher => verify,
+            :site_overrides => { :interpolate => true, :crunchy => 'bacon' }
         }
     ]
 
 
 describe Awestruct::Handlers::TiltHandler.to_s + '-JavaScript' do
-  def additional_config
-    { :interpolate => true, :crunchy => 'bacon' }
-  end
-
   it_should_behave_like 'a handler', theories
-end
+end

data/spec/markdown_handler_spec.rb

@@ -35,7 +35,5 @@ theories =
   ]
 
 describe Awestruct::Handlers::TiltHandler.to_s + "-Markdown" do
-  
   it_should_behave_like "a handler", theories
-
 end

data/spec/mustache_handler_spec.rb

@@ -11,23 +11,20 @@ theories =
       :simple_name => 'mustache-page',
       :syntax => :mustache,
       :extension => '.html',
-      :matcher => verify
+      :matcher => verify,
+      :site_overrides => { :markup_type => 'Mustache' }
     },
     {
       :page => 'mustache-page.xml.mustache',
       :simple_name => 'mustache-page',
       :syntax => :mustache,
       :extension => '.xml',
-      :matcher => verify
+      :matcher => verify,
+      :site_overrides => { :markup_type => 'Mustache' }
     }
   ]
 
 
 describe Awestruct::Handlers::TiltHandler.to_s + '-Mustache' do
-  def additional_config
-    {:markup_type => 'Mustache'}
-  end
-
   it_should_behave_like 'a handler', theories
-
-end
+end

data/spec/orgmode_handler_spec.rb

@@ -18,7 +18,5 @@ theories =
   ]
 
 describe Awestruct::Handlers::TiltHandler.to_s + "-OrgMode" do
-
   it_should_behave_like "a handler", theories
-
-end
+end

data/spec/page_loader_spec.rb

@@ -42,4 +42,22 @@ describe Awestruct::PageLoader do
     @site.pages[1].output_path.should          == '/page-two.html'
   end
 
+  it "should be able to load all site pages (even drafts) if show_drafts is true" do
+    @site.show_drafts = true
+    @loader.load_all
+    @site.pages.size.should == 3
+
+    @site.pages.sort!{|l,r| l.relative_source_path <=> r.relative_source_path }
+
+    @site.pages[0].relative_source_path.should == '/page-draft.md'
+    @site.pages[0].output_path.should          == '/page-draft.html'
+
+    @site.pages[1].relative_source_path.should == '/page-one.md'
+    @site.pages[1].output_path.should          == '/page-one.html'
+
+    @site.pages[2].relative_source_path.should == '/page-two.html.haml'
+    @site.pages[2].output_path.should          == '/page-two.html'
+
+  end
+
 end

data/spec/redirect_handler_spec.rb

@@ -21,16 +21,12 @@ theories =
             :simple_name => "redirect-page",
             :syntax => :text,
             :extension => '.html',
-            :matcher => verify_with_interpol
+            :matcher => verify_with_interpol,
+            :site_overrides => { :interpolate => true, :crunchy => 'bacon', :base_url => 'http://mysite' }
         }
     ]
 
 
 describe Awestruct::Handlers::TiltHandler.to_s + "-Redirect" do
-  def additional_config
-    { :interpolate => true, :crunchy => 'bacon', :base_url => 'http://mysite' }
-  end
-
   it_should_behave_like "a handler", theories
-
 end

data/spec/restructuredtext_handler_spec.rb

@@ -16,7 +16,5 @@ theories =
   ]
 
 describe Awestruct::Handlers::TiltHandler.to_s + "-reStructuredText" do
-
   it_should_behave_like "a handler", theories
-
-end
+end

data/spec/sass_handler_spec.rb

@@ -17,7 +17,5 @@ theories =
   ]
 
 describe Awestruct::Handlers::TiltHandler.to_s + "-Sass" do
-
   it_should_behave_like "a handler", theories
-
-end
+end

data/spec/scss_handler_spec.rb

@@ -17,7 +17,5 @@ theories =
   ]
 
 describe Awestruct::Handlers::TiltHandler.to_s + "-Scss" do
-
   it_should_behave_like "a handler", theories
-
-end
+end

data/spec/slim_handler_spec.rb

@@ -70,14 +70,11 @@ theories =
             :simple_name => 'slim-with-variables',
             :syntax => :slim,
             :extension => '.html',
-            :matcher => verify_with_variables
+            :matcher => verify_with_variables,
+            :site_overrides => { :crunchy => 'bacon' }
         }
     ]
 
 describe Awestruct::Handlers::TiltHandler.to_s + '-Slim' do
-  def additional_config
-    { :crunchy => 'bacon' }
-  end
-
   it_should_behave_like 'a handler', theories
 end

data/spec/support/shared_handler_example.rb

@@ -5,7 +5,7 @@ require 'rspec'
 require 'hashery'
 
 REQUIRED_VARIABLES = [:page, :simple_name, :syntax, :extension]
-ALL_VARIABLES = REQUIRED_VARIABLES + [:format, :matcher, :unless]
+ALL_VARIABLES = REQUIRED_VARIABLES + [:format, :matcher, :unless, :site_overrides]
 
 shared_examples 'a handler' do |theories|
 
@@ -19,24 +19,29 @@ shared_examples 'a handler' do |theories|
 
   describe Awestruct::Handlers do
 
-    before :all do
-      @opts = Awestruct::CLI::Options.new
-      @opts.source_dir = File.dirname(__FILE__) + '/../test-data/handlers'
-      @config = Awestruct::Config.new( @opts )
-
-      @engine = Awestruct::Engine.new( @config )
-      @engine.load_default_site_yaml
+    before :each do
+      @engine = init
       @site = @engine.site
     end
 
-    before :each do
-      @site.merge! additional_config if respond_to?("additional_config")
+    def init
+      opts = Awestruct::CLI::Options.new
+      opts.source_dir = File.dirname(__FILE__) + '/../test-data/handlers'
+      config = Awestruct::Config.new( opts )
+
+      engine = Awestruct::Engine.new( config )
+      engine.load_default_site_yaml
+      engine
     end
 
     def create_handler(page)
       @engine.load_page File.join(@engine.config.dir, page)
     end
 
+    def merge_site_overrides(overrides)
+      @site.update overrides
+    end
+
     theories.each do |theory|
 
       # Validate input
@@ -82,6 +87,9 @@ shared_examples 'a handler' do |theories|
 
         it "should render page '#{theory[:page]}'" do
           if theory[:unless].nil? or !theory[:unless][:exp].call()
+            if theory.has_key? :site_overrides
+              merge_site_overrides(theory[:site_overrides])
+            end
             handler = create_handler theory[:page]
             handler.update(additional_config_page) { |k, oldval, newval| oldval } if respond_to?('additional_config_page')
             output = handler.rendered_content(handler.create_context)

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

@@ -1,7 +1,9 @@
 profiles:
   development:
+    show_drafts: false
     cook: microwave
   production:
+    show_drafts: true
     cook: oven
     asciidoctor:
       :eruby: erb

data/spec/test-data/front-matter-file-no-content.txt

@@ -1,2 +1,3 @@
 ---
 foo: bar
+---

data/spec/test-data/front-matter-looking.txt

@@ -0,0 +1,9 @@
+ ---
+
+^ That was a Markdown horizontal rule.
+
+Here's another one:
+
+---
+
+This is more content.

data/spec/test-data/front-matter-middle.txt

@@ -0,0 +1,12 @@
+This is content
+
+---
+
+slkdjfklsjd f;klsjaljkdflj2k'l23423 4234jkl 
+wejtrkl'w jrk   l'23tr
+wj fkwe'jt'wk   j'tfk l34j
+tFjroi  k ntfklqwnkltf: get off my lawn : This is not front matter!
+
+---
+
+We're all just content here.

data/spec/test-data/gzip/subdir/yes.css

@@ -0,0 +1,3 @@
+body {
+  color: purple;
+}

data/spec/test-data/gzip/yes.html

@@ -0,0 +1,10 @@
+<!DOCTYPE html>
+<html lang="en">
+  <head>
+    <meta charset="UTF-8">
+    <title>Hello, World!</title>
+  </head>
+  <body>
+    <h1>Hello, World!</h1>
+  </body>
+</html>

data/spec/test-data/gzip/yes.js

@@ -0,0 +1 @@
+var awestruct = {"description": "A static site-baking tool"};

data/spec/test-data/handlers/asciidoc_with_attributes.ad

@@ -0,0 +1,3 @@
+docname={docname};
+docfile={docfile};
+docdir={docdir};

data/spec/test-data/handlers/asciidoc_with_interpolation.ad

@@ -0,0 +1,4 @@
+= Title
+:page-interpolate: true
+
+#{site.encoding}

data/spec/test-data/handlers/asciidoc_without_interpolation.ad

@@ -0,0 +1,3 @@
+= Title
+
+#{site.encoding}