jekyll 2.0.3 → 2.1.0

data/test/helper.rb

@@ -2,9 +2,6 @@ require 'simplecov'
 require 'simplecov-gem-adapter'
 SimpleCov.start('gem')
 
-require 'coveralls'
-Coveralls.wear_merged!
-
 require 'rubygems'
 require 'test/unit'
 require 'ostruct'

data/test/source/_data/categories/dairy.yaml

@@ -0,0 +1,6 @@
+name: Dairy
+products:
+- name: cheese
+  price: 5.3
+- name: milk
+  price: 2.5

data/test/source/_data/members.json

@@ -0,0 +1,12 @@
+[
+  {
+    "name": "Jack",
+    "age": 27,
+    "blog": "http://example.com/jack"
+  },
+  {
+    "name": "John",
+    "age": 32,
+    "blog": "http://example.com/john"
+  }
+]

data/test/source/_methods/site/initialize.md

@@ -1,5 +1,4 @@
 ---
-title: "Site#initialize"
 ---
 
-Create dat site.
+Page without title.

data/test/source/_posts/2009-01-27-no-category.textile

@@ -0,0 +1,6 @@
+---
+layout: default
+title: Category in YAML
+---
+
+Best *post* ever

data/test/source/_slides/example-slide-1.html

@@ -0,0 +1,4 @@
+---
+  title: Example slide
+  layout: slide
+---

data/test/source/_slides/example-slide-2.html

@@ -0,0 +1,7 @@
+---
+  title: Override title
+  layout: slide
+  nested:
+    test1: override1
+    test2: override2
+---

data/test/source/_with.dots/all.dots/2.4.0.md

@@ -0,0 +1,5 @@
+---
+title: v2.4.0
+---
+
+v2.4.0

data/test/source/environment.html

@@ -0,0 +1,5 @@
+---
+title: I'm a Jekyll environment exchequer
+---
+
+{{ jekyll.environment }}

data/test/test_cleaner.rb

@@ -0,0 +1,77 @@
+require 'helper'
+
+class TestCleaner < Test::Unit::TestCase
+  context "directory in keep_files" do
+    setup do
+      clear_dest
+      stub(Jekyll).configuration do
+        Jekyll::Configuration::DEFAULTS.merge({'source' => source_dir, 'destination' => dest_dir})
+      end
+
+      FileUtils.mkdir_p(dest_dir('to_keep/child_dir'))
+      FileUtils.touch(File.join(dest_dir('to_keep'), 'index.html'))
+      FileUtils.touch(File.join(dest_dir('to_keep/child_dir'), 'index.html'))
+
+      @site = Site.new(Jekyll.configuration)
+      @site.keep_files = ['to_keep/child_dir']
+
+      @cleaner = Site::Cleaner.new(@site)
+      @cleaner.cleanup!
+    end
+
+    teardown do
+      FileUtils.rm_rf(dest_dir('to_keep'))
+    end
+
+    should "keep the parent directory" do
+      assert File.exist?(dest_dir('to_keep'))
+    end
+
+    should "keep the child directory" do
+      assert File.exist?(dest_dir('to_keep/child_dir'))
+    end
+
+    should "keep the file in the directory in keep_files" do
+      assert File.exist?(File.join(dest_dir('to_keep/child_dir'), 'index.html'))
+    end
+
+    should "delete the file in the directory not in keep_files" do
+      assert !File.exist?(File.join(dest_dir('to_keep'), 'index.html'))
+    end
+  end
+
+  context "directory containing no files and non-empty directories" do
+    setup do
+      clear_dest
+      stub(Jekyll).configuration do
+        Jekyll::Configuration::DEFAULTS.merge({'source' => source_dir, 'destination' => dest_dir})
+      end
+
+      FileUtils.mkdir_p(source_dir('no_files_inside/child_dir'))
+      FileUtils.touch(File.join(source_dir('no_files_inside/child_dir'), 'index.html'))
+
+      @site = Site.new(Jekyll.configuration)
+      @site.process
+
+      @cleaner = Site::Cleaner.new(@site)
+      @cleaner.cleanup!
+    end
+
+    teardown do
+      FileUtils.rm_rf(source_dir('no_files_inside'))
+      FileUtils.rm_rf(dest_dir('no_files_inside'))
+    end
+
+    should "keep the parent directory" do
+      assert File.exist?(dest_dir('no_files_inside'))
+    end
+
+    should "keep the child directory" do
+      assert File.exist?(dest_dir('no_files_inside/child_dir'))
+    end
+
+    should "keep the file" do
+      assert File.exist?(File.join(dest_dir('no_files_inside/child_dir'), 'index.html'))
+    end
+  end
+end

data/test/test_collections.rb

