tigefa 1.1.2 → 1.1.3

data/site/docs/posts.md

@@ -2,7 +2,7 @@
 layout: docs
 title: Writing posts
 prev_section: frontmatter
-next_section: drafts
+next_section: pages
 permalink: /docs/posts/
 ---
 

data/site/docs/structure.md

@@ -31,8 +31,6 @@ A basic Jekyll site usually looks something like this:
 ├── _posts
 |   ├── 2007-10-29-why-every-programmer-should-play-nethack.textile
 |   └── 2009-04-26-barcamp-boston-4-roundup.textile
-├── _data
-|   └── members.yml
 ├── _site
 └── index.html
 {% endhighlight %}
@@ -123,21 +121,6 @@ An overview of what each of these does:
         </p>
       </td>
     </tr>
-    <tr>
-      <td>
-        <p><code>_data</code></p>
-      </td>
-      <td>
-        <p>
-
-          Well-formatted site data should be placed here. The jekyll engine will 
-          autoload all yaml files (ends with <code>.yml</code> or <code>.yaml</code>) 
-          in this directory. If there's a file <code>members.yml</code> under the directory, 
-          then you can access contents of the file through <code>site.data.members</code>.
-
-        </p>
-      </td>
-    </tr>
     <tr>
       <td>
         <p><code>_site</code></p>

data/site/docs/templates.md

