monad 0.0.2 → 0.0.3

data/lib/{monad → jekyll}/configuration.rb

@@ -1,6 +1,6 @@
 # encoding: UTF-8
 
-module Monad
+module Jekyll
   class Configuration < Hash
 
     # Default options. Overridden by values in _config.yml.
@@ -10,11 +10,15 @@ module Monad
       'destination'   => File.join(Dir.pwd, '_site'),
       'plugins'       => '_plugins',
       'layouts'       => '_layouts',
+      'data_source'   =>  '_data',
       'keep_files'    => ['.git','.svn'],
 
       'timezone'      => nil,           # use the local timezone
 
+      'encoding'      => nil,           # use the system encoding
+
       'safe'          => false,
+      'detach'        => false,          # default to not detaching the server
       'show_drafts'   => nil,
       'limit_posts'   => 0,
       'lsi'           => false,
@@ -29,7 +33,7 @@ module Monad
       'baseurl'       => '/',
       'include'       => ['.htaccess'],
       'exclude'       => [],
-      'paginate_path' => 'page:num',
+      'paginate_path' => '/page:num',
 
       'markdown_ext'  => 'markdown,mkd,mkdn,md',
       'textile_ext'   => 'textile',
@@ -85,11 +89,11 @@ module Monad
       reduce({}) { |hsh,(k,v)| hsh.merge(k.to_s => v) }
     end
 
-    # Public: Directory of the Monad source folder
+    # Public: Directory of the Jekyll source folder
     #
     # override - the command-line options hash
     #
-    # Returns the path to the Monad source directory
+    # Returns the path to the Jekyll source directory
     def source(override)
       override['source'] || self['source'] || DEFAULTS['source']
     end
@@ -102,7 +106,10 @@ module Monad
     def config_files(override)
       # Get configuration from <source>/_config.yml or <source>/<config_file>
       config_files = override.delete('config')
-      config_files = File.join(source(override), "_config.yml") if config_files.to_s.empty?
+      if config_files.to_s.empty?
+        config_files = File.join(source(override), "_config.yml")
+        @default_config_file = true
+      end
       config_files = [config_files] unless config_files.is_a? Array
       config_files
     end
@@ -114,9 +121,17 @@ module Monad
     # Returns this configuration, overridden by the values in the file
     def read_config_file(file)
       next_config = YAML.safe_load_file(file)
-      raise "Configuration file: (INVALID) #{file}".yellow if !next_config.is_a?(Hash)
-      Monad::Logger.info "Configuration file:", file
+      raise ArgumentError.new("Configuration file: (INVALID) #{file}".yellow) if !next_config.is_a?(Hash)
+      Jekyll.logger.info "Configuration file:", file
       next_config
+    rescue SystemCallError
+      if @default_config_file
+        Jekyll.logger.warn "Configuration file:", "none"
+        {}
+      else
+        Jekyll.logger.error "Fatal:", "The configuration file '#{file}' could not be found."
+        raise LoadError
+      end
     end
 
     # Public: Read in a list of configuration files and merge with this hash
@@ -133,27 +148,33 @@ module Monad
           new_config = read_config_file(config_file)
           configuration = configuration.deep_merge(new_config)
         end
-      rescue SystemCallError
-        # Errno:ENOENT = file not found
-        Monad::Logger.warn "Configuration file:", "none"
-      rescue => err
-        Monad::Logger.warn "WARNING:", "Error reading configuration. " +
+      rescue ArgumentError => err
+        Jekyll.logger.warn "WARNING:", "Error reading configuration. " +
                      "Using defaults (and options)."
         $stderr.puts "#{err}"
       end
 
-      configuration.backwards_compatibilize
+      configuration.fix_common_issues.backwards_compatibilize
+    end
+
+    # Public: Split a CSV string into an array containing its values
+    #
+    # csv - the string of comma-separated values
+    #
+    # Returns an array of the values contained in the CSV
+    def csv_to_array(csv)
+      csv.split(",").map(&:strip)
     end
 
     # Public: Ensure the proper options are set in the configuration to allow for
