awestruct 0.5.6.beta8 → 0.5.6.beta9

data/lib/awestruct/extensions/sitemap.rb

@@ -24,6 +24,11 @@ module Awestruct
           if site.sitemap["excluded_extensions"]
             @excluded_extensions.merge(site.sitemap.excluded_extensions)
           end
+          
+          # Check for a specified stylesheet for the sitemap
+          if site.sitemap["stylesheet_url"]
+            stylesheet_url = site.sitemap["stylesheet_url"]
+          end
         end
 
         # Go through all of the site's pages and add sitemap metadata
@@ -50,6 +55,7 @@ module Awestruct
         page.output_path     = 'sitemap.xml'
         page.sitemap_entries = sitemap_pages
         page.do_not_track_dependencies = true
+        page.stylesheet_url = stylesheet_url || nil
 
         # Add the sitemap to our site
         site.pages << page

data/lib/awestruct/extensions/sitemap.xml.haml

@@ -1,7 +1,8 @@
 ---
 ---
 !!! XML
-
+- if !page.stylesheet_url.nil?
+  <?xml-stylesheet type='text/xsl' href='#{site.baseurl}#{page.stylesheet_url}'?>
 %urlset{ :xmlns=>'http://www.sitemaps.org/schemas/sitemap/0.9' }
   - unless page.sitemap_entries.empty?
     - for entry in page.sitemap_entries

data/lib/awestruct/extensions/tagger.rb

@@ -20,7 +20,11 @@ module Awestruct
       module TagLinker
         def tag_links(delimiter = ', ', style_class = nil)
           class_attr = (style_class ? ' class="' + style_class + '"' : '')
