spinto-jekyll 0.11.2.3 → 0.11.2.5

data/History.txt

@@ -5,11 +5,14 @@
     * Allow setting of RedCloth options (#284)
     * Add post_url Liquid tag for internal post linking (#369)
     * Allow multiple plugin dirs to be specified (#438)
+    * Inline TOC token support for RDiscount (#333)
+    * Add the option to specify the paginated url format (#342)
   * Bug Fixes
     * Allow some special characters in highlight names
     * URL escape category names in URL generation (#360)
     * Fix error with limit_posts (#442)
     * Properly select dotfile during directory scan (#363, #431, #377)
+    * Allow setting of Kramdown smart_quotes (#482)
 
 == 0.11.2 / 2011-12-27
   * Bug Fixes

data/bin/jekyll

@@ -106,7 +106,7 @@ opts = OptionParser.new do |opts|
   opts.on("--permalink [TYPE]", "Use 'date' (default) for YYYY/MM/DD") do |style|
     options['permalink'] = style unless style.nil?
   end
-  
+
   opts.on("--paginate [POSTS_PER_PAGE]", "Paginate a blog's posts") do |per_page|
     begin
       options['paginate'] = per_page.to_i
@@ -117,6 +117,16 @@ opts = OptionParser.new do |opts|
     end
   end
 
+  opts.on("--paginate_path [PAGINATED_URL_FORMAT]", "Leave blank for /page<num>") do |paginate_path|
+    begin
+      options['paginate_path'] = paginate_path
+      raise ArgumentError if options['paginate_path'].nil?
+    rescue
+      puts 'You must specify a pagination url format'
+      exit 0
+    end
+  end
+
   opts.on("--limit_posts [MAX_POSTS]", "Limit the number of posts to publish") do |limit_posts|
     begin
       options['limit_posts'] = limit_posts.to_i
@@ -156,12 +166,12 @@ if ARGV.size > 0
     else
       migrator = migrator.downcase
     end
-    
+
     cmd_options = []
     ['file', 'dbname', 'user', 'pass', 'host', 'site'].each do |p|
       cmd_options << "\"#{options[p]}\"" unless options[p].nil?
     end
-    
+
     # It's import time
     puts "Importing..."
     

data/features/pagination.feature

@@ -19,9 +19,36 @@ Feature: Site pagination
     And the "_site/page<exist>/index.html" file should exist
     And I should see "<posts>" in "_site/page<exist>/index.html"
     And the "_site/page<not_exist>/index.html" file should not exist
-    
+
     Examples:
       | num | exist | posts | not_exist |
       | 1   | 4     | 1     | 5         |
       | 2   | 2     | 2     | 3         |
       | 3   | 2     | 1     | 3         |
+
+  Scenario Outline: Setting a custom pagination path
+    Given I have a configuration file with:
+      | key           | value                          |
+      | paginate      | 1                              |
+      | paginate_path | /blog/page-:num                |
+      | permalink     | /blog/:year/:month/:day/:title |
+      And I have a _layouts directory
+      And I have an "index.html" page that contains "{{ paginator.posts.size }}"
+    And I have a _posts directory
+    And I have the following post:
+      | title     | date      | layout  | content                                |
+      | Wargames  | 3/27/2009 | default | The only winning move is not to play.  |
+      | Wargames2 | 4/27/2009 | default | The only winning move is not to play2. |
+      | Wargames3 | 5/27/2009 | default | The only winning move is not to play3. |
+      | Wargames4 | 6/27/2009 | default | The only winning move is not to play4. |
+    When I run jekyll
+    Then the _site/blog/page-<exist> directory should exist
+    And the "_site/blog/page-<exist>/index.html" file should exist
+    And I should see "<posts>" in "_site/blog/page-<exist>/index.html"
+    And the "_site/blog/page-<not_exist>/index.html" file should not exist
+
+    Examples:
+      | exist | posts | not_exist |
+      | 2     | 1     | 5         |
+      | 3     | 1     | 6         |
+      | 4     | 1     | 7         |

data/features/step_definitions/jekyll_steps.rb

@@ -121,7 +121,7 @@ When /^I change "(.*)" to contain "(.*)"$/ do |file, text|
 end
 
 Then /^the (.*) directory should exist$/ do |dir|
-  assert File.directory?(dir)
+  assert File.directory?(dir), "The directory \"#{dir}\" does not exist"
 end
 
 Then /^I should see "(.*)" in "(.*)"$/ do |text, file|

data/lib/jekyll.rb

@@ -51,10 +51,10 @@ module Jekyll
   # Default options. Overriden by values in _config.yml or command-line opts.
   # (Strings rather symbols used for compatability with YAML).
   DEFAULTS = {
-    'safe'         => false,
-    'auto'         => false,
-    'server'       => false,
-    'server_port'  => 4000,
+    'safe'          => false,
+    'auto'          => false,
+    'server'        => false,
+    'server_port'   => 4000,
 
     'source'       => Dir.pwd,
     'destination'  => File.join(Dir.pwd, '_site'),
@@ -66,6 +66,7 @@ module Jekyll
     'markdown'     => 'maruku',
     'permalink'    => 'date',
     'include'      => ['.htaccess'],
+    'paginate_path' => 'page:num',
 
     'markdown_ext' => 'markdown,mkd,mkdn,md',
     'textile_ext'  => 'textile',
@@ -88,6 +89,7 @@ module Jekyll
       'footnote_nr'   => 1,
       'entity_output' => 'as_char',
       'toc_levels'    => '1..6',
+      'smart_quotes'  => 'lsquo,rsquo,ldquo,rdquo',
       'use_coderay'   => false,
 
       'coderay' => {

data/lib/jekyll/converters/markdown.rb

@@ -97,6 +97,7 @@ module Jekyll
               :footnote_nr   => @config['kramdown']['footnote_nr'],
               :entity_output => @config['kramdown']['entity_output'],
               :toc_levels    => @config['kramdown']['toc_levels'],
+              :smart_quotes  => @config['kramdown']['smart_quotes'],
 
               :coderay_wrap               => @config['kramdown']['coderay']['coderay_wrap'],
               :coderay_line_numbers       => @config['kramdown']['coderay']['coderay_line_numbers'],
@@ -111,11 +112,17 @@ module Jekyll
               :auto_ids      => @config['kramdown']['auto_ids'],
               :footnote_nr   => @config['kramdown']['footnote_nr'],
               :entity_output => @config['kramdown']['entity_output'],
-              :toc_levels    => @config['kramdown']['toc_levels']
+              :toc_levels    => @config['kramdown']['toc_levels'],
+              :smart_quotes  => @config['kramdown']['smart_quotes']
             }).to_html
           end
         when 'rdiscount'
-          RDiscount.new(content, *@rdiscount_extensions).to_html
+          rd = RDiscount.new(content, *@rdiscount_extensions)
+          html = rd.to_html
+          if rd.generate_toc and html.include?(@config['rdiscount']['toc_token'])
+            html.gsub!(@config['rdiscount']['toc_token'], rd.toc_content)
+          end
+          html
         when 'maruku'
           Maruku.new(content).to_html
       end

data/lib/jekyll/generators/pagination.rb

@@ -37,13 +37,19 @@ module Jekyll
         if num_page > 1
           newpage = Page.new(site, site.source, page.dir, page.name)
           newpage.pager = pager
-          newpage.dir = File.join(page.dir, "page#{num_page}")
+          newpage.dir = File.join(page.dir, paginate_path(site, num_page))
           site.pages << newpage
         else
           page.pager = pager
         end
       end
     end
+
+    private
+      def paginate_path(site, num_page)
+        format = site.config['paginate_path']
+        format.sub(':num', num_page.to_s)
+      end
   end
 
   class Pager

data/lib/jekyll/site.rb

@@ -200,18 +200,19 @@ module Jekyll
     #
     # Returns nothing.
     def render
+      payload = site_payload
       self.posts.each do |post|
-        post.render(self.layouts, site_payload)
+        post.render(self.layouts, payload)
       end
       
       if self.preview
         self.unpublished_posts.sort.each do |post|
-          post.render(self.layouts, site_payload)
+          post.render(self.layouts, payload)
         end
       end
 
       self.pages.each do |page|
-        page.render(self.layouts, site_payload)
+        page.render(self.layouts, payload)
       end
 
       self.categories.values.map { |ps| ps.sort! { |a, b| b <=> a } }

data/lib/spinto-jekyll.rb

@@ -1,3 +1,3 @@
 module SpintoJekyll
-  VERSION = '0.11.2.3'
+  VERSION = '0.11.2.5'
 end

data/spinto-jekyll.gemspec

@@ -4,8 +4,8 @@ Gem::Specification.new do |s|
   s.rubygems_version = '1.3.5'
 
   s.name              = 'spinto-jekyll'
-  s.version           = '0.11.2.3'
-  s.date              = '2012-03-27'
+  s.version           = '0.11.2.5'
+  s.date              = '2012-05-01'
   s.rubyforge_project = 'spinto-jekyll'
 
   s.summary     = "A simple, blog aware, static site generator."
@@ -22,11 +22,11 @@ Gem::Specification.new do |s|
   s.rdoc_options = ["--charset=UTF-8"]
   s.extra_rdoc_files = %w[README.textile LICENSE]
 
-  s.add_runtime_dependency('spinto-liquid', "~> 2.3")
+  s.add_runtime_dependency('spinto-liquid', "~> 2.3.0.3")
   s.add_runtime_dependency('classifier', "~> 1.3")
   s.add_runtime_dependency('directory_watcher', "~> 1.1")
   s.add_runtime_dependency('maruku', "~> 0.5")
-  s.add_runtime_dependency('kramdown', "~> 0.13")
+  s.add_runtime_dependency('kramdown', "~> 0.13.4")
   s.add_runtime_dependency('albino', "~> 1.3")
 
   s.add_development_dependency('rake', "~> 0.9")

data/test/test_kramdown.rb

@@ -3,21 +3,31 @@ require 'helper'
 class TestKramdown < Test::Unit::TestCase
   context "kramdown" do
     setup do
-      config = {
+      @config = {
         'markdown' => 'kramdown',
         'kramdown' => {
           'auto_ids'      => false,
           'footnote_nr'   => 1,
           'entity_output' => 'as_char',
-          'toc_levels'    => '1..6'
+          'toc_levels'    => '1..6',
+          'smart_quotes'  => 'lsquo,rsquo,ldquo,rdquo'
         }
       }
-      @markdown = MarkdownConverter.new config
     end
 
     # http://kramdown.rubyforge.org/converter/html.html#options
     should "pass kramdown options" do
-      assert_equal "<h1>Some Header</h1>", @markdown.convert('# Some Header #').strip
+      markdown = MarkdownConverter.new(@config)
+      assert_equal "<h1>Some Header</h1>", markdown.convert('# Some Header #').strip
+    end
+
+    should "convert quotes to smart quotes" do
+      markdown = MarkdownConverter.new(@config)
+      assert_equal "<p>&ldquo;Pit&rsquo;hy&rdquo;</p>", markdown.convert(%{"Pit'hy"}).strip
+
+      override = { 'kramdown' => { 'smart_quotes' => 'lsaquo,rsaquo,laquo,raquo' } }
+      markdown = MarkdownConverter.new(@config.deep_merge(override))
+      assert_equal "<p>&laquo;Pit&rsaquo;hy&raquo;</p>", markdown.convert(%{"Pit'hy"}).strip
     end
   end
 end

data/test/test_rdiscount.rb

@@ -5,8 +5,8 @@ class TestRdiscount < Test::Unit::TestCase
   context "rdiscount" do
     setup do
       config = {
-        'rdiscount' => { 'extensions' => ['smart'] },
-        'markdown' => 'rdiscount'
+        'markdown' => 'rdiscount',
+        'rdiscount' => { 'extensions' => ['smart', 'generate_toc'], 'toc_token' => '{:toc}' }
       }
       @markdown = MarkdownConverter.new config
     end
@@ -14,5 +14,9 @@ class TestRdiscount < Test::Unit::TestCase
     should "pass rdiscount extensions" do
       assert_equal "<p>&ldquo;smart&rdquo;</p>", @markdown.convert('"smart"').strip
     end
+
+    should "render toc" do
+      assert_equal "<h1 id=\"Header+1\">Header 1</h1>\n\n<h2 id=\"Header+2\">Header 2</h2>\n\n<p>\n <ul>\n <li><a href=\"#Header+1\">Header 1</a>\n  <ul>\n  <li><a href=\"#Header+2\">Header 2</a>  </li>\n  </ul>\n </li>\n </ul>\n\n</p>", @markdown.convert("# Header 1\n\n## Header 2\n\n{:toc}").strip
+    end
   end
 end

data/test/test_redcarpet.rb

@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/helper'
+require 'helper'
 
 class TestRedcarpet < Test::Unit::TestCase
   context "redcarpet" do

data/test/test_tags.rb

@@ -6,7 +6,7 @@ class TestTags < Test::Unit::TestCase
 
   def create_post(content, override = {}, converter_class = Jekyll::MarkdownConverter)
     stub(Jekyll).configuration do
-      Jekyll::DEFAULTS.merge({'pygments' => true}).merge(override)
+      Jekyll::DEFAULTS.deep_merge({'pygments' => true}).deep_merge(override)
     end
     site = Site.new(Jekyll.configuration)
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: spinto-jekyll
 version: !ruby/object:Gem::Version
-  version: 0.11.2.3
+  version: 0.11.2.5
   prerelease: 
 platform: ruby
 authors:
@@ -10,22 +10,22 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-03-27 00:00:00.000000000 Z
+date: 2012-05-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: spinto-liquid
-  requirement: &2181013520 !ruby/object:Gem::Requirement
+  requirement: &2167463280 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '2.3'
+        version: 2.3.0.3
   type: :runtime
   prerelease: false
-  version_requirements: *2181013520
+  version_requirements: *2167463280
 - !ruby/object:Gem::Dependency
   name: classifier
-  requirement: &2181013040 !ruby/object:Gem::Requirement
+  requirement: &2167467200 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -33,10 +33,10 @@ dependencies:
         version: '1.3'
   type: :runtime
   prerelease: false
-  version_requirements: *2181013040
+  version_requirements: *2167467200
 - !ruby/object:Gem::Dependency
   name: directory_watcher
-  requirement: &2181012580 !ruby/object:Gem::Requirement
+  requirement: &2167188340 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -44,10 +44,10 @@ dependencies:
         version: '1.1'
   type: :runtime
   prerelease: false
-  version_requirements: *2181012580
+  version_requirements: *2167188340
 - !ruby/object:Gem::Dependency
   name: maruku
-  requirement: &2181012120 !ruby/object:Gem::Requirement
+  requirement: &2166730300 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -55,21 +55,21 @@ dependencies:
         version: '0.5'
   type: :runtime
   prerelease: false
-  version_requirements: *2181012120
+  version_requirements: *2166730300
 - !ruby/object:Gem::Dependency
   name: kramdown
-  requirement: &2181011660 !ruby/object:Gem::Requirement
+  requirement: &2166683980 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '0.13'
+        version: 0.13.4
   type: :runtime
   prerelease: false
-  version_requirements: *2181011660
+  version_requirements: *2166683980
 - !ruby/object:Gem::Dependency
   name: albino
-  requirement: &2181011200 !ruby/object:Gem::Requirement
+  requirement: &2166634560 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -77,10 +77,10 @@ dependencies:
         version: '1.3'
   type: :runtime
   prerelease: false
-  version_requirements: *2181011200
+  version_requirements: *2166634560
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &2181010740 !ruby/object:Gem::Requirement
+  requirement: &2166578160 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -88,10 +88,10 @@ dependencies:
         version: '0.9'
   type: :development
   prerelease: false
-  version_requirements: *2181010740
+  version_requirements: *2166578160
 - !ruby/object:Gem::Dependency
   name: rdoc
-  requirement: &2181010280 !ruby/object:Gem::Requirement
+  requirement: &2166550520 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -99,10 +99,10 @@ dependencies:
         version: '3.11'
   type: :development
   prerelease: false
-  version_requirements: *2181010280
+  version_requirements: *2166550520
 - !ruby/object:Gem::Dependency
   name: redgreen
-  requirement: &2181009820 !ruby/object:Gem::Requirement
+  requirement: &2166487820 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -110,10 +110,10 @@ dependencies:
         version: '1.2'
   type: :development
   prerelease: false
-  version_requirements: *2181009820
+  version_requirements: *2166487820
 - !ruby/object:Gem::Dependency
   name: shoulda
-  requirement: &2181009360 !ruby/object:Gem::Requirement
+  requirement: &2166419060 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -121,10 +121,10 @@ dependencies:
         version: '2.11'
   type: :development
   prerelease: false
-  version_requirements: *2181009360
+  version_requirements: *2166419060
 - !ruby/object:Gem::Dependency
   name: rr
-  requirement: &2181008900 !ruby/object:Gem::Requirement
+  requirement: &2166363660 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -132,10 +132,10 @@ dependencies:
         version: '1.0'
   type: :development
   prerelease: false
-  version_requirements: *2181008900
+  version_requirements: *2166363660
 - !ruby/object:Gem::Dependency
   name: cucumber
-  requirement: &2181008440 !ruby/object:Gem::Requirement
+  requirement: &2166337000 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - =
@@ -143,10 +143,10 @@ dependencies:
         version: '1.1'
   type: :development
   prerelease: false
-  version_requirements: *2181008440
+  version_requirements: *2166337000
 - !ruby/object:Gem::Dependency
   name: RedCloth
-  requirement: &2181007980 !ruby/object:Gem::Requirement
+  requirement: &2166290820 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -154,10 +154,10 @@ dependencies:
         version: '4.2'
   type: :development
   prerelease: false
-  version_requirements: *2181007980
+  version_requirements: *2166290820
 - !ruby/object:Gem::Dependency
   name: rdiscount
-  requirement: &2181007520 !ruby/object:Gem::Requirement
+  requirement: &2166218000 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -165,10 +165,10 @@ dependencies:
         version: '1.6'
   type: :development
   prerelease: false
-  version_requirements: *2181007520
+  version_requirements: *2166218000
 - !ruby/object:Gem::Dependency
   name: redcarpet
-  requirement: &2181007060 !ruby/object:Gem::Requirement
+  requirement: &2166121500 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -176,7 +176,7 @@ dependencies:
         version: '1.9'
   type: :development
   prerelease: false
-  version_requirements: *2181007060
+  version_requirements: *2166121500
 description: Jekyll is a simple, blog aware, static site generator.
 email: matt.beale@madhatted.com
 executables: []
@@ -307,7 +307,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 1960019851315219458
+      hash: -4519138792738615429
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: