Render optgroup for light / dark syntax highlighting

Author: rossta

app/models/settings/syntax_highlight.rb

@@ -7,38 +7,34 @@ def default
     end
 
     def find(name)
-      if available_names.include?(name)
-        new(name: name)
+      attrs = curated_data.find { |attrs| attrs[:name] == name }
+      if attrs.present?
+        new(**attrs)
       else
         raise ActiveRecord::RecordNotFound, "Couldn't find SyntaxHighlight with name '#{name}'"
       end
     end
 
     def curated
-      available_names.map { |name| find(name) }
+      curated_data.map { |attrs| new(**attrs) }
     end
 
-    def available_names
-      @available_names ||= Dir.glob(css_glob_pattern).map { |file| File.basename(file, ".css") }
-    end
-
-    private
-
-    def css_glob_pattern
-      Rails.root.join("app", "assets", "stylesheets", "pygments", "*.css")
+    def curated_data
+      @curated_data ||= YAML.load_file(Rails.root.join("config", "syntax_highlights.yml"))
     end
   end
 
-  attr_accessor :name
+  attr_accessor :name, :mode
 
-  def initialize(name:)
+  def initialize(name:, mode:, **)
     @name = name
+    @mode = mode
   end
 
   def ==(other)
     return false if other.nil? || !other.is_a?(self.class)
 
-    name == other.name
+    name == other.name && mode == other.mode
   end
 
   def path

app/views/settings/syntax_highlights/form.rb

@@ -14,16 +14,17 @@ def view_template
     stylesheet_link_tag @current_highlight.asset_path, data: {syntax_highlight: @current_highlight.name}
 
     div(class: "grid grid-content", data: {controller: "syntax-highlight-preview", syntax_highlight_preview_name_value: @current_highlight.name}) do
-      p {
+      p do
         plain %(Current syntax highlight style:)
+        whitespace
         strong { @current_highlight.name }
-      }
+      end
       form_with(
         model: @current_highlight,
         url: settings_syntax_highlight_path,
         method: :get
       ) do |form|
-        fieldset {
+        fieldset do
           form.label :name, "Choose a syntax highlight style:"
           form.select :name,
             syntax_highlight_options_for_select,
@@ -32,7 +33,7 @@ def view_template
             },
             name: "settings[syntax_highlight]",
             onchange: "this.form.requestSubmit()"
-        }
+        end
       end
 
       h2 { %(Preview) }
@@ -76,6 +77,8 @@ def each(&)
   private
 
   def syntax_highlight_options_for_select
-    @available_highlights.map { |highlight| [highlight.name, highlight.name] }
+    @available_highlights
+      .group_by { |sh| sh.mode }
+      .map { |mode, syntaxes| [mode.titleize, syntaxes.map { |sh| [sh.name.titleize, sh.name] }] }
   end
 end