@@ -17,15 +17,15 @@ class TestCollections < Test::Unit::TestCase
     end
 
     should "sanitize the label name" do
-      assert_equal @collection.label, "etcpassword"
+      assert_equal @collection.label, "....etcpassword"
     end
 
     should "have a sanitized relative path name" do
-      assert_equal @collection.relative_directory, "_etcpassword"
+      assert_equal @collection.relative_directory, "_....etcpassword"
     end
 
     should "have a sanitized full path" do
-      assert_equal @collection.directory, source_dir("_etcpassword")
+      assert_equal @collection.directory, source_dir("_....etcpassword")
     end
   end
 
@@ -38,6 +38,10 @@ class TestCollections < Test::Unit::TestCase
       assert_equal @collection.label, "methods"
     end
 
+    should "have default url template" do
+      assert_equal @collection.url_template, "/:collection/:path:output_ext"
+    end
+
     should "contain no docs when initialized" do
       assert_empty @collection.docs
     end
@@ -91,6 +95,24 @@ class TestCollections < Test::Unit::TestCase
     end
   end
 
+  context "a collection with permalink" do
+    setup do
+      @site = fixture_site({
+        "collections" => {
+          "methods" => {
+            "permalink" => "/awesome/:path/"
+          }
+        }
+      })
+      @site.process
+      @collection = @site.collections["methods"]
+    end
+
+    should "have custom url template" do
+      assert_equal @collection.url_template, "/awesome/:path/"
+    end
+  end
+
   context "with a collection" do
     setup do
       @site = fixture_site({
@@ -172,4 +194,31 @@ class TestCollections < Test::Unit::TestCase
     end
   end
 
+  context "with dots in the filenames" do
+    setup do
+      @site = fixture_site({
+        "collections" => ["with.dots"],
+        "safe"        => true
+      })
+      @site.process
+      @collection = @site.collections["with.dots"]
+    end
+
+    should "exist" do
+      assert_not_nil @collection
+    end
+
+    should "contain one document" do
+      assert_equal 2, @collection.docs.size
+    end
+
+    should "allow dots in the filename" do
+      assert_equal "_with.dots", @collection.relative_directory
+    end
+
+    should "read document in subfolders with dots" do
+      assert @collection.docs.any? { |d| d.path.include?("all.dots") }
+    end
+  end
+
 end

data/test/test_command.rb

@@ -1,38 +1,35 @@
 require 'helper'
 
 class TestCommand < Test::Unit::TestCase
-  context "when calling .globs" do
-    context "when non-default dest & source dirs" do
-      setup do
-        @source = source_dir
-        @dest   = dest_dir
-        directory_with_contents(@dest)
-        @globs  = Command.globs(@source, @dest)
-      end
-      should "return an array without the destination dir" do
-        assert @globs.is_a?(Array)
-        assert !@globs.include?(@dest)
-      end
-      teardown do
-        clear_dest
+  context "when calling .ignore_paths" do
+    context "when source is absolute" do
+      setup { @source = source_dir }
+      should "return an array with regex for destination" do
+        absolute = source_dir('dest')
+        relative = Pathname.new(source_dir('dest')).relative_path_from(Pathname.new('.').expand_path).to_s
+        [absolute, relative].each do |dest|
+          config = build_configs("source" => @source, "destination" => dest)
+          assert Command.ignore_paths(config).include?(/dest/), "failed with destination: #{dest}"
+        end
       end
     end
-    context "when using default dest dir" do
-      setup do
-        @source = test_dir
-        @dest   = test_dir('_site')
-        directory_with_contents(@dest)
-        @globs  = Command.globs(@source, @dest)
-      end
-      should "return an array without the destination dir" do
-        assert @globs.is_a?(Array)
-        assert !@globs.include?(@dest)
-        @globs.each do |glob|
-           assert !glob.include?(File.basename(@dest))
+    context "when source is relative" do
+      setup { @source = Pathname.new(source_dir).relative_path_from(Pathname.new('.').expand_path).to_s }
+      should "return an array with regex for destination" do
+        absolute = source_dir('dest')
+        relative = Pathname.new(source_dir('dest')).relative_path_from(Pathname.new('.').expand_path).to_s
+        [absolute, relative].each do |dest|
+          config = build_configs("source" => @source, "destination" => dest)
+          assert Command.ignore_paths(config).include?(/dest/), "failed with destination: #{dest}"
         end
       end
-      teardown do
-        FileUtils.rm_r(@dest)
+    end
+    context "multiple config files" do
+      should "return an array with regex for config files" do
+        config = build_configs("config"=> ["_config.yaml", "_config2.yml"])
+        ignore_paths = Command.ignore_paths(config)
+        assert ignore_paths.include?(/_config\.yaml/), 'did not include _config.yaml'
+        assert ignore_paths.include?(/_config2\.yml/), 'did not include _config2.yml'
       end
     end
   end

data/test/test_configuration.rb

@@ -39,7 +39,16 @@ class TestConfiguration < Test::Unit::TestCase
       assert @config.config_files(@multiple_files).is_a?(Array)
     end
     should "return the default config path if no config files are specified" do
-      assert_equal [File.join(source_dir, "_config.yml")], @config.config_files(@no_override)
+      assert_equal [source_dir("_config.yml")], @config.config_files(@no_override)
+    end
+    should "return .yaml if it exists but .yml does not" do
+      mock(File).exists?(source_dir("_config.yml")) { false }
+      mock(File).exists?(source_dir("_config.yaml")) { true }
+      assert_equal [source_dir("_config.yaml")], @config.config_files(@no_override)
+    end
+    should "return .yml if both .yml and .yaml exist" do
+      mock(File).exists?(source_dir("_config.yml")) { true }
+      assert_equal [source_dir("_config.yml")], @config.config_files(@no_override)
     end
     should "return the config if given one config file" do
       assert_equal %w[config.yml], @config.config_files(@one_config_file)

data/test/test_document.rb

@@ -40,6 +40,129 @@ class TestDocument < Test::Unit::TestCase
       }, @document.data)
     end
 
