awestruct 0.5.3 → 0.5.4.beta1

data/spec/slim_handler_spec.rb

@@ -26,56 +26,58 @@ verify_with_variables = lambda { |output|
 }
 
 theories =
-  [
-    {
-      :page => 'slim-page.html.slim',
-      :simple_name => 'slim-page',
-      :syntax => :slim,
-      :extension => '.html',
-      :format => :html5,
-      :matcher => verify
-    },
-    {
-      :page => 'slim-page.xml.slim',
-      :simple_name => 'slim-page',
-      :syntax => :slim,
-      :extension => '.xml',
-      :format => :xhtml,
-      :matcher => verify
-    },
-    {
-      :page => 'slim-page.atom.slim',
-      :simple_name => 'slim-page',
-      :syntax => :slim,
-      :extension => '.atom',
-      :format => :xhtml,
-      :matcher => verify_atom
-    },
-    {
-      :page => 'slim-with-markdown-page.html.slim',
-      :simple_name => 'slim-with-markdown-page',
-      :syntax => :slim,
-      :extension => '.html',
-      :matcher => verify_with_markdown
-    },
-    {
-      :page => 'slim-with-utf.html.slim',
-      :simple_name => 'slim-with-utf',
-      :syntax => :slim,
-      :extension => '.html',
-      :matcher => verify_with_utf8
-    },
-    {
-      :page => 'slim-with-variables.html.slim',
-      :simple_name => 'slim-with-variables',
-      :syntax => :slim,
-      :extension => '.html',
-      :matcher => verify_with_variables
-    }
-  ]
+    [
+        {
+            :page => 'slim-page.html.slim',
+            :simple_name => 'slim-page',
+            :syntax => :slim,
+            :extension => '.html',
+            :format => :html5,
+            :matcher => verify
+        },
+        {
+            :page => 'slim-page.xml.slim',
+            :simple_name => 'slim-page',
+            :syntax => :slim,
+            :extension => '.xml',
+            :format => :xhtml,
+            :matcher => verify
+        },
+        {
+            :page => 'slim-page.atom.slim',
+            :simple_name => 'slim-page',
+            :syntax => :slim,
+            :extension => '.atom',
+            :format => :xhtml,
+            :matcher => verify_atom
+        },
+        {
+            :page => 'slim-with-markdown-page.html.slim',
+            :simple_name => 'slim-with-markdown-page',
+            :syntax => :slim,
+            :extension => '.html',
+            :matcher => verify_with_markdown
+        },
+        {
+            :page => 'slim-with-utf.html.slim',
+            :simple_name => 'slim-with-utf',
+            :syntax => :slim,
+            :extension => '.html',
+            :matcher => verify_with_utf8
+        },
+        {
+            :page => 'slim-with-variables.html.slim',
+            :simple_name => 'slim-with-variables',
+            :syntax => :slim,
+            :extension => '.html',
+            :matcher => verify_with_variables
+        }
+    ]
 
 describe Awestruct::Handlers::TiltHandler.to_s + '-Slim' do
-  let(:additional_config) { {:crunchy => 'bacon'} }
-  it_should_behave_like 'a handler', theories
+  def additional_config
+    { :crunchy => 'bacon' }
+  end
 
+  it_should_behave_like 'a handler', theories
 end

data/spec/support/shared_handler_example.rb

@@ -7,25 +7,29 @@ require 'hashery'
 REQUIRED_VARIABLES = [:page, :simple_name, :syntax, :extension]
 ALL_VARIABLES = REQUIRED_VARIABLES + [:format, :matcher, :unless]
 
-shared_examples "a handler" do |theories|
+shared_examples '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 :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(
-                    Awestruct::Config.new( File.expand_path(File.dirname(__FILE__) + '/../') + '/test-data/handlers' ))
+      @engine = Awestruct::Engine.new( @config )
       @engine.load_default_site_yaml
       @site = @engine.site
+    end
 
+    before :each do
       @site.merge! additional_config if respond_to?("additional_config")
     end
 
