jazzy 0.11.0 → 0.13.1
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- checksums.yaml +4 -4
- data/.circleci/config.yml +3 -20
- data/CHANGELOG.md +133 -0
- data/CONTRIBUTING.md +1 -1
- data/Gemfile.lock +37 -31
- data/README.md +51 -3
- data/bin/sourcekitten +0 -0
- data/jazzy.gemspec +2 -2
- data/lib/jazzy/config.rb +27 -6
- data/lib/jazzy/doc.rb +0 -4
- data/lib/jazzy/doc_builder.rb +36 -20
- data/lib/jazzy/gem_version.rb +1 -1
- data/lib/jazzy/highlighter.rb +10 -8
- data/lib/jazzy/jazzy_markdown.rb +3 -4
- data/lib/jazzy/source_declaration.rb +62 -6
- data/lib/jazzy/source_declaration/type.rb +8 -0
- data/lib/jazzy/source_mark.rb +11 -0
- data/lib/jazzy/sourcekitten.rb +239 -93
- data/lib/jazzy/stats.rb +4 -0
- data/lib/jazzy/themes/apple/assets/css/jazzy.css.scss +36 -2
- data/lib/jazzy/themes/apple/templates/task.mustache +4 -3
- data/lib/jazzy/themes/fullwidth/assets/css/jazzy.css.scss +35 -7
- data/lib/jazzy/themes/fullwidth/templates/doc.mustache +1 -1
- data/lib/jazzy/themes/fullwidth/templates/task.mustache +4 -3
- data/lib/jazzy/themes/jony/assets/css/jazzy.css.scss +35 -2
- data/lib/jazzy/themes/jony/templates/task.mustache +4 -3
- data/spec/integration_spec.rb +23 -10
- metadata +5 -4
data/lib/jazzy/stats.rb
CHANGED
@@ -152,7 +152,7 @@ header {
|
|
152
152
|
background-color: $bg_color;
|
153
153
|
position: fixed;
|
154
154
|
width: 100%;
|
155
|
-
z-index:
|
155
|
+
z-index: 2;
|
156
156
|
img {
|
157
157
|
padding-right: 6px;
|
158
158
|
vertical-align: -4px;
|
@@ -177,7 +177,7 @@ header {
|
|
177
177
|
padding-top: $breadcrumb_padding_top;
|
178
178
|
position: fixed;
|
179
179
|
width: 100%;
|
180
|
-
z-index:
|
180
|
+
z-index: 2;
|
181
181
|
margin-top: $header_height;
|
182
182
|
#carat {
|
183
183
|
height: 10px;
|
@@ -270,6 +270,17 @@ header {
|
|
270
270
|
margin: -$content_top_offset 0 0;
|
271
271
|
}
|
272
272
|
}
|
273
|
+
.section-name {
|
274
|
+
p {
|
275
|
+
margin-bottom: inherit;
|
276
|
+
line-height: inherit;
|
277
|
+
}
|
278
|
+
code {
|
279
|
+
background-color: inherit;
|
280
|
+
padding: inherit;
|
281
|
+
color: inherit;
|
282
|
+
}
|
283
|
+
}
|
273
284
|
}
|
274
285
|
|
275
286
|
.section {
|
@@ -317,6 +328,29 @@ header {
|
|
317
328
|
}
|
318
329
|
}
|
319
330
|
|
331
|
+
.section-name-container {
|
332
|
+
position: relative;
|
333
|
+
display: inline-block;
|
334
|
+
|
335
|
+
.section-name-link {
|
336
|
+
position: absolute;
|
337
|
+
top: 0;
|
338
|
+
left: 0;
|
339
|
+
bottom: 0;
|
340
|
+
right: 0;
|
341
|
+
margin-bottom: 0;
|
342
|
+
}
|
343
|
+
|
344
|
+
.section-name {
|
345
|
+
position: relative;
|
346
|
+
pointer-events: none;
|
347
|
+
z-index: 1;
|
348
|
+
a {
|
349
|
+
pointer-events: auto;
|
350
|
+
}
|
351
|
+
}
|
352
|
+
}
|
353
|
+
|
320
354
|
.item {
|
321
355
|
padding-top: 8px;
|
322
356
|
width: 100%;
|
@@ -3,9 +3,10 @@
|
|
3
3
|
<div class="task-name-container">
|
4
4
|
<a name="/{{uid}}"></a>
|
5
5
|
<a name="//apple_ref/{{language_stub}}/Section/{{name}}" class="dashAnchor"></a>
|
6
|
-
<
|
7
|
-
<
|
8
|
-
|
6
|
+
<div class="section-name-container">
|
7
|
+
<a class="section-name-link" href="#/{{uid}}"></a>
|
8
|
+
<h3 class="section-name">{{{name_html}}}</h3>
|
9
|
+
</div>
|
9
10
|
</div>
|
10
11
|
{{/name}}
|
11
12
|
<ul>
|
@@ -201,13 +201,15 @@ code {
|
|
201
201
|
font-family: $code_font;
|
202
202
|
}
|
203
203
|
|
204
|
-
|
205
|
-
|
206
|
-
|
207
|
-
|
208
|
-
|
209
|
-
|
210
|
-
|
204
|
+
.item-container, .top-matter {
|
205
|
+
p, li {
|
206
|
+
> code {
|
207
|
+
background: $code_bg_color;
|
208
|
+
padding: .2em;
|
209
|
+
&:before, &:after {
|
210
|
+
letter-spacing: -.2em;
|
211
|
+
content: "\00a0";
|
212
|
+
}
|
211
213
|
}
|
212
214
|
}
|
213
215
|
}
|
@@ -367,6 +369,10 @@ pre code {
|
|
367
369
|
.section-name {
|
368
370
|
color: #666;
|
369
371
|
display: block;
|
372
|
+
|
373
|
+
p {
|
374
|
+
margin-bottom: inherit;
|
375
|
+
}
|
370
376
|
}
|
371
377
|
|
372
378
|
.declaration .highlight {
|
@@ -394,6 +400,28 @@ pre code {
|
|
394
400
|
}
|
395
401
|
}
|
396
402
|
|
403
|
+
.section-name-container {
|
404
|
+
position: relative;
|
405
|
+
|
406
|
+
.section-name-link {
|
407
|
+
position: absolute;
|
408
|
+
top: 0;
|
409
|
+
left: 0;
|
410
|
+
bottom: 0;
|
411
|
+
right: 0;
|
412
|
+
margin-bottom: 0;
|
413
|
+
}
|
414
|
+
|
415
|
+
.section-name {
|
416
|
+
position: relative;
|
417
|
+
pointer-events: none;
|
418
|
+
z-index: 1;
|
419
|
+
a {
|
420
|
+
pointer-events: auto;
|
421
|
+
}
|
422
|
+
}
|
423
|
+
}
|
424
|
+
|
397
425
|
.item-container {
|
398
426
|
padding: 0;
|
399
427
|
}
|
@@ -3,9 +3,10 @@
|
|
3
3
|
<div class="task-name-container">
|
4
4
|
<a name="/{{uid}}"></a>
|
5
5
|
<a name="//apple_ref/{{language_stub}}/Section/{{name}}" class="dashAnchor"></a>
|
6
|
-
<
|
7
|
-
<
|
8
|
-
|
6
|
+
<div class="section-name-container">
|
7
|
+
<a class="section-name-link" href="#/{{uid}}"></a>
|
8
|
+
<h3 class="section-name">{{{name_html}}}</h3>
|
9
|
+
</div>
|
9
10
|
</div>
|
10
11
|
{{/name}}
|
11
12
|
<ul class="item-container">
|
@@ -182,7 +182,7 @@ header {
|
|
182
182
|
background-color: $bg_color;
|
183
183
|
position: fixed;
|
184
184
|
width: 100%;
|
185
|
-
z-index:
|
185
|
+
z-index: 3;
|
186
186
|
img {
|
187
187
|
padding-right: 6px;
|
188
188
|
vertical-align: -4px;
|
@@ -204,7 +204,7 @@ header {
|
|
204
204
|
#breadcrumbs-container {
|
205
205
|
background-color: $bg_color;
|
206
206
|
position: fixed;
|
207
|
-
z-index:
|
207
|
+
z-index: 2;
|
208
208
|
width: 100%;
|
209
209
|
}
|
210
210
|
|
@@ -310,6 +310,16 @@ header {
|
|
310
310
|
margin: -$content_top_offset 0 0;
|
311
311
|
}
|
312
312
|
}
|
313
|
+
|
314
|
+
.section-name {
|
315
|
+
p {
|
316
|
+
margin-bottom: inherit;
|
317
|
+
line-height: inherit;
|
318
|
+
}
|
319
|
+
code {
|
320
|
+
color: inherit;
|
321
|
+
}
|
322
|
+
}
|
313
323
|
}
|
314
324
|
|
315
325
|
.highlight {
|
@@ -356,6 +366,29 @@ header {
|
|
356
366
|
}
|
357
367
|
}
|
358
368
|
|
369
|
+
.section-name-container {
|
370
|
+
position: relative;
|
371
|
+
display: inline-block;
|
372
|
+
|
373
|
+
.section-name-link {
|
374
|
+
position: absolute;
|
375
|
+
top: 0;
|
376
|
+
left: 0;
|
377
|
+
bottom: 0;
|
378
|
+
right: 0;
|
379
|
+
margin-bottom: 0;
|
380
|
+
}
|
381
|
+
|
382
|
+
.section-name {
|
383
|
+
position: relative;
|
384
|
+
pointer-events: none;
|
385
|
+
z-index: 1;
|
386
|
+
a {
|
387
|
+
pointer-events: auto;
|
388
|
+
}
|
389
|
+
}
|
390
|
+
}
|
391
|
+
|
359
392
|
.item {
|
360
393
|
padding-top: 8px;
|
361
394
|
width: 100%;
|
@@ -3,9 +3,10 @@
|
|
3
3
|
<div class="task-name-container">
|
4
4
|
<a name="/{{uid}}"></a>
|
5
5
|
<a name="//apple_ref/{{language_stub}}/Section/{{name}}" class="dashAnchor"></a>
|
6
|
-
<
|
7
|
-
<
|
8
|
-
|
6
|
+
<div class="section-name-container">
|
7
|
+
<a class="section-name-link" href="#/{{uid}}"></a>
|
8
|
+
<h3 class="section-name">{{{name_html}}}</h3>
|
9
|
+
</div>
|
9
10
|
</div>
|
10
11
|
{{/name}}
|
11
12
|
<ul>
|
data/spec/integration_spec.rb
CHANGED
@@ -52,13 +52,9 @@ require 'cocoapods'
|
|
52
52
|
|
53
53
|
def configure_cocoapods
|
54
54
|
Pod::Config.instance.with_changes(silent: true) do
|
55
|
-
|
56
|
-
|
57
|
-
|
58
|
-
Pod::Command::Repo::Update.invoke(%w[master])
|
59
|
-
else
|
60
|
-
Pod::Command::Setup.invoke
|
61
|
-
end
|
55
|
+
Pod::Command::Setup.invoke
|
56
|
+
Pod::Command::Repo::AddCDN.invoke(%w[trunk https://cdn.cocoapods.org/])
|
57
|
+
Pod::Command::Repo::Update.invoke(%w[trunk])
|
62
58
|
end
|
63
59
|
end
|
64
60
|
|
@@ -77,8 +73,11 @@ CLIntegracon.configure do |c|
|
|
77
73
|
File.write(
|
78
74
|
path,
|
79
75
|
File.read(path).gsub(
|
80
|
-
|
76
|
+
c.temp_path.to_s,
|
81
77
|
'<TMP>',
|
78
|
+
).gsub(
|
79
|
+
c.spec_path.to_s,
|
80
|
+
'<SPEC>',
|
82
81
|
),
|
83
82
|
)
|
84
83
|
end
|
@@ -164,9 +163,23 @@ describe_cli 'jazzy' do
|
|
164
163
|
"--head #{realm_head.shellescape}"
|
165
164
|
end
|
166
165
|
|
167
|
-
describe 'Creates docs for ObjC project with a variety of contents' do
|
166
|
+
describe 'Creates docs for ObjC-Swift project with a variety of contents' do
|
167
|
+
base = ROOT + 'spec/integration_specs/misc_jazzy_objc_features/before'
|
168
|
+
Dir.chdir(base) do
|
169
|
+
sourcekitten = ROOT + 'bin/sourcekitten'
|
170
|
+
sdk = `xcrun --show-sdk-path --sdk iphonesimulator`.chomp
|
171
|
+
objc_args = "#{base}/MiscJazzyObjCFeatures/MiscJazzyObjCFeatures.h " \
|
172
|
+
'-- -x objective-c ' \
|
173
|
+
"-isysroot #{sdk} " \
|
174
|
+
"-I #{base} " \
|
175
|
+
'-fmodules'
|
176
|
+
`#{sourcekitten} doc --objc #{objc_args} > objc.json`
|
177
|
+
`#{sourcekitten} doc > swift.json`
|
178
|
+
end
|
179
|
+
|
168
180
|
behaves_like cli_spec 'misc_jazzy_objc_features',
|
169
|
-
'--theme fullwidth'
|
181
|
+
'--theme fullwidth '\
|
182
|
+
'-s objc.json,swift.json'
|
170
183
|
end
|
171
184
|
end if !spec_subset || spec_subset == 'objc'
|
172
185
|
|
metadata
CHANGED
@@ -1,16 +1,17 @@
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
2
2
|
name: jazzy
|
3
3
|
version: !ruby/object:Gem::Version
|
4
|
-
version: 0.
|
4
|
+
version: 0.13.1
|
5
5
|
platform: ruby
|
6
6
|
authors:
|
7
7
|
- JP Simard
|
8
8
|
- Tim Anglade
|
9
9
|
- Samuel Giddins
|
10
|
+
- John Fairhurst
|
10
11
|
autorequire:
|
11
12
|
bindir: bin
|
12
13
|
cert_chain: []
|
13
|
-
date:
|
14
|
+
date: 2020-01-07 00:00:00.000000000 Z
|
14
15
|
dependencies:
|
15
16
|
- !ruby/object:Gem::Dependency
|
16
17
|
name: cocoapods
|
@@ -161,7 +162,7 @@ dependencies:
|
|
161
162
|
description: Soulful docs for Swift & Objective-C. Run in your Xcode project's root
|
162
163
|
directory for instant HTML docs.
|
163
164
|
email:
|
164
|
-
- jp@
|
165
|
+
- jp@jpsim.com
|
165
166
|
executables:
|
166
167
|
- jazzy
|
167
168
|
extensions: []
|
@@ -279,7 +280,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
|
|
279
280
|
- !ruby/object:Gem::Version
|
280
281
|
version: '0'
|
281
282
|
requirements: []
|
282
|
-
rubygems_version: 3.0.
|
283
|
+
rubygems_version: 3.0.6
|
283
284
|
signing_key:
|
284
285
|
specification_version: 4
|
285
286
|
summary: Soulful docs for Swift & Objective-C.
|