webgen 0.5.10 → 0.5.11

data/lib/webgen/cli/utils.rb

@@ -1,11 +1,7 @@
 # -*- encoding: utf-8 -*-
 
-require 'facets/ansicode'
 require 'rbconfig'
 
-ANSICode.define_ansicolor_method(:lred, '1;31')
-ANSICode.define_ansicolor_method(:lblue, '1;34')
-
 module Webgen::CLI
 
   # Provides methods for other CLI classes for formatting text in a consistent manner.
@@ -15,13 +11,28 @@ module Webgen::CLI
     DEFAULT_WIDTH = if Config::CONFIG['host_os'] =~ /mswin|mingw/
                       72
                     else
-                      ((size = %x{stty size 2>/dev/null}).length > 0 ? size.split.last.to_i : 72) rescue 72
+                      ((size = %x{stty size 2>/dev/null}).length > 0 && (size = size.split.last.to_i) > 0 ? size : 72) rescue 72
                     end
 
+    module Color
+
+      @@colors = {:bold => [0, 1], :green => [0, 32], :lred => [1, 31], :reset => [0, 0]}
+
+      @@colors.each do |color, values|
+        module_eval <<-EOF
+        def Color.#{color.to_s}(text = nil)
+            "\e[#{values[0]};#{values[1]}m" + (text.nil? ? '' : text + self.reset)
+        end
+        EOF
+      end
+
+    end
+
+
     # Used for dynamically formatting the text (setting color, bold face, ...).
     def self.method_missing(id, text = nil)
-      if USE_ANSI_COLORS && ANSICode.respond_to?(id)
-        ANSICode.send(id, text.to_s)
+      if USE_ANSI_COLORS && Color.respond_to?(id)
+        Color.send(id, text.to_s)
       else
         text.to_s
       end

data/lib/webgen/cli/webgui_command.rb

@@ -1,7 +1,6 @@
 # -*- encoding: utf-8 -*-
 
 require 'webgen/cli'
-require 'facets/kernel/silence'
 
 module Webgen::CLI
 
@@ -22,7 +21,8 @@ module Webgen::CLI
       $:.unshift File.join(Webgen.data_dir, 'webgui', 'overrides')
       require 'win32console'
       $:.shift
-      silence_warnings do
+      begin
+        oldv, $VERBOSE = $VERBOSE, nil
         begin
           require 'ramaze/snippets/object/__dir__'
           Object.__send__(:include, Ramaze::CoreExtensions::Object)
@@ -32,6 +32,8 @@ module Webgen::CLI
           puts "You can install it via 'gem install ramaze --version 2009.04'"
           return
         end
+      ensure
+        $VERBOSE = oldv
       end
       def Ramaze.shutdown; # :nodoc:
       end

data/lib/webgen/common.rb

@@ -7,6 +7,16 @@ module Webgen
 
     autoload :Sitemap, 'webgen/common/sitemap'
 
+    # Return the constant object for the given absolute constant +name+.
+    def self.const_for_name(name)
+      name.split('::').inject(Object) {|b,n| b.const_get(n)}
+    end
+
+    # Return the error line by inspecting the backtrace of the given +error+ instance.
+    def self.error_line(error)
+      (error.is_a?(::SyntaxError) ? error.message : error.backtrace[0]).scan(/:(\d+)/).first.first.to_i rescue nil
+    end
+
   end
 
 end

data/lib/webgen/configuration.rb

@@ -1,7 +1,5 @@
 # -*- encoding: utf-8 -*-
 
-require 'facets/symbol/to_proc'
-
 module Webgen
 
   # Stores the configuration for a webgen website.
@@ -105,7 +103,7 @@ module Webgen
       # Complete +sh_name+ by checking if a source handler called
       # <tt>Webgen::SourceHandler::SH_NAME</tt> exists.
       def complete_source_handler_name(sh_name)