-          tags.map{|tag| %Q{<a#{class_attr} href="#{tag.primary_page.url}">#{tag}</a>}}.join(delimiter)
+          tags.map do |tag|
+            url = tag.primary_page.url
+            url << '/' unless (url.include?('.htm') || url.end_with?('/'))
+            %Q{<a#{class_attr} href="#{url}">#{tag}</a>}
+          end.join(delimiter)
         end
       end
 
@@ -45,14 +49,11 @@ module Awestruct
               @tags[tag] ||= TagStat.new( tag, [] )
               @tags[tag].pages << page
             end
+            page.tags = (page.tags || []).collect{|t| @tags[t]}
+            page.extend( TagLinker )
           end
         end
 
-        all.each do |page|
-          page.tags = (page.tags||[]).collect{|t| @tags[t]}
-          page.extend( TagLinker )
-        end
-
         ordered_tags = @tags.values
         ordered_tags.sort!{|l,r| -(l.pages.size <=> r.pages.size)}
         #ordered_tags = ordered_tags[0,100]

data/lib/awestruct/extensions/template.atom.haml

@@ -36,7 +36,7 @@
           - for tag in entry.tags
             %category{:term=>"#{tag}"}
         %summary
-          #{summarize( html_to_text( entry.content ), 100 )}
+          #{summarize( html_to_text( entry.content ).strip, 100 )}
         %content{:type=>'html'}
           = clean_html( html_escape( fully_qualify_urls( site.base_url, find_and_preserve( entry.content ) ) ) )
   

data/lib/awestruct/frameworks/base_Gemfile

@@ -24,9 +24,20 @@
 
 source 'https://rubygems.org'                             # This tells Bundler where to look for gems
 
-gem 'awestruct', '~> 0.5.3'                               # Goes without saying
+gem 'awestruct', '>= <%= awestruct_version %>'                               # Goes without saying
 gem 'webrick', '~> 1.3.1'                                 # The rack webserver to use in dev mode
 
+gem 'compass', '<%= dependencies['compass'].requirement %>'
+<% if framework.eql? 'bootstrap' %>
+gem 'bootstrap-sass', '<%= dependencies['bootstrap-sass'].requirement %>'
+<% end %>
+<% if framework.eql? 'foundation' %>
+gem 'zurb-foundation', '<%= dependencies['zurb-foundation'].requirement %>'
+<% end %>
+<% if framework.eql? '960' %>
+gem 'compass-960-plugin', '<%= dependencies['compass-960-plugin'].requirement %>'
+<% end %>
+
 # FIXME
 # gem 'rake', '>= 0.9.2'                                  # Needed for the Rakefile to work
 # gem 'coffee-script', '>= 2.2.0'                         # If using coffee-script or to remove the warning

data/lib/awestruct/frameworks/bootstrap/base_index.html.haml

@@ -1,27 +1,29 @@
 ---
 layout: base
 ---
-.hero-unit
+.jumbotron
   %h1 You're awestruct!
-  %p This site is all setup to use Bootstrap 2 with Awestruct.
+  %p This site is all setup to use Bootstrap 3 with Awestruct.
   %p
-    %a.btn.btn-primary.btn-large{ :href=>'http://awestruct.org' }
+    %a.btn.btn-primary.btn-lg{ :href=>'http://awestruct.org', :role=>"button" }
       %i.icon-info-sign.icon-white
       Learn more »
-.row
-  .span4
-    %h2 About
-    %p Awestruct is a framework for creating static HTML sites. It's inspired by the awesome Jekyll utility in the same genre.
-    %p Additionally, Awestruct integrates technologies such as Compass, Markdown and Haml.
-    %p
-      %a.btn{ :href=>'http://awestruct.org' } View details » 
-  .span4
-    %h2 Goal
-    %p The goal of Awestruct is to make it trivially easy to bake out non-trivial static websites. In addition to providing template-driven site creation (using Haml), Awestruct provides facilities for easily priming the site creation with additional non-page data.
-    %p
-      %a.btn{ :href=>'http://awestruct.org' } View details » 
-  .span4
-    %h2 Concept
-    %p The core concept of Awestruct is that of structures, specifically Ruby OpenStruct structures. The struct aspect allows arbitrary, schema-less data to be associated with a specific page or the entire site.
-    %p
-      %a.btn{ :href=>'http://awestruct.org' } View details » 
+
+.container-fluid
+  .row
+    .col-md-4
+      %h2 About
+      %p Awestruct is a framework for creating static HTML sites. It's inspired by the awesome Jekyll utility in the same genre.
+      %p Additionally, Awestruct integrates technologies such as Compass, Markdown and Haml.
+      %p
+        %a.btn{ :href=>'http://awestruct.org' } View details »
+    .col-md-4
+      %h2 Goal
+      %p The goal of Awestruct is to make it trivially easy to bake out non-trivial static websites. In addition to providing template-driven site creation (using Haml), Awestruct provides facilities for easily priming the site creation with additional non-page data.
+      %p
+        %a.btn{ :href=>'http://awestruct.org' } View details »
+    .col-md-4
+      %h2 Concept
+      %p The core concept of Awestruct is that of structures, specifically Ruby OpenStruct structures. The struct aspect allows arbitrary, schema-less data to be associated with a specific page or the entire site.
+      %p
+        %a.btn{ :href=>'http://awestruct.org' } View details »

data/lib/awestruct/frameworks/bootstrap/base_layout.html.haml

@@ -12,13 +12,15 @@
     /[if lt IE 9]
       %script{ :type=>'text/javascript', :src=>'//html5shim.googlecode.com/svn/trunk/html5.js' }
   %body
-    .navbar.navbar-fixed-top
-      .navbar-inner
-        .container
-          %a.brand{ :href=>"#{site.base_url}" } #{site.name}
-          %ul.nav
-            %li
-              %a{ :href=>"#{site.base_url}" } Home
+    %nav.navbar.navbar-default.navbar-fixed-top{:role=>'navigation'}
+      .container-fluid
+        .navbar-header
+          %a.navbar-brand{ :href=>"#{site.base_url}" } #{site.name}
+
+        %ul.nav.navbar-nav.navbar-right
+          %li
+            %a{ :href=>"#{site.base_url}" } Home
+
     .container
       ~ content
       %hr

data/lib/awestruct/handlers/asciidoctor_handler.rb

@@ -23,7 +23,7 @@ module Awestruct
       end
     end
 
-    class AsciidoctorHandler < BaseTiltHandler
+    class AsciidoctorHandler < TiltHandler
 
       CHAIN = Awestruct::HandlerChain.new( Awestruct::Handlers::AsciidoctorTiltMatcher.new(),
         Awestruct::Handlers::FileHandler,

data/lib/awestruct/handlers/base_tilt_handler.rb

@@ -137,12 +137,14 @@ module Awestruct
           ExceptionHelper.log_message "Could not load template library required for rendering #{File.join site.dir, error_page.source_path}."
           ExceptionHelper.log_message "Please see #{File.join site.dir, error_page.output_path} for more information"
           return ExceptionHelper.html_error_report e, error_page.source_path
-        rescue Exception => e
+        rescue => e
           error_page = context[:page]
           if error_page[:__is_layout] == true
             ExceptionHelper.log_message "An error during rendering layout file #{File.join site.dir, error_page.source_path} occurred."
+            ExceptionHelper.log_building_error e, error_page.source_path
           else
             ExceptionHelper.log_message "An error during rendering #{File.join site.dir, error_page.source_path} occurred."
+            ExceptionHelper.log_building_error e, error_page.source_path
           end
           ExceptionHelper.log_message "Please see #{File.join site.dir, error_page.output_path} for more information"
           return ExceptionHelper.html_error_report e, error_page.source_path

data/lib/awestruct/pipeline.rb

@@ -6,18 +6,35 @@ module Awestruct
   class Pipeline
 
     attr_reader :handler_chains
+    attr_reader :before_all_extensions
+    attr_reader :extensions
+    attr_reader :after_all_extensions
+    attr_reader :helpers
+    attr_reader :transformers
+    attr_reader :after_generation_extensions
 
     def initialize()
       @handler_chains = HandlerChains.new
-      @extensions     = []
-      @helpers        = []
-      @transformers   = []
+      @before_all_extensions       = []
+      @extensions                  = []
+      @helpers                     = []
+      @transformers                = []
+      @after_all_extensions        = []
+      @after_generation_extensions = []
+    end
+
+    def add_before_extension(e)
+      @before_all_extensions << e
     end
 
     def extension(e)
       @extensions << e
       # TC: why? transformer and extension?
-      e.transform(@transformers) if e.respond_to?('transform')
+      e.transform(@transformers) if e.respond_to?(:transform)
+    end
+
+    def add_after_extension(e)
+      @after_all_extensions << e
     end
 
     def helper(h)
@@ -28,14 +45,37 @@ module Awestruct
       @transformers << t
     end
 
-    def execute(site)
-      execute_extensions(site)
+    def add_after_generation_extension(e)
+      @after_generation_extensions << e
     end
 
-    def execute_extensions(site)
+    def execute(site, on_reload = false)
+      execute_extensions(site, on_reload)
+    end
+
+    def execute_extensions(site, on_reload)
+      @before_all_extensions.each do |e|
+        e.on_reload(site) if (on_reload && e.respond_to?(:on_reload))
+        if (e.respond_to? :execute)
+          e.execute(site)
+        else
+          e.before_extensions(site)
+        end
+      end
+
       @extensions.each do |e|
+        e.on_reload(site) if (on_reload && e.respond_to?(:on_reload))
         e.execute(site)
       end
+
+      @after_all_extensions.each do |e|
+        e.on_reload(site) if (on_reload && e.respond_to?(:on_reload))
+        if e.respond_to? :execute
+          e.execute(site)
+        else
+          e.after_generation(site)
+        end
+      end
     end
 
     def apply_transformers(site, page, rendered)
@@ -45,6 +85,16 @@ module Awestruct
       rendered
     end
 
+    def execute_after_generation(site)
+      @after_generation_extensions.each do |e|
+        if e.respond_to? :execute
+          e.execute(site)
+        else
+          e.after_generation(site)
+        end
+      end
+    end
+
     def mixin_helpers(context)
       context.extend( Awestruct::ContextHelper )
       @helpers.each do |h|

data/lib/awestruct/rack/generate.rb

@@ -0,0 +1,43 @@
+
+module Awestruct
+  module Rack
+
+    class GenerateOnAccess
+      def initialize(app)
+        @app = app
+      end
+
+      def call(env)
+        engine = ::Awestruct::Engine.instance
+
+        generate = false
+
+        req_path = env['REQUEST_PATH']
+        path = req_path
+        path = req_path + "index.html" if req_path.end_with? '/'
+
+        page = engine.site.pages_by_output_path[path]
+        if page.nil? and !req_path.end_with? '/'
+          path = req_path + "/index.html"
+          page = engine.site.pages_by_output_path[path]
+        end
+
+        if !page.nil?
+          generate_path = File.join( engine.site.config.output_dir, page.output_path )
+
+          generate = true if page.stale_output? generate_path
+          generate = true if path.end_with? '.html'
+        end
+
+        if generate
+          puts "Regenerate #{page.source_path}"
+
+          engine.generate_page page, true
+        end
+
+        @app.call(env)
+      end
+    end
+
+  end
+end

data/lib/awestruct/util/exception_helper.rb

@@ -1,5 +1,8 @@
 module Awestruct
   class ExceptionHelper
+
+    EXITCODES = {:generation_error => 125, :success => 0}
+
     @@failed = false
 
     def self.log_message message

data/lib/awestruct/version.rb

@@ -1,3 +1,3 @@
 module Awestruct
-  VERSION = '0.5.6.beta8'
+  VERSION = '0.5.6.beta9'
 end

data/spec/awestruct/cli/invoker_spec.rb

@@ -76,7 +76,7 @@ describe Awestruct::CLI::Invoker do
     generator = double
     Awestruct::CLI::Generate.should_receive( :new ).and_return( generator )
     generator.should_receive( :run ).and_return( false )
-    Awestruct::CLI::Invoker.new( %w(--source-dir spec/support/test-config --generate) ).invoke!.should be_false
+    expect(Awestruct::CLI::Invoker.new( %w(--source-dir spec/support/test-config --generate) ).invoke!).to be_falsey
   end
 
 

data/spec/awestruct/cli/options_spec.rb

@@ -63,37 +63,38 @@ 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.'
-      #parse!( '--run', 'puts "hi"' ).script.should == 'puts "hi"'
-    end
+    # I'm not sure if we'll ever do this
+    # 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
       result = parse!( '--deploy' )
-      result.deploy.should be_true
-      result.generate.should be_false
+      result.deploy.should be_truthy
+      result.generate.should be_falsey
     end
 
     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
+      result.deploy.should be_truthy
+      result.generate.should be_truthy
 
       result = parse!( '--generate', '--deploy' )
-      result.deploy.should be_true
-      result.generate.should be_true
+      result.deploy.should be_truthy
+      result.generate.should be_truthy
     end
 
     it 'should turn on verbose when -w or --verbose is explicitly turned back on' do
       result = parse!( '-w' )
-      result.verbose.should be_true
+      result.verbose.should be_truthy
 
       result = parse!( '--verbose' )
-      result.verbose.should be_true
+      result.verbose.should be_truthy
     end
 
     it 'should generate by default' do
-      parse!().generate.should be_true
+      parse!().generate.should be_truthy
     end
 
     it 'should parse directory options' do

data/spec/awestruct/cli/server_spec.rb

@@ -0,0 +1,15 @@
+require 'awestruct/cli/server'
+require 'awestruct/cli/options'
+require 'socket'
+require 'timeout'
+
+describe Awestruct::CLI::Server do
+
+  let(:subject) { Awestruct::CLI::Server.new('./')}
+
+  it 'should abort if the port is already in use' do
+    server = class_double(TCPServer).as_stubbed_const(:transfer_nested_constants => true)
+    expect(server).to receive(:new).and_raise(Errno::EADDRINUSE)
+    expect(lambda { Timeout.timeout(0.2) { subject.run } }).to raise_error(SystemExit)
+  end
+end

data/spec/awestruct/context_helper_spec.rb

@@ -76,21 +76,21 @@ describe Awestruct::ContextHelper do
   describe "fully_qualify_urls" do
     it "should fix anchor tags" do
       str = "<a href='/foo'>foobar</a>"
-      @tester.fully_qualify_urls('http://foobar.com', str).should == "<a href=\"http://foobar.com/foo\">foobar</a>"
+      @tester.fully_qualify_urls('http://foobar.com', str).should == %q(<a href="http://foobar.com/foo">foobar</a>)
     end
 
     it "should fix link tags" do
-      str = "<link href='/foo' />"
-      @tester.fully_qualify_urls('http://foobar.com', str).should == "<link href=\"http://foobar.com/foo\"/>"
+      str = "<link href='/foo'>"
+      @tester.fully_qualify_urls('http://foobar.com', str).should == %q(<link href="http://foobar.com/foo" />)
     end
 
     it "should fix image tags" do
       str = "<img src='/foo' />"
-      @tester.fully_qualify_urls('http://foobar.com', str).should == "<img src=\"http://foobar.com/foo\"/>"
+      @tester.fully_qualify_urls('http://foobar.com', str).should == %q(<img src="http://foobar.com/foo" />)
     end
 
     it "should leave anchor tags with no href attribute (for page anchors) unchanged" do
-      str = "<a target=\"#foo\">foobar</a>"
+      str = %q(<a target="#foo">foobar</a>)
       @tester.fully_qualify_urls('http://foobar.com', str).should == str
     end
   end