awestruct 0.5.3 → 0.5.4.beta1

data/spec/github_pages_deploy_spec.rb

@@ -1,3 +1,5 @@
+require 'spec_helper'
+require 'awestruct/scm/git'
 require 'awestruct/deploy/github_pages_deploy'
 
 describe Awestruct::Deploy::GitHubPagesDeploy do
@@ -9,6 +11,8 @@ 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('scm').and_return('git')
+    @deploy_config.stub(:[]).with('source_dir').and_return('.')
     @deploy_config.stub(:[]).with('uncommitted').and_return('false')
     @deployer = Awestruct::Deploy::GitHubPagesDeploy.new( site_config, @deploy_config )
 
@@ -21,19 +25,18 @@ describe Awestruct::Deploy::GitHubPagesDeploy do
     Awestruct::Deployers.instance[ :github_pages ].should == Awestruct::Deploy::GitHubPagesDeploy
   end
 
-  it "should publish the site if there have been changes to the git repo" do
-    ::Git.should_receive(:open).with('.').and_return @git
-    @deployer.should_receive(:publish_site)
-    @deployer.run(@deploy_config)
-  end
-
   it "should warn and noop if no changes have been committed" do
-    @git.stub_chain(:status, :changed, :empty?).and_return false
+    git_scm = mock()
+    git_scm.stub(:uncommitted_changes?).with('.').and_return true
+    ::Awestruct::Scm::Git.stub(:new).and_return git_scm
     $LOG.should_receive(:error).with(Awestruct::Deploy::Base::UNCOMMITTED_CHANGES)
     @deployer.run(@deploy_config)
   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
     @git.should_receive(:current_branch).and_return( 'bacon' )
     @git.stub_chain(:branch, :checkout)
     @git.should_receive(:push).with('the-repo', 'the-branch')
@@ -44,6 +47,9 @@ describe Awestruct::Deploy::GitHubPagesDeploy do
   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
     @git.should_receive(:current_branch).and_return( '(no branch)' )
     @git.should_receive(:revparse).with( 'HEAD' ).and_return( '0123456789' )
     @git.stub_chain(:branch, :checkout)

data/spec/haml_handler_spec.rb

