nesta 0.13.0 → 0.15.0

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.
Files changed (55) hide show
  1. checksums.yaml +4 -4
  2. data/.github/workflows/tests.yml +1 -1
  3. data/.gitignore +1 -0
  4. data/{CHANGES → CHANGELOG.md} +117 -21
  5. data/Gemfile.lock +28 -26
  6. data/LICENSE +1 -1
  7. data/README.md +45 -31
  8. data/RELEASING.md +1 -1
  9. data/bin/nesta +4 -1
  10. data/lib/nesta/app.rb +1 -2
  11. data/lib/nesta/commands/build.rb +38 -0
  12. data/lib/nesta/commands/new.rb +2 -1
  13. data/lib/nesta/commands.rb +1 -0
  14. data/lib/nesta/config.rb +49 -75
  15. data/lib/nesta/config_file.rb +5 -1
  16. data/lib/nesta/helpers.rb +0 -5
  17. data/lib/nesta/models/file_model.rb +191 -0
  18. data/lib/nesta/models/menu.rb +67 -0
  19. data/lib/nesta/models/page.rb +167 -0
  20. data/lib/nesta/models.rb +3 -422
  21. data/lib/nesta/navigation.rb +0 -5
  22. data/lib/nesta/overrides.rb +32 -43
  23. data/lib/nesta/plugin.rb +0 -16
  24. data/lib/nesta/static/assets.rb +50 -0
  25. data/lib/nesta/static/html_file.rb +26 -0
  26. data/lib/nesta/static/site.rb +104 -0
  27. data/lib/nesta/version.rb +1 -1
  28. data/lib/nesta.rb +1 -3
  29. data/nesta.gemspec +5 -5
  30. data/templates/config/config.yml +28 -2
  31. data/templates/themes/README.md +1 -1
  32. data/templates/themes/views/master.sass +1 -1
  33. data/test/integration/atom_feed_test.rb +1 -1
  34. data/test/integration/commands/build_test.rb +53 -0
  35. data/test/integration/overrides_test.rb +1 -1
  36. data/test/integration/sitemap_test.rb +1 -1
  37. data/test/support/temporary_files.rb +1 -1
  38. data/test/support/test_configuration.rb +2 -4
  39. data/test/unit/config_test.rb +25 -94
  40. data/test/unit/static/assets_test.rb +56 -0
  41. data/test/unit/static/html_file_test.rb +41 -0
  42. data/test/unit/static/site_test.rb +104 -0
  43. data/views/atom.haml +2 -2
  44. data/views/comments.haml +2 -2
  45. data/views/footer.haml +1 -1
  46. data/views/header.haml +2 -3
  47. data/views/layout.haml +2 -2
  48. data/views/master.sass +1 -1
  49. data/views/mixins.sass +2 -2
  50. data/views/normalize.scss +0 -1
  51. data/views/sitemap.haml +1 -1
  52. metadata +42 -31
  53. /data/test/unit/{file_model_test.rb → models/file_model_test.rb} +0 -0
  54. /data/test/unit/{menu_test.rb → models/menu_test.rb} +0 -0
  55. /data/test/unit/{page_test.rb → models/page_test.rb} +0 -0
data/views/atom.haml CHANGED
@@ -1,7 +1,7 @@
1
1
  !!! XML
2
- %feed(xmlns='http://www.w3.org/2005/Atom')
2
+ %feed(xmlns='https://www.w3.org/2005/Atom')
3
3
  %title(type='text')= @title
4
- %generator(uri='http://nestacms.com') Nesta
4
+ %generator(uri='https://nestacms.com') Nesta
5
5
  %id= atom_id
6
6
  %link(href="#{path_to('/articles.xml', :uri => true)}" rel='self')
7
7
  %link(href="#{path_to('/', :uri => true)}" rel='alternate')
data/views/comments.haml CHANGED
@@ -3,7 +3,7 @@
3
3
  - if Sinatra::Application.environment == :development
4
4
  :javascript