-        (Webgen::SourceHandler.constants.map(&:to_s).include?(sh_name) ? 'Webgen::SourceHandler::' + sh_name : sh_name)
+        (Webgen::SourceHandler.constants.map {|c| c.to_s}.include?(sh_name) ? 'Webgen::SourceHandler::' + sh_name : sh_name)
       end
       private :complete_source_handler_name
 

data/lib/webgen/contentprocessor.rb

@@ -56,9 +56,9 @@ module Webgen
   #
   #   end
   #
-  #   WebsiteAccess.website.config['contentprocessor.map']['replacer'] = 'SampleProcessor'
+  #   Webgen::WebsiteAccess.website.config['contentprocessor.map']['replacer'] = 'SampleProcessor'
   #   # Or one could equally write
-  #   # WebsiteAccess.website.config['contentprocessor.map']['replacer'] = ['SampleProcessor', :text]
+  #   # Webgen::WebsiteAccess.website.config['contentprocessor.map']['replacer'] = ['SampleProcessor', :text]
   #
   module ContentProcessor
 
@@ -77,6 +77,8 @@ module Webgen
     autoload :Head, 'webgen/contentprocessor/head'
     autoload :Tidy, 'webgen/contentprocessor/tidy'
     autoload :Xmllint, 'webgen/contentprocessor/xmllint'
+    autoload :Kramdown, 'webgen/contentprocessor/kramdown'
+    autoload :Less, 'webgen/contentprocessor/less'
 
     # Return the list of all available content processors.
     def self.list

data/lib/webgen/contentprocessor/blocks.rb

@@ -45,6 +45,7 @@ module Webgen::ContentProcessor
         used_chain = (context[:chain].length > 1 ? context[:chain][1..-1] : context[:chain]).dup
       elsif options[:chain].kind_of?(Array)
         used_chain = options[:chain]
+        dest_node = context.content_node
       else
         paths = options[:chain].split(';')
         used_chain = paths.collect do |path|

data/lib/webgen/contentprocessor/builder.rb

@@ -1,23 +1,18 @@
 # -*- encoding: utf-8 -*-
 
+require 'webgen/common'
+
 module Webgen::ContentProcessor
 
   # Processes content that is valid Ruby to build an XML tree. This is done by using the +builder+
   # library.
   class Builder
 
-    include Deprecated
-
     # Process the content of +context+ which needs to be valid Ruby code. The special variable +xml+
     # should be used to construct the XML content.
     def call(context)
       require 'builder'
 
-      website = deprecate('website', 'context.website', context.website)
-      node = deprecate('node', 'context.node', context.content_node)
-      ref_node = deprecate('ref_node', 'context.ref_node', context.ref_node)
-      dest_node = deprecate('dest_node', 'context.dest_node', context.dest_node)
-
       xml = ::Builder::XmlMarkup.new(:indent => 2)
       eval(context.content, binding, context.ref_node.alcn)
       context.content = xml.target!
@@ -25,8 +20,7 @@ module Webgen::ContentProcessor
     rescue LoadError
       raise Webgen::LoadError.new('builder', self.class.name, context.dest_node.alcn, 'builder')
     rescue Exception => e
-      line = (e.is_a?(::SyntaxError) ? e.message : e.backtrace[0]).scan(/:(\d+)/).first.first.to_i rescue nil
-      raise Webgen::RenderError.new(e, self.class.name, context.dest_node.alcn, context.ref_node.alcn, line)
+      raise Webgen::RenderError.new(e, self.class.name, context.dest_node.alcn, context.ref_node.alcn, Webgen::Common.error_line(e))
     end
 
   end

data/lib/webgen/contentprocessor/erb.rb

@@ -1,29 +1,23 @@
 # -*- encoding: utf-8 -*-
 
+require 'webgen/common'
+
 module Webgen::ContentProcessor
 
   # Processes embedded Ruby statements.
   class Erb
 
-    include Deprecated
-
     # Process the Ruby statements embedded in the content of +context+.
     def call(context)
       require 'erb'
       extend(ERB::Util)
 
