jekyll 1.3.0 → 1.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: fa3966f04190edd8878f4cc0301a06d856e89e48
-  data.tar.gz: ba1d29bb0118036650a3995667f9a20e097ba28e
+  metadata.gz: 54f2c04f2decc2f06508c9205753f6c65a62dcde
+  data.tar.gz: 9a5c07d788561b8a9ebdffb395961610e1f0bb84
 SHA512:
-  metadata.gz: 9789c1c9bf08e7d2ebe99c6fe31924819565f4275f909d7d070350f5e11a157c27837baff4c5ab1e1452481184469ea311ced869b32934f2e58fa7bde0dc80e1
-  data.tar.gz: 92baf68cd9a63f7d780672ee6916220a160674bc1017920ff5043f1ddf2be489e9b5b001dc5a501e84cf3d3de7cfa60e160d2119df416807b1fcbfcfc6a985bc
+  metadata.gz: 0e700a2800c20defbf5b1106a434a92445e43f959044ea232e5d90ae54914ab84c3ae8ec7985a9876343041b014e5a37cafdce87f0262acff5741a0e0dc52dd3
+  data.tar.gz: 93db0c83231d8a8476fd5a4bd58496d80ca204c5d13dcb714af00da9653ddb2c19708b3933104a60c64115d1fcd7aabb85890be003f7650e57293a93f909f21f

data/History.markdown

@@ -10,7 +10,40 @@
 
 ### Site Enhancements
 