-    # backwards-compatibility with Monad pre-1.0
+    # backwards-compatibility with Jekyll pre-1.0
     #
     # Returns the backwards-compatible configuration
     def backwards_compatibilize
       config = clone
       # Provide backwards-compatibility
       if config.has_key?('auto') || config.has_key?('watch')
-        Monad::Logger.warn "Deprecation:", "Auto-regeneration can no longer" +
+        Jekyll.logger.warn "Deprecation:", "Auto-regeneration can no longer" +
                             " be set from your configuration file(s). Use the"+
                             " --watch/-w command-line option instead."
         config.delete('auto')
@@ -161,14 +182,14 @@ module Monad
       end
 
       if config.has_key? 'server'
-        Monad::Logger.warn "Deprecation:", "The 'server' configuration option" +
-                            " is no longer accepted. Use the 'monad serve'" +
+        Jekyll.logger.warn "Deprecation:", "The 'server' configuration option" +
+                            " is no longer accepted. Use the 'jekyll serve'" +
                             " subcommand to serve your site with WEBrick."
         config.delete('server')
       end
 
       if config.has_key? 'server_port'
-        Monad::Logger.warn "Deprecation:", "The 'server_port' configuration option" +
+        Jekyll.logger.warn "Deprecation:", "The 'server_port' configuration option" +
                             " has been renamed to 'port'. Please update your config" +
                             " file accordingly."
         # copy but don't overwrite:
@@ -176,6 +197,27 @@ module Monad
         config.delete('server_port')
       end
 
+      %w[include exclude].each do |option|
+        if config.fetch(option, []).is_a?(String)
+          Jekyll.logger.warn "Deprecation:", "The '#{option}' configuration option" +
+            " must now be specified as an array, but you specified" +
+            " a string. For now, we've treated the string you provided" +
+            " as a list of comma-separated values."
+          config[option] = csv_to_array(config[option])
+        end
+      end
+      config
+    end
+
+    def fix_common_issues
+      config = clone
+
+      if config.has_key?('paginate') && (!config['paginate'].is_a?(Integer) || config['paginate'] < 1)
+        Jekyll.logger.warn "Config Warning:", "The `paginate` key must be a" +
+          " positive integer or nil. It's currently set to '#{config['paginate'].inspect}'."
+        config['paginate'] = nil
+      end
+
       config
     end
 

data/lib/{monad → jekyll}/converter.rb

@@ -1,4 +1,4 @@
-module Monad
+module Jekyll
   class Converter < Plugin
     # Public: Get or set the pygments prefix. When an argument is specified,
     # the prefix will be set. If no argument is specified, the current prefix

data/lib/{monad → jekyll}/converters/identity.rb

@@ -1,4 +1,4 @@
-module Monad
+module Jekyll
   module Converters
     class Identity < Converter
       safe true

data/lib/{monad → jekyll}/converters/markdown.rb

@@ -1,4 +1,4 @@
-module Monad
+module Jekyll
   module Converters
     class Markdown < Converter
       safe true
@@ -26,7 +26,7 @@ module Monad
       end
 
       def matches(ext)
-        rgx = '(' + @config['markdown_ext'].gsub(',','|') +')'
+        rgx = '^\.(' + @config['markdown_ext'].gsub(',','|') +')$'
         ext =~ Regexp.new(rgx, Regexp::IGNORECASE)
       end
 

data/lib/jekyll/converters/markdown/kramdown_parser.rb

@@ -0,0 +1,29 @@
+module Jekyll
+  module Converters
+    class Markdown
+      class KramdownParser
+        def initialize(config)
+          require 'kramdown'
+          @config = config
+        rescue LoadError
+          STDERR.puts 'You are missing a library required for Markdown. Please run:'
+          STDERR.puts '  $ [sudo] gem install kramdown'
+          raise FatalException.new("Missing dependency: kramdown")
+        end
+
+        def convert(content)
+          # Check for use of coderay
+          if @config['kramdown']['use_coderay']
+            %w[wrap line_numbers line_numbers_start tab_width bold_every css default_lang].each do |opt|
+              key = "coderay_#{opt}"
+              @config['kramdown'][key] = @config['kramdown']['coderay'][key] unless @config['kramdown'].has_key?(key)
+            end
+          end
+
+          Kramdown::Document.new(content, @config["kramdown"].symbolize_keys).to_html
+        end
+
+      end
+    end
+  end
+end

