monad 0.0.2 → 0.0.3

data/lib/jekyll/tags/gist.rb

@@ -0,0 +1,48 @@
+# Gist Liquid Tag
+#
+# Example:
+#    {% gist 1234567 %}
+#    {% gist 1234567 file.rb %}
+
+module Jekyll
+  class GistTag < Liquid::Tag
+
+    def render(context)
+      if tag_contents = determine_arguments(@markup.strip)
+        gist_id, filename = tag_contents[0], tag_contents[1]
+        gist_script_tag(gist_id, filename)
+      else
+        raise ArgumentError.new <<-eos
+Syntax error in tag 'gist' while parsing the following markup:
+
+  #{@markup}
+
+Valid syntax:
+  for public gists:  {% gist 1234567 %}
+  for private gists: {% gist user/1234567 %}
+eos
+      end
+    end
+
+    private
+
+    def determine_arguments(input)
+      matched = if input.include?("/")
+        input.match(/\A([a-zA-Z0-9\/\-_]+) ?(\S*)\Z/)
+      else
+        input.match(/\A(\d+) ?(\S*)\Z/)
+      end
+      [matched[1].strip, matched[2].strip] if matched && matched.length >= 3
+    end
+
+    def gist_script_tag(gist_id, filename = nil)
+      if filename.empty?
+        "<script src=\"https://gist.github.com/#{gist_id}.js\"> </script>"
+      else
+        "<script src=\"https://gist.github.com/#{gist_id}.js?file=#{filename}\"> </script>"
+      end
+    end
+  end
+end
+
+Liquid::Template.register_tag('gist', Jekyll::GistTag)

data/lib/{monad → jekyll}/tags/highlight.rb

@@ -1,4 +1,4 @@
-module Monad
+module Jekyll
   module Tags
     class HighlightBlock < Liquid::Block
       include Liquid::StandardFilters
@@ -14,7 +14,7 @@ module Monad
       def initialize(tag_name, markup, tokens)
         super
         if markup.strip =~ SYNTAX
-          @lang = $1
+          @lang = $1.downcase
           @options = {}
           if defined?($2) && $2 != ''
             $2.split.each do |opt|
@@ -82,4 +82,4 @@ eos
   end
 end
 
-Liquid::Template.register_tag('highlight', Monad::Tags::HighlightBlock)
+Liquid::Template.register_tag('highlight', Jekyll::Tags::HighlightBlock)

data/lib/jekyll/tags/include.rb

