tigefa 1.1.2 → 1.1.3

data/lib/tigefa/stevenson.rb

@@ -7,7 +7,7 @@ module Tigefa
     WARN   = 2
     ERROR  = 3
 
-    # Public: Create a new instance of Stevenson, Tigefa's logger
+    # Public: Create a new instance of Stevenson, Jekyll's logger
     #
     # level - (optional, integer) the log level
     #
@@ -46,7 +46,7 @@ module Tigefa
       $stderr.puts(message(topic, message).yellow) if log_level <= WARN
     end
 
-    # Public: Print a Tigefa error message to stderr
+    # Public: Print a jekyll error message to stderr
     #
     # topic - the topic of the message, e.g. "Configuration file", "Deprecation", etc.
     # message - the message detail
@@ -56,7 +56,7 @@ module Tigefa
       $stderr.puts(message(topic, message).red) if log_level <= ERROR
     end
 
-    # Public: Print a Tigefa error message to stderr and immediately abort the process
+    # Public: Print a Jekyll error message to stderr and immediately abort the process
     #
     # topic - the topic of the message, e.g. "Configuration file", "Deprecation", etc.
     # message - the message detail (can be omitted)
@@ -67,7 +67,7 @@ module Tigefa
       abort
     end
 
-    # Public: Build a Tigefa topic method
+    # Public: Build a Jekyll topic method
     #
     # topic - the topic of the message, e.g. "Configuration file", "Deprecation", etc.
     # message - the message detail

data/lib/tigefa/tags/gist.rb

@@ -12,15 +12,7 @@ module Tigefa
         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
+        "Error parsing gist id"
       end
     end
 

data/lib/tigefa/tags/highlight.rb

@@ -14,7 +14,7 @@ module Tigefa
       def initialize(tag_name, markup, tokens)
         super
         if markup.strip =~ SYNTAX
-          @lang = $1.downcase
+          @lang = $1
           @options = {}
           if defined?($2) && $2 != ''
             $2.split.each do |opt|

data/lib/tigefa/tags/include.rb

@@ -1,33 +1,21 @@
 module Tigefa
   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'