data/lib/{monad → jekyll}/converters/markdown/maruku_parser.rb

@@ -1,16 +1,13 @@
-module Monad
+module Jekyll
   module Converters
     class Markdown
       class MarukuParser
         def initialize(config)
           require 'maruku'
           @config = config
-          if @config['maruku']['use_divs']
-            load_divs_library
-          end
-          if @config['maruku']['use_tex']
-            load_blahtext_library
-          end
+          @errors = []
+          load_divs_library if @config['maruku']['use_divs']
+          load_blahtext_library if @config['maruku']['use_tex']
         rescue LoadError
           STDERR.puts 'You are missing a library required for Markdown. Please run:'
           STDERR.puts '  $ [sudo] gem install maruku'
@@ -38,8 +35,15 @@ module Monad
           MaRuKu::Globals[:html_png_url] = @config['maruku']['png_url']
         end
 
+        def print_errors_and_fail
+          print @errors.join
+          raise MaRuKu::Exception, "MaRuKu encountered problem(s) while converting your markup."
+        end
+
         def convert(content)
-          Maruku.new(content).to_html
+          converted = Maruku.new(content, :error_stream => @errors).to_html
+          print_errors_and_fail unless @errors.empty?
+          converted
         end
       end
     end

data/lib/{monad → jekyll}/converters/markdown/rdiscount_parser.rb

@@ -1,4 +1,4 @@
-module Monad
+module Jekyll
   module Converters
     class Markdown
       class RDiscountParser
@@ -24,7 +24,9 @@ module Monad
         private
         def replace_generated_toc(rd, html, toc_token)
           if rd.generate_toc && html.include?(toc_token)
-            html.gsub(toc_token, rd.toc_content.force_encoding('utf-8'))
+            utf8_toc = rd.toc_content
+            utf8_toc.force_encoding('utf-8') if utf8_toc.respond_to?(:force_encoding)
+            html.gsub(toc_token, utf8_toc)
           else
             html
           end

data/lib/{monad → jekyll}/converters/markdown/redcarpet_parser.rb

@@ -1,4 +1,4 @@
-module Monad
+module Jekyll
   module Converters
     class Markdown
       class RedcarpetParser

data/lib/{monad → jekyll}/converters/textile.rb

@@ -1,4 +1,4 @@
-module Monad
+module Jekyll
   module Converters
     class Textile < Converter
       safe true

data/lib/{monad → jekyll}/convertible.rb

@@ -6,36 +6,43 @@ require 'set'
 # from a certain type of markup into actual content
 #
 # Requires
-#   self.site -> Monad::Site
+#   self.site -> Jekyll::Site
 #   self.content
 #   self.content=
 #   self.data=
 #   self.ext=
 #   self.output=
 #   self.name
-module Monad
+module Jekyll
   module Convertible
     # Returns the contents as a String.
     def to_s
       self.content || ''
     end
 
+    # Returns merged optin hash for File.read of self.site (if exists)
+    # and a given param
+    def merged_file_read_opts(opts)
+      (self.site ? self.site.file_read_opts : {}).merge(opts)
+    end
+
     # Read the YAML frontmatter.
     #
     # base - The String path to the dir containing the file.
     # name - The String filename of the file.
+    # opts - optional parameter to File.read, default at site configs
     #
     # Returns nothing.
-    def read_yaml(base, name)
+    def read_yaml(base, name, opts = {})
       begin
-        self.content = File.read(File.join(base, name))
-
+        self.content = File.read_with_options(File.join(base, name),
+                                              merged_file_read_opts(opts))
         if self.content =~ /\A(---\s*\n.*?\n?)^(---\s*$\n?)/m
           self.content = $POSTMATCH
           self.data = YAML.safe_load($1)
         end
       rescue SyntaxError => e