5
5
  var disqus_developer = true;
6
- %script{:type => 'text/javascript', :src => "http://#{short_name}.disqus.com/embed.js", :async => true}
6
+ %script{:type => 'text/javascript', :src => "https://#{short_name}.disqus.com/embed.js", :async => true}
7
7
 
8
8
  %noscript
9
- %a(href="http://#{short_name}.disqus.com/embed.js?url=ref") View comments.
9
+ %a(href="https://#{short_name}.disqus.com/embed.js?url=ref") View comments.
data/views/footer.haml CHANGED
@@ -2,4 +2,4 @@
2
2
  %p
3
3
  Powered by Nesta, a
4
4
  = succeed "." do
5
- %a(href="http://nestacms.com") Ruby CMS
5
+ %a(href="https://nestacms.com") Ruby CMS
data/views/header.haml CHANGED
@@ -1,4 +1,3 @@
1
1
  %header(role="banner")
2
- %hgroup
3
- %h1= @heading
4
- %h2= @subtitle
2
+ %h1= @heading
3
+ %h2= @subtitle
data/views/layout.haml CHANGED
@@ -8,13 +8,13 @@
8
8
  - if @keywords
9
9
  %meta(name="keywords" content=@keywords)
10
10
  %title= @title
11
- %link(href='http://fonts.googleapis.com/css?family=Roboto+Slab:400,700' rel='stylesheet' type='text/css')
11
+ %link(href='//fonts.googleapis.com/css?family=Roboto+Slab:400,700' rel='stylesheet' type='text/css')
12
12
  <!--[if ! lte IE 6]><!-->
13
13
  %link(href="#{path_to('/css/master.css')}" media="screen" rel="stylesheet")
14
14
  - local_stylesheet_link_tag('local')
15
15
  <!--<![endif]-->
16
16
  /[if lte IE 6]
17
- %link(rel="stylesheet" href="http://universal-ie6-css.googlecode.com/files/ie6.1.1.css" media="screen, projection")
17
+ %link(rel="stylesheet" href="//universal-ie6-css.googlecode.com/files/ie6.1.1.css" media="screen, projection")
18
18
  /[if lt IE 9]
19
19
  %script(src="//html5shim.googlecode.com/svn/trunk/html5.js")
20
20
  %script(src="//cdnjs.cloudflare.com/ajax/libs/respond.js/1.1.0/respond.min.js")
data/views/master.sass CHANGED
@@ -70,7 +70,7 @@ li
70
70
 
71
71
  blockquote
72
72
  margin: $vertical-margin 0
73
- padding: 0 $vertical-margin / 2
73
+ padding: 0 calc($vertical-margin / 2)
74
74
  border-left: 5px solid $tint
75
75
 
76
76
  font-style: italic
data/views/mixins.sass CHANGED
@@ -1,5 +1,5 @@
1
1
  // Default ratios between font sizes; used to maintain the type hierarchy.
2
- // http://www.markboulton.co.uk/journal/comments/five-simple-steps-to-better-typography-part-4
2
+ // https://www.markboulton.co.uk/journal/comments/five-simple-steps-to-better-typography-part-4
3
3
 
4
4
  $size5: 2.18em
5
5
  $size4: 1.64em
@@ -23,7 +23,7 @@ $nav-link-color: desaturate(lighten($link-color, 10%), 25%)
23
23
  $meta-color: #87877D
24
24
 
25
25
  @function empx($em, $base: 16px)
26
- @return ($em / 1em) * $base
26
+ @return calc($em / 1em) * $base
27
27
 
28
28
  // Layout settings
29
29
 
data/views/normalize.scss CHANGED
@@ -15,7 +15,6 @@ figcaption,
15
15
  figure,
16
16
  footer,
17
17
  header,
18
- hgroup,
19
18
  main,
20
19
  nav,
21
20
  section,
data/views/sitemap.haml CHANGED
@@ -1,5 +1,5 @@
1
1
  !!! XML
