jekyll 3.3.0.pre.rc1 → 3.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0f37d320b2fa6347d5fd020d17cf815ba0fcd32a
-  data.tar.gz: 6832433b42442d9eed559699b6a49078425bd537
+  metadata.gz: d8d1ccf027b6fb0da7805b442449aa63d0a22ef0
+  data.tar.gz: ac1b81c708fd150ddf115d8d967d20e245460645
 SHA512:
-  metadata.gz: c02a41ead91f7f078cd3333efb390623d214110523b6e86cdf5fad590e01d150629d7dea302220ffdc595eea72d53ffffea34eef2cb62173812fb833f894ff43
-  data.tar.gz: 521abff35bc9f59edee2737440ee700e50508da2b11e6a0af33360e4ffb31318b0cbb2ea19a94828be179d4d93fbc5d7a82b2bbb6433f373f05a30cc8fd885ae
+  metadata.gz: e336dc8f9e8dd733ab4fb788434c48eecede987f412c8f8ba07a050ce2cb9daedd6bb8625bf1c57149011981fcda9b2c5ff8ba8aaa86f4cc351f1d925709f470
+  data.tar.gz: d1b9196688c17be6cb1e89c573d22180972e44b1e4e519515d1f722df37c56313bb28ac6e6003a216bafa224a26532970315d9a09f7afdce13dce63b01c8d649

data/lib/jekyll/commands/new.rb

@@ -74,7 +74,7 @@ ruby RUBY_VERSION
 gem "jekyll", "#{Jekyll::VERSION}"
 
 # This is the default theme for new Jekyll sites. You may change this to anything you like.
-gem "minima"
+gem "minima", "~> 2.0"
 
 # If you want to use GitHub Pages, remove the "gem "jekyll"" above and
 # uncomment the line below. To upgrade, run `bundle update github-pages`.

data/lib/jekyll/commands/serve.rb

@@ -104,12 +104,7 @@ module Jekyll
         def start_up_webrick(opts, destination)
           server = WEBrick::HTTPServer.new(webrick_opts(opts)).tap { |o| o.unmount("") }
           server.mount(opts["baseurl"], Servlet, destination, file_handler_opts)
-          Jekyll.logger.info "Server address:", server_address(
-            server.config[:SSLEnable],
-            server.config[:BindAddress],
-            server.config[:Port],
-            opts["baseurl"]
-          )
+          Jekyll.logger.info "Server address:", server_address(server, opts)
           launch_browser server, opts if opts["open_url"]
           boot_or_detach server, opts
         end
@@ -129,9 +124,19 @@ module Jekyll
         #
 
         private
-        def server_address(prefix, address, port, baseurl = nil)
+        def server_address(server, options = {})
+          format_url(
+            server.config[:SSLEnable],
+            server.config[:BindAddress],
+            server.config[:Port],
+            options["baseurl"]
+          )
+        end
+
+        private
+        def format_url(ssl_enabled, address, port, baseurl = nil)
           format("%{prefix}://%{address}:%{port}%{baseurl}", {
-            :prefix  => prefix ? "https" : "http",
+            :prefix  => ssl_enabled ? "https" : "http",
             :address => address,
             :port    => port,
             :baseurl => baseurl ? "#{baseurl}/" : ""
@@ -143,7 +148,7 @@ module Jekyll
         private
         def default_url(opts)
           config = configuration_from_options(opts)
-          server_address(
+          format_url(
             config["ssl_cert"] && config["ssl_key"],
             config["host"] == "127.0.0.1" ? "localhost" : config["host"],
             config["port"]

data/lib/jekyll/readers/data_reader.rb

@@ -37,10 +37,10 @@ module Jekyll
         path = @site.in_source_dir(dir, entry)
         next if @entry_filter.symlink?(path)
 
-        key = sanitize_filename(File.basename(entry, ".*"))
         if File.directory?(path)
-          read_data_to(path, data[key] = {})
+          read_data_to(path, data[sanitize_filename(entry)] = {})
         else
+          key = sanitize_filename(File.basename(entry, ".*"))
           data[key] = read_data_file(path)
         end
       end

data/lib/jekyll/version.rb

@@ -1,3 +1,3 @@
 module Jekyll
-  VERSION = "3.3.0.pre.rc1".freeze
+  VERSION = "3.3.0".freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: jekyll
 version: !ruby/object:Gem::Version
-  version: 3.3.0.pre.rc1
+  version: 3.3.0
 platform: ruby
 authors:
 - Tom Preston-Werner
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-10-05 00:00:00.000000000 Z
+date: 2016-10-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: liquid
@@ -273,9 +273,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: 2.0.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">"
+  - - ">="
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
 requirements: []
 rubyforge_project: 
 rubygems_version: 2.5.1