jekyll 3.3.0.pre.rc1 → 3.3.0

Sign up to get free protection for your applications and to get access to all the features.

Potentially problematic release.


This version of jekyll might be problematic. Click here for more details.

checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA1:
3
- metadata.gz: 0f37d320b2fa6347d5fd020d17cf815ba0fcd32a
4
- data.tar.gz: 6832433b42442d9eed559699b6a49078425bd537
3
+ metadata.gz: d8d1ccf027b6fb0da7805b442449aa63d0a22ef0
4
+ data.tar.gz: ac1b81c708fd150ddf115d8d967d20e245460645
5
5
  SHA512:
6
- metadata.gz: c02a41ead91f7f078cd3333efb390623d214110523b6e86cdf5fad590e01d150629d7dea302220ffdc595eea72d53ffffea34eef2cb62173812fb833f894ff43
7
- data.tar.gz: 521abff35bc9f59edee2737440ee700e50508da2b11e6a0af33360e4ffb31318b0cbb2ea19a94828be179d4d93fbc5d7a82b2bbb6433f373f05a30cc8fd885ae
6
+ metadata.gz: e336dc8f9e8dd733ab4fb788434c48eecede987f412c8f8ba07a050ce2cb9daedd6bb8625bf1c57149011981fcda9b2c5ff8ba8aaa86f4cc351f1d925709f470
7
+ data.tar.gz: d1b9196688c17be6cb1e89c573d22180972e44b1e4e519515d1f722df37c56313bb28ac6e6003a216bafa224a26532970315d9a09f7afdce13dce63b01c8d649
@@ -74,7 +74,7 @@ ruby RUBY_VERSION
74
74
  gem "jekyll", "#{Jekyll::VERSION}"
75
75
 
76
76
  # This is the default theme for new Jekyll sites. You may change this to anything you like.
77
- gem "minima"
77
+ gem "minima", "~> 2.0"
78
78
 
79
79
  # If you want to use GitHub Pages, remove the "gem "jekyll"" above and
80
80
  # uncomment the line below. To upgrade, run `bundle update github-pages`.
@@ -104,12 +104,7 @@ module Jekyll
104
104
  def start_up_webrick(opts, destination)
105
105
  server = WEBrick::HTTPServer.new(webrick_opts(opts)).tap { |o| o.unmount("") }
106
106
  server.mount(opts["baseurl"], Servlet, destination, file_handler_opts)
107
- Jekyll.logger.info "Server address:", server_address(
108
- server.config[:SSLEnable],
109
- server.config[:BindAddress],
110
- server.config[:Port],
111
- opts["baseurl"]
112
- )
107
+ Jekyll.logger.info "Server address:", server_address(server, opts)
113
108
  launch_browser server, opts if opts["open_url"]
114
109
  boot_or_detach server, opts
115
110
  end
@@ -129,9 +124,19 @@ module Jekyll
129
124
  #
130
125
 
131
126
  private
132
- def server_address(prefix, address, port, baseurl = nil)
127
+ def server_address(server, options = {})
128
+ format_url(
129
+ server.config[:SSLEnable],
130
+ server.config[:BindAddress],
131
+ server.config[:Port],
132
+ options["baseurl"]
133
+ )
134
+ end
135
+
136
+ private
137
+ def format_url(ssl_enabled, address, port, baseurl = nil)
133
138
  format("%{prefix}://%{address}:%{port}%{baseurl}", {
134
- :prefix => prefix ? "https" : "http",
139
+ :prefix => ssl_enabled ? "https" : "http",
135
140
  :address => address,
136
141
  :port => port,
137
142
  :baseurl => baseurl ? "#{baseurl}/" : ""
@@ -143,7 +148,7 @@ module Jekyll
143
148
  private
144
149
  def default_url(opts)
145
150
  config = configuration_from_options(opts)
146
- server_address(
151
+ format_url(
147
152
  config["ssl_cert"] && config["ssl_key"],
148
153
  config["host"] == "127.0.0.1" ? "localhost" : config["host"],
149
154
  config["port"]
@@ -37,10 +37,10 @@ module Jekyll
37
37
  path = @site.in_source_dir(dir, entry)
38
38
  next if @entry_filter.symlink?(path)
39
39
 
40
- key = sanitize_filename(File.basename(entry, ".*"))
41
40
  if File.directory?(path)
42
- read_data_to(path, data[key] = {})
41
+ read_data_to(path, data[sanitize_filename(entry)] = {})
43
42
  else
43
+ key = sanitize_filename(File.basename(entry, ".*"))
44
44
  data[key] = read_data_file(path)
45
45
  end
46
46
  end
@@ -1,3 +1,3 @@
1
1
  module Jekyll
2
- VERSION = "3.3.0.pre.rc1".freeze
2
+ VERSION = "3.3.0".freeze
3
3
  end
metadata CHANGED
@@ -1,14 +1,14 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: jekyll
3
3
  version: !ruby/object:Gem::Version
4
- version: 3.3.0.pre.rc1
4
+ version: 3.3.0
5
5
  platform: ruby
6
6
  authors:
7
7
  - Tom Preston-Werner
8
8
  autorequire:
9
9
  bindir: exe
10
10
  cert_chain: []
11
- date: 2016-10-05 00:00:00.000000000 Z
11
+ date: 2016-10-06 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: liquid
@@ -273,9 +273,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
273
273
  version: 2.0.0
274
274
  required_rubygems_version: !ruby/object:Gem::Requirement
275
275
  requirements:
276
- - - ">"
276
+ - - ">="
277
277
  - !ruby/object:Gem::Version
278
- version: 1.3.1
278
+ version: '0'
279
279
  requirements: []
280
280
  rubyforge_project:
281
281
  rubygems_version: 2.5.1