2
- %urlset(xmlns="http://www.sitemaps.org/schemas/sitemap/0.9")
2
+ %urlset(xmlns="https://www.sitemaps.org/schemas/sitemap/0.9")
3
3
  %url
4
4
  %loc= path_to('/', :uri => true)
5
5
  %changefreq daily
metadata CHANGED
@@ -1,14 +1,14 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: nesta
3
3
  version: !ruby/object:Gem::Version
4
- version: 0.13.0
4
+ version: 0.15.0
5
5
  platform: ruby
6
6
  authors:
7
7
  - Graham Ashton
8
8
  autorequire:
9
9
  bindir: bin
10
10
  cert_chain: []
11
- date: 2022-09-28 00:00:00.000000000 Z
11
+ date: 2023-07-11 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: haml
@@ -50,14 +50,28 @@ dependencies:
50
50
  requirements:
51
51
  - - "~>"
52
52
  - !ruby/object:Gem::Version
53
- version: '2.0'
53
+ version: '2'
54
54
  type: :runtime
55
55
  prerelease: false
56
56
  version_requirements: !ruby/object:Gem::Requirement
57
57
  requirements:
58
58
  - - "~>"
59
59
  - !ruby/object:Gem::Version
60
- version: '2.0'
60
+ version: '2'
61
+ - !ruby/object:Gem::Dependency
62
+ name: rake
63
+ requirement: !ruby/object:Gem::Requirement
64
+ requirements:
65
+ - - ">="
66
+ - !ruby/object:Gem::Version
67
+ version: '0'
68
+ type: :runtime
69
+ prerelease: false
70
+ version_requirements: !ruby/object:Gem::Requirement
71
+ requirements:
72
+ - - ">="
73
+ - !ruby/object:Gem::Version
74
+ version: '0'
61
75
  - !ruby/object:Gem::Dependency
62
76
  name: rdiscount
63
77
  requirement: !ruby/object:Gem::Requirement
@@ -87,33 +101,33 @@ dependencies:
87
101
  - !ruby/object:Gem::Version
88
102
  version: '4.2'
89
103
  - !ruby/object:Gem::Dependency
90
- name: sassc
104
+ name: sass-embedded
91
105
  requirement: !ruby/object:Gem::Requirement
92
106
  requirements:
93
- - - ">="
107
+ - - "~>"
94
108
  - !ruby/object:Gem::Version
95
- version: '2.2'
109
+ version: '1.58'
96
110
  type: :runtime
97
111
  prerelease: false
98
112
  version_requirements: !ruby/object:Gem::Requirement
99
113
  requirements:
100
- - - ">="
114
+ - - "~>"
101
115
  - !ruby/object:Gem::Version
102
- version: '2.2'
116
+ version: '1.58'
103
117
  - !ruby/object:Gem::Dependency
104
118
  name: sinatra
105
119
  requirement: !ruby/object:Gem::Requirement
106
120
  requirements:
107
121
  - - "~>"
108
122
  - !ruby/object:Gem::Version
109
- version: '2.0'
123
+ version: '3.0'
110
124
  type: :runtime
111
125
  prerelease: false
112
126
  version_requirements: !ruby/object:Gem::Requirement
113
127
  requirements:
114
128
  - - "~>"
115
129
  - !ruby/object:Gem::Version
116
- version: '2.0'
130
+ version: '3.0'
117
131
  - !ruby/object:Gem::Dependency
118
132
  name: tilt
119
133
  requirement: !ruby/object:Gem::Requirement
@@ -198,20 +212,6 @@ dependencies:
198
212
  - - ">="
199
213
  - !ruby/object:Gem::Version
200
214
  version: '0'
201
- - !ruby/object:Gem::Dependency
202
- name: rake
203
- requirement: !ruby/object:Gem::Requirement
204
- requirements:
205
- - - ">="
206
- - !ruby/object:Gem::Version
207
- version: '0'
208
- type: :development
209
- prerelease: false
210
- version_requirements: !ruby/object:Gem::Requirement
211
- requirements:
212
- - - ">="
213
- - !ruby/object:Gem::Version
214
- version: '0'
215
215
  description: |
