awestruct 0.5.6.beta8 → 0.5.6.beta9

data/spec/awestruct/engine_spec.rb

@@ -1,5 +1,6 @@
 require 'awestruct/cli/options'
 require 'awestruct/engine'
+require 'logger'
 
 require 'hashery/open_cascade'
 
@@ -68,6 +69,18 @@ describe Awestruct::Engine do
     engine.site.intl_name.should == "Intern\u00e9\u0161nl"
   end
 
+  it "should be able to handle erb in site.yaml" do
+    opts = Awestruct::CLI::Options.new
+    opts.source_dir = test_data_dir 'engine-yaml'
+    config = Awestruct::Config.new( opts )
+
+    engine = Awestruct::Engine.new(config)
+    engine.load_default_site_yaml
+    engine.load_user_site_yaml( 'development' )
+    engine.site.date.should be_a Date
+    engine.site.date.iso8601.should eql '2015-04-13'
+  end
+
 
   it "should be able to load arbitrary _config/*.yml files" do
     opts = Awestruct::CLI::Options.new
@@ -119,7 +132,103 @@ describe Awestruct::Engine do
     expect( Compass.configuration.output_style ).to eq :expanded
   end
 
-  it "wip should accept site.compass_line_comments and site.compass_output_style to configure behavior" do
+  it "should cleanly generate page output, using threads" do
+    output_dir = Dir.mktmpdir 'engine-generate-no-errors'
+
+    begin
+      log = StringIO.new
+      $LOG = Logger.new(log)
+      $LOG.level = Logger::DEBUG
+
+      opts = Awestruct::CLI::Options.new
+      opts.source_dir = test_data_dir 'engine-generate-no-errors'
+      opts.output_dir = output_dir
+      config = Awestruct::Config.new( opts )
+      engine = Awestruct::Engine.new(config)
+      begin
+        engine.run('development', 'http://localhost:4242', 'http://localhost:4242')
+      rescue SystemExit => e
+        e.status.should eql 0
+      end
+    ensure
+      FileUtils.remove_entry_secure output_dir
+    end
+  end
+
+  it "should cleanly generate page output, using processes" do
+    output_dir = Dir.mktmpdir 'engine-generate-no-errors'
+
+    begin
+      log = StringIO.new
+      $LOG = Logger.new(log)
+      $LOG.level = Logger::DEBUG
+
+      opts = Awestruct::CLI::Options.new
+      opts.source_dir = test_data_dir 'engine-generate-no-errors'
+      opts.output_dir = output_dir
+      config = Awestruct::Config.new( opts )
+      engine = Awestruct::Engine.new(config)
+      engine.site.generation = [:in_processes => 2]
+      begin
+        engine.run('development', 'http://localhost:4242', 'http://localhost:4242')
+      rescue SystemExit => e
+        e.status.should eql 0
+      end
+    ensure
+      FileUtils.remove_entry_secure output_dir
+    end
+  end
+
+  it "should exit unsuccessfully if generate page output fails, using threads" do
+    output_dir = Dir.mktmpdir 'engine-generate-with-errors'
+
+    begin
+      log = StringIO.new
+      $LOG = Logger.new(log)
+      $LOG.level = Logger::DEBUG
+
+      opts = Awestruct::CLI::Options.new
+      opts.source_dir = test_data_dir 'engine-generate-with-errors'
+      opts.output_dir = output_dir
+      config = Awestruct::Config.new( opts )
+      engine = Awestruct::Engine.new(config)
+      begin
+        engine.run('development', 'http://localhost:4242', 'http://localhost:4242')
+        fail('Expected generation error')
+      rescue SystemExit => e
+        e.status.should eql Awestruct::ExceptionHelper::EXITCODES[:generation_error]
+      end
+    ensure
+      FileUtils.remove_entry_secure output_dir, true
+    end
+  end
+
+  it "should exit unsuccessfully if generate page output fails, using processes" do
+    output_dir = Dir.mktmpdir 'engine-generate-with-errors'
+
+    begin
+      log = StringIO.new
+      $LOG = Logger.new(log)
+      $LOG.level = Logger::DEBUG
+
+      opts = Awestruct::CLI::Options.new
+      opts.source_dir = test_data_dir 'engine-generate-with-errors'
+      opts.output_dir = output_dir
+      config = Awestruct::Config.new( opts )
+      engine = Awestruct::Engine.new(config)
+      engine.site.generation = [:in_processes => 2]
+      begin
+        engine.run('development', 'http://localhost:4242', 'http://localhost:4242')
+        fail('Expected generation error')
+      rescue SystemExit => e
+        e.status.should eql Awestruct::ExceptionHelper::EXITCODES[:generation_error]
+      end
+    ensure
+      FileUtils.remove_entry_secure output_dir, true
+    end
+  end
+
+  it "should accept site.compass_line_comments and site.compass_output_style to configure behavior" do
     opts = Awestruct::CLI::Options.new
     opts.source_dir = test_data_dir 'engine' 
     config = Awestruct::Config.new( opts )

