jekyll 3.1.2 → 3.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 754fc17db71e2e921e0af04aa539ce4ed79bc11d
-  data.tar.gz: af228ee2a490fdc51c039cbfdd57ed6877396fe0
+  metadata.gz: 29daae6d76fc38cafbe21fabe31445e88fe0464a
+  data.tar.gz: b985ebf8f0ed03fa16bd46a031c7294d2581ea87
 SHA512:
-  metadata.gz: ea0b25be9b51836e6b8909704cbc1473cd35daf97985376e4ce397b98a54c64511c841155a21c2276b813993a8e42683a998df245d776c1395e3c8f7a8f749e2
-  data.tar.gz: 1d69242ac627e23898a9f179302477ab9d79f86372f6f318c811c3c009e1fd526eaac7ee6c62316eb89cf4bed5d24ac80ed0012ec9897af7df0896f521339839
+  metadata.gz: 976d81d83465c53dead23b40de153e81c3cdf4281f977ec8942a73352effd2d9750c9d329ae5dd04332afbfb8f597eda5afa5b88857a4d82a5b4ec6804632236
+  data.tar.gz: 316a5bb0096f088753b928940b2c846fce08f921c8cb720ccd22b48465a9fffa1250b53c935241fb3ebb63b645386a00e209cf38b6e3286643ace43243ff09ad

data/lib/jekyll/commands/serve.rb

@@ -112,11 +112,12 @@ module Jekyll
 
         private
         def server_address(server, opts)
-          address = server.config[:BindAddress]
-          baseurl = "#{opts["baseurl"]}/" if opts["baseurl"]
-          port = server.config[:Port]
-
-          "http://#{address}:#{port}#{baseurl}"
+          "%{prefix}://%{address}:%{port}%{baseurl}" % {
+            :prefix => server.config[:SSLEnable] ? "https" : "http",
+            :baseurl => opts["baseurl"] ? "#{opts["baseurl"]}/" : "",
+            :address => server.config[:BindAddress],
+            :port => server.config[:Port]
+          }
         end
 
         #
@@ -181,7 +182,7 @@ module Jekyll
           source_certificate = Jekyll.sanitized_path(opts[:JekyllOptions]["source"], opts[:JekyllOptions]["ssl_cert"])
           opts[:SSLCertificate] = OpenSSL::X509::Certificate.new(File.read(source_certificate))
           opts[:SSLPrivateKey ] = OpenSSL::PKey::RSA.new(File.read(source_key))
-          opts[:EnableSSL] = true
+          opts[:SSLEnable] = true
         end
 
         private

data/lib/jekyll/document.rb

@@ -259,7 +259,7 @@ module Jekyll
         @data = SafeYAML.load_file(path)
       else
         begin
-          defaults = @site.frontmatter_defaults.all(url, collection.label.to_sym)
+          defaults = @site.frontmatter_defaults.all(relative_path, collection.label.to_sym)
           merge_data!(defaults, source: "front matter defaults") unless defaults.empty?
 
           self.content = File.read(path, Utils.merged_file_read_opts(site, opts))

data/lib/jekyll/version.rb

@@ -1,3 +1,3 @@
 module Jekyll
-  VERSION = '3.1.2'
+  VERSION = '3.1.3'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: jekyll
 version: !ruby/object:Gem::Version
-  version: 3.1.2
+  version: 3.1.3
 platform: ruby
 authors:
 - Tom Preston-Werner
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-02-20 00:00:00.000000000 Z
+date: 2016-04-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: liquid