@@ -0,0 +1,135 @@
+module Jekyll
+  module Tags
+    class IncludeTagError < StandardError
+      attr_accessor :path
+
+      def initialize(msg, path)
+        super(msg)
+        @path = path
+      end
+    end
+
+    class IncludeTag < Liquid::Tag
+
+      SYNTAX_EXAMPLE = "{% include file.ext param='value' param2='value' %}"
+
+      VALID_SYNTAX = /([\w-]+)\s*=\s*(?:"([^"\\]*(?:\\.[^"\\]*)*)"|'([^'\\]*(?:\\.[^'\\]*)*)'|([\w\.-]+))/      
+
+      INCLUDES_DIR = '_includes'
+
+      def initialize(tag_name, markup, tokens)
+        super
+        @file, @params = markup.strip.split(' ', 2);
+        validate_params if @params
+      end
+
+      def parse_params(context)
+        params = {}
+        markup = @params
+
+        while match = VALID_SYNTAX.match(markup) do
+          markup = markup[match.end(0)..-1]
+
+          value = if match[2]
+            match[2].gsub(/\\"/, '"')
+          elsif match[3]
+            match[3].gsub(/\\'/, "'")
+          elsif match[4]
+            context[match[4]]
+          end
+
+          params[match[1]] = value
+        end
+        params
+      end
+
+      def validate_file_name
+        if @file !~ /^[a-zA-Z0-9_\/\.-]+$/ || @file =~ /\.\// || @file =~ /\/\./
+            raise ArgumentError.new <<-eos
+Invalid syntax for include tag. File contains invalid characters or sequences:
+
+	#{@file}
+
+Valid syntax:
+
+	#{SYNTAX_EXAMPLE}
+
+eos
+        end
+      end
+
+      def validate_params
+        full_valid_syntax = Regexp.compile('\A\s*(?:' + VALID_SYNTAX.to_s + '(?=\s|\z)\s*)*\z')
+        unless @params =~ full_valid_syntax
+          raise ArgumentError.new <<-eos
+Invalid syntax for include tag:
+
+	#{@params}
+
+Valid syntax:
+
+	#{SYNTAX_EXAMPLE}
+
+eos
+        end
+      end
+
+      # Grab file read opts in the context
+      def file_read_opts(context)
+        context.registers[:site].file_read_opts
+      end
+
+      def retrieve_variable(context)
+        if /\{\{([\w\-\.]+)\}\}/ =~ @file
+          raise ArgumentError.new("No variable #{$1} was found in include tag") if context[$1].nil?
+          @file = context[$1]
+        end
+      end
+
+      def render(context)
+        dir = File.join(context.registers[:site].source, INCLUDES_DIR)
+        validate_dir(dir, context.registers[:site].safe)
+
+        retrieve_variable(context)
+        validate_file_name
+
+        file = File.join(dir, @file)
+        validate_file(file, context.registers[:site].safe)
+
+        partial = Liquid::Template.parse(source(file, context))
+
+        context.stack do
+          context['include'] = parse_params(context) if @params
+          partial.render!(context)
+        end
+      rescue => e
+        raise IncludeTagError.new e.message, File.join(INCLUDES_DIR, @file)
+      end
+
+      def validate_dir(dir, safe)
+        if File.symlink?(dir) && safe
+          raise IOError.new "Includes directory '#{dir}' cannot be a symlink"
+        end
+      end
+
+      def validate_file(file, safe)
+        if !File.exists?(file)
+          raise IOError.new "Included file '#{@file}' not found in '#{INCLUDES_DIR}' directory"
+        elsif File.symlink?(file) && safe
+          raise IOError.new "The included file '#{INCLUDES_DIR}/#{@file}' should not be a symlink"
+        end
+      end
+
+      def blank?
+        false
+      end
+
+      # This method allows to modify the file content by inheriting from the class.
+      def source(file, context)
+        File.read_with_options(file, file_read_opts(context))
+      end
+    end
+  end
+end
+
+Liquid::Template.register_tag('include', Jekyll::Tags::IncludeTag)

data/lib/{monad → jekyll}/tags/post_url.rb

@@ -1,4 +1,4 @@
-module Monad
+module Jekyll
   module Tags
     class PostComparer
       MATCHER = /^(.+\/)*(\d+-\d+-\d+)-(.*)$/
@@ -19,9 +19,9 @@ module Monad
       end
 
       private
-      # Construct the directory-aware post slug for a Monad::Post
+      # Construct the directory-aware post slug for a Jekyll::Post
       #
-      # other - the Monad::Post
+      # other - the Jekyll::Post
       #
       # Returns the post slug with the subdirectory (relative to _posts)
       def post_slug(other)
@@ -50,12 +50,14 @@ module Monad
           end
         end
 
-        puts "ERROR: post_url: \"#{@orig_post}\" could not be found"
+        raise ArgumentError.new <<-eos
+Could not find post "#{@orig_post}" in tag 'post_url'.
 
-        return "#"
+Make sure the post exists and the name is correct.
+eos
       end
     end
   end
 end
 
-Liquid::Template.register_tag('post_url', Monad::Tags::PostUrl)
+Liquid::Template.register_tag('post_url', Jekyll::Tags::PostUrl)

data/lib/jekyll/url.rb

@@ -0,0 +1,67 @@
+# Public: Methods that generate a URL for a resource such as a Post or a Page.
+#
+# Examples
+#
+#   URL.new({
+#     :template => /:categories/:title.html",
+#     :placeholders => {:categories => "ruby", :title => "something"}
+#   }).to_s
+#
+module Jekyll
+  class URL
+
+    # options - One of :permalink or :template must be supplied.
+    #           :template     - The String used as template for URL generation,
+    #                           for example "/:path/:basename:output_ext", where
+    #                           a placeholder is prefixed with a colon.
+    #           :placeholders - A hash containing the placeholders which will be
+    #                           replaced when used inside the template. E.g.
+    #                           { "year" => Time.now.strftime("%Y") } would replace
+    #                           the placeholder ":year" with the current year.
+    #           :permalink    - If supplied, no URL will be generated from the
+    #                           template. Instead, the given permalink will be
+    #                           used as URL.
+    def initialize(options)
+      @template = options[:template]
+      @placeholders = options[:placeholders] || {}
+      @permalink = options[:permalink]
+
+      if (@template || @permalink).nil?
+        raise ArgumentError, "One of :template or :permalink must be supplied."
+      end
+    end
+
+    # The generated relative URL of the resource
+    #
+    # Returns the String URL
+    def to_s
+      sanitize_url(@permalink || generate_url)
+    end
+
+    # Internal: Generate the URL by replacing all placeholders with their
+    # respective values
+    #
+    # Returns the _unsanitizied_ String URL
+    def generate_url
+      @placeholders.inject(@template) do |result, token|
+        result.gsub(/:#{token.first}/, token.last)
+      end
+    end
+
+    # Returns a sanitized String URL
+    def sanitize_url(in_url)
+      # Remove all double slashes
+      url = in_url.gsub(/\/\//, "/")
+
+      # Remove every URL segment that consists solely of dots
+      url = url.split('/').reject{ |part| part =~ /^\.+$/ }.join('/')
+
+      # Append a trailing slash to the URL if the unsanitized URL had one
+      url += "/" if in_url =~ /\/$/
+
+      # Always add a leading slash
+      url.gsub!(/\A([^\/])/, '/\1')
+      url
+    end
+  end
+end

data/lib/monad.rb

@@ -20,6 +20,7 @@ require 'fileutils'
 require 'time'
 require 'safe_yaml'
 require 'English'
+require 'pathname'
 
 # 3rd party
 require 'liquid'
@@ -27,43 +28,47 @@ require 'maruku'
 require 'colorator'
 
 # internal requires
-require 'monad/core_ext'
-require 'monad/logger'
-require 'monad/deprecator'
-require 'monad/configuration'
-require 'monad/site'
-require 'monad/convertible'
-require 'monad/layout'
-require 'monad/page'
-require 'monad/post'
-require 'monad/draft'
-require 'monad/filters'
-require 'monad/static_file'
-require 'monad/errors'
+require 'jekyll/core_ext'
+require 'jekyll/stevenson'
+require 'jekyll/deprecator'
+require 'jekyll/configuration'
+require 'jekyll/site'
+require 'jekyll/convertible'
+require 'jekyll/url'
+require 'jekyll/layout'
+require 'jekyll/page'
+require 'jekyll/post'
+require 'jekyll/excerpt'
+require 'jekyll/draft'
+require 'jekyll/filters'
+require 'jekyll/static_file'
+require 'jekyll/errors'
+require 'jekyll/related_posts'
+require 'jekyll/cleaner'
 
 # extensions
-require 'monad/plugin'
-require 'monad/converter'
-require 'monad/generator'
-require 'monad/command'
+require 'jekyll/plugin'
+require 'jekyll/converter'
+require 'jekyll/generator'
+require 'jekyll/command'
 
-require_all 'monad/commands'
-require_all 'monad/converters'
-require_all 'monad/converters/markdown'
-require_all 'monad/generators'
-require_all 'monad/tags'
-require_all 'monad/drivers'
+require_all 'jekyll/commands'
+require_all 'jekyll/converters'
+require_all 'jekyll/converters/markdown'
+require_all 'jekyll/generators'
+require_all 'jekyll/tags'
+require_all 'jekyll/drivers'
 
 SafeYAML::OPTIONS[:suppress_warnings] = true
 
-module Monad
-  VERSION = '0.0.2'
+module Jekyll
+  VERSION = '1.2.1'
 
-  # Public: Generate a Monad configuration Hash by merging the default
+  # Public: Generate a Jekyll configuration Hash by merging the default
   # options with anything in _config.yml, and adding the given options on top.
   #
   # override - A Hash of config directives that override any options in both
-  #            the defaults and the config file. See Monad::Configuration::DEFAULTS for a
+  #            the defaults and the config file. See Jekyll::Configuration::DEFAULTS for a
   #            list of option names and their defaults.
   #
   # Returns the final configuration Hash.
@@ -87,4 +92,8 @@ module Monad
   def self.set_timezone(timezone)
     ENV['TZ'] = timezone
   end
+
+  def self.logger
+    @logger ||= Stevenson.new
+  end
 end

data/lib/site_template/_config.yml

@@ -1,2 +1,3 @@
-name: Your New Monad Site
+name: Your New Jekyll Site
+markdown: redcarpet
 pygments: true

data/lib/site_template/_layouts/default.html

@@ -15,32 +15,30 @@
     </head>
     <body>
 
-        <div class="container">
-          <div class="site">
-            <div class="header">
-              <h1 class="title"><a href="/">{{ site.name }}</a></h1>
-              <a class="extra" href="/">home</a>
-            </div>
-     
-                {{ content }}
+        <div class="site">
+          <div class="header">
+            <h1 class="title"><a href="/">{{ site.name }}</a></h1>
+            <a class="extra" href="/">home</a>
+          </div>
 
-            <div class="footer">
-              <div class="contact">
-                <p>
-                  Your Name<br />
-                  What You Are<br />
-                  your@email.com
-                </p>
-              </div>
-              <div class="contact">
-                <p>
-                  <a href="http://github.com/yourusername/">github.com/yourusername</a><br />
-                  <a href="http://twitter.com/yourusername/">twitter.com/yourusername</a><br />
-                </p>
-              </div>
+          {{ content }}
+
+          <div class="footer">
+            <div class="contact">
+              <p>
+                Your Name<br />
+                What You Are<br />
+                you@example.com
+              </p>
+            </div>
+            <div class="contact">
+              <p>
+                <a href="https://github.com/yourusername">github.com/yourusername</a><br />
+                <a href="https://twitter.com/yourusername">twitter.com/yourusername</a><br />
+              </p>
             </div>
           </div>
-        </div> <!-- /container -->
+        </div>
 
     </body>
 </html>