@@ -62,7 +66,7 @@ shared_examples "a handler" do |theories|
         handler.output_extension.should == theory[:extension]
       end
 
-      if !theory[:format].nil?
+      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
@@ -74,13 +78,13 @@ shared_examples "a handler" do |theories|
         end
       end
 
-      if !theory[:matcher].nil?
+      unless theory[:matcher].nil?
 
         it "should render page '#{theory[:page]}'" do
           if theory[:unless].nil? or !theory[:unless][:exp].call()
             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 )
+            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

data/spec/test-data/front-matter-file-utf8.txt

@@ -0,0 +1,5 @@
+---
+foo: bar
+utf8-content: Μεα ιυδισο μενθιτυμ ετ. Ιυς ευ ποπυλω
+---
+This is some content

data/spec/test-data/handlers/haml-error.html.haml

@@ -0,0 +1,4 @@
+%h1
+  testing
+    %span
+        Hello World!

data/spec/test-data/handlers/hello.bogus

@@ -0,0 +1 @@
+xml.em('Hello World!')

data/spec/tilt_handler_spec.rb

@@ -1,16 +1,44 @@
-
+require 'logger'
 require 'awestruct/config'
+#require 'awestruct/engine'
 require 'awestruct/handlers/file_handler'
 require 'awestruct/handlers/tilt_handler'
 
 require 'hashery'
+require 'tilt/template'
+
+
+module Tilt
+  class BogusTemplate < Template
+    self.default_mime_type = 'text/html'
+
+    def self.engine_initialized?
+      defined? ::Bogus::Document
+    end
+
+    def initialize_engine
+      require_template_library 'fake-gem-name'
+    end
+
+    def evaluate(scope, locals, &block)
+      @output ||= "bogus, bogus, bogus"
+    end
+
+    def allows_script?
+      false
+    end
+  end
+end
+
 
 describe Awestruct::Handlers::TiltHandler do
 
   before do
-    dir = Pathname.new( File.dirname(__FILE__) + '/test-data/handlers' ) 
+    dir = Pathname.new( File.dirname(__FILE__) + '/test-data/handlers' )
+    opts = Awestruct::CLI::Options.new
+    opts.source_dir = dir
 
-    @site = Hashery::OpenCascade[ { :encoding=>false, :dir=>dir, :config=>Awestruct::Config.new( dir ) } ]
+    @site = Hashery::OpenCascade[ { :encoding=>false, :dir=>dir, :config=>Awestruct::Config.new( opts ) } ]
   end
 
   def handler_file(path)
@@ -76,4 +104,43 @@ describe Awestruct::Handlers::TiltHandler do
     handler.output_filename.should eql 'warp-1.0.0.Alpha2.html'
 
   end
+
+  context 'when loading an engine not installed' do
+    specify 'should not throw exceptions; instead have the error in the rendered output' do
+      # setup
+      Tilt::register Tilt::BogusTemplate, '.bogus',
+      log = StringIO.new
+      $LOG = Logger.new(log)
+      $LOG.level = Logger::DEBUG
+      @site.dir = Pathname.new( File.dirname(__FILE__) + '/test-data/handlers/' )
+      path = handler_file( "hello.bogus" )
+      expect(Awestruct::Handlers::TiltMatcher.new().match(path)).to be_false
+      expect(log.string).to include('missing required gem')
+
+      # we don't even want to process a file if we cannot load its Tilt template
+      #file_handler = Awestruct::Handlers::FileHandler.new( @site, path )
+      #handler = Awestruct::Handlers::TiltHandler.new( @site, file_handler )
+      #content = handler.rendered_content(create_context)
+
+      #expect(content).to_not eql ('bogus, bogus, bogus')
+      #expect(content).to include('load', 'fake-gem-name')
+    end
+  end
+
+  context 'when rendering a file with an error' do
+    specify 'should not stop processing, but render the error as the file' do
+      # setup
+      log = StringIO.new
+      $LOG = Logger.new(log)
+      $LOG.level = Logger::DEBUG
+      @site.dir = Pathname.new( File.dirname(__FILE__) + '/test-data/handlers/' )
+      file_handler = Awestruct::Handlers::FileHandler.new( @site, handler_file( "haml-error.html.haml" ) )
+      handler = Awestruct::Handlers::TiltHandler.new( @site, file_handler )
+      content = handler.rendered_content(create_context)
+
+      expect(content).to_not be_empty
+      expect(content).to include('Illegal', 'nesting', 'Line', '2')
+    end
+  end
+
 end

