outro_rails 0.1.8 → 0.1.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7f73ddddb9f91e04692558bfb73bb13241299ca4a914d20b878c1f44132cfc20
-  data.tar.gz: 1138e5cddc70b005f69b833b7ee39d868bbdbac599c29fedca71b3ef42c0edab
+  metadata.gz: faefc647f0e0140abbf35ca6c154c680f4b9288521391aed584eae48cb2657fe
+  data.tar.gz: 6801a967992044421351c38b537c66645a496c2f362034bcc36dd4778e9999c1
 SHA512:
-  metadata.gz: 1b27a2bcd3a3415940a46816d772e504db463d9f90058b01dfdbaf284047e46914da8c9aecfd83afc2383651fba682fb642a81979b044f009bbf89845504e32f
-  data.tar.gz: 72b5c7576c366c11e80963fdfaac49602729746e02c562158921545d1be426e61805d48dc5bfa9d142f2c81197b3ac318f5392c8d53a8ea2a608ecb3272461fe
+  metadata.gz: 6ad7f179486fce333d763331c5a6b8bb2123aba871554255a93da7ffacd667cc8783fdec510121859028ca298bccdd0059a9b61a33c7e3e0a09eff9d46e2fc08
+  data.tar.gz: 75ab968c2ecdfcb471e26bbdbead2a2ca59180576106abecc8d0545e2c0d16432474683c68e31f1f2473ce7e6ab8a7434d776573c6b96ff7fb70ffe2d2ed5c30

data/app/views/outro_rails/instruments/_guitar_figure.html.erb

@@ -36,12 +36,14 @@
   highlight_frets = guitar_positions(
     Array(local_assigns.fetch(:highlight_frets, [])).select(&complete)
   )
-  highlight_color = local_assigns.fetch(:highlight_color, "#2f6bed")
+  highlight_color = local_assigns.fetch(:highlight_color,
+                                        "var(--outro-accent, #2f6bed)")
   root_frets      = guitar_positions(
     Array(local_assigns.fetch(:root_frets, [])).select(&complete)
   )
   highlight_frets |= root_frets
-  root_color      = local_assigns.fetch(:root_color, "#d1495b")
+  root_color      = local_assigns.fetch(:root_color,
+                                        "var(--outro-root, #d1495b)")
   prefer          = local_assigns.fetch(:prefer, "sharps").to_sym
 
   open_midis   = guitar_open_midis(tuning)   # { 1 => 64, ..., 6 => 40 }
@@ -130,7 +132,7 @@
     <% next unless fret.positive? && fret >= row_start %>
     <% root = roots.include?([string, fret]) %>
     <circle cx="<%= col_x.call(string) %>" cy="<%= row_y.call(fret) %>"
-            r="4.4" fill="<%= root ? root_color : highlight_color %>" />
+            r="4.4" style="fill: <%= root ? root_color : highlight_color %>" />
   <% end %>
 
   <%# sounded note names under the box %>

data/app/views/outro_rails/instruments/_guitar_midi.html.erb

@@ -10,12 +10,14 @@
                       1 (highest pitch) to 6 (lowest). Accepts [string, fret]
                       pairs or "string:fret" strings, e.g.
                       [[5, 3], [4, 2], [3, 0], [2, 1], [1, 0]]  (open C major)
-    highlight_color:  any CSS color for the dots (default blue)
+    highlight_color:  any CSS color for the dots. Omit to inherit
+                      --outro-accent from the host app (see note below).
     root_frets:       subset of positions to mark as roots with a distinct
                       color, same formats as highlight_frets (default []).
                       Root positions should also be included in
                       highlight_frets so playback covers them.
-    root_color:       any CSS color for root dots (default red)
+    root_color:       any CSS color for root dots. Omit to inherit
+                      --outro-root from the host app.
 
   When highlight_frets is present, "Play Chord" strums all marked notes
   (lowest first, slightly staggered like a downstroke) and "Play Notes"
@@ -29,11 +31,18 @@
   default_tuning  = OutroRails::InstrumentsHelper::GUITAR_STANDARD_TUNING
   tuning          = local_assigns.fetch(:tuning, default_tuning)
   highlight_frets = guitar_positions(local_assigns.fetch(:highlight_frets, []))
-  highlight_color = local_assigns.fetch(:highlight_color, "#2f6bed")
   root_frets      = guitar_positions(local_assigns.fetch(:root_frets, []))
-  root_color      = local_assigns.fetch(:root_color, "#d1495b")
   prefer          = local_assigns.fetch(:prefer, 'sharps')
 
+  # Only emit inline custom properties for colors the caller actually
+  # passed; the stylesheet owns the defaults.
+  highlight_color = local_assigns[:highlight_color].presence
+  root_color      = local_assigns[:root_color].presence
+  color_vars      = [
+    ("--outro-guitar-highlight: #{highlight_color};" if highlight_color),
+    ("--outro-guitar-root: #{root_color};"           if root_color)
+  ].compact.join(" ").presence
+
   start_fret, end_fret = end_fret, start_fret if start_fret > end_fret
   guitar     = OutroRails::Instruments::Guitar
   fret_range = guitar::MIN_FRET..guitar::MAX_FRET
@@ -60,8 +69,7 @@
 
 <div class="outro-guitar"
      data-outro-guitar
-     style="--outro-guitar-highlight: <%= highlight_color %>;
-            --outro-guitar-root: <%= root_color %>;">
+     <%= tag.attributes(style: color_vars) %>>
   <div>
     <div class="outro-guitar__board"
          role="group"

data/app/views/outro_rails/instruments/_piano_figure.html.erb

@@ -18,9 +18,11 @@
   start_note      = local_assigns.fetch(:start_note, nil).presence || "C3"
   end_note        = local_assigns.fetch(:end_note, nil).presence || "C5"
   highlight_keys  = Array(local_assigns.fetch(:highlight_keys, []))