-      website = deprecate('website', 'context.website', context.website)
-      node = deprecate('node', 'context.node', context.content_node)
-      ref_node = deprecate('ref_node', 'context.ref_node', context.ref_node)
-      dest_node = deprecate('dest_node', 'context.dest_node', context.dest_node)
-
       erb = ERB.new(context.content)
       erb.filename = context.ref_node.alcn
       context.content = erb.result(binding)
       context
     rescue Exception => e
-      line = (e.is_a?(::SyntaxError) ? e.message : e.backtrace[0]).scan(/:(\d+)/).first.first.to_i rescue nil
-      raise Webgen::RenderError.new(e, self.class.name, context.dest_node.alcn, context.ref_node.alcn, line)
+      raise Webgen::RenderError.new(e, self.class.name, context.dest_node.alcn, context.ref_node.alcn, Webgen::Common.error_line(e))
     end
 
   end

data/lib/webgen/contentprocessor/erubis.rb

@@ -1,23 +1,18 @@
 # -*- encoding: utf-8 -*-
 
+require 'webgen/common'
+
 module Webgen::ContentProcessor
 
   # Processes embedded Ruby statements with the +erubis+ library.
   class Erubis
 
-    include Deprecated
-
     # Process the Ruby statements embedded in the content of +context+.
     def call(context)
       require 'erubis'
       # including Erubis because of problem with resolving Erubis::XmlHelper et al
       self.class.class_eval "include ::Erubis"
 
-      website = deprecate('website', 'context.website', context.website)
-      node = deprecate('node', 'context.node', context.content_node)
-      ref_node = deprecate('ref_node', 'context.ref_node', context.ref_node)
-      dest_node = deprecate('dest_node', 'context.dest_node', context.dest_node)
-
       options = context.website.config['contentprocessor.erubis.options']
       if context[:block]
         use_pi = context[:block].options['erubis_use_pi']
@@ -35,8 +30,7 @@ module Webgen::ContentProcessor
     rescue LoadError
       raise Webgen::LoadError.new('erubis', self.class.name, context.dest_node.alcn, 'erubis')
     rescue Exception => e
-      line = (e.is_a?(::SyntaxError) ? e.message : e.backtrace[0]).scan(/:(\d+)/).first.first.to_i rescue nil
-      raise Webgen::RenderError.new(e, self.class.name, context.dest_node.alcn, context.ref_node.alcn, line)
+      raise Webgen::RenderError.new(e, self.class.name, context.dest_node.alcn, context.ref_node.alcn, Webgen::Common.error_line(e))
     end
 
   end

data/lib/webgen/contentprocessor/haml.rb

@@ -1,32 +1,31 @@
 # -*- encoding: utf-8 -*-
 
+require 'webgen/common'
+
 module Webgen::ContentProcessor
 
   # Processes content in Haml markup using the +haml+ library.
   class Haml
 
-    include Deprecated
-
     # Convert the content in +haml+ markup to HTML.
     def call(context)
       require 'haml'
 
-      locals = {
-        :context => context,
-        :website => deprecate('website', 'context.website', context.website),
-        :node => deprecate('node', 'context.node', context.content_node),
-        :ref_node => deprecate('ref_node', 'context.ref_node', context.ref_node),
-        :dest_node => deprecate('dest_node', 'context.dest_node', context.dest_node)
-      }
+      locals = {:context => context}
       context.content = ::Haml::Engine.new(context.content, :filename => context.ref_node.alcn).
         render(Object.new, locals)
       context
     rescue LoadError
       raise Webgen::LoadError.new('haml', self.class.name, context.dest_node.alcn, 'haml')
     rescue ::Haml::Error => e
-      raise Webgen::RenderError.new(e, self.class.name, context.dest_node.alcn, context.ref_node.alcn, (e.line + 1 if e.line))
+      line = if e.line
+               e.line + 1
+             else
+               Webgen::Common.error_line(e)
+             end
+      raise Webgen::RenderError.new(e, self.class.name, context.dest_node.alcn, context.ref_node.alcn, line)
     rescue Exception => e
