bible270 1.13.2 → 1.13.5

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 CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA256:
3
- metadata.gz: e3ad19cb0135805b5e2d26483aec5dd677963bbb68b0c30c7e5a55a5f5c524db
4
- data.tar.gz: 2f38d9e1c8b23a2e942b8bbcb88e1465b041ba968dcbebff1e3be51c7e3c152f
3
+ metadata.gz: c0604bfd12394b7c2e425dbb6c6ebda57913aede6f10dfe7d8b80c2da58df8bb
4
+ data.tar.gz: 5bbd0cab477f7fa0a34d39050768090f4825806c64d6aa64bdea789d46564d23
5
5
  SHA512:
6
- metadata.gz: fe4d26bd641fe4d85b65c8dfa8a7f4b31ee694c5103803e8d41dc278ab7b877268fa30aa19101e69384d4569108fb988f49d243646e4011d5e22644be96b15cd
7
- data.tar.gz: b2e0251c6c7a945a330be54b9d3a5438948dfc34d0a5cab5380b815826b0b51eb14479390e9ad9e39928a4db3938e5f336282c6bdbbe1b67ce1cd7c55a879f16
6
+ metadata.gz: 8f53626e011dde1c8672a13ee4e2d78cec30668e30d5a8d26fe5b31fa81ea50130f980c78b211f9fe0184477911a2b54a6b926dfd1a10852983449f1873ee94a
7
+ data.tar.gz: 786060c5e720a1f797768416c8f22b0416fd0d5c5f8603cc2dbe2dbf7f011e3cb191521d578bcab436730f370e6b337f8dcfec28a9e2159f0737c874fe114308
data/CHANGELOG.md CHANGED
@@ -4,11 +4,34 @@ All notable changes to bible270. Format follows [Keep a Changelog](https://keepa
4
4
 
5
5
  ## [Unreleased]
6
6
 
7
+ ### Changed
8
+
9
+ - keep Psalm 73 whole on one day and divide Psalm 69 after verse 19 (1–19, then 20–36)
10
+ - close the plan with a second whole reading of Psalm 1 on day 270, retaining its day-one reading and keeping Proverbs 11 in three readings; Proverbs 31 now finishes on day 269
11
+ - update the default Psalms/Proverbs assignments on days 112–113 and 117–270 compared with 1.13.3; existing day-based check-offs are not remapped
12
+
13
+ **[Full Changelog](https://github.com/avonderluft/bible270/compare/v1.13.3...main)**
14
+
15
+ ## [1.13.3] - 2026-10-30
16
+
7
17
  ### Fixed
8
18
 
9
- - center the Hebrew and Greek background text in the available left and right margins on wide displays, while preserving narrow-screen positioning and phone visibility rules
19
+ - keep Moonlight's Hebrew and Greek word reflections aligned with their responsive text columns without moving the moon or shoreline
20
+ - share horizontal positioning between words and reflections while preserving ripple effects, narrow-screen alignment, and hidden reflections on phones
21
+
22
+ **[Full Changelog](https://github.com/avonderluft/bible270/compare/v1.13.2...v1.13.3)**
23
+
24
+ ## [1.13.2] - 2026-10-30
25
+
26
+ ### Fixed
27
+
28
+ - center the Hebrew and Greek background text in the available left and right margins on displays 1200px and wider, using the content wrapper's width while preserving narrow-screen positioning and phone visibility rules
29
+
30
+ ### Changed
31
+
32
+ - update test dependencies to RuboCop 1.91.x and SimpleCov 1.2.x
10
33
 
11
- **[Full Changelog](https://github.com/avonderluft/bible270/compare/v1.13.1...main)**
34
+ **[Full Changelog](https://github.com/avonderluft/bible270/compare/v1.13.1...v1.13.2)**
12
35
 
13
36
  ## [1.13.1] - 2026-10-29
14
37
 
@@ -978,7 +1001,9 @@ This is the initial public release.
978
1001
 
979
1002
  * Email sign-in requires working Action Mailer delivery in the host application. Set `config.mailer_from`; delivery is inline by default, or set `email_sign_in_deliver_later` when a queue backend is available.
980
1003
 
981
- [Unreleased]: https://github.com/avonderluft/bible270/compare/v1.13.1...main
1004
+ [Unreleased]: https://github.com/avonderluft/bible270/compare/v1.13.3...main
1005
+ [1.13.3]: https://github.com/avonderluft/bible270/compare/v1.13.2...v1.13.3
1006
+ [1.13.2]: https://github.com/avonderluft/bible270/compare/v1.13.1...v1.13.2
982
1007
  [1.13.1]: https://github.com/avonderluft/bible270/compare/v1.13.0...v1.13.1
983
1008
  [1.13.0]: https://github.com/avonderluft/bible270/compare/v1.12.0...v1.13.0
984
1009
  [1.12.0]: https://github.com/avonderluft/bible270/compare/v1.11.1...v1.12.0
data/README.md CHANGED
@@ -13,9 +13,9 @@ Three readings a day, sized by **verse count** so each day takes roughly the sam
13
13
 
14
14
  - **Old Testament** — once through, with Psalms and Proverbs in their own track.
15
15
  - **New Testament** — once through, a reading every day. 260 chapters over 270 days, long chapters are divided to even out the daily reading
16
- - **Psalms & Proverbs** — once each, interleaved in one track. 181 chapters have to cover 270 days, so some are divided, shared between the two books by verse load. **A psalm of 25 verses or fewer is never divided**, keeping 131 of the 150 whole; longer psalms and Proverbs chapters break at their turns of thought (see `CHAPTER_BREAKS`). **Psalm 119 is 11 sections of 16 verses** — two of its eight-verse acrostic stanzas each. Proverbs lands on 89 days, near its proportional share. **A divided chapter is always read on consecutive days**, so nothing is inserted between the parts of a split psalm.
16
+ - **Psalms & Proverbs** — once each, interleaved over the first 269 days, then **Psalm 1 is read again on day 270**, returning to the opening day's reading. The 181 chapters are divided as needed, shared between the two books by verse load. **A psalm of 25 verses or fewer is never divided**, keeping 131 of the 150 whole; longer psalms and Proverbs chapters break at their turns of thought (see `CHAPTER_BREAKS`). **Psalm 119 is 11 sections of 16 verses** — two of its eight-verse acrostic stanzas each. Proverbs lands on 91 days, near its proportional share. **A divided chapter is always read on consecutive days**, so nothing is inserted between the parts of a split psalm.
17
17
 
18
- Genesis → Malachi and Revelation 22 both land on day 270, as does the second part of Proverbs 31. Every day carries all three tracks. A typical day is ~119 verses (range 76–175).
18
+ Genesis → Malachi and Revelation 22 both land on day 270, alongside the second reading of Psalm 1. Proverbs 31 finishes on day 269. Every day carries all three tracks. A typical day is ~115 verses (range 76–166).
19
19
 
20
20
  The schedule is pure deterministic Ruby (`Bible270::Plan`) — none of it is stored. Portions come from per-chapter verse counts in `Bible270::Versification`. The DB only holds readers, check-offs, comments, and sign-in tokens.
21
21
 
@@ -406,26 +406,21 @@ Psalm 35: []
406
406
  Psalm 78: [20, 39, 55]
407
407
  ```
408
408
 
409
- ## Theme
409
+ ## Themes
410
410
 
411
- Readers can choose **Papyrus (Light)**, **Meadow (Light)**, **Ocean (Light)**, **Cedar (Dark)**,
412
- **Forest (Dark)**, **Moonlight (Dark)**, or **System** under **Profile → Theme**. Signed-in readers can also use
413
- the compact selector beside the app title on every page; it shows the short theme names without Light/Dark suffixes.
414
- Selecting a theme saves and applies it immediately without submitting other profile edits. The header and Profile
415
- selectors stay synchronized, and a failed save restores the previous selection and displays an error.
416
- Admin theme selections also save automatically;
417
- changing another reader's theme does not change the admin's own theme. With JavaScript disabled, use Save.
418
- The preference is stored
419
- with their account and applies throughout Bible270 on every device. System is the default for existing
420
- and new readers, follows the device's current appearance using Papyrus for light or Cedar for dark,
421
- and responds to changes without reloading. Signed-out visitors also use System.
422
- The completion dove retains its bright colors in every theme.
423
-
424
- Existing preferences and persisted values are unchanged under the new names. Meadow, Ocean, Cedar, Forest, and Moonlight
425
- require no additional migration once display preferences are installed.
411
+ Readers can choose Light themes **Papyrus**, **Meadow**, **Ocean**, **Cedar**,
412
+ **Forest**, **Moonlight**, or **System** under **Profile → Theme**. Signed-in readers can also use the compact selector beside the app title on every page, which immediately applies and saves the new theme.
413
+ Admin theme selections also save automatically; with JavaScript disabled, use Save. System is the default for unauthenticated and new readers, fand ollows the device's current appearance using Papyrus for light or Cedar for dark.
426
414
 
427
415
  Upgrading hosts must install and run migration `20260101000023`:
428
416
 
417
+ ![Papyrus](images/papyrus.png "Papyrus")
418
+ ![Meadow](images/meadow.png "Meadow")
419
+ ![Ocean](images/ocean.png "Ocean")
420
+ ![Cedar](images/cedar.png "Cedar")
421
+ ![Forest](images/forest.png "Forest")
422
+ ![Moonlight](images/moonlight.png "Moonlight")
423
+
429
424
  ```bash
430
425
  bin/rails bible270:install:migrations
431
426
  bin/rails db:migrate
@@ -126,7 +126,7 @@
126
126
  }
127
127
  }
128
128
  /* A fixed SVG avoids mobile background-attachment quirks and stays behind all content. */
129
- .b270-theme-scenery{display:none;--b270-scene-height:clamp(280px,52vh,560px);position:fixed;inset:auto 0 0;width:100%;height:var(--b270-scene-height);z-index:-1;pointer-events:none}
129
+ .b270-theme-scenery{display:none;--b270-scene-height:clamp(280px,52vh,560px);--b270-scripture-inset:10%;--b270-greek-scene-inset:max(5.625%, var(--b270-scene-height) * 90 / 440);--b270-greek-inset:var(--b270-greek-scene-inset);position:fixed;inset:auto 0 0;width:100%;height:var(--b270-scene-height);z-index:-1;pointer-events:none}
130
130
  .b270{isolation:isolate}
131
131
  .b270 > .b270-theme-scripture{display:block;color:var(--gold)}
132
132
  .b270[data-display-mode="dark_blue"] > .b270-theme-scripture{color:#c6d6e9}
@@ -139,6 +139,7 @@
139
139
  .b270[data-display-mode="dark_green"] > .b270-theme-scenery[data-scenery="dark_green"],
140
140
  .b270[data-display-mode="dark_blue"] > .b270-theme-scenery[data-scenery="dark_blue"],
141
141
  .b270[data-display-mode="dark_blue"] > .b270-theme-scenery[data-scenery="hebrew_water"],
142
+ .b270[data-display-mode="dark_blue"] > .b270-theme-scenery[data-scenery="greek_water"],
142
143
  .b270[data-display-mode="light"] > .b270-theme-scenery[data-scenery="light"],
143
144
  .b270[data-display-mode="system"] > .b270-theme-scenery[data-scenery="light"]{display:block}
144
145
  .b270-theme-scenery[data-scenery="light"],.b270-theme-scripture{font-size:clamp(12px,2.2vw,30px)}
@@ -153,18 +154,20 @@
153
154
  .b270-theme-scenery[data-scenery="sage_sky"]{height:100%}
154
155
  .b270-theme-scenery[data-scenery="mist_sky"]{height:100%}
155
156
  .b270-ocean-gulls{transform-box:view-box;transform:translate(calc(100% - 115px),calc(100% - 35px))}
156
- /* Match the moon's 90-unit right inset in its 1600 × 440, right-aligned slice viewport. */
157
- .b270-scripture-letters [lang="el"]{transform-box:view-box;transform:translateX(calc(100% - max(5.625%, var(--b270-scene-height) * 90 / 440)))}
157
+ /* Words and reflections share their viewport-relative column positions. */
158
+ .b270-scripture-letters [lang="he"]{transform-box:view-box;transform:translateX(calc(var(--b270-scripture-inset) - 10%))}
159
+ .b270-scripture-letters [lang="el"]{transform-box:view-box;transform:translateX(calc(100% - var(--b270-greek-inset)))}
158
160
  .b270-scripture-letters [lang="el"] tspan{font-size:.9em}
159
161
  /* Once the side margins can fit the words, center each column between the
160
162
  content wrapper and viewport edge. Hebrew already has an SVG x of 10%. */
161
163
  @media (min-width:1200px){
162
- .b270-theme-scripture{--b270-scripture-inset:calc((100% - var(--b270-content-width)) / 4)}
163
- .b270-scripture-letters [lang="he"]{transform-box:view-box;transform:translateX(calc(var(--b270-scripture-inset) - 10%))}
164
- .b270-scripture-letters [lang="el"]{transform:translateX(calc(100% - var(--b270-scripture-inset)))}
164
+ .b270-theme-scenery{--b270-scripture-inset:calc((100% - var(--b270-content-width)) / 4);--b270-greek-inset:var(--b270-scripture-inset)}
165
165
  }
166
166
  /* Scale reflected Hebrew with the lake artwork, allowing for its smaller letterforms. */
167
- .b270-hebrew-water{font-size:max(2vw, var(--b270-scene-height) * 32 / 440);transform-box:view-box;transform:translate(10%,calc(100% - max(12.5vw, var(--b270-scene-height) * 200 / 440)))}
167
+ .b270-hebrew-water{font-size:max(2vw, var(--b270-scene-height) * 32 / 440);transform-box:view-box;transform:translate(var(--b270-scripture-inset),calc(100% - max(12.5vw, var(--b270-scene-height) * 200 / 440)))}
168
+ /* Move only the Greek reflection layer, compensating for its original lake
169
+ coordinates after SVG scaling; the moon and shoreline remain stationary. */
170
+ .b270-theme-scenery[data-scenery="greek_water"]{transform-box:border-box;transform:translateX(calc(var(--b270-greek-scene-inset) - var(--b270-greek-inset)))}
168
171
  @media (prefers-color-scheme:dark){
169
172
  .b270[data-display-mode="system"] > .b270-theme-scenery[data-scenery="light"]{display:none}
170
173
  .b270[data-display-mode="system"] > .b270-theme-scenery[data-scenery="dark"]{display:block}
@@ -174,7 +177,8 @@
174
177
  @media (max-width:600px){
175
178
  .b270-theme-scenery{--b270-scene-height:clamp(180px,30vh,260px)}
176
179
  .b270[data-display-mode] > .b270-theme-scripture,
177
- .b270[data-display-mode] > .b270-theme-scenery[data-scenery="hebrew_water"]{display:none}
180
+ .b270[data-display-mode] > .b270-theme-scenery[data-scenery="hebrew_water"],
181
+ .b270[data-display-mode] > .b270-theme-scenery[data-scenery="greek_water"]{display:none}
178
182
  .b270-mobile-scenery{display:block}
179
183
  .b270-papyrus-grid{opacity:.2}
180
184
  .b270-papyrus-edges{opacity:.55}
@@ -419,14 +419,22 @@
419
419
  <path d="M0 240H1600" stroke="#8fa7c3" stroke-width=".7" opacity=".12" />
420
420
  <g clip-path="url(#b270-lake-clip)">
421
421
  <ellipse cx="1510" cy="305" rx="145" ry="125" fill="url(#b270-moon-halo)" opacity=".6" />
422
- <rect id="b270-lake-reflection" fill="url(#b270-moon-reflection)"
423
- x="0" y="240" width="1600" height="200" mask="url(#b270-greek-reflection)" />
422
+
424
423
  <%# Phones use a quiet pool of moonlight instead of the reflected scripture. %>
425
424
  <ellipse class="b270-mobile-scenery" cx="1510" cy="332" rx="65" ry="92" fill="url(#b270-moon-mobile-glow)" />
426
425
  <%# The rippled letters supply the desktop water texture without straight lines crossing the reflections. %>
427
426
  </g>
428
427
  </svg>
429
428
 
429
+ <%# A separate layer lets the reflected Greek follow its column without moving the lake. %>
430
+ <svg class="b270-theme-scenery" data-scenery="greek_water" viewBox="0 0 1600 440" preserveAspectRatio="xMaxYMax slice"
431
+ xmlns="http://www.w3.org/2000/svg" aria-hidden="true" focusable="false">
432
+ <g clip-path="url(#b270-lake-clip)">
433
+ <rect id="b270-lake-reflection" fill="url(#b270-moon-reflection)"
434
+ x="0" y="240" width="1600" height="200" mask="url(#b270-greek-reflection)" />
435
+ </g>
436
+ </svg>
437
+
430
438
  <svg class="b270-theme-scenery" data-scenery="hebrew_water"
431
439
  xmlns="http://www.w3.org/2000/svg" aria-hidden="true" focusable="false">
432
440
  <%# A viewport-based layer keeps the faint reflection beneath the Hebrew column on narrow screens. %>
data/lib/bible270/plan.rb CHANGED
@@ -15,8 +15,8 @@ module Bible270
15
15
  # grouped so each day is ~equal in verses (~73/day)
16
16
  # * New Testament – read once, one reading every day; the 10 longest chapters
17
17
  # (Luke 1 and friends) are divided in two so 260 chapters fill 270 days
18
- # * Psalms/Proverbs – Psalms and Proverbs once, interleaved in one track.
19
- # Longer psalms are divided so the two fill exactly 270 days;
18
+ # * Psalms/Proverbs – Psalms and Proverbs once, interleaved over 269 days,
19
+ # then Psalm 1 again on the final day.
20
20
  # Psalm 119 is pinned to 11 sections of 16 verses.
21
21
  #
22
22
  # Genesis → Malachi, Revelation 22, Psalm 150 and the second Proverbs 31 all land
@@ -368,9 +368,9 @@ module Bible270
368
368
 
369
369
  # ---- Psalms & Proverbs -------------------------------------------------
370
370
  #
371
- # Psalms once and Proverbs once, interleaved in one daily track.
371
+ # Psalms once and Proverbs once, interleaved, then Psalm 1 again on day 270.
372
372
  #
373
- # 150 + 31 = 181 chapters have to cover 270 days, so 89 of them are divided.
373
+ # 150 + 31 = 181 chapters cover the first 269 days using 88 extra divisions.
374
374
  # Two rules shape which:
375
375
  #
376
376
  # * A psalm of PSALM_WHOLE_MAX_VERSES verses or fewer is never divided.
@@ -406,7 +406,7 @@ module Bible270
406
406
  ['Psalm', 44] => [], ['Psalm', 49] => [], ['Psalm', 50] => [], ['Psalm', 51] => [], # Stay whole
407
407
  ['Psalm', 55] => [], ['Psalm', 59] => [], ['Psalm', 65] => [], ['Psalm', 66] => [], # Stay whole
408
408
  ['Psalm', 68] => [18], # => Psalm 68:1–18, 68:19–35
409
- ['Psalm', 69] => [18], # => Psalm 69:1–18, 69:19–36
409
+ ['Psalm', 69] => [19], # => Psalm 69:1–19, 69:20–36
410
410
  ['Psalm', 78] => [20, 39, 55], # => 78:1–20, 21–39, 40–55, 56–72
411
411
  ['Psalm', 37] => [20], # => Psalm 37:1–20, 37:21–40
412
412
  ['Matthew', 26] => [35], # => Matthew 26:1–35, 26:36–75
@@ -421,7 +421,7 @@ module Bible270
421
421
 
422
422
  # -- Psalms over 25 verses, divided at their turns of thought ----------
423
423
  ['Psalm', 35] => [], # kept whole
424
- ['Psalm', 73] => [14], # the envious lament | the sanctuary
424
+ ['Psalm', 73] => [], # kept whole
425
425
  ['Psalm', 89] => [18, 37], # hymn | covenant oracle | lament
426
426
  ['Psalm', 102] => [17], # affliction | Zion restored
427
427
  ['Psalm', 104] => [18], # creation ordered | creation sustained
@@ -472,14 +472,13 @@ module Bible270
472
472
 
473
473
  def pp_chapters = memo(:pp_chapters) { psalm_chapters + proverbs_chapters }
474
474
 
475
- # Psalms and Proverbs are divided together against a single budget of DAYS
476
- # readings, so the two books balance against each other by verse load rather
477
- # than each being squeezed into a fixed number of days.
475
+ # Reserve the final day for rereading Psalm 1. The first pass through Psalms
476
+ # and Proverbs shares the remaining budget, balanced by verse load.
478
477
  def pp_parts
479
478
  memo(:pp_parts) do
480
479
  chapters = pp_chapters
481
480
  weights = chapters.map { |b, c| verses_for(b, c) }
482
- divide_to_fill(weights, DAYS, pp_pinned_parts(chapters, weights))
481
+ divide_to_fill(weights, DAYS - 1, pp_pinned_parts(chapters, weights))
483
482
  end
484
483
  end
485
484
 
@@ -498,6 +497,7 @@ module Bible270
498
497
  def psalm_parts = memo(:psalm_parts) { pp_parts.first(psalm_chapters.size) }
499
498
  def proverbs_parts = memo(:proverbs_parts) { pp_parts.last(proverbs_chapters.size) }
500
499
 
500
+ # First-pass readings; the closing rereading is appended in pp_readings.
501
501
  def psalm_readings = memo(:psalm_readings) { expand_readings(psalm_chapters, psalm_parts) }
502
502
  def proverbs_readings = memo(:proverbs_readings) { expand_readings(proverbs_chapters, proverbs_parts) }
503
503
 
@@ -528,7 +528,7 @@ module Bible270
528
528
  end
529
529
  end
530
530
  days.concat(proverbs[placed..].to_a.flatten(1)) if placed < proverbs.size
531
- days
531
+ days << ['Psalm', 1]
532
532
  end
533
533
  end
534
534
 
@@ -673,13 +673,13 @@ module Bible270
673
673
  nt_readings: nt_readings.size, # 270 - one every day
674
674
  nt_divided: divided_nt_chapters.size, # 10 long chapters halved
675
675
  psalms: Versification.chapter_count('Psalm'), # 150
676
- psalm_readings: psalm_readings.size, # 208
676
+ psalm_readings: pp_readings.count { |seg| seg[0] == 'Psalm' },
677
677
  proverbs: Versification.chapter_count('Proverbs'), # 31
678
678
  proverbs_readings: proverbs_readings.size,
679
679
  proverbs_divided: divided_proverbs.size,
680
680
  psalms_whole_max_verses: PSALM_WHOLE_MAX_VERSES,
681
681
  pp: flatten(PP).size, # 181 chapters
682
- pp_verses: flatten(PP).sum { |b, c| verses_for(b, c) },
682
+ pp_verses: pp_verse_loads.sum,
683
683
  ot_verses: flatten(OT).sum { |b, c| verses_for(b, c) },
684
684
  nt_verses: flatten(NT).sum { |b, c| verses_for(b, c) },
685
685
  days: DAYS
@@ -1,5 +1,5 @@
1
1
  # frozen_string_literal: true
2
2
 
3
3
  module Bible270
4
- VERSION = '1.13.2'
4
+ VERSION = '1.13.5'
5
5
  end
metadata CHANGED
@@ -1,7 +1,7 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: bible270
3
3
  version: !ruby/object:Gem::Version
4
- version: 1.13.2
4
+ version: 1.13.5
5
5
  platform: ruby
6
6
  authors:
7
7
  - Andrew vonderLuft