Release 💎 3.4.2

Backport #5871 for v3.4.x: Convert StaticFile liquid representation to a Drop & add front matter defaults support to StaticFiles

.travis.yml

@@ -28,6 +28,7 @@ branches:
   only:
     - master
     - themes
+    - 3.4-stable*
 
 notifications:
   slack:

History.markdown

@@ -1,3 +1,12 @@
+## 3.4.2 / 2017-03-09
+
+  * Backport #5871 for v3.4.x: Convert StaticFile liquid representation to
+    a Drop & add front matter defaults support to StaticFiles (#5940)
+
+## 3.4.1 / 2017-03-02
+
+  * Backport #5920 for v3.4.x: Allow abbreviated post dates (#5924)
+
 ## 3.4.0 / 2016-01-27
 
 ### Minor Enhancements

docs/_docs/history.md

@@ -4,6 +4,19 @@ permalink: "/docs/history/"
 note: This file is autogenerated. Edit /History.markdown instead.
 ---
 
+## 3.4.2 / 2017-03-09
+{: #v3-4-2}
+
+- Backport [#5871]({{ site.repository }}/issues/5871) for v3.4.x: Convert StaticFile liquid representation to
+    a Drop & add front matter defaults support to StaticFiles ([#5940]({{ site.repository }}/issues/5940))
+
+
+## 3.4.1 / 2017-03-02
+{: #v3-4-1}
+
+- Backport [#5920]({{ site.repository }}/issues/5920) for v3.4.x: Allow abbreviated post dates ([#5924]({{ site.repository }}/issues/5924))
+
+
 ## 3.4.0 / 2016-01-27
 {: #v3-4-0}
 

docs/latest_version.txt

@@ -1 +1 @@
-3.4.0
+3.4.2

lib/jekyll/document.rb

@@ -9,7 +9,7 @@ module Jekyll
 
     YAML_FRONT_MATTER_REGEXP = %r!\A(---\s*\n.*?\n?)^((---|\.\.\.)\s*$\n?)!m
     DATELESS_FILENAME_MATCHER = %r!^(?:.+/)*(.*)(\.[^.]+)$!
-    DATE_FILENAME_MATCHER = %r!^(?:.+/)*(\d{4}-\d{2}-\d{2})-(.*)(\.[^.]+)$!
+    DATE_FILENAME_MATCHER = %r!^(?:.+/)*(\d{2,4}-\d{1,2}-\d{1,2})-(.*)(\.[^.]+)$!
 
     # Create a new Document.
     #

lib/jekyll/drops/static_file_drop.rb

@@ -0,0 +1,11 @@
+module Jekyll
+  module Drops
+    class StaticFileDrop < Drop
+      extend Forwardable
+      def_delegators :@obj, :name, :extname, :modified_time, :basename
+      def_delegator :@obj, :relative_path, :path
+      def_delegator :@obj, :data, :fallback_data
+      def_delegator :@obj, :type, :collection
+    end
+  end
+end

lib/jekyll/static_file.rb

@@ -28,6 +28,10 @@ module Jekyll
       @collection = collection
       @relative_path = File.join(*[@dir, @name].compact)
       @extname = File.extname(@name)
+
+      data.default_proc = proc do |_, key|
+        site.frontmatter_defaults.find(relative_path, type, key)
+      end
     end
     # rubocop: enable ParameterLists
 
@@ -96,13 +100,15 @@ module Jekyll
     end
 
     def to_liquid
-      {
-        "basename"      => File.basename(name, extname),
-        "name"          => name,
-        "extname"       => extname,
-        "modified_time" => modified_time,
-        "path"          => File.join("", relative_path),
-      }
+      @to_liquid ||= Drops::StaticFileDrop.new(self)
+    end
+
+    def data
+      @data ||= {}
+    end
+
+    def basename
+      File.basename(name, extname)
     end
 
     def placeholders

lib/jekyll/version.rb

@@ -1,3 +1,3 @@
 module Jekyll
-  VERSION = "3.4.0".freeze
+  VERSION = "3.4.2".freeze
 end

rake/release.rake

@@ -6,7 +6,8 @@
 
 desc "Release #{name} v#{version}"
 task :release => :build do
-  unless `git branch` =~ %r!^\* master$!
+  current_branch = `git branch`.to_s.strip.match(%r!^\* (.+)$!)[1]
+  unless current_branch == "master" || current_branch.end_with?("-stable")
     puts "You must be on the master branch to release!"
     exit!
   end

test/source/_posts/2017-2-5-i-dont-like-zeroes.md

@@ -0,0 +1,5 @@
+---
+foo: bar
+---
+I have an abbreviated date. Instead of "2017-02-05", I am instead "2017-2-5".
+Zeros have always seemed superfluous.

test/test_generated_site.rb

@@ -7,11 +7,14 @@ class TestGeneratedSite < JekyllUnitTest
 
       @site = fixture_site
       @site.process
-      @index = File.read(dest_dir("index.html"))
+      @index = File.read(
+        dest_dir("index.html"),
+        Utils.merged_file_read_opts(@site, {})
+      )
     end
 
     should "ensure post count is as expected" do
-      assert_equal 51, @site.posts.size
+      assert_equal 52, @site.posts.size
     end
 
     should "insert site.posts into the index" do
@@ -48,6 +51,13 @@ class TestGeneratedSite < JekyllUnitTest
       assert_exist dest_dir("dynamic_file.php")
     end
 
+    should "include a post with a abbreviated dates" do
+      refute_nil @site.posts.index { |post|
+        post.relative_path == "_posts/2017-2-5-i-dont-like-zeroes.md"
+      }
+      assert_exist dest_dir("2017", "02", "05", "i-dont-like-zeroes.html")
+    end
+
     should "print a nice list of static files" do
       time_regexp = "\\d+:\\d+"
       #

test/test_static_file.rb

@@ -148,8 +148,9 @@ class TestStaticFile < JekyllUnitTest
         "extname"       => ".txt",
         "modified_time" => @static_file.modified_time,
         "path"          => "/static_file.txt",
+        "collection"    => nil
       }
-      assert_equal expected, @static_file.to_liquid
+      assert_equal expected, @static_file.to_liquid.to_h
     end
   end
 end