+      MATCHER = /([\w-]+)\s*=\s*(?:"([^"\\]*(?:\\.[^"\\]*)*)"|'([^'\\]*(?:\\.[^'\\]*)*)'|([\w\.-]+))/
 
       def initialize(tag_name, markup, tokens)
         super
         @file, @params = markup.strip.split(' ', 2);
-        validate_params if @params
       end
 
       def parse_params(context)
+        validate_syntax
+
         params = {}
         markup = @params
 
-        while match = VALID_SYNTAX.match(markup) do
+        while match = MATCHER.match(markup) do
           markup = markup[match.end(0)..-1]
 
           value = if match[2]
@@ -43,90 +31,59 @@ module Tigefa
         params
       end
 
-      def validate_file_name(file)
-        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
+      # ensure the entire markup string from start to end is valid syntax, and params are separated by spaces
+      def validate_syntax
+        full_matcher = Regexp.compile('\A\s*(?:' + MATCHER.to_s + '(?=\s|\z)\s*)*\z')
+        unless @params =~ full_matcher
+          raise SyntaxError.new <<-eos
 Invalid syntax for include tag:
 
 	#{@params}
 
 Valid syntax:
 
-	#{SYNTAX_EXAMPLE}
+	{% include file.ext param='value' param2="value" %}
 
 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?
-          context[$1]
-        end
-      end
-
       def render(context)
-        dir = File.join(File.realpath(context.registers[:site].source), INCLUDES_DIR)
+        includes_dir = File.join(context.registers[:site].source, '_includes')
 
-        file = retrieve_variable(context) || @file
-        validate_file_name(file)
-
-        path = File.join(dir, file)
-        validate_path(path, dir, context.registers[:site].safe)
+        if error = validate_file(includes_dir)
+          return error
+        end
 
-        begin
-          partial = Liquid::Template.parse(source(path, context))
+        source = File.read(File.join(includes_dir, @file))
+        partial = Liquid::Template.parse(source)
 
-          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)
+        context.stack do
+          context['include'] = parse_params(context) if @params
+          partial.render(context)
         end
       end
 
-      def validate_path(path, dir, safe)
-        if safe && !realpath_prefixed_with?(path, dir)
-          raise IOError.new "The included file '#{path}' should exist and should not be a symlink"
-        elsif !File.exist?(path)
-          raise IOError.new "Included file '#{path}' not found"
+      def validate_file(includes_dir)
+        if File.symlink?(includes_dir)
+          return "Includes directory '#{includes_dir}' cannot be a symlink"
+        end
+
+        if @file !~ /^[a-zA-Z0-9_\/\.-]+$/ || @file =~ /\.\// || @file =~ /\/\./
+          return "Include file '#{@file}' contains invalid characters or sequences"
         end
-      end
 
-      def realpath_prefixed_with?(path, dir)
-        File.exist?(path) && File.realpath(path).start_with?(dir)
+        file = File.join(includes_dir, @file)
+        if !File.exists?(file)
+          return "Included file #{@file} not found in _includes directory"
+        elsif File.symlink?(file)
+          return "The included file '_includes/#{@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

data/lib/tigefa/tags/post_url.rb

@@ -19,9 +19,9 @@ module Tigefa
       end
 
       private
-      # Construct the directory-aware post slug for a TigefaTigefa::Post
+      # Construct the directory-aware post slug for a Tigefa::Post
       #
-      # other - the TigefaTigefa::Post
+      # other - the Tigefa::Post
       #
       # Returns the post slug with the subdirectory (relative to _posts)
       def post_slug(other)
@@ -50,11 +50,9 @@ module Tigefa
           end
         end
 
-        raise ArgumentError.new <<-eos
-Could not find post "#{@orig_post}" in tag 'post_url'.
+        puts "ERROR: post_url: \"#{@orig_post}\" could not be found"
 
-Make sure the post exists and the name is correct.
-eos
+        return "#"
       end
     end
   end

data/lib/tigefa/url.rb

@@ -50,7 +50,6 @@ module Tigefa
 
     # Returns a sanitized String URL
     def sanitize_url(in_url)
-
       # Remove all double slashes
       url = in_url.gsub(/\/\//, "/")
 
@@ -62,7 +61,6 @@ module Tigefa
 
       # Always add a leading slash
       url.gsub!(/\A([^\/])/, '/\1')
-
       url
     end
   end

data/site/_includes/docs_contents.html

@@ -3,7 +3,7 @@
     <h4>Getting Started</h4>
     {% include docs_ul.html items='home quickstart installation usage structure configuration' %}
     <h4>Your Content</h4>
-    {% include docs_ul.html items='frontmatter posts drafts pages variables datafiles migrations' %}
+    {% include docs_ul.html items='frontmatter posts drafts pages variables migrations' %}
     <h4>Customization</h4>
     {% include docs_ul.html items='templates permalinks pagination plugins extras' %}
     <h4>Deployment</h4>

data/site/_includes/docs_contents_mobile.html

@@ -5,7 +5,7 @@
       {% include docs_option.html items='home quickstart installation usage structure configuration' %}
     </optgroup>
     <optgroup label="Your Content">
-      {% include docs_option.html items='frontmatter posts drafts pages variables datafiles migrations' %}
+      {% include docs_option.html items='frontmatter posts drafts pages variables migrations' %}
     </optgroup>
     <optgroup label="Customization">
       {% include docs_option.html items='templates permalinks pagination plugins extras' %}

data/site/_includes/top.html

@@ -12,6 +12,6 @@
   <link rel="stylesheet" href="{{ site.url }}/css/gridism.css" />
   <link rel="stylesheet" href="{{ site.url }}/css/style.css" />
   <link rel="stylesheet" href="{{ site.url }}/css/pygments.css" />
-  <link rel="icon" type="image/png" href="{{ site.url }}/favicon.png" />
+  <link rel="icon" type="image/x-icon" href="{{ site.url }}/favicon.png" />
   <script src="{{ site.url }}/js/modernizr-2.5.3.min.js"></script>
 </head>

data/site/docs/configuration.md

@@ -99,22 +99,6 @@ class="flag">flags</code> (specified on the command-line) that control them.
         <p><code class="option">timezone: TIMEZONE</code></p>
       </td>
     </tr>
-    <tr class='setting'>
-      <td>
-        <p class='name'><strong>Encoding</strong></p>
-        <p class="description">
-            Set the encoding of files by name. Only available for Ruby
-            1.9 or later).
-            The default value is nil, which use Ruby default,
-            <code>ASCII-8BIT</code>.
-            Available encoding for the ruby in use, can be shown by
-            command <code>ruby -e 'puts Encoding::list.join("\n")'</code>
-        </p>
-      </td>
-      <td class='align-center'>
-        <p><code class="option">encoding: ENCODING</code></p>
-      </td>
-    </tr>
   </tbody>
 </table>
 </div>
@@ -281,9 +265,7 @@ layouts:     ./_layouts
 include:     ['.htaccess']
 exclude:     []
 keep_files:  ['.git','.svn']
-gems:        []
 timezone:    nil
-encoding:    nil
 
 future:      true
 show_drafts: nil
@@ -316,7 +298,6 @@ maruku:
   png_engine: blahtex
   png_dir:    images/latex
   png_url:    /images/latex
-  fenced_code_blocks: true
 
 rdiscount:
   extensions: []

data/site/docs/deployment-methods.md

@@ -37,7 +37,7 @@ this](http://web.archive.org/web/20091223025644/http://www.taknado.com/en/2009/0
 To have a remote server handle the deploy for you every time you push changes using Git, you can create a user account which has all the public keys that are authorized to deploy in its `authorized_keys` file. With that in place, setting up the post-receive hook is done as follows:
 
 {% highlight bash %}
-laptop$ ssh deployer@example.com
+laptop$ ssh deployer@myserver.com
 server$ mkdir myrepo.git
 server$ cd myrepo.git
 server$ git --bare init
@@ -63,7 +63,7 @@ Finally, run the following command on any users laptop that needs to be able to
 deploy using this hook:
 
 {% highlight bash %}
-laptops$ git remote add deploy deployer@example.com:~/myrepo.git
+laptops$ git remote add deploy deployer@myserver.com:~/myrepo.git
 {% endhighlight %}
 
 Deploying is now as easy as telling nginx or Apache to look at
@@ -76,7 +76,7 @@ laptops$ git push deploy master
 ### Rake
 
 Another way to deploy your Jekyll site is to use [Rake](https://github.com/jimweirich/rake), [HighLine](https://github.com/JEG2/highline), and
-[Net::SSH](http://net-ssh.rubyforge.org/). A more complex example of deploying Jekyll with Rake that deals with multiple branches can be found in [Git Ready](https://github.com/gitready/gitready/blob/cdfbc4ec5321ff8d18c3ce936e9c749dbbc4f190/Rakefile).
+[Net::SSH](http://net-ssh.rubyforge.org/). A more complex example of deploying Jekyll with Rake that deals with multiple branches can be found in [Git Ready](https://github.com/gitready/gitready/blob/en/Rakefile).
 
 ### rsync
 

data/site/docs/drafts.md

@@ -1,8 +1,6 @@
 ---
 layout: docs
 title: Working with drafts
-prev_section: posts
-next_section: pages
 permalink: /docs/drafts/
 ---
 
@@ -17,5 +15,6 @@ first draft:
 {% endhighlight %}
 
 To preview your site with drafts, simply run `jekyll serve` or `jekyll build` with
-the `--drafts` switch.  Each will be assigned the value modification time of the draft file
-for its date, and thus you will see currently edited drafts as the latest posts.
+the `--drafts` switch.  Each will be assigned the value of `Time.now`
+for its date, and thus you will see them generated as the latest posts.
+

data/site/docs/history.md

@@ -1,154 +1,10 @@
---- 
-prev_section: contributing
-title: History
+---
 layout: docs
+title: History
 permalink: /docs/history/
+prev_section: contributing
 ---
 
-## 1.4.3 / 2014-01-13
-
-### Bug Fixes
-
-- Patch show-stopping security vulnerabilities ([#1944]({{ site.repository }}/issues/1944))
-
-## 1.4.2 / 2013-12-16
-
-### Bug Fixes
-- Turn on Maruku fenced code blocks by default ([#1830]({{ site.repository }}/issues/1830))
-
-## 1.4.1 / 2013-12-09
-
-### Bug Fixes
-- Don't allow nil entries when loading posts ([#1796]({{ site.repository }}/issues/1796))
-
-## 1.4.0 / 2013-12-07
-
-### Major Enhancements
-- Add support for TOML config files ([#1765]({{ site.repository }}/issues/1765))
-
-### Minor Enhancements
-- Sort plugins as a way to establish a load order ([#1682]({{ site.repository }}/issues/1682))
-- Update Maruku to 0.7.0 ([#1775]({{ site.repository }}/issues/1775))
-
-### Bug Fixes
-- Add a space between two words in a Pagination warning message ([#1769]({{ site.repository }}/issues/1769))
-- Upgrade `toml` gem to `v0.1.0` to maintain compat with Ruby 1.8.7 ([#1778]({{ site.repository }}/issues/1778))
-
-### Development Fixes
-- Remove some whitespace in the code ([#1755]({{ site.repository }}/issues/1755))
-- Remove some duplication in the reading of posts and drafts ([#1779]({{ site.repository }}/issues/1779))
-
-### Site Enhancements
-- Fixed case of a word in the Jekyll v1.3.0 release post ([#1762]({{ site.repository }}/issues/1762))
-- Fixed the mime type for the favicon ([#1772]({{ site.repository }}/issues/1772))
-
-## 1.3.1 / 2013-11-26
-
-### Minor Enhancements
-- Add a `--prefix` option to passthrough for the importers ([#1669]({{ site.repository }}/issues/1669))
-- Push the paginator plugin lower in the plugin priority order so
-    other plugins run before it ([#1759]({{ site.repository }}/issues/1759))
-
-### Bug Fixes
-- Fix the include tag when ran in a loop ([#1726]({{ site.repository }}/issues/1726))
-- Fix errors when using `--watch` on 1.8.7 ([#1730]({{ site.repository }}/issues/1730))
-- Specify where the include is called from if an included file is
-    missing ([#1746]({{ site.repository }}/issues/1746))
-
-### Development Fixes
-- Extract `Site#filter_entries` into its own object ([#1697]({{ site.repository }}/issues/1697))
-- Enable Travis' bundle caching ([#1734]({{ site.repository }}/issues/1734))
-- Remove trailing whitespace in some files ([#1736]({{ site.repository }}/issues/1736))
-- Fix a duplicate test name ([#1754]({{ site.repository }}/issues/1754))
-
-### Site Enhancements
-- Update link to example Rakefile to point to specific commit ([#1741]({{ site.repository }}/issues/1741))
-- Fix drafts docs to indicate that draft time is based on file modification
-    time, not `Time.now` ([#1695]({{ site.repository }}/issues/1695))
-- Add `jekyll-monthly-archive-plugin` and `jekyll-category-archive-plugin` to
-    list of third-party plugins ([#1693]({{ site.repository }}/issues/1693))
-- Add `jekyll-asset-path-plugin` to list of third-party plugins ([#1670]({{ site.repository }}/issues/1670))
-- Add `emoji-for-jekyll` to list of third-part plugins ([#1708]({{ site.repository }}/issues/1708))
-- Fix previous section link on plugins page to point to pagination page ([#1707]({{ site.repository }}/issues/1707))
-- Add `org-mode` converter plugin to third-party plugins ([#1711]({{ site.repository }}/issues/1711))
-- Point "Blog migrations" page to http://import.jekyllrb.com ([#1732]({{ site.repository }}/issues/1732))
-- Add docs for `post_url` when posts are in subdirectories ([#1718]({{ site.repository }}/issues/1718))
-- Update the docs to point to `example.com` ([#1448]({{ site.repository }}/issues/1448))
-
-## 1.3.0 / 2013-11-04
-
-### Major Enhancements
-- Add support for adding data as YAML files under a site's `_data`
-    directory ([#1003]({{ site.repository }}/issues/1003))
-- Allow variables to be used with `include` tags ([#1495]({{ site.repository }}/issues/1495))
-- Allow using gems for plugin management ([#1557]({{ site.repository }}/issues/1557))
-
-### Minor Enhancements
-- Decrease the specificity in the site template CSS ([#1574]({{ site.repository }}/issues/1574))
-- Add `encoding` configuration option ([#1449]({{ site.repository }}/issues/1449))
-- Provide better error handling for Jekyll's custom Liquid tags
-    ([#1514]({{ site.repository }}/issues/1514))
-- If an included file causes a Liquid error, add the path to the
-    include file that caused the error to the error message ([#1596]({{ site.repository }}/issues/1596))
-- If a layout causes a Liquid error, change the error message so that
-    we know it comes from the layout ([#1601]({{ site.repository }}/issues/1601))
-- Update Kramdown dependency to `~> 1.2` ([#1610]({{ site.repository }}/issues/1610))
-- Update `safe_yaml` dependency to `~> 0.9.7` ([#1602]({{ site.repository }}/issues/1602))
-- Allow layouts to be in subfolders like includes ([#1622]({{ site.repository }}/issues/1622))
-- Switch to listen for site watching while serving ([#1589]({{ site.repository }}/issues/1589))
-- Add a `json` liquid filter to be used in sites ([#1651]({{ site.repository }}/issues/1651))
-- Point people to the migration docs when the `jekyll-import` gem is
-    missing ([#1662]({{ site.repository }}/issues/1662))
-
-### Bug Fixes
-- Fix up matching against source and destination when the two
-    locations are similar ([#1556]({{ site.repository }}/issues/1556))
-- Fix the missing `pathname` require in certain cases ([#1255]({{ site.repository }}/issues/1255))
-- Use `+` instead of `Array#concat` when building `Post` attribute list ([#1571]({{ site.repository }}/issues/1571))
-- Print server address when launching a server ([#1586]({{ site.repository }}/issues/1586))
-- Downgrade to Maruku `~> 0.6.0` in order to avoid changes in rendering ([#1598]({{ site.repository }}/issues/1598))
-- Fix error with failing include tag when variable was file name ([#1613]({{ site.repository }}/issues/1613))
-- Downcase lexers before passing them to pygments ([#1615]({{ site.repository }}/issues/1615))
-- Capitalize the short verbose switch because it conflicts with the
-    built-in Commander switch ([#1660]({{ site.repository }}/issues/1660))
-- Fix compatibility with 1.8.x ([#1665]({{ site.repository }}/issues/1665))
-- Fix an error with the new file watching code due to library version
-    incompatibilities ([#1687]({{ site.repository }}/issues/1687))
-
-### Development Fixes
-- Add coverage reporting with Coveralls ([#1539]({{ site.repository }}/issues/1539))
-- Refactor the Liquid `include` tag ([#1490]({{ site.repository }}/issues/1490))
-- Update launchy dependency to `~> 2.3` ([#1608]({{ site.repository }}/issues/1608))
-- Update rr dependency to `~> 1.1` ([#1604]({{ site.repository }}/issues/1604))
-- Update cucumber dependency to `~> 1.3` ([#1607]({{ site.repository }}/issues/1607))
-- Update coveralls dependency to `~> 0.7.0` ([#1606]({{ site.repository }}/issues/1606))
-- Update rake dependency to `~> 10.1` ([#1603]({{ site.repository }}/issues/1603))
-- Clean up `site.rb` comments to be more concise/uniform ([#1616]({{ site.repository }}/issues/1616))
-- Use the master branch for the build badge in the readme ([#1636]({{ site.repository }}/issues/1636))
-- Refactor Site#render ([#1638]({{ site.repository }}/issues/1638))
-- Remove duplication in command line options ([#1637]({{ site.repository }}/issues/1637))
-- Add tests for all the coderay options ([#1543]({{ site.repository }}/issues/1543))
-- Improve some of the cucumber test code ([#1493]({{ site.repository }}/issues/1493))
-- Improve comparisons of timestamps by ignoring the seconds ([#1582]({{ site.repository }}/issues/1582))
-
-### Site Enhancements
-- Fix params for `JekyllImport::WordPress.process` arguments ([#1554]({{ site.repository }}/issues/1554))
-- Add `jekyll-suggested-tweet` to list of third-party plugins ([#1555]({{ site.repository }}/issues/1555))
-- Link to Liquid's docs for tags and filters ([#1553]({{ site.repository }}/issues/1553))
-- Add note about installing Xcode on the Mac in the Installation docs ([#1561]({{ site.repository }}/issues/1561))
-- Simplify/generalize pagination docs ([#1577]({{ site.repository }}/issues/1577))
-- Add documentation for the new data sources feature ([#1503]({{ site.repository }}/issues/1503))
-- Add more information on how to create generators ([#1590]({{ site.repository }}/issues/1590), [#1592]({{ site.repository }}/issues/1592))
-- Improve the instructions for mimicking GitHub Flavored Markdown
-    ([#1614]({{ site.repository }}/issues/1614))
-- Add `jekyll-import` warning note of missing dependencies ([#1626]({{ site.repository }}/issues/1626))
-- Fix grammar in the Usage section ([#1635]({{ site.repository }}/issues/1635))
-- Add documentation for the use of gems as plugins ([#1656]({{ site.repository }}/issues/1656))
-- Document the existence of a few additional plugins ([#1405]({{ site.repository }}/issues/1405))
-- Document that the `date_to_string` always returns a two digit day ([#1663]({{ site.repository }}/issues/1663))
-- Fix navigation in the "Working with Drafts" page ([#1667]({{ site.repository }}/issues/1667))
-- Fix an error with the data documentation ([#1691]({{ site.repository }}/issues/1691))
-
 ## 1.2.1 / 2013-09-14
 
 ### Minor Enhancements