-## v1.3.0 / 2013-11-04
+## 1.3.1 / 2013-11/26
+
+### Minor Enhancements
+  * Add a `--prefix` option to passthrough for the importers (#1669)
+  * Push the paginator plugin lower in the plugin priority order so
+    other plugins run before it (#1759)
+
+### Bug Fixes
+  * Fix the include tag when ran in a loop (#1726)
+  * Fix errors when using `--watch` on 1.8.7 (#1730)
+  * Specify where the include is called from if an included file is
+    missing (#1746)
+
+### Development Fixes
+  * Extract `Site#filter_entries` into its own object (#1697)
+  * Enable Travis' bundle caching (#1734)
+  * Remove trailing whitespace in some files (#1736)
+  * Fix a duplicate test name (#1754)
+
+### Site Enhancements
+  * Update link to example Rakefile to point to specific commit (#1741)
+  * Fix drafts docs to indicate that draft time is based on file modification
+    time, not `Time.now` (#1695)
+  * Add `jekyll-monthly-archive-plugin` and `jekyll-category-archive-plugin` to
+    list of third-party plugins (#1693)
+  * Add `jekyll-asset-path-plugin` to list of third-party plugins (#1670)
+  * Add `emoji-for-jekyll` to list of third-part plugins (#1708)
+  * Fix previous section link on plugins page to point to pagination page (#1707)
+  * Add `org-mode` converter plugin to third-party plugins (#1711)
+  * Point "Blog migrations" page to http://import.jekyllrb.com (#1732)
+  * Add docs for `post_url` when posts are in subdirectories (#1718)
+  * Update the docs to point to `example.com` (#1448)
+
+## 1.3.0 / 2013-11-04
 
 ### Major Enhancements
   * Add support for adding data as YAML files under a site's `_data`

data/bin/jekyll

@@ -143,6 +143,7 @@ command :import do |c|
   c.option '--user STRING', 'Username to use when migrating'
   c.option '--pass STRING', 'Password to use when migrating'
   c.option '--host STRING', 'Host address to use when migrating'
+  c.option '--prefix STRING', 'Database table prefix to use when migrating'
 
   c.action do |args, options|
     begin

data/features/include_tag.feature

@@ -46,3 +46,12 @@ Feature: Include tags
     When I run jekyll
     Then the _site directory should exist
     And I should see "a snippet that works with parameters" in "_site/index.html"
+
+  Scenario: Include a variable file in a loop
+    Given I have an _includes directory
+    And I have an "_includes/one.html" file that contains "one"
+    And I have an "_includes/two.html" file that contains "two"
+    And I have an "index.html" page with files "[one.html, two.html]" that contains "{% for file in page.files %}{% include {{file}} %} {% endfor %}"
+    When I run jekyll
+    Then the _site directory should exist
+    And I should see "one two" in "_site/index.html"

data/features/site_data.feature

@@ -4,10 +4,10 @@ Feature: Site data
   In order to make the site slightly dynamic
 
   Scenario: Use page variable in a page
-    Given I have an "contact.html" page with title "Contact" that contains "{{ page.title }}: email@me.com"
+    Given I have an "contact.html" page with title "Contact" that contains "{{ page.title }}: email@example.com"
     When I run jekyll
     Then the _site directory should exist
-    And I should see "Contact: email@me.com" in "_site/contact.html"
+    And I should see "Contact: email@example.com" in "_site/contact.html"
 
   Scenario Outline: Use page.path variable in a page
     Given I have a <dir> directory
@@ -95,10 +95,10 @@ Feature: Site data
 
   Scenario: Use configuration date in site payload
     Given I have an "index.html" page that contains "{{ site.url }}"
-    And I have a configuration file with "url" set to "http://mysite.com"
+    And I have a configuration file with "url" set to "http://example.com"
     When I run jekyll
     Then the _site directory should exist
-    And I should see "http://mysite.com" in "_site/index.html"
+    And I should see "http://example.com" in "_site/index.html"
 
   Scenario: Access Jekyll version via jekyll.version
     Given I have an "index.html" page that contains "{{ jekyll.version }}"

data/features/support/env.rb

@@ -50,7 +50,7 @@ def seconds_agnostic_datetime(datetime = Time.now)
   pieces = datetime.to_s.split(" ")
   if pieces.size == 6 # Ruby 1.8.7
     date = pieces[0..2].join(" ")
-    time = seconds_agnostic_time(pieces[3]) 
+    time = seconds_agnostic_time(pieces[3])
     zone = pieces[4..5].join(" ")
   else # Ruby 1.9.1 or greater
     date, time, zone = pieces

data/jekyll.gemspec

@@ -4,9 +4,9 @@ Gem::Specification.new do |s|
   s.rubygems_version = '1.3.5'
 
   s.name              = 'jekyll'
-  s.version           = '1.3.0'
+  s.version           = '1.3.1'
   s.license           = 'MIT'
-  s.date              = '2013-11-04'
+  s.date              = '2013-11-26'
   s.rubyforge_project = 'jekyll'
 
   s.summary     = "A simple, blog aware, static site generator."
@@ -95,6 +95,7 @@ Gem::Specification.new do |s|
     lib/jekyll/core_ext.rb
     lib/jekyll/deprecator.rb
     lib/jekyll/draft.rb
+    lib/jekyll/entry_filter.rb
     lib/jekyll/errors.rb
     lib/jekyll/excerpt.rb
     lib/jekyll/filters.rb
@@ -156,6 +157,7 @@ Gem::Specification.new do |s|
     site/_posts/2013-09-14-jekyll-1-2-1-released.markdown
     site/_posts/2013-10-28-jekyll-1-3-0-rc1-released.markdown
     site/_posts/2013-11-04-jekyll-1-3-0-released.markdown
+    site/_posts/2013-11-26-jekyll-1-3-1-released.markdown
     site/css/gridism.css
     site/css/normalize.css
     site/css/pygments.css
@@ -273,6 +275,7 @@ Gem::Specification.new do |s|
     test/test_configuration.rb
     test/test_convertible.rb
     test/test_core_ext.rb
+    test/test_entry_filter.rb
     test/test_excerpt.rb
     test/test_filters.rb
     test/test_generated_site.rb

data/lib/jekyll.rb

@@ -45,6 +45,7 @@ require 'jekyll/static_file'
 require 'jekyll/errors'
 require 'jekyll/related_posts'
 require 'jekyll/cleaner'
+require 'jekyll/entry_filter'
 
 # extensions
 require 'jekyll/plugin'
@@ -61,7 +62,7 @@ require_all 'jekyll/tags'
 SafeYAML::OPTIONS[:suppress_warnings] = true
 
 module Jekyll
-  VERSION = '1.3.0'
+  VERSION = '1.3.1'
 
   # Public: Generate a Jekyll configuration Hash by merging the default
   # options with anything in _config.yml, and adding the given options on top.

data/lib/jekyll/commands/build.rb

@@ -37,7 +37,7 @@ module Jekyll
         destination = options['destination']
 
         begin
-          dest = Pathname.new(destination).relative_path_from(Pathname.new(source)).to_path
+          dest = Pathname.new(destination).relative_path_from(Pathname.new(source)).to_s
           ignored = Regexp.new(Regexp.escape(dest))
         rescue ArgumentError
           # Destination is outside the source, no need to ignore it.

data/lib/jekyll/convertible.rb

@@ -87,7 +87,7 @@ module Jekyll
     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}"
+      Jekyll.logger.error "Liquid Exception:", "#{e.message} in #{e.path}, included in #{path || self.path}"
       raise e
     rescue Exception => e
       Jekyll.logger.error "Liquid Exception:", "#{e.message} in #{path || self.path}"

data/lib/jekyll/entry_filter.rb

@@ -0,0 +1,35 @@
+class EntryFilter
+  attr_reader :site
+  def initialize(site)
+    @site = site
+  end
+
+  def filter(entries)
+    entries.reject do |e|
+      unless included?(e)
+        special?(e) || backup?(e) || excluded?(e) || symlink?(e)
+      end
+    end
+  end
+
+  def included?(entry)
+    site.include.glob_include?(entry)
+  end
+
+  def special?(entry)
+    ['.', '_', '#'].include?(entry[0..0])
+  end
+
+  def backup?(entry)
+    entry[-1..-1] == '~'
+  end
+
+  def excluded?(entry)
+    site.exclude.glob_include?(entry)
+  end
+
+  def symlink?(entry)
+    File.symlink?(entry) && site.safe
+  end
+
+end

data/lib/jekyll/generators/pagination.rb

@@ -4,6 +4,9 @@ module Jekyll
       # This generator is safe from arbitrary code execution.
       safe true
 
+      # This generator should be passive with regard to its execution
+      priority :lowest
+
       # Generate paginated pages if necessary.
       #
       # site - The Site.

data/lib/jekyll/site.rb

@@ -325,14 +325,7 @@ module Jekyll
     #
     # Returns the Array of filtered entries.
     def filter_entries(entries)
-      entries.reject do |e|
-        unless self.include.glob_include?(e)
-          ['.', '_', '#'].include?(e[0..0]) ||
-          e[-1..-1] == '~' ||
-          self.exclude.glob_include?(e) ||
-          (File.symlink?(e) && self.safe)
-        end
-      end
+      EntryFilter.new(self).filter(entries)
     end
 
     # Get the implementation class for the given Converter.

data/lib/jekyll/tags/include.rb

@@ -43,8 +43,8 @@ module Jekyll
         params
       end
 
-      def validate_file_name
-        if @file !~ /^[a-zA-Z0-9_\/\.-]+$/ || @file =~ /\.\// || @file =~ /\/\./
+      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:
 
@@ -82,7 +82,7 @@ eos
       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]
+          context[$1]
         end
       end
 
@@ -90,20 +90,22 @@ eos
         dir = File.join(context.registers[:site].source, INCLUDES_DIR)
         validate_dir(dir, context.registers[:site].safe)
 
-        retrieve_variable(context)
-        validate_file_name
+        file = retrieve_variable(context) || @file
+        validate_file_name(file)
 
-        file = File.join(dir, @file)
-        validate_file(file, context.registers[:site].safe)
+        path = File.join(dir, file)
+        validate_file(path, context.registers[:site].safe)
 
-        partial = Liquid::Template.parse(source(file, context))
+        begin
+          partial = Liquid::Template.parse(source(path, context))
 
-        context.stack do
-          context['include'] = parse_params(context) if @params
-          partial.render!(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
-      rescue => e
-        raise IncludeTagError.new e.message, File.join(INCLUDES_DIR, @file)
       end
 
       def validate_dir(dir, safe)

data/site/_posts/2013-11-26-jekyll-1-3-1-released.markdown

@@ -0,0 +1,21 @@
+---
+layout: news_item
+title: 'Jekyll 1.3.1 Released'
+date: 2013-11-26 19:52:20 -0600
+author: mattr-
+version: 1.3.1
+categories: [release]
+---
+
+Just in time for the US holiday Thanksgiving, we're releasing version
+1.3.1 of Jekyll to address some of the issues seen since the
+release of 1.3.0.
+
+In addition to a couple of other smaller bug fixes, the biggest thing
+we've fixed is an issue with the `--watch` option with Ruby 1.8.7. For a
+full run-down, visit our [change log](/docs/history/)!
+
+Thanks to all the people who have contributed to this release! They are
+(in alphabetical order): Abhi Yerra, Anatol Broder, Andreas Möller, Greg
+Karékinian, Sam Rayner, Santeri Paavolainen, Shigeya Suzuki, Yihang Ho,
+albertogg, andrewhavens, maul.esel, and thomasdao

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@myserver.com
+laptop$ ssh deployer@example.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@myserver.com:~/myrepo.git
+laptops$ git remote add deploy deployer@example.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/en/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/cdfbc4ec5321ff8d18c3ce936e9c749dbbc4f190/Rakefile).
 
 ### rsync
 

data/site/docs/drafts.md

@@ -17,6 +17,5 @@ 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 of `Time.now`
-for its date, and thus you will see them generated as the latest posts.
-
+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.

data/site/docs/history.md

@@ -5,6 +5,113 @@ permalink: /docs/history/
 prev_section: contributing
 ---
 
+## 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

data/site/docs/migrations.md

@@ -7,251 +7,5 @@ permalink: /docs/migrations/
 ---
 
 If you’re switching to Jekyll from another blogging system, Jekyll’s importers
-can help you with the move. Most methods listed on this page require read access
-to the database from your old system to generate posts for Jekyll. Each method
-generates `.markdown` posts in the `_posts` directory based on the entries in
-the foreign system.
-
-## Preparing for migrations
-
-Because the importers have many of their own dependencies, they are made
-available via a separate gem called
-[`jekyll-import`](https://github.com/jekyll/jekyll-import). To use them, all
-you need to do is install the gem, and they will become available as part of
-Jekyll's standard command line interface.
-
-{% highlight bash %}
-$ gem install jekyll-import --pre
-{% endhighlight %}
-
-<div class="note warning">
-  <h5>Jekyll-import requires you to manually install some dependencies.</h5>
-  <p markdown="1">If you are importing your blog from Drupal 6,7, Joomla,
-  Mephisto, Movable Type, Textpattern, or Typo (with mysql db), you need to install
-  `mysql` and `sequel` gems. If you are importing from a WordPress database, you
-  need to install `mysql2` and `sequel` gems, and if you are importing from Enki
-  or Typo (with postgresql db) you need to install `pg` and `sequel` gems.</p>
-</div>
-
-You should now be all set to run the importers below. If you ever get stuck, you
-can see help for each importer:
-
-{% highlight bash %}
-$ jekyll help import           # => See list of importers
-$ jekyll help import IMPORTER  # => See importer specific help
-{% endhighlight %}
-
-Where IMPORTER is the name of the specific importer.
-
-<div class="note info">
-  <h5>Note: Always double-check migrated content</h5>
-  <p>
-
-    Importers may not distinguish between published or private posts, so
-    you should always check that the content Jekyll generates for you appears as
-    you intended.
-
-  </p>
-</div>
-
-<!-- TODO all these need to be fixed -->
-
-## WordPress
-
-### WordPress export files
-
-If hpricot is not already installed, you will need to run `gem install hpricot`.
-Next, export your blog using the WordPress export utility. Assuming that the
-exported file is saved as `wordpress.xml`, here is the command you need to run:
-
-{% highlight bash %}
-$ ruby -rubygems -e 'require "jekyll/jekyll-import/wordpressdotcom";
-    JekyllImport::WordpressDotCom.process({ :source => "wordpress.xml" })'
-{% endhighlight %}
-
-<div class="note">
-  <h5>ProTip™: WordPress.com Export Tool</h5>
-  <p markdown="1">If you are migrating from a WordPress.com account, you can
-  access the export tool at the following URL:
-  `https://YOUR-USER-NAME.wordpress.com/wp-admin/export.php`.</p>
-</div>
-
-### Using WordPress MySQL server connection
-
-If you want to import using a direct connection to the WordPress MySQL server,
-here's how:
-
-{% highlight bash %}
-$ ruby -rubygems -e 'require "jekyll/jekyll-import/wordpress";
-    JekyllImport::WordPress.process({:dbname => "database", :user => "user", :pass => "pass"})'
-{% endhighlight %}
-
-If you are using Webfaction and have to set up an [SSH
-tunnel](http://docs.webfaction.com/user-guide/databases.html?highlight=mysql#starting-an-ssh-tunnel-with-ssh),
-be sure to make the hostname (`127.0.0.1`) explicit, otherwise MySQL may block
-your access based on `localhost` and `127.0.0.1` not being equivalent in its
-authentication system:
-
-{% highlight bash %}
-$ ruby -rubygems -e 'require "jekyll/jekyll-import/wordpress";
-    JekyllImport::WordPress.process({:host => "127.0.0.1", :dbname => "database", :user => "user", :pass => "pass"})'
-{% endhighlight %}
-
-### Further WordPress migration alternatives
-
-While the above methods work, they do not import much of the metadata that is
-usually stored in WordPress posts and pages. If you need to export things like
-pages, tags, custom fields, image attachments and so on, the following resources
-might be useful to you:
-
-- [Exitwp](https://github.com/thomasf/exitwp) is a configurable tool written in
-  Python for migrating one or more WordPress blogs into Jekyll (Markdown) format
-  while keeping as much metadata as possible. Exitwp also downloads attachments
-  and pages.
-- [A great
-  article](http://vitobotta.com/how-to-migrate-from-wordpress-to-jekyll/) with a
-  step-by-step guide for migrating a WordPress blog to Jekyll while keeping most
-  of the structure and metadata.
-- [wpXml2Jekyll](https://github.com/theaob/wpXml2Jekyll) is an executable
-  windows application for creating Markdown posts from your WordPress XML file.
-
-## Drupal
-
-If you’re migrating from [Drupal](http://drupal.org), there are two migrators
-for you, depending upon your Drupal version:
-- [Drupal 6](https://github.com/jekyll/jekyll-import/blob/v0.1.0.beta1/lib/jekyll/jekyll-import/drupal6.rb)
-- [Drupal 7](https://github.com/jekyll/jekyll-import/blob/v0.1.0.beta1/lib/jekyll/jekyll-import/drupal7.rb)
-
-{% highlight bash %}
-$ ruby -rubygems -e 'require "jekyll/jekyll-import/drupal6";
-    JekyllImport::Drupal6.process("dbname", "user", "pass")'
-# ... or ...
-$ ruby -rubygems -e 'require "jekyll/jekyll-import/drupal7";
-    JekyllImport::Drupal7.process("dbname", "user", "pass")'
-{% endhighlight %}
-
-If you are connecting to a different host or need to specify a table prefix for
-your database, you may optionally add those two parameters to the end of either
-Drupal migrator execution:
-
-{% highlight bash %}
-$ ruby -rubygems -e 'require "jekyll/jekyll-import/drupal6";
-    JekyllImport::Drupal6.process("dbname", "user", "pass", "host", "table_prefix")'
-# ... or ...
-$ ruby -rubygems -e 'require "jekyll/jekyll-import/drupal7";
-    JekyllImport::Drupal7.process("dbname", "user", "pass", "host", "table_prefix")'
-{% endhighlight %}
-
-## Movable Type
-
-To import posts from Movable Type:
-
-{% highlight bash %}
-$ ruby -rubygems -e 'require "jekyll/jekyll-import/mt";
-    JekyllImport::MT.process("database", "user", "pass")'
-{% endhighlight %}
-
-## Typo
-
-To import posts from Typo:
-
-{% highlight bash %}
-$ ruby -rubygems -e 'require "jekyll/jekyll-import/typo";
-    JekyllImport::Typo.process("database", "user", "pass")'
-{% endhighlight %}
-
-This code has only been tested with Typo version 4+.
-
-## TextPattern
-
-To import posts from TextPattern:
-
-{% highlight bash %}
-$ ruby -rubygems -e 'require "jekyll/jekyll-import/textpattern";
-    JekyllImport::TextPattern.process("database_name", "username", "password", "hostname")'
-{% endhighlight %}
-
-You will need to run the above from the parent directory of your `_import`
-folder. For example, if `_import` is located in `/path/source/_import`, you will
-need to run this code from `/path/source`. The hostname defaults to `localhost`,
-all other variables are required. You may need to adjust the code used to filter
-entries. Left alone, it will attempt to pull all entries that are live or
-sticky.
-
-## Mephisto
-
-To import posts from Mephisto:
-
-{% highlight bash %}
-$ ruby -rubygems -e 'require "jekyll/jekyll-import/mephisto";
-    JekyllImport::Mephisto.process("database", "user", "password")'
-{% endhighlight %}
-
-If your data is in Postgres, you should do this instead:
-
-{% highlight bash %}
-$ ruby -rubygems -e 'require "jekyll/jekyll-import/mephisto";
-    JekyllImport::Mephisto.postgres({:database => "database", :username=>"username", :password =>"password"})'
-{% endhighlight %}
-
-## Blogger (Blogspot)
-
-To import posts from Blogger, see [this post about migrating from Blogger to
-Jekyll](http://blog.coolaj86.com/articles/migrate-from-blogger-to-jekyll.html). If
-that doesn’t work for you, you might want to try some of the following
-alternatives:
-
-- [@kennym](https://github.com/kennym) created a [little migration
-  script](https://gist.github.com/1115810), because the solutions in the
-  previous article didn't work out for him.
-- [@ngauthier](https://github.com/ngauthier) created [another
-  importer](https://gist.github.com/1506614) that imports comments, and does so
-  via blogger’s archive instead of the RSS feed.
-- [@juniorz](https://github.com/juniorz) created [yet another
-  importer](https://gist.github.com/1564581) that works for
-  [Octopress](http://octopress.org). It is like [@ngauthier’s
-  version](https://gist.github.com/1506614) but separates drafts from posts, as
-  well as importing tags and permalinks.
-
-## Posterous
-
-To import posts from your primary Posterous blog:
-
-{% highlight bash %}
-$ ruby -rubygems -e 'require "jekyll/jekyll-import/posterous";
-    JekyllImport::Posterous.process("my_email", "my_pass")'
-{% endhighlight %}
-
-For any other Posterous blog on your account, you will need to specify the
-`blog_id` for the blog:
-
-{% highlight bash %}
-$ ruby -rubygems -e 'require "jekyll/jekyll-import/posterous";
-    JekyllImport::Posterous.process("my_email", "my_pass", "blog_id")'
-{% endhighlight %}
-
-There is also an [alternative Posterous
-migrator](https://github.com/pepijndevos/jekyll/blob/patch-1/lib/jekyll/migrators/posterous.rb)
-that maintains permalinks and attempts to import images too.
-
-## Tumblr
-
-To import posts from Tumblr:
-
-{% highlight bash %}
-$ ruby -rubygems -e 'require "jekyll/jekyll-import/tumblr";
-    JekyllImport::Tumblr.process(url, format, grab_images, add_highlights, rewrite_urls)'
-# url    - String: your blog's URL
-# format - String: the output file extension. Use "md" to have your content
-#          converted from HTML to Markdown. Defaults to "html".
-# grab_images    - Boolean: whether to download images as well. Defaults to false.
-# add_highlights - Boolean: whether to wrap code blocks (indented 4 spaces) in a Liquid
-                   "highlight" tag. Defaults to false.
-# rewrite_urls   - Boolean: whether to write pages that redirect from the old Tumblr paths
-                   to the new Jekyll paths. Defaults to false.
-{% endhighlight %}
-
-## Other Systems
-
-If you have a system for which there is currently no migrator, consider writing
-one and sending us [a pull request](https://github.com/jekyll/jekyll-import).
+can help you with the move. To learn more about importing your site to Jekyll,
+visit our [`jekyll-import` docs site](http://import.jekyllrb.com).

data/site/docs/pages.md

@@ -53,9 +53,9 @@ and associated URLs might look like:
 |-- _layouts/
 |-- _posts/
 |-- _site/
-|-- about.html    # => http://yoursite.com/about.html
-|-- index.html    # => http://yoursite.com/
-└── contact.html  # => http://yoursite.com/contact.html
+|-- about.html    # => http://example.com/about.html
+|-- index.html    # => http://example.com/
+└── contact.html  # => http://example.com/contact.html
 {% endhighlight %}
 
 ### Named folders containing index HTML files
@@ -76,10 +76,10 @@ look like:
 ├── _posts/
 ├── _site/
 ├── about/
-|   └── index.html  # => http://yoursite.com/about/
+|   └── index.html  # => http://example.com/about/
 ├── contact/
-|   └── index.html  # => http://yoursite.com/contact/
-└── index.html      # => http://yoursite.com/
+|   └── index.html  # => http://example.com/contact/
+└── index.html      # => http://example.com/
 {% endhighlight %}
 
 This approach may not suit everyone, but for people who like clean URLs it’s

data/site/docs/plugins.md

@@ -1,7 +1,7 @@
 ---
 layout: docs
 title: Plugins
-prev_section: assets
+prev_section: pagination
 next_section: extras
 permalink: /docs/plugins/
 ---
@@ -419,6 +419,9 @@ You can find a few useful plugins at the following locations:
 - [Pageless Redirect Generator by Nick Quinlan](https://github.com/nquinlan/jekyll-pageless-redirects): Generates redirects based on files in the Jekyll root, with support for htaccess style redirects.
 - [Projectlist by Frederic Hemberger](https://github.com/fhemberger/jekyll-projectlist): Renders files in a directory as a single page instead of separate posts.
 - [RssGenerator by Assaf Gelber](https://github.com/agelber/jekyll-rss): Automatically creates an RSS 2.0 feed from your posts.
+- [Monthly archive generator by Shigeya Suzuki](https://github.com/shigeya/jekyll-monthly-archive-plugin): Generator and template which renders monthly archive like MovableType style, based on the work by Ilkka Laukkanen and others above.
+- [Category archive generator by Shigeya Suzuki](https://github.com/shigeya/jekyll-category-archive-plugin): Generator and template which renders category archive like MovableType style, based on Monthly archive generator.
+- [Emoji for Jekyll](https://github.com/yihangho/emoji-for-jekyll): Seamlessly enable emoji for all posts and pages.
 
 #### Converters
 
@@ -437,6 +440,7 @@ You can find a few useful plugins at the following locations:
 - [Jekyll-pandoc-multiple-formats](https://github.com/fauno/jekyll-pandoc-multiple-formats) by [edsl](https://github.com/edsl): Use pandoc to generate your site in multiple formats. Supports pandoc’s markdown extensions.
 - [ReStructuredText Converter](https://github.com/xdissent/jekyll-rst): Converts ReST documents to HTML with Pygments syntax highlighting.
 - [Transform Layouts](https://gist.github.com/1472645): Allows HAML layouts (you need a HAML Converter plugin for this to work).
+- [Org-mode Converter](https://gist.github.com/abhiyerra/7377603): Org-mode converter for Jekyll.
 
 #### Filters
 
@@ -455,6 +459,7 @@ You can find a few useful plugins at the following locations:
 
 #### Tags
 
+- [Asset Path Tag](https://github.com/samrayner/jekyll-asset-path-plugin) by [Sam Rayner](http://www.samrayner.com/): Allows organisation of assets into subdirectories by outputting a path for a given file relative to the current post or page.
 - [Delicious Plugin by Christian Hellsten](https://github.com/christianhellsten/jekyll-plugins): Fetches and renders bookmarks from delicious.com.
 - [Ultraviolet Plugin by Steve Alex](https://gist.github.com/480380): Jekyll tag for the [Ultraviolet](http://ultraviolet.rubyforge.org/) code highligher.
 - [Tag Cloud Plugin by Ilkka Laukkanen](https://gist.github.com/710577): Generate a tag cloud that links to tag pages.

data/site/docs/templates.md

@@ -290,6 +290,15 @@ will generate the correct permalink URL for the post you specify.
 {% endraw %}
 {% endhighlight %}
 
+If you organize your posts in subdirectories, you need to include subdirectory 
+path to the post:
+
+{% highlight text %}
+{% raw %}
+{% post_url /subdir/2010-07-21-name-of-post %}
+{% endraw %}
+{% endhighlight %}
+
 There is no need to include the file extension when using the `post_url` tag.
 
 You can also use this tag to create a link to a post in Markdown as follows:

data/test/test_entry_filter.rb

@@ -0,0 +1,74 @@
+require 'helper'
+
+class TestEntryFilter < Test::Unit::TestCase
+  context "Filtering entries" do
+    setup do
+      stub(Jekyll).configuration do
+        Jekyll::Configuration::DEFAULTS.merge({'source' => source_dir, 'destination' => dest_dir})
+      end
+      @site = Site.new(Jekyll.configuration)
+    end
+
+    should "filter entries" do
+      ent1 = %w[foo.markdown bar.markdown baz.markdown #baz.markdown#
+              .baz.markdow foo.markdown~ .htaccess _posts _pages]
+
+      entries = EntryFilter.new(@site).filter(ent1)
+      assert_equal %w[foo.markdown bar.markdown baz.markdown .htaccess], entries
+    end
+
+    should "filter entries with exclude" do
+      excludes = %w[README TODO]
+      files = %w[index.html site.css .htaccess]
+
+      @site.exclude = excludes + ["exclude*"]
+      assert_equal files, @site.filter_entries(excludes + files + ["excludeA"])
+    end
+
+    should "not filter entries within include" do
+      includes = %w[_index.html .htaccess include*]
+      files = %w[index.html _index.html .htaccess includeA]
+
+      @site.include = includes
+      assert_equal files, @site.filter_entries(files)
+    end
+
+    should "filter symlink entries when safe mode enabled" do
+      stub(Jekyll).configuration do
+        Jekyll::Configuration::DEFAULTS.merge({'source' => source_dir, 'destination' => dest_dir, 'safe' => true})
+      end
+      site = Site.new(Jekyll.configuration)
+      stub(File).symlink?('symlink.js') {true}
+      files = %w[symlink.js]
+      assert_equal [], site.filter_entries(files)
+    end
+
+    should "not filter symlink entries when safe mode disabled" do
+      stub(File).symlink?('symlink.js') {true}
+      files = %w[symlink.js]
+      assert_equal files, @site.filter_entries(files)
+    end
+
+    should "not include symlinks in safe mode" do
+      stub(Jekyll).configuration do
+        Jekyll::Configuration::DEFAULTS.merge({'source' => source_dir, 'destination' => dest_dir, 'safe' => true})
+      end
+      site = Site.new(Jekyll.configuration)
+
+      site.read_directories("symlink-test")
+      assert_equal [], site.pages
+      assert_equal [], site.static_files
+    end
+
+    should "include symlinks in unsafe mode" do
+      stub(Jekyll).configuration do
+        Jekyll::Configuration::DEFAULTS.merge({'source' => source_dir, 'destination' => dest_dir, 'safe' => false})
+      end
+      site = Site.new(Jekyll.configuration)
+
+      site.read_directories("symlink-test")
+      assert_not_equal [], site.pages
+      assert_not_equal [], site.static_files
+    end
+  end
+end

data/test/test_redcloth.rb

@@ -7,7 +7,7 @@ class TestRedCloth < Test::Unit::TestCase
       @textile = Converters::Textile.new
     end
 
-    should "preserve single line breaks in HTML output" do 
+    should "preserve single line breaks in HTML output" do
       assert_equal "<p>line1<br />\nline2</p>", @textile.convert("p. line1\nline2").strip
     end
   end
@@ -20,7 +20,7 @@ class TestRedCloth < Test::Unit::TestCase
       @textile = Converters::Textile.new config
     end
 
-    should "preserve single line breaks in HTML output" do 
+    should "preserve single line breaks in HTML output" do
       assert_equal "<p>line1<br />\nline2</p>", @textile.convert("p. line1\nline2").strip
     end
   end
@@ -35,7 +35,7 @@ class TestRedCloth < Test::Unit::TestCase
       @textile = Converters::Textile.new config
     end
 
-    should "preserve single line breaks in HTML output" do 
+    should "preserve single line breaks in HTML output" do
       assert_equal "<p>line1<br />\nline2</p>", @textile.convert("p. line1\nline2").strip
     end
   end

data/test/test_site.rb

@@ -179,69 +179,6 @@ class TestSite < Test::Unit::TestCase
       assert_equal 4, @site.categories['foo'].size
     end
 
-    should "filter entries" do
-      ent1 = %w[foo.markdown bar.markdown baz.markdown #baz.markdown#
-              .baz.markdow foo.markdown~]
-      ent2 = %w[.htaccess _posts _pages bla.bla]
-
-      assert_equal %w[foo.markdown bar.markdown baz.markdown], @site.filter_entries(ent1)
-      assert_equal %w[.htaccess bla.bla], @site.filter_entries(ent2)
-    end
-
-    should "filter entries with exclude" do
-      excludes = %w[README TODO]
-      files = %w[index.html site.css .htaccess]
-
-      @site.exclude = excludes + ["exclude*"]
-      assert_equal files, @site.filter_entries(excludes + files + ["excludeA"])
-    end
-
-    should "not filter entries within include" do
-      includes = %w[_index.html .htaccess include*]
-      files = %w[index.html _index.html .htaccess includeA]
-
-      @site.include = includes
-      assert_equal files, @site.filter_entries(files)
-    end
-
-    should "filter symlink entries when safe mode enabled" do
-      stub(Jekyll).configuration do
-        Jekyll::Configuration::DEFAULTS.merge({'source' => source_dir, 'destination' => dest_dir, 'safe' => true})
-      end
-      site = Site.new(Jekyll.configuration)
-      stub(File).symlink?('symlink.js') {true}
-      files = %w[symlink.js]
-      assert_equal [], site.filter_entries(files)
-    end
-
-    should "not filter symlink entries when safe mode disabled" do
-      stub(File).symlink?('symlink.js') {true}
-      files = %w[symlink.js]
-      assert_equal files, @site.filter_entries(files)
-    end
-
-    should "not include symlinks in safe mode" do
-      stub(Jekyll).configuration do
-        Jekyll::Configuration::DEFAULTS.merge({'source' => source_dir, 'destination' => dest_dir, 'safe' => true})
-      end
-      site = Site.new(Jekyll.configuration)
-
-      site.read_directories("symlink-test")
-      assert_equal [], site.pages
-      assert_equal [], site.static_files
-    end
-
-    should "include symlinks in unsafe mode" do
-      stub(Jekyll).configuration do
-        Jekyll::Configuration::DEFAULTS.merge({'source' => source_dir, 'destination' => dest_dir, 'safe' => false})
-      end
-      site = Site.new(Jekyll.configuration)
-
-      site.read_directories("symlink-test")
-      assert_not_equal [], site.pages
-      assert_not_equal [], site.static_files
-    end
-
     context 'error handling' do
       should "raise if destination is included in source" do
         stub(Jekyll).configuration do

data/test/test_tags.rb

@@ -226,7 +226,7 @@ CONTENT
       assert_no_match /markdown\-html\-error/, @result
     end
 
-    should "have the url to the \"nested\" post from 2008-11-21" do
+    should "have the url to the \"complex\" post from 2008-11-21" do
       assert_match %r{1\s/2008/11/21/complex/}, @result
       assert_match %r{2\s/2008/11/21/complex/}, @result
     end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: jekyll
 version: !ruby/object:Gem::Version
-  version: 1.3.0
+  version: 1.3.1
 platform: ruby
 authors:
 - Tom Preston-Werner
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-11-04 00:00:00.000000000 Z
+date: 2013-11-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: liquid
@@ -412,6 +412,7 @@ files:
 - lib/jekyll/core_ext.rb
 - lib/jekyll/deprecator.rb
 - lib/jekyll/draft.rb
+- lib/jekyll/entry_filter.rb
 - lib/jekyll/errors.rb
 - lib/jekyll/excerpt.rb
 - lib/jekyll/filters.rb
@@ -473,6 +474,7 @@ files:
 - site/_posts/2013-09-14-jekyll-1-2-1-released.markdown
 - site/_posts/2013-10-28-jekyll-1-3-0-rc1-released.markdown
 - site/_posts/2013-11-04-jekyll-1-3-0-released.markdown
+- site/_posts/2013-11-26-jekyll-1-3-1-released.markdown
 - site/css/gridism.css
 - site/css/normalize.css
 - site/css/pygments.css
@@ -588,6 +590,7 @@ files:
 - test/test_configuration.rb
 - test/test_convertible.rb
 - test/test_core_ext.rb
+- test/test_entry_filter.rb
 - test/test_excerpt.rb
 - test/test_filters.rb
 - test/test_generated_site.rb
@@ -633,6 +636,7 @@ test_files:
 - test/test_configuration.rb
 - test/test_convertible.rb
 - test/test_core_ext.rb
+- test/test_entry_filter.rb
 - test/test_excerpt.rb
 - test/test_filters.rb
 - test/test_generated_site.rb