metadata

@@ -1,15 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: awestruct
 version: !ruby/object:Gem::Version
-  version: 0.5.3
-  prerelease: 
+  version: 0.5.4.beta1
+  prerelease: 6
 platform: ruby
 authors:
 - Bob McWhirter and other contributors
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-07-25 00:00:00.000000000 Z
+date: 2013-08-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: haml
@@ -139,22 +139,6 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: 1.6.7
-- !ruby/object:Gem::Dependency
-  name: git
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 1.2.5
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 1.2.5
 - !ruby/object:Gem::Dependency
   name: ruby-s3cmd
   requirement: !ruby/object:Gem::Requirement
@@ -239,6 +223,7 @@ files:
 - lib/awestruct/handlers/page_delegating_handler.rb
 - lib/awestruct/handlers/string_handler.rb
 - lib/awestruct/handlers/interpolation_handler.rb
+- lib/awestruct/handlers/verbatim_file_handler.rb
 - lib/awestruct/handlers/restructuredtext_handler.rb
 - lib/awestruct/handlers/no_op_handler.rb
 - lib/awestruct/handlers/tilt_handler.rb
@@ -259,6 +244,7 @@ files:
 - lib/awestruct/config/default-site.yml
 - lib/awestruct/site.rb
 - lib/awestruct/deployers.rb
+- lib/awestruct/scm/git.rb
 - lib/awestruct/astruct_mixin.rb
 - lib/awestruct/version.rb
 - lib/awestruct/page_loader.rb
@@ -305,6 +291,7 @@ files:
 - man/awestruct.1
 - spec/yaml_handler_spec.rb
 - spec/mustache_handler_spec.rb
+- spec/awestruct/scm/git_spec.rb
 - spec/options_spec.rb
 - spec/posts_archive_spec.rb
 - spec/front_matter_handler_spec.rb
@@ -335,8 +322,11 @@ files:
 - 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/front-matter-file-utf8.txt
+- spec/test-data/handlers/hello.bogus
 - spec/test-data/handlers/scss-page-include.scss
 - spec/test-data/handlers/haml-layout-two.html.haml
+- spec/test-data/handlers/haml-error.html.haml
 - spec/test-data/handlers/haml-page.xml.haml
 - spec/test-data/handlers/markdown-page.mkd
 - spec/test-data/handlers/outside_relative/git_keep
@@ -430,16 +420,13 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -3726188984491065778
+      hash: -305438061854300207
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
-  - - ! '>='
+  - - ! '>'
     - !ruby/object:Gem::Version
-      version: '0'
-      segments:
-      - 0
-      hash: -3726188984491065778
+      version: 1.3.1
 requirements:
 - Any markup languages you are using and its dependencies
 - Haml and markdown filters are touchy things. Rdiscount works well if you're running
@@ -452,6 +439,7 @@ summary: Static site-baking utility
 test_files:
 - spec/yaml_handler_spec.rb
 - spec/mustache_handler_spec.rb
+- spec/awestruct/scm/git_spec.rb
 - spec/options_spec.rb
 - spec/posts_archive_spec.rb
 - spec/front_matter_handler_spec.rb
@@ -482,8 +470,11 @@ test_files:
 - 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/front-matter-file-utf8.txt
+- spec/test-data/handlers/hello.bogus
 - spec/test-data/handlers/scss-page-include.scss
 - spec/test-data/handlers/haml-layout-two.html.haml
+- spec/test-data/handlers/haml-error.html.haml
 - spec/test-data/handlers/haml-page.xml.haml
 - spec/test-data/handlers/markdown-page.mkd
 - spec/test-data/handlers/outside_relative/git_keep