-      raise Webgen::RenderError.new(e, self.class.name, context.dest_node.alcn, context.ref_node.alcn)
+      raise Webgen::RenderError.new(e, self.class.name, context.dest_node.alcn, context.ref_node.alcn, Webgen::Common.error_line(e))
     end
 
   end

data/lib/webgen/contentprocessor/head.rb

@@ -29,11 +29,16 @@ module Webgen::ContentProcessor
 
     HTML_HEAD_END_RE = /<\/head\s*>/i #:nodoc:
 
+    LINK_DOCUMENT_ATTRS = {'type' => 'text/html'} #:nodoc:
+    LINK_DOCUMENT_TYPES = %w{start next prev contents index glossary chapter section subsection appendix help} #:nodoc:
+
     # Insert the additional header information.
     def call(context)
       require 'erb'
       context.content.sub!(HTML_HEAD_END_RE) do |match|
         result = ''
+
+        # add content set programmatically
         if context.persistent[:cp_head].kind_of?(Hash)
           context.persistent[:cp_head][:js_file].uniq.each do |js_file|
             result += "\n<script type=\"text/javascript\" src=\"#{js_file}\"></script>"
@@ -54,6 +59,65 @@ module Webgen::ContentProcessor
         ((context.persistent[:cp_head] || {})[:meta] || {}).merge(context.node['meta'] || {}).each do |name, content|
           result += "\n<meta name=\"#{ERB::Util.h(name)}\" content=\"#{ERB::Util.h(content)}\" />"
         end
+
+        # add links to other languages of same page
+        context.dest_node.tree.node_access[:acn][context.dest_node.acn].
+          select {|n| n.alcn != context.dest_node.alcn}.each do |node|
+          context.dest_node.node_info[:used_meta_info_nodes] << node.alcn
+          result += "\n<link type=\"text/html\" rel=\"alternate\" hreflang=\"#{node.lang}\" "
+          result += "href=\"#{context.dest_node.route_to(node)}\" "
+          if node['title'] && !node['title'].empty?
+            result += "lang=\"#{node.lang}\" title=\"#{ERB::Util.h(node['title'])}\" "
+          end
+          result += "/>"
+        end
+
+        link = (context.node['link'] || {}).dup
+
+        handle_files = lambda do |files|
+          [files].flatten.compact.collect do |file|
+            if !Webgen::Node.url(file, false).absolute?
+              file = context.node.resolve(file, context.dest_node.lang)
+              if file
+                context.dest_node.node_info[:used_meta_info_nodes] << file.alcn
+                file = context.dest_node.route_to(file)
+              else
+                log(:error) { "Could not resolve path '#{file}' used in 'link' meta information in <#{context.node.alcn}>" }
+                context.dest_node.flag(:dirty)
+              end
+            end
+            file
+          end.compact
+        end
+
+        # Add user defined javascript and CSS links
+        handle_files.call(link.delete('javascript')).each do |file|
+          result += "\n<script type=\"text/javascript\" src=\"#{file}\"></script>"
+        end
+        handle_files.call(link.delete('css')).each do |file|
+          result += "\n<link rel=\"stylesheet\" href=\"#{file}\" type=\"text/css\" />"
+        end
+
+        # add generic links specified via the +link+ meta information
+        link.sort.each do |link_type, vals|
+          link_type = link_type.downcase
+          [vals.dup].flatten.each do |val|
+            val = {'href' => val} if val.kind_of?(String)
+            val['rel'] ||= link_type
+            val = LINK_DOCUMENT_ATTRS.merge(val) if LINK_DOCUMENT_TYPES.include?(link_type)
+            if href = val.delete('href')
+              href = handle_files.call(href).first
+            else
+              log(:error) { "No link target specified for link type '#{link_type}' in 'link' meta information in <#{context.node.alcn}>" }
+            end
+            if href
+              s = "\n<link href=\"#{href}\" "
+              val.sort.each {|k,v| s += "#{k}=\"#{ERB::Util.h(v)}\" "}
+              result += s + "/>"
+            end
+          end
+        end
+
         result + match
       end
       context