216
216
  Nesta is a lightweight Content Management System, written in Ruby using
217
217
  the Sinatra web framework. Nesta has the simplicity of a static site
@@ -234,7 +234,7 @@ files:
234
234
  - ".github/workflows/tests.yml"
235
235
  - ".gitignore"
236
236
  - ".gitmodules"
237
- - CHANGES
237
+ - CHANGELOG.md
238
238
  - Gemfile
239
239
  - Gemfile.lock
240
240
  - Guardfile
@@ -248,6 +248,7 @@ files:
248
248
  - lib/nesta.rb
249
249
  - lib/nesta/app.rb
250
250
  - lib/nesta/commands.rb
251
+ - lib/nesta/commands/build.rb
251
252
  - lib/nesta/commands/demo.rb
252
253
  - lib/nesta/commands/demo/content.rb
253
254
  - lib/nesta/commands/edit.rb
@@ -264,10 +265,16 @@ files:
264
265
  - lib/nesta/env.rb
265
266
  - lib/nesta/helpers.rb
266
267
  - lib/nesta/models.rb
268
+ - lib/nesta/models/file_model.rb
269
+ - lib/nesta/models/menu.rb
270
+ - lib/nesta/models/page.rb
267
271
  - lib/nesta/navigation.rb
268
272
  - lib/nesta/overrides.rb
269
273
  - lib/nesta/path.rb
270
274
  - lib/nesta/plugin.rb
275
+ - lib/nesta/static/assets.rb
276
+ - lib/nesta/static/html_file.rb
277
+ - lib/nesta/static/site.rb
271
278
  - lib/nesta/system_command.rb
272
279
  - lib/nesta/version.rb
273
280
  - nesta.gemspec
@@ -298,6 +305,7 @@ files:
298
305
  - test/fixtures/nesta-plugin-test/lib/nesta-plugin-test/version.rb
299
306
  - test/fixtures/nesta-plugin-test/nesta-plugin-test.gemspec
300
307
  - test/integration/atom_feed_test.rb
308
+ - test/integration/commands/build_test.rb
301
309
  - test/integration/commands/demo/content_test.rb
302
310
  - test/integration/commands/edit_test.rb
303
311
  - test/integration/commands/new_test.rb
@@ -315,11 +323,14 @@ files:
315
323
  - test/support/test_configuration.rb
316
324
  - test/test_helper.rb
317
325
  - test/unit/config_test.rb
318
- - test/unit/file_model_test.rb
319
- - test/unit/menu_test.rb
320
- - test/unit/page_test.rb
326
+ - test/unit/models/file_model_test.rb
327
+ - test/unit/models/menu_test.rb
328
+ - test/unit/models/page_test.rb
321
329
  - test/unit/path_test.rb
322
330
  - test/unit/plugin_test.rb
331
+ - test/unit/static/assets_test.rb
332
+ - test/unit/static/html_file_test.rb
333
+ - test/unit/static/site_test.rb
323
334
  - test/unit/system_command_test.rb
324
335
  - views/analytics.haml
325
336
  - views/atom.haml
@@ -340,7 +351,7 @@ files:
340
351
  - views/sidebar.haml
341
352
  - views/sitemap.haml
342
353
  - views/summaries.haml
343
- homepage: http://nestacms.com
354
+ homepage: https://nestacms.com
344
355
  licenses: []
345
356
  metadata: {}
346
357
  post_install_message:
@@ -358,7 +369,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
358
369
  - !ruby/object:Gem::Version
359
370
  version: '0'
360
371
  requirements: []
361
- rubygems_version: 3.3.7
372
+ rubygems_version: 3.4.10
362
373
  signing_key:
363
374
  specification_version: 4
364
375
  summary: Ruby CMS, written in Sinatra
File without changes
File without changes