@@ -6,12 +6,12 @@ verify = lambda { |output|
 }
 
 verify_atom = lambda { |output|
-  output.should == %(<?xml version="1.0" encoding="utf-8" ?>
+  output.should == '<?xml version="1.0" encoding="utf-8" ?>
 <feed xmlns="http://www.w3.org/2005/Atom">
   <id>http://example.com</id>
   <title>A News Feed</title>
 </feed>
-)
+'
 }
 
 verify_with_markdown = lambda { |output|
@@ -31,63 +31,66 @@ verify_with_variables = lambda { |output|
 }
 
 theories =
-  [
-    {
-      :page => "haml-page.html.haml",
-      :simple_name => "haml-page",
-      :syntax => :haml,
-      :extension => '.html',
-      :format => :html5,
-      :matcher => verify
-    },
-    {
-      :page => "haml-page.xml.haml",
-      :simple_name => "haml-page",
-      :syntax => :haml,
-      :extension => '.xml',
-      :format => :xhtml,
-      :matcher => verify
-    },
-    {
-      :page => 'haml-page.atom.haml',
-      :simple_name => 'haml-page',
-      :syntax => :haml,
-      :extension => '.atom',
-      :format => :xhtml,
-      :matcher => verify_atom
-    },
-    {
-      :page => "haml-with-markdown-page.html.haml",
-      :simple_name => "haml-with-markdown-page",
-      :syntax => :haml,
-      :extension => '.html',
-      :matcher => verify_with_markdown
-    },
-    {
-      :page => "haml-with-textile-page.html.haml",
-      :simple_name => "haml-with-textile-page",
-      :syntax => :haml,
-      :extension => '.html',
-      :matcher => verify_with_textile
-    },
-    {
-      :page => "haml-with-utf.html.haml",
-      :simple_name => "haml-with-utf",
-      :syntax => :haml,
-      :extension => '.html',
-      :matcher => verify_with_utf8
-    },
-    {
-      :page => "haml-with-variables.html.haml",
-      :simple_name => "haml-with-variables",
-      :syntax => :haml,
-      :extension => '.html',
-      :matcher => verify_with_variables
-    }
-  ]
+    [
+        {
+            :page => 'haml-page.html.haml',
+            :simple_name => 'haml-page',
+            :syntax => :haml,
+            :extension => '.html',
+            :format => :html5,
+            :matcher => verify
+        },
+        {
+            :page => 'haml-page.xml.haml',
+            :simple_name => 'haml-page',
+            :syntax => :haml,
+            :extension => '.xml',
+            :format => :xhtml,
+            :matcher => verify
+        },
+        {
+            :page => 'haml-page.atom.haml',
+            :simple_name => 'haml-page',
+            :syntax => :haml,
+            :extension => '.atom',
+            :format => :xhtml,
+            :matcher => verify_atom
+        },
+        {
+            :page => 'haml-with-markdown-page.html.haml',
+            :simple_name => 'haml-with-markdown-page',
+            :syntax => :haml,
+            :extension => '.html',
+            :matcher => verify_with_markdown
+        },
+        {
+            :page => 'haml-with-textile-page.html.haml',
+            :simple_name => 'haml-with-textile-page',
+            :syntax => :haml,
+            :extension => '.html',
+            :matcher => verify_with_textile
+        },
+        {
+            :page => 'haml-with-utf.html.haml',
+            :simple_name => 'haml-with-utf',
+            :syntax => :haml,
+            :extension => '.html',
+            :matcher => verify_with_utf8
+        },
+        {
+            :page => 'haml-with-variables.html.haml',
+            :simple_name => 'haml-with-variables',
+            :syntax => :haml,
+            :extension => '.html',
+            :matcher => verify_with_variables
+        }
+    ]
 
-describe Awestruct::Handlers::TiltHandler.to_s + "-Haml" do
-  let(:additional_config) { {:crunchy => 'bacon'} }
-  it_should_behave_like "a handler", theories
 
+describe Awestruct::Handlers::TiltHandler.to_s + '-Haml' do
+  def additional_config
+    { :crunchy => 'bacon' }
+  end
+
+  it_should_behave_like 'a handler', theories
 end

data/spec/interpolation_handler_spec.rb

@@ -17,14 +17,10 @@ describe Awestruct::Handlers::InterpolationHandler do
   end
 
   it "should correctly interpolate complicated stuff that includes regular expressions [Issue #139]" do
-    if RUBY_VERSION >= '1.9'
-      input = %q(url = url.replace(/\/?#$/, '');)
-      handler = build_handler( input )
-      content = handler.rendered_content( Hashery::OpenCascade[] )
-      content.should == input
-    else
-      pending "Cannot yet handle this test case with ruby 1.8"
-    end
+    input = %q(url = url.replace(/\/?#$/, '');)
+    handler = build_handler( input )
+    content = handler.rendered_content( Hashery::OpenCascade[] )
+    content.should == input
   end
 
   def build_handler( input )

data/spec/javascript_handler_spec.rb

@@ -2,22 +2,25 @@
 require 'spec_helper'
 
 verify = lambda { |output|
-   output.should =~ %r(var crunchy = "bacon")
+  output.should =~ %r(var crunchy = "bacon")
 }
 
 theories =
-  [
-    {
-      :page => "javascript-page.js",
-      :simple_name => "javascript-page",
-      :syntax => :javascript,
-      :extension => '.js',
-      :matcher => verify
-    }
-  ]
+    [
+        {
+            :page => 'javascript-page.js',
+            :simple_name => 'javascript-page',
+            :syntax => :javascript,
+            :extension => '.js',
+            :matcher => verify
+        }
+    ]
 
-describe Awestruct::Handlers::TiltHandler.to_s + "-JavaScript" do
-  let(:additional_config) { {:interpolate => true, :crunchy => 'bacon'} }
-  it_should_behave_like "a handler", theories
 
+describe Awestruct::Handlers::TiltHandler.to_s + '-JavaScript' do
+  def additional_config
+    { :interpolate => true, :crunchy => 'bacon' }
+  end
+
+  it_should_behave_like 'a handler', theories
 end

data/spec/minify_spec.rb

@@ -53,7 +53,9 @@ describe Awestruct::Extensions::Minify do
     page.should_receive(:output_path).any_number_of_times.and_return "test.js"
 
     input = "function    a (a,     c) { \n a = \"a\";\n }"
-    expected_output = "function a(a){a=\"a\"}" # we're minifying so we're going to strip dead or unreferenced code
+    # we're minifying so we're going to strip dead or unreferenced code
+    # note that htmlcompressor < 0.0.7 generates different output
+    expected_output = "function a(a){a=\"a\"}"
 
     minifier = Awestruct::Extensions::Minify.new [:js]
     minifier.transform(site, page, input).should == expected_output

data/spec/mustache_handler_spec.rb

@@ -7,23 +7,27 @@ verify = lambda { |output|
 theories =
   [
     {
-      :page => "mustache-page.html.mustache",
-      :simple_name => "mustache-page",
+      :page => 'mustache-page.html.mustache',
+      :simple_name => 'mustache-page',
       :syntax => :mustache,
       :extension => '.html',
       :matcher => verify
     },
     {
-      :page => "mustache-page.xml.mustache",
-      :simple_name => "mustache-page",
+      :page => 'mustache-page.xml.mustache',
+      :simple_name => 'mustache-page',
       :syntax => :mustache,
       :extension => '.xml',
       :matcher => verify
     }
   ]
 
-describe Awestruct::Handlers::TiltHandler.to_s + "-Mustache" do
-  let(:additional_config) { {:markup_type => 'Mustache'} }
-  it_should_behave_like "a handler", theories
+
+describe Awestruct::Handlers::TiltHandler.to_s + '-Mustache' do
+  def additional_config
+    {:markup_type => 'Mustache'}
+  end
+
+  it_should_behave_like 'a handler', theories
 
 end

data/spec/options_spec.rb

@@ -3,7 +3,7 @@ require 'awestruct/cli/options'
 
 describe Awestruct::CLI::Options do
 
-  it "should have reasonable defaults" do
+  it 'should have reasonable defaults' do
     options = Awestruct::CLI::Options.new
     options.generate.should == nil
     options.server.should   == false
@@ -23,14 +23,17 @@ describe Awestruct::CLI::Options do
     options.profile.should  == nil
     options.script.should   == nil
     options.verbose.should  == false
+
+    options.output_dir == File.join( __FILE__, '..', '_site' )
+    options.source_dir == File.join( __FILE__, '..' )
   end
 
-  describe "parsing" do 
+  describe 'parsing' do
     def parse!(*args)
       Awestruct::CLI::Options.parse! args
     end
 
-    it "should parse server-related args" do
+    it 'should parse server-related args' do
       parse!( '-s' ).server.should == true
       parse!( '--server' ).server.should == true
 
@@ -44,12 +47,12 @@ describe Awestruct::CLI::Options do
       parse!( '--url', 'http://mysite.com/' ).base_url.should == 'http://mysite.com/'
     end
 
-    it "should parse profile-related args" do
+    it 'should parse profile-related args' do
       parse!( '-P', 'numberwang' ).profile.should == 'numberwang'
       parse!( '--profile', 'superhans' ).profile.should == 'superhans'
     end
 
-    it "should parse generation-related args" do
+    it 'should parse generation-related args' do
       parse!( '-g' ).generate.should == true
       parse!( '--generate' ).generate.should == true
       parse!( '--no-generate' ).generate.should == false
@@ -60,18 +63,18 @@ describe Awestruct::CLI::Options do
       parse!( '--auto' ).auto.should == true
     end
 
-    it "should parse script-related args" do
-      pending "Not yet implemented. See issue #248."
+    it 'should parse script-related args' do
+      pending 'Not yet implemented. See issue #248.'
       #parse!( '--run', 'puts "hi"' ).script.should == 'puts "hi"'
     end
 
-    it "should turn off generate when doing a --deploy" do
+    it 'should turn off generate when doing a --deploy' do
       result = parse!( '--deploy' )
       result.deploy.should be_true
       result.generate.should be_false
     end
 
-    it "should turn off generate when doing a --deploy unless explicitly turned back on" do
+    it 'should turn off generate when doing a --deploy unless explicitly turned back on' do
       result = parse!( '--deploy', '--generate' )
       result.deploy.should be_true
       result.generate.should be_true
@@ -81,7 +84,7 @@ describe Awestruct::CLI::Options do
       result.generate.should be_true
     end
 
-    it "should turn on verbose when -w or --verbose is explicitly turned back on" do
+    it 'should turn on verbose when -w or --verbose is explicitly turned back on' do
       result = parse!( '-w' )
       result.verbose.should be_true
 
@@ -89,9 +92,15 @@ describe Awestruct::CLI::Options do
       result.verbose.should be_true
     end
 
-    it "should generate by default" do
+    it 'should generate by default' do
       parse!().generate.should be_true
     end
+
+    it 'should parse directory options' do
+      result = Awestruct::CLI::Options.parse!(%w(--source-dir /tmp --output-dir /tmp/new-site))
+      result.source_dir.should eql '/tmp'
+      result.output_dir.should eql '/tmp/new-site'
+    end
   end
 
 end

data/spec/page_loader_spec.rb

@@ -6,7 +6,9 @@ require 'awestruct/config'
 describe Awestruct::PageLoader do
 
   before :each do
-    @config = Awestruct::Config.new( File.dirname(__FILE__) + "/test-data/page-loader" )
+    @opts = Awestruct::CLI::Options.new
+    @opts.source_dir = File.dirname(__FILE__) + '/test-data/page-loader'
+    @config = Awestruct::Config.new( @opts )
     @engine = Awestruct::Engine.new
     @engine.pipeline.handler_chains << :defaults
     @site   = Awestruct::Site.new( @engine, @config )

data/spec/page_loader_spec_for_layouts.rb

@@ -6,7 +6,9 @@ require 'awestruct/config'
 describe Awestruct::PageLoader do
 
   before :each do
-    @config = Awestruct::Config.new( File.dirname(__FILE__) + "/test-data/page-loader" )
+    @opts = Awestruct::CLI::Options.new
+    @opts.source_dir = File.dirname(__FILE__) + '/test-data/page-loader'
+    @config = Awestruct::Config.new( @opts )
     @engine = Awestruct::Engine.new
     @engine.pipeline.handler_chains << :defaults
     @site   = Awestruct::Site.new( @engine, @config )

data/spec/redirect_handler_spec.rb

@@ -8,25 +8,29 @@ verify_with_interpol = lambda { |output|
 }
 
 theories =
-  [
-    {
-      :page => "simple-redirect-page.redirect",
-      :simple_name => "simple-redirect-page",
-      :syntax => :text,
-      :extension => '.html',
-      :matcher => verify
-    },
-    {
-      :page => "redirect-page.redirect",
-      :simple_name => "redirect-page",
-      :syntax => :text,
-      :extension => '.html',
-      :matcher => verify_with_interpol
-    }
-  ]
+    [
+        {
+            :page => "simple-redirect-page.redirect",
+            :simple_name => "simple-redirect-page",
+            :syntax => :text,
+            :extension => '.html',
+            :matcher => verify
+        },
+        {
+            :page => "redirect-page.redirect",
+            :simple_name => "redirect-page",
+            :syntax => :text,
+            :extension => '.html',
+            :matcher => verify_with_interpol
+        }
+    ]
+
 
 describe Awestruct::Handlers::TiltHandler.to_s + "-Redirect" do
-  let(:additional_config) { {:interpolate => true, :crunchy => 'bacon', :base_url => 'http://mysite' } }
+  def additional_config
+    { :interpolate => true, :crunchy => 'bacon', :base_url => 'http://mysite' }
+  end
+
   it_should_behave_like "a handler", theories
 
 end