-        puts "YAML Exception reading #{File.join(base, name)}: #{e.message}"        
+        puts "YAML Exception reading #{File.join(base, name)}: #{e.message}"
       rescue Exception => e
         puts "Error reading file #{File.join(base, name)}: #{e.message}"
       end
@@ -48,6 +55,10 @@ module Monad
     # Returns nothing.
     def transform
       self.content = converter.convert(self.content)
+    rescue => e
+      Jekyll.logger.error "Conversion error:", "There was an error converting" +
+        " '#{self.path}'."
+      raise e
     end
 
     # Determine the extension depending on content_type.
@@ -73,14 +84,24 @@ module Monad
     # info    - the info for Liquid
     #
     # Returns the converted content
-    def render_liquid(content, payload, info)
+    def render_liquid(content, payload, info, path = nil)
       Liquid::Template.parse(content).render!(payload, info)
+    rescue Tags::IncludeTagError => e
+      Jekyll.logger.error "Liquid Exception:", "#{e.message} in #{e.path}"
+      raise e
     rescue Exception => e
-      Monad::Logger.error "Liquid Exception:", "#{e.message} in #{payload[:file]}"
-      e.backtrace.each do |backtrace|
-        puts backtrace
-      end
-      abort("Build Failed")
+      Jekyll.logger.error "Liquid Exception:", "#{e.message} in #{path || self.path}"
+      raise e
+    end
+
+    # Convert this Convertible's data to a Hash suitable for use by Liquid.
+    #
+    # Returns the Hash representation of this Convertible.
+    def to_liquid(attrs = nil)
+      further_data = Hash[(attrs || self.class::ATTRIBUTES_FOR_LIQUID).map { |attribute|
+        [attribute, send(attribute)]
+      }]
+      data.deep_merge(further_data)
     end
 
     # Recursively render layouts
@@ -99,8 +120,9 @@ module Monad
         payload = payload.deep_merge({"content" => self.output, "page" => layout.data})
 
         self.output = self.render_liquid(layout.content,
-                                         payload.merge({:file => self.data["layout"]}),
-                                         info)
+                                         payload,
+                                         info,
+                                         File.join(self.site.config['layouts'], layout.name))
 
         if layout = layouts[layout.data["layout"]]
           if used.include?(layout)
@@ -119,14 +141,14 @@ module Monad
     #
     # Returns nothing.
     def do_layout(payload, layouts)
-      info = { :filters => [Monad::Filters], :registers => { :site => self.site, :page => payload['page'] } }
+      info = { :filters => [Jekyll::Filters], :registers => { :site => self.site, :page => payload['page'] } }
 
       # render and transform content (this becomes the final content of the object)
       payload["pygments_prefix"] = converter.pygments_prefix
       payload["pygments_suffix"] = converter.pygments_suffix
 
       self.content = self.render_liquid(self.content,
-                                        payload.merge({:file => self.name}),
+                                        payload,
                                         info)
       self.transform
 
@@ -144,7 +166,7 @@ module Monad
     def write(dest)
       path = destination(dest)
       FileUtils.mkdir_p(File.dirname(path))
-      File.open(path, 'w') do |f|
+      File.open(path, 'wb') do |f|
         f.write(self.output)
       end
     end

data/lib/{monad → jekyll}/core_ext.rb

@@ -41,6 +41,17 @@ class Hash
     end
     array || []
   end
+
+  def symbolize_keys!
+    keys.each do |key|
+      self[(key.to_sym rescue key) || key] = delete(key)
+    end
+    self
+  end
+
+  def symbolize_keys
+    dup.symbolize_keys!
+  end
 end
 
 # Thanks, ActiveSupport!
@@ -59,10 +70,17 @@ module Enumerable
   end
 end
 
-if RUBY_VERSION < "1.9"
-  class String
-    def force_encoding(enc)
-      self
+# Ruby 1.8's File.read don't support option.
+# read_with_options ignore optional parameter for 1.8,
+# and act as alias for 1.9 or later.
+class File
+  if RUBY_VERSION < '1.9'
+    def self.read_with_options(path, opts = {})
+      self.read(path)
+    end
+  else
+    def self.read_with_options(path, opts = {})
+      self.read(path, opts)
     end
   end
 end