+    should "output the collection name in the #to_liquid method" do
+      assert_equal @document.to_liquid['collection'], "methods"
+    end
+
+  end
+
+  context "a document as part of a collection with frontmatter defaults" do
+    setup do
+      @site = Site.new(Jekyll.configuration({
+        "collections" => ["slides"],
+        "source"      => source_dir,
+        "destination" => dest_dir,
+        "defaults" => [{
+          "scope"=> {"path"=>"", "type"=>"slides"},
+          "values"=> {
+            "nested"=> {
+              "key"=>"myval",
+            }
+          }
+        }]
+      }))
+      @site.process
+      @document = @site.collections["slides"].docs.first
+    end
+
+    should "know the frontmatter defaults" do
+      assert_equal({
+        "title"=>"Example slide",
+        "layout"=>"slide",
+        "nested"=> { 
+          "key"=>"myval"
+        }
+      }, @document.data)
+    end
+  end
+
+  context "a document as part of a collection with overriden default values" do
+    setup do
+      @site = Site.new(Jekyll.configuration({
+        "collections" => ["slides"],
+        "source"      => source_dir,
+        "destination" => dest_dir,
+        "defaults" => [{
+          "scope"=> {"path"=>"", "type"=>"slides"},
+          "values"=> {
+            "nested"=> {
+              "test1"=>"default1",
+              "test2"=>"default1"
+            }
+          }
+        }]
+      }))
+      @site.process
+      @document = @site.collections["slides"].docs[1]
+    end
+
+    should "override default values in the document frontmatter" do
+      assert_equal({
+        "title"=>"Override title",
+        "layout"=>"slide",
+        "nested"=> { 
+          "test1"=>"override1",
+          "test2"=>"override2"
+        }
+      }, @document.data)
+    end
+  end
+
+  context "a document as part of a collection with valid path" do
+    setup do
+      @site = Site.new(Jekyll.configuration({
+        "collections" => ["slides"],
+        "source"      => source_dir,
+        "destination" => dest_dir,
+        "defaults" => [{
+          "scope"=> {"path"=>"slides", "type"=>"slides"},
+          "values"=> {
+            "nested"=> {
+              "key"=>"value123",
+            }
+          }
+        }]
+      }))
+      @site.process
+      @document = @site.collections["slides"].docs.first
+    end
+
+    should "know the frontmatter defaults" do
+      assert_equal({
+        "title"=>"Example slide",
+        "layout"=>"slide",
+        "nested"=> { 
+          "key"=>"value123"
+        }
+      }, @document.data)
+    end
+  end
+
+  context "a document as part of a collection with invalid path" do
+    setup do
+      @site = Site.new(Jekyll.configuration({
+        "collections" => ["slides"],
+        "source"      => source_dir,
+        "destination" => dest_dir,
+        "defaults" => [{
+          "scope"=> {"path"=>"somepath", "type"=>"slides"},
+          "values"=> {
+            "nested"=> {
+              "key"=>"myval",
+            }
+          }
+        }]
+      }))
+      @site.process
+      @document = @site.collections["slides"].docs.first
+    end
+
+    should "not know the specified frontmatter defaults" do
+      assert_equal({
+        "title"=>"Example slide",
+        "layout"=>"slide"
+      }, @document.data)
+    end
   end
 
   context " a document part of a rendered collection" do