data/lib/webgen/contentprocessor/kramdown.rb

@@ -0,0 +1,26 @@
+# -*- encoding: utf-8 -*-
+
+module Webgen::ContentProcessor
+
+  # Processes content in kramdown format (based on Markdown) using the +kramdown+ library.
+  class Kramdown
+
+    include Webgen::Loggable
+
+    # Convert the content in +context+ to HTML.
+    def call(context)
+      require 'kramdown'
+      require 'webgen/contentprocessor/kramdown/html'
+      doc = ::Kramdown::Document.new(context.content, context.website.config['contentprocessor.kramdown.options'])
+      context.content = KramdownHtmlConverter.convert(doc, context)
+      doc.warnings.each do |warn|
+        log(:warn) { "Warning while parsing <#{context.ref_node.alcn}> with kramdown: #{warn}" }
+      end
+      context
+    rescue LoadError
+      raise Webgen::LoadError.new('kramdown', self.class.name, context.dest_node.alcn, 'kramdown')
+    end
+
+  end
+
+end

data/lib/webgen/contentprocessor/kramdown/html.rb

@@ -0,0 +1,32 @@
+# -*- encoding: utf-8 -*-
+
+require 'kramdown'
+
+module Webgen::ContentProcessor
+
+  class KramdownHtmlConverter < ::Kramdown::Converter::Html
+
+    def initialize(doc, context) #:nodoc:
+      super(doc)
+      @context = context
+      @do_convert = context.website.config['contentprocessor.kramdown.handle_links']
+    end
+
+    # Convert the Kramdown document +doc+ to HTML using the webgen +context+ object.
+    def self.convert(doc, context)
+      new(doc, context).convert(doc.tree)
+    end
+
+    def convert_a(el, indent, opts)
+      el.options[:attr]['href'] = @context.tag('relocatable', {'path' => el.options[:attr]['href']}) if @do_convert
+      "<a#{options_for_element(el)}>#{inner(el, indent, opts)}</a>"
+    end
+
+    def convert_img(el, indent, opts)
+      el.options[:attr]['src'] = @context.tag('relocatable', {'path' => el.options[:attr]['src']}) if @do_convert
+      "<img#{options_for_element(el)} />"
+    end
+
+  end
+
+end

data/lib/webgen/contentprocessor/less.rb

@@ -0,0 +1,35 @@
+# -*- encoding: utf-8 -*-
+
+module Webgen::ContentProcessor
+
+  # Generates valid CSS from CSS-like input, supporting variables, nesting and mixins.
+  class Less
+
+    include Webgen::Loggable
+
+    # Convert the content in +context+ to valid CSS.
+    def call(context)
+      require 'less'
+      context.content = ::Less.parse(context.content)
+      context
+    rescue ::Less::SyntaxError => e
+      line = e.message.scan(/on line (\d+):/).first.first.to_i rescue nil
+      raise Webgen::RenderError.new(e, self.class.name, context.dest_node.alcn, context.ref_node.alcn, line)
+    rescue ::Less::MixedUnitsError => e
+      raise Webgen::RenderError.new("Can't mix different units together: #{e}",
+                                    self.class.name, context.dest_node.alcn, context.ref_node.alcn)
+    rescue ::Less::VariableNameError => e
+      raise Webgen::RenderError.new("Variable name is undefined: #{e}",
+                                    self.class.name, context.dest_node.alcn, context.ref_node.alcn)
+    rescue ::Less::MixinNameError => e
+      raise Webgen::RenderError.new("Mixin name is undefined: #{e}",
+                                    self.class.name, context.dest_node.alcn, context.ref_node.alcn)
+    rescue ::Less::ImportError => e
+      raise Webgen::RenderError.new(e, self.class.name, context.dest_node.alcn, context.ref_node.alcn)
+    rescue LoadError
+      raise Webgen::LoadError.new('less', self.class.name, context.dest_node.alcn, 'less')
+    end
+
+  end
+
+end