data/spec/awestruct/extensions/relative_spec.rb

@@ -0,0 +1,22 @@
+require 'awestruct/extensions/relative'
+require 'ostruct'
+
+describe Awestruct::Extensions::Relative do
+  let(:dummy_class) { Class.new { extend Awestruct::Extensions::Relative } }
+
+  context 'with file extension' do
+    let (:page) { OpenStruct.new(:output_path => 'site/base/path/file.html') }
+
+    it "should should not  have '/' at the end if there is a file extension" do
+      expect(dummy_class.relative('site/base/path/another_file.html', page)).to eql 'another_file.html'
+    end
+  end
+
+  context 'without file extension' do
+    let (:page) { OpenStruct.new(:output_path => 'site/base/path/file.html') }
+
+    it "should should not  have '/' at the end if there is a file extension" do
+      expect(dummy_class.relative('site/base/path/some_directory', page)).to eql 'some_directory/'
+    end
+  end
+end

data/spec/awestruct/handlers/asciidoc_handler_spec.rb

@@ -1,10 +1,11 @@
 require 'spec_helper'
 require 'rspec/matchers.rb'
+require 'tilt'
 
 verify = lambda { |output|
   include EmmetMatchers
   # clean whitespace to make comparison easier
-  output.should have_structure('div#preamble>div.sectionbody>div.paragraph>p>strong')
+  output.should have_structure('div.paragraph>p>strong')
 }
 
 verify_front_matter = lambda { |output, page|
@@ -121,4 +122,9 @@ describe Awestruct::Handlers::AsciidoctorHandler do
   end
 
   it_should_behave_like 'a handler', theories
+
+  it 'should be registered as our implementation for tilt' do
+    puts ::Tilt.default_mapping['adoc']
+    ::Tilt.default_mapping['adoc'].should eql ::Awestruct::Tilt::AsciidoctorTemplate
+  end
 end

data/spec/awestruct/handlers/layout_handler_spec.rb

@@ -19,21 +19,21 @@ describe Awestruct::Handlers::LayoutHandler do
     @site = Awestruct::Site.new( @engine, @config )
     layout_loader = Awestruct::PageLoader.new( @site, :layouts )
     layout = layout_loader.load_page( File.join( @config.dir, 'haml-layout.html.haml' ) )
-    layout.class.should == Awestruct::Page
-    layout.should_not be_nil
+    expect(layout.class).to eql Awestruct::Page
+    expect(layout).to_not be_nil
 
     @site.layouts << layout
 
     layout = layout_loader.load_page( File.join( @config.dir, 'haml-layout-two.html.haml' ) )
-    layout.class.should == Awestruct::Page
-    layout.should_not be_nil
+    expect(layout.class).to eql Awestruct::Page
+    expect(layout).to_not be_nil
 
     @site.layouts << layout
   end
 
   it "should be able to find layouts by simple name" do
     layout = @site.layouts.find_matching( 'haml-layout', '.html' )
-    layout.class.should == Awestruct::Page
+    expect(layout.class).to eql Awestruct::Page
   end
 
   it "should apply the layout to its delegate's content" do
@@ -45,7 +45,7 @@ describe Awestruct::Handlers::LayoutHandler do
     context = page.create_context
     context.page.layout = 'haml-layout'
 
-    @site.layouts.find_matching( 'haml-layout', '.html' ).should_not be_nil
+    expect(@site.layouts.find_matching( 'haml-layout', '.html' )).to_not be_nil
     rendered = layout_handler.rendered_content( context )
     
   end
@@ -59,7 +59,7 @@ describe Awestruct::Handlers::LayoutHandler do
 
     context = page.create_context
 
-    @site.layouts.find_matching('haml-layout', '.html').should_not be_nil
+    expect(@site.layouts.find_matching('haml-layout', '.html')).to_not be_nil
     rendered = layout_handler.rendered_content( context )
 
     haml_index = ( rendered =~ %r(This is a haml layout) )

data/spec/awestruct/handlers/tilt_handler_spec.rb

@@ -115,7 +115,7 @@ describe Awestruct::Handlers::TiltHandler do
       $LOG.level = Logger::DEBUG
       @site.dir = Pathname.new( test_data_dir 'handlers' ) 
       path = handler_file( "hello.bogus" )
-      expect(Awestruct::Handlers::TiltMatcher.new().match(path)).to be_false
+      expect(Awestruct::Handlers::TiltMatcher.new().match(path)).to be_falsey
       expect(log.string).to include('Copying')
 
       # we don't even want to process a file if we cannot load its Tilt template

data/spec/awestruct/pipeline_spec.rb

@@ -1,8 +1,33 @@
+require 'awestruct/engine'
+require 'awestruct/pipeline' 
 
-require 'awestruct/pipeline'
+describe Awestruct::Pipeline do
+  before do 
+    dir = Pathname.new( test_data_dir 'pipeline' )
+    opts = Awestruct::CLI::Options.new
+    opts.source_dir = dir
 
+    @site = Hashery::OpenCascade[ { :encoding=>false, :dir=>dir, :config=>Awestruct::Config.new( opts ), :pages => [] } ]
+    @engine = Awestruct::Engine.new(@site.config)
 
-describe Awestruct::Pipeline do
+    log = StringIO.new
+    $LOG = Logger.new(log)
+    $LOG.level = Logger::DEBUG 
+
+    @engine.load_pipeline
+    @pipeline = @engine.pipeline
+  end
+
+  context "after pipeline is loaded" do 
+    specify "should have all specified extension points" do
+      expect(@pipeline.before_all_extensions.size).to eql 1
+      expect(@pipeline.extensions.size).to eql 1
+      expect(@pipeline.after_all_extensions.size).to eql 1
+      expect(@pipeline.helpers.size).to eql 1
+      expect(@pipeline.transformers.size).to eql 1
+      expect(@pipeline.after_generation_extensions.size).to eql 1
+    end
+  end
 
   it "should provide a way to find a matching handler chain for a given path" do
     pipeline = Awestruct::Pipeline.new

data/spec/awestruct/scm/git_spec.rb

@@ -8,22 +8,22 @@ describe Awestruct::Scm::Git do
   context "#uncommitted_changes?('.')" do
     specify 'when there are no changes, returns false' do
       Open3.should_receive(:popen3).with('git status --porcelain', :chdir => '.').and_yield(nil, StringIO.new(''), StringIO.new(''), nil)
-      expect(subject.uncommitted_changes? '.').to be_false
+      expect(subject.uncommitted_changes? '.').to be_falsey
     end
 
     specify 'when there are changes to untracked files, returns true' do
       Open3.should_receive(:popen3).with('git status --porcelain', :chdir => '.').and_yield(nil, StringIO.new('?? test.rb'), StringIO.new(''), nil)
-      expect(subject.uncommitted_changes? '.').to be_true
+      expect(subject.uncommitted_changes? '.').to be_truthy
     end
 
     specify 'when there are modifications, returns true' do
       Open3.should_receive(:popen3).with('git status --porcelain', :chdir => '.').and_yield(nil, StringIO.new(' M test.rb'), StringIO.new(''), nil)
-      expect(subject.uncommitted_changes? '.').to be_true
+      expect(subject.uncommitted_changes? '.').to be_truthy
     end
 
     specify 'when there are additions and modifications, returns true' do
       Open3.should_receive(:popen3).with('git status --porcelain', :chdir => '.').and_yield(nil, StringIO.new('AM test.rb'), StringIO.new(''), nil)
-      expect(subject.uncommitted_changes? '.').to be_true
+      expect(subject.uncommitted_changes? '.').to be_truthy
     end
   end
 end

data/spec/spec_helper.rb

@@ -1,8 +1,13 @@
 require 'rubygems'
 require 'rspec'
+require 'simplecov'
+
+SimpleCov.start
 
 Dir["./spec/support/**/*.rb"].each {|f| require f} 
 
 RSpec.configure do |config| 
-  config.mock_framework = :rspec
+  config.mock_with :rspec do |mocks|
+    mocks.verify_doubled_constant_names = true
+  end
 end

data/spec/support/emmet_matchers.rb

@@ -40,7 +40,7 @@ module EmmetMatchers
       @emmet_string == @test_string 
     end
 
-    def failure_message_for_should
+    def failure_message
       "expected to match #{@test_string} against #{@emmet_string}, but they are not equal"
     end 
   end

data/spec/support/nokogiri_matchers.rb

@@ -10,7 +10,7 @@ module NokogiriMatchers
       !@document.search(@tag).nil?
     end
 
-    def failure_message_for_should
+    def failure_message
       "expected to find #{@tag} within #{@document.to_s} but was not found"
     end
   end

data/spec/support/shared_handler_example.rb

@@ -7,103 +7,98 @@ require 'hashery'
 REQUIRED_VARIABLES = [:page, :simple_name, :syntax, :extension]
 ALL_VARIABLES = REQUIRED_VARIABLES + [:format, :matcher, :unless, :site_overrides]
 
-shared_examples 'a handler' do |theories|
+shared_examples_for 'a handler' do |theories|
 
   def handler_file(path)
     "#{@site.config.dir}/#{path}"
   end
 
   def create_context
-    Hashery::OpenCascade[{ :site => @site }]
+    Hashery::OpenCascade[{:site => @site}]
   end
 
-  describe Awestruct::Handlers do
+  before :each do
+    @engine = init
+    @site = @engine.site
+  end
 
-    before :each do
-      @engine = init
-      @site = @engine.site
-    end
+  def init
+    opts = Awestruct::CLI::Options.new
+    opts.source_dir = test_data_dir 'handlers'
+    config = Awestruct::Config.new(opts)
 
-    def init
-      opts = Awestruct::CLI::Options.new
-      opts.source_dir = test_data_dir 'handlers' 
-      config = Awestruct::Config.new( opts )
+    engine = Awestruct::Engine.new(config)
+    engine.load_default_site_yaml
+    engine
+  end
 
-      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 create_handler(page)
-      @engine.load_page File.join(@engine.config.dir, page)
-    end
+  def merge_site_overrides(overrides)
+    @site.update overrides
+  end
 
-    def merge_site_overrides(overrides)
-      @site.update overrides
-    end
+  theories.each do |theory|
 
-    theories.each do |theory|
+    # Validate input
+    missing = []
+    REQUIRED_VARIABLES.each do |key|
+      missing << key unless theory.has_key? key
+    end
+    raise "Missing required variable(s) '#{missing.join(', ')}'. Requires all '#{REQUIRED_VARIABLES.join(', ')}'" if missing.size > 0
 
-      # Validate input
-      missing = []
-      REQUIRED_VARIABLES.each do |key|
-        missing << key unless theory.has_key? key
-      end
-      raise "Missing required variable(s) '#{missing.join(', ')}'. Requires all '#{REQUIRED_VARIABLES.join(', ')}'" if missing.size > 0
+    unknown = theory.keys-ALL_VARIABLES
+    raise "Unknown theory variable(s) '#{unknown.join(', ')}'. Supported variables '#{ALL_VARIABLES.join(', ')}'" if unknown.size > 0
 
-      unknown = theory.keys-ALL_VARIABLES
-      raise "Unknown theory variable(s) '#{unknown.join(', ')}'. Supported variables '#{ALL_VARIABLES.join(', ')}'" if unknown.size > 0
+    # Prove the theory
 
-      # Prove the theory
+    it "should provide simple name '#{theory[:simple_name]}' for page '#{theory[:page]}'" do
+      handler = create_handler theory[:page]
+      expect(handler.simple_name).to eql theory[:simple_name]
+    end
 
-      it "should provide simple name '#{theory[:simple_name]}' for page '#{theory[:page]}'" do
-        handler = create_handler theory[:page]
-        handler.simple_name.should == theory[:simple_name]
-      end
+    it "should provide content syntax '#{theory[:syntax]}' for page '#{theory[:page]}'" do
+      handler = create_handler theory[:page]
+      expect(handler.content_syntax).to eql theory[:syntax]
+    end
 
-      it "should provide content syntax '#{theory[:syntax]}' for page '#{theory[:page]}'" do
-        handler = create_handler theory[:page]
-        handler.content_syntax.should == theory[:syntax]
-      end
+    it "should provide output extension '#{theory[:extension]}' for page '#{theory[:page]}'" do
+      handler = create_handler theory[:page]
+      expect(handler.output_extension).to eql theory[:extension]
+    end
 
-      it "should provide output extension '#{theory[:extension]}' for page '#{theory[:page]}'" do
-        handler = create_handler theory[:page]
-        handler.output_extension.should == theory[:extension]
+    unless theory[:format].nil?
+      it "should set the engine format '#{theory[:format]}' for page '#{theory[:page]}'" do
+        page = create_handler theory[:page]
+        handler = page.handler
+        begin
+          handler = handler.delegate
+        end while handler.delegate and !handler.kind_of?(Awestruct::Handlers::TiltHandler)
+        expect(handler).to_not be_nil
+        expect(handler.options[:format]).to eql theory[:format]
       end
+    end
 
-      unless theory[:format].nil?
-        it "should set the engine format '#{theory[:format]}' for page '#{theory[:page]}'" do
-          page = create_handler theory[:page]
-          handler = page.handler
-          begin
-            handler = handler.delegate
-          end while handler.delegate and !handler.kind_of?(Awestruct::Handlers::TiltHandler)
-          handler.should_not be_nil
-          handler.options[:format].should == theory[:format]
-        end
-      end
+    unless theory[:matcher].nil?
 
-      unless theory[:matcher].nil?
-
-        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)
-            output.should_not be_nil
-
-            theory[:matcher].call(output, handler) if theory[:matcher].arity == 2
-            theory[:matcher].call(output) if theory[:matcher].arity == 1
-          else
-            pending theory[:unless][:message]
+      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)
+          expect(output).to_not be_nil
+
+          theory[:matcher].call(output, handler) if theory[:matcher].arity == 2
+          theory[:matcher].call(output) if theory[:matcher].arity == 1
+        else
+          pending theory[:unless][:message]
         end
-
       end
-
     end
   end
 end