@@ -7,9 +7,9 @@ permalink: /docs/templates/
 ---
 
 Jekyll uses the [Liquid](http://wiki.shopify.com/Liquid) templating language to
-process templates. All of the standard Liquid [tags](http://wiki.shopify.com/Logic) and
-[filters](http://wiki.shopify.com/Filters) are
-supported. Jekyll even adds a few handy filters and tags of its own to make
+process templates. All of the [standard Liquid tags and
+filters](http://wiki.github.com/shopify/liquid/liquid-for-designers) are
+supported, Jekyll even adds a few handy filters and tags of its own to make
 common tasks easier.
 
 ## Filters
@@ -33,7 +33,7 @@ common tasks easier.
          <code class='filter'>{% raw %}{{ site.time | date_to_xmlschema }}{% endraw %}</code>
         </p>
         <p>
-          <code class='output'>2008-11-07T13:07:54-08:00</code>
+          <code class='output'>2008-11-17T13:07:54-08:00</code>
         </p>
       </td>
     </tr>
@@ -47,7 +47,7 @@ common tasks easier.
          <code class='filter'>{% raw %}{{ site.time | date_to_rfc822 }}{% endraw %}</code>
         </p>
         <p>
-          <code class='output'>Mon, 07 Nov 2008 13:07:54 -0800</code>
+          <code class='output'>Mon, 17 Nov 2008 13:07:54 -0800</code>
         </p>
       </td>
     </tr>
@@ -61,7 +61,7 @@ common tasks easier.
          <code class='filter'>{% raw %}{{ site.time | date_to_string }}{% endraw %}</code>
         </p>
         <p>
-          <code class='output'>07 Nov 2008</code>
+          <code class='output'>17 Nov 2008</code>
         </p>
       </td>
     </tr>
@@ -75,7 +75,7 @@ common tasks easier.
          <code class='filter'>{% raw %}{{ site.time | date_to_long_string }}{% endraw %}</code>
         </p>
         <p>
-          <code class='output'>07 November 2008</code>
+          <code class='output'>17 November 2008</code>
         </p>
       </td>
     </tr>
@@ -173,17 +173,6 @@ common tasks easier.
         </p>
       </td>
     </tr>
-    <tr>
-      <td>
-        <p class='name'><strong>Data To JSON</strong></p>
-        <p>Convert Hash or Array to JSON.</p>
-      </td>
-      <td class='align-center'>
-        <p>
-         <code class='filter'>{% raw %}{{ site.data.projects | jsonify }}{% endraw %}</code>
-        </p>
-      </td>
-    </tr>
   </tbody>
 </table>
 </div>
@@ -203,19 +192,6 @@ Jekyll expects all include files to be placed in an `_includes` directory at the
 root of your source directory. This will embed the contents of
 `<source>/_includes/footer.html` into the calling file.
 
-<div class="note">
-  <h5>ProTip™: Use variables as file name</h5>
-  <p>
-
-    The name of the file you wish to embed can be literal (as in the example above),
-    or you can use a variable, using liquid-like variable syntax as in
-    <code>{% raw %}{% include {{my_variable}} %}{% endraw %}</code>.
-
-    Note that unlike usual liquid variable syntax, you cannot have spaces inside the curly braces.
-
-  </p>
-</div>
-
 You can also pass parameters to an include:
 
 {% highlight ruby %}
@@ -290,15 +266,6 @@ 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/site/docs/upgrading.md

@@ -42,7 +42,7 @@ rebuild each time a file changes, just add the `--watch` flag at the end.
 ### Absolute Permalinks
 
 In Jekyll v1.0, we introduced absolute permalinks for pages in subdirectories.
-Until v2.0, it is **opt-in**. Starting with v2.0, however, absolute permalinks
+Until v1.1, it is **opt-in**. Starting with v1.1, however, absolute permalinks
 will become **opt-out**, meaning Jekyll will default to using absolute permalinks
 instead of relative permalinks.
 
@@ -50,9 +50,9 @@ instead of relative permalinks.
 * To continue using relative permalinks, set `relative_permalinks: true` in your configuration file.
 
 <div class="note warning" id="absolute-permalinks-warning">
-  <h5 markdown="1">Absolute permalinks will be default in v2.0 and on</h5>
+  <h5 markdown="1">Absolute permalinks will be default in v1.1 and on</h5>
   <p markdown="1">
-    Starting with Jekyll v2.0, `relative_permalinks` will default to `false`,
+    Starting with Jekyll v1.1.0, `relative_permalinks` will default to `false`,
     meaning all pages will be built using the absolute permalink behaviour.
     The switch will still exist until v2.0.
   </p>

data/site/docs/usage.md

@@ -40,7 +40,7 @@ $ jekyll serve --watch
 # => Same as `jekyll serve`, but watch for changes and regenerate automatically.
 {% endhighlight %}
 
-These are just a few of the available [configuration options](../configuration/).
+This is just a few of the available [configuration options](../configuration/).
 Many configuration options can either be specified as flags on the command line,
 or alternatively (and more commonly) they can be specified in a `_config.yml`
 file at the root of the source directory. Jekyll will automatically use the

data/site/docs/variables.md

@@ -2,14 +2,14 @@
 layout: docs
 title: Variables
 prev_section: pages
-next_section: datafiles
+next_section: migrations
 permalink: /docs/variables/
 ---
 
 Jekyll traverses your site looking for files to process. Any files with [YAML
 Front Matter](../frontmatter/) are subject to processing. For each of these
 files, Jekyll makes a variety of data available via the [Liquid templating
-system](http://wiki.shopify.com/Liquid). The
+system](http://wiki.github.com/shopify/liquid/liquid-for-designers). The
 following is a reference of the available data.
 
 ## Global Variables

data/test/helper.rb

@@ -1,10 +1,7 @@
-if RUBY_VERSION > '1.9'
+if RUBY_VERSION > '1.9' && ENV["COVERAGE"] == "true"
   require 'simplecov'
   require 'simplecov-gem-adapter'
   SimpleCov.start('gem')
-
-  require 'coveralls'
-  Coveralls.wear_merged!
 end
 
 require 'rubygems'

data/test/test_configuration.rb

@@ -30,7 +30,7 @@ class TestConfiguration < Test::Unit::TestCase
       @config = Configuration[{"source" => source_dir}]
       @no_override     = {}
       @one_config_file = {"config" => "config.yml"}
-      @multiple_files  = {"config" => %w[config/site.yml config/deploy.toml configuration.yml]}
+      @multiple_files  = {"config" => %w[config/site.yml config/deploy.yml configuration.yml]}
     end
 
     should "always return an array" do
@@ -45,7 +45,7 @@ class TestConfiguration < Test::Unit::TestCase
       assert_equal %w[config.yml], @config.config_files(@one_config_file)
     end
     should "return an array of the config files if given many config files" do
-      assert_equal %w[config/site.yml config/deploy.toml configuration.yml], @config.config_files(@multiple_files)
+      assert_equal %w[config/site.yml config/deploy.yml configuration.yml], @config.config_files(@multiple_files)
     end
   end
   context "#backwards_compatibilize" do
@@ -102,27 +102,27 @@ class TestConfiguration < Test::Unit::TestCase
     should "fire warning with no _config.yml" do
       mock(YAML).safe_load_file(@path) { raise SystemCallError, "No such file or directory - #{@path}" }
       mock($stderr).puts("Configuration file: none".yellow)
-      assert_equal Tigefa::Configuration::DEFAULTS, TigefaTigefa.configuration({})
+      assert_equal Tigefa::Configuration::DEFAULTS, Tigefa.configuration({})
     end
 
     should "load configuration as hash" do
       mock(YAML).safe_load_file(@path) { Hash.new }
       mock($stdout).puts("Configuration file: #{@path}")
-      assert_equal TigefaTigefa::Configuration::DEFAULTS, TigefaTigefa.configuration({})
+      assert_equal Tigefa::Configuration::DEFAULTS, Tigefa.configuration({})
     end
 
     should "fire warning with bad config" do
       mock(YAML).safe_load_file(@path) { Array.new }
       mock($stderr).puts(("WARNING: ".rjust(20) + "Error reading configuration. Using defaults (and options).").yellow)
       mock($stderr).puts("Configuration file: (INVALID) #{@path}".yellow)
-      assert_equal TigefaTigefa::Configuration::DEFAULTS, TigefaTigefa.configuration({})
+      assert_equal Tigefa::Configuration::DEFAULTS, Tigefa.configuration({})
     end
 
     should "fire warning when user-specified config file isn't there" do
       mock(YAML).safe_load_file(@user_config) { raise SystemCallError, "No such file or directory - #{@user_config}" }
       mock($stderr).puts(("Fatal: ".rjust(20) + "The configuration file '#{@user_config}' could not be found.").red)
       assert_raises LoadError do
-        TigefaTigefa.configuration({'config' => [@user_config]})
+        Tigefa.configuration({'config' => [@user_config]})
       end
     end
   end
@@ -131,7 +131,6 @@ class TestConfiguration < Test::Unit::TestCase
       @paths = {
         :default => File.join(Dir.pwd, '_config.yml'),
         :other   => File.join(Dir.pwd, '_config.live.yml'),
-        :toml    => source_dir('_config.dev.toml'),
         :empty   => ""
       }
     end
@@ -154,20 +153,12 @@ class TestConfiguration < Test::Unit::TestCase
       assert_equal Tigefa::Configuration::DEFAULTS, Tigefa.configuration({ "config" => @paths[:empty] })
     end
 
-    should "successfully load a TOML file" do
-      Tigefa.logger.log_level = Tigefa::Stevenson::WARN
-      assert_equal Tigefa::Configuration::DEFAULTS.merge({ "baseurl" => "/you-beautiful-blog-you", "title" => "My magnificent site, wut" }), Tigefa.configuration({ "config" => [@paths[:toml]] })
-      Tigefa.logger.log_level = Tigefa::Stevenson::INFO
-    end
-
     should "load multiple config files" do
       mock(YAML).safe_load_file(@paths[:default]) { Hash.new }
       mock(YAML).safe_load_file(@paths[:other]) { Hash.new }
-      mock(TOML).load_file(@paths[:toml]) { Hash.new }
       mock($stdout).puts("Configuration file: #{@paths[:default]}")
       mock($stdout).puts("Configuration file: #{@paths[:other]}")
-      mock($stdout).puts("Configuration file: #{@paths[:toml]}")
-      assert_equal Tigefa::Configuration::DEFAULTS, Tigefa.configuration({ "config" => [@paths[:default], @paths[:other], @paths[:toml]] })
+      assert_equal Tigefa::Configuration::DEFAULTS, Tigefa.configuration({ "config" => [@paths[:default], @paths[:other]] })
     end
 
     should "load multiple config files and last config should win" do

data/test/test_convertible.rb

@@ -40,7 +40,7 @@ class TestConvertible < Test::Unit::TestCase
       should "not parse if there is encoding error in file" do
         name = 'broken_front_matter3.erb'
         out = capture_stdout do
-          ret = @convertible.read_yaml(@base, name, :encoding => 'utf-8')
+          ret = @convertible.read_yaml(@base, name)
           assert_equal({}, ret)
         end
         assert_match(/invalid byte sequence in UTF-8/, out)

data/test/test_excerpt.rb

@@ -14,7 +14,7 @@ class TestExcerpt < Test::Unit::TestCase
     setup do
       clear_dest
       stub(Tigefa).configuration do
-        Tigefa::Configuration::DEFAULTS.merge({'excerpt_separator' => ''})
+        Tigefa:Tigefa:Configuration::DEFAULTS.merge({'excerpt_separator' => ''})
       end
       @site = Site.new(Tigefa.configuration)
       @post = setup_post("2013-07-22-post-excerpt-with-layout.markdown")
@@ -30,7 +30,7 @@ class TestExcerpt < Test::Unit::TestCase
     setup do
       clear_dest
       stub(Tigefa).configuration { Tigefa::Configuration::DEFAULTS }
-      @site = Site.new(Tigefa.configuration)
+      @site = Site.new(Jekyll.configuration)
       @post = setup_post("2013-07-22-post-excerpt-with-layout.markdown")
       @excerpt = @post.send :extract_excerpt
     end
@@ -66,7 +66,7 @@ class TestExcerpt < Test::Unit::TestCase
         end
 
         should "be the first paragraph of the page" do
-          assert_equal "<p>First paragraph with <a href=\"http://www.jekyllrb.com/\">link ref</a>.</p>", @extracted_excerpt.content
+          assert_equal "<p>First paragraph with <a href='http://www.jekyllrb.com/'>link ref</a>.</p>", @extracted_excerpt.content
         end
 
         should "link properly" do

data/test/test_filters.rb

@@ -98,16 +98,5 @@ class TestFilters < Test::Unit::TestCase
     should "escape space as %20" do
       assert_equal "my%20things", @filter.uri_escape("my things")
     end
-
-    context "jsonify filter" do
-      should "convert hash to json" do
-        assert_equal "{\"age\":18}", @filter.jsonify({:age => 18})
-      end
-
-      should "convert array to json" do
-        assert_equal "[1,2]", @filter.jsonify([1, 2])
-        assert_equal "[{\"name\":\"Jack\"},{\"name\":\"Smith\"}]", @filter.jsonify([{:name => 'Jack'}, {:name => 'Smith'}])
-      end
-    end
   end
 end

data/test/test_generated_site.rb

@@ -14,7 +14,7 @@ class TestGeneratedSite < Test::Unit::TestCase
     end
 
     should "ensure post count is as expected" do
-      assert_equal 37, @site.posts.size
+      assert_equal 36, @site.posts.size
     end
 
     should "insert site.posts into the index" do

data/test/test_kramdown.rb

@@ -12,51 +12,24 @@ class TestKramdown < Test::Unit::TestCase
           'footnote_nr'   => 1,
           'entity_output' => 'as_char',
           'toc_levels'    => '1..6',
-          'smart_quotes'  => 'lsquo,rsquo,ldquo,rdquo',
-
-          'use_coderay'   => true,
-          'coderay_bold_every'=> 12,
-          'coderay' => {
-            'coderay_css'        => :style,
-            'coderay_bold_every' => 8
-          }
+          'smart_quotes'  => 'lsquo,rsquo,ldquo,rdquo'
         }
       }
-      @config = Tigefa.configuration(@config)
-      @markdown = Converters::Markdown.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 = Converters::Markdown.new(@config)
+      assert_equal "<h1>Some Header</h1>", markdown.convert('# Some Header #').strip
     end
 
     should "convert quotes to smart quotes" do
-      assert_match /<p>(&#8220;|“)Pit(&#8217;|’)hy(&#8221;|”)<\/p>/, @markdown.convert(%{"Pit'hy"}).strip
+      markdown = Converters::Markdown.new(@config)
+      assert_match /<p>(&#8220;|“)Pit(&#8217;|’)hy(&#8221;|”)<\/p>/, markdown.convert(%{"Pit'hy"}).strip
 
       override = { 'kramdown' => { 'smart_quotes' => 'lsaquo,rsaquo,laquo,raquo' } }
       markdown = Converters::Markdown.new(@config.deep_merge(override))
       assert_match /<p>(&#171;|«)Pit(&#8250;|›)hy(&#187;|»)<\/p>/, markdown.convert(%{"Pit'hy"}).strip
     end
-
-    context "moving up nested coderay options" do
-      setup do
-        @markdown.convert('some markup')
-        @converter_config = @markdown.instance_variable_get(:@config)['kramdown']
-      end
-
-      should "work correctly" do
-        assert_equal :style, @converter_config['coderay_css']
-      end
-
-      should "also work for defaults" do
-        default = Tigefa::Configuration::DEFAULTS['kramdown']['coderay']['coderay_tab_width']
-        assert_equal default, @converter_config['coderay_tab_width']
-      end
-
-      should "not overwrite" do
-        assert_equal 12, @converter_config['coderay_bold_every']
-      end
-    end
   end
 end

data/test/test_new_command.rb

@@ -31,7 +31,7 @@ class TestNewCommand < Test::Unit::TestCase
 
     should 'display a success message' do
       output = capture_stdout { Tigefa::Commands::New.process(@args) }
-      success_message = "New jekyll site installed in #{@full_path}.\n"
+      success_message = "New tigefA site installed in #{@full_path}.\n"
       assert_equal success_message, output
     end
 

data/test/test_page.rb

@@ -101,16 +101,6 @@ class TestPage < Test::Unit::TestCase
         assert_equal @page.permalink, @page.url
         assert_equal "/about/", @page.dir
       end
-
-      should "not be writable outside of destination" do
-        unexpected = File.expand_path("../../../baddie.html", dest_dir)
-        File.delete unexpected if File.exist?(unexpected)
-        page = setup_page("exploit.md")
-        do_render(page)
-        page.write(dest_dir)
-
-        assert !File.exist?(unexpected)
-      end
     end
 
     context "with specified layout of nil" do

data/test/test_post.rb

@@ -75,17 +75,6 @@ class TestPost < Test::Unit::TestCase
         assert_equal "/my_category/permalinked-post", @post.url
       end
 
-      should "not be writable outside of destination" do
-        unexpected = File.expand_path("../../../baddie.html", dest_dir)
-        File.delete unexpected if File.exist?(unexpected)
-        post = setup_post("2014-01-06-permalink-traversal.md")
-        do_render(post)
-        post.write(dest_dir)
-
-        assert !File.exist?(unexpected)
-        assert File.exist?(File.expand_path("baddie.html", dest_dir))
-      end
-
       context "with CRLF linebreaks" do
         setup do
           @real_file = "2009-05-24-yaml-linebreak.markdown"
@@ -295,7 +284,7 @@ class TestPost < Test::Unit::TestCase
         end
 
         should "return rendered HTML" do
-          assert_equal "<p>First paragraph with <a href=\"http://www.jekyllrb.com/\">link ref</a>.</p>",
+          assert_equal "<p>First paragraph with <a href='http://www.jekyllrb.com/'>link ref</a>.</p>",
                        @post.excerpt
         end