-  highlight_color = local_assigns.fetch(:highlight_color, "#2f6bed")
+  highlight_color = local_assigns.fetch(:highlight_color,
+                                        "var(--outro-accent, #2f6bed)")
   root_keys       = Array(local_assigns.fetch(:root_keys, []))
-  root_color      = local_assigns.fetch(:root_color, "#d1495b")
+  root_color      = local_assigns.fetch(:root_color,
+                                        "var(--outro-root, #d1495b)")
   prefer          = local_assigns.fetch(:prefer, "sharps").to_sym
 
   keys              = piano_keys_between(start_note, end_note, prefer: prefer)
@@ -29,6 +31,8 @@
 
   white_w, white_h = 14, 46      # viewBox units
   black_w, black_h = 8.5, 28
+  stroke_w = 0.75
+  pad      = stroke_w / 2.0
 
   whites = []
   blacks = []
@@ -44,8 +48,6 @@
     end
   end
 
-  width = [white_index, 1].max * white_w
-
   fill_for = lambda do |key|
     if root_midis.include?(key[:midi]) then root_color
     elsif highlighted_midis.include?(key[:midi]) then highlight_color
@@ -60,23 +62,28 @@
     else
       "Piano keyboard from #{start_note} to #{end_note}"
     end
+
+  width    = [white_index, 1].max * white_w
+  vb_w     = width + (pad * 2)
+  vb_h     = white_h + (pad * 2)
 %>
 
 <svg class="outro-figure__svg outro-figure__svg--piano"
-     viewBox="0 0 <%= width %> <%= white_h %>"
-     width="<%= (width * 0.9).round %>"
+     viewBox="<%= -pad %> <%= -pad %> <%= vb_w %> <%= vb_h %>"
+     width="<%= (vb_w * 0.9).round %>"
+     height="<%= (vb_h * 0.9).round %>"
      role="img"
      aria-label="<%= label %>">
   <% whites.each do |key| %>
     <rect x="<%= key[:x] %>" y="0"
           width="<%= white_w %>" height="<%= white_h %>"
-          rx="1.5" fill="<%= fill_for.call(key) %>"
-          stroke="#444444" stroke-width="0.75" />
+          rx="1.5" style="fill: <%= fill_for.call(key) %>"
+          stroke="#444444" stroke-width="<%= stroke_w %>" />
   <% end %>
   <% blacks.each do |key| %>
     <rect x="<%= key[:x] %>" y="0"
           width="<%= black_w %>" height="<%= black_h %>"
-          rx="1.5" fill="<%= fill_for.call(key) %>"
-          stroke="#111111" stroke-width="0.75" />
+          rx="1.5" style="fill: <%= fill_for.call(key) %>"
+          stroke="#111111" stroke-width="<%= stroke_w %>" />
   <% end %>
 </svg>

data/app/views/outro_rails/instruments/_piano_midi.html.erb

@@ -6,11 +6,13 @@
     end_note:        last key,  e.g. "C5"  (default "C5")
     highlight_keys:  array of note names to highlight,
                      e.g. %w[C4 E4 G4] (default [])
-    highlight_color: any CSS color for highlighted keys (default blue)
+    highlight_color: any CSS color for highlighted keys. Omit to inherit
+                     --outro-accent from the host app (see note below).
     root_keys:       subset of keys to mark as roots with a distinct color,
                      e.g. %w[C4 C5] (default []). Root keys should also be
                      included in highlight_keys so playback covers them.
-    root_color:      any CSS color for root keys (default red)
+    root_color:      any CSS color for root keys. Omit to inherit
+                     --outro-root from the host app.
 
   When highlight_keys is present, "Play Chord" plays all highlighted notes
   at once and "Play Notes" plays them one at a time (low to high).
@@ -21,11 +23,18 @@
   start_note      = local_assigns.fetch(:start_note, "C3")
   end_note        = local_assigns.fetch(:end_note, "C5")
   highlight_keys  = Array(local_assigns.fetch(:highlight_keys, []))
-  highlight_color = local_assigns.fetch(:highlight_color, "#2f6bed")
   root_keys       = Array(local_assigns.fetch(:root_keys, []))
-  root_color      = local_assigns.fetch(:root_color, "#d1495b")
   prefer          = local_assigns.fetch(:prefer, 'sharps').to_sym
 
+  # Only emit inline custom properties for colors the caller actually
+  # passed; the stylesheet owns the defaults.
+  highlight_color = local_assigns[:highlight_color].presence
+  root_color      = local_assigns[:root_color].presence
+  color_vars      = [
+    ("--outro-piano-highlight: #{highlight_color};" if highlight_color),
+    ("--outro-piano-root: #{root_color};"           if root_color)
+  ].compact.join(" ").presence
+
   keys              = piano_keys_between(start_note, end_note, prefer: prefer)
   highlighted_midis = highlight_keys.map { |n| note_to_midi(n) }
   root_midis        = root_keys.map { |n| note_to_midi(n) }
@@ -35,8 +44,7 @@
 
 <div class="outro-piano"
      data-outro-piano
-     style="--outro-piano-highlight: <%= highlight_color %>;
-            --outro-piano-root: <%= root_color %>;">
+     <%= tag.attributes(style: color_vars) %>>
   <div class="outro-piano__keys" role="group"
        aria-label="<%= keys_label %>">
     <% keys.each do |key| %>

data/lib/outro_rails/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module OutroRails
-  VERSION = "0.1.8"
+  VERSION = "0.1.10"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: outro_rails
 version: !ruby/object:Gem::Version
-  version: 0.1.8
+  version: 0.1.10
 platform: ruby
 authors:
 - endtoendpaper