bullet_train-themes-light 1.3.22 → 1.3.24

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 001a0d44ebf47d4ec75398cf011dafdf7fd85c4e5f4aefc1ad82b5c9082d738b
-  data.tar.gz: f8051ae0dbe0930264f8074d52df5940ca6a0d87e9edd4709d098ba1693f3329
+  metadata.gz: 5928cebefcf72bf371bd19fd488587dcd20cbe6ca21f5f207f3530ab96a142c2
+  data.tar.gz: de69366834b591529df60bc6499c2c3b3fd730684d32df30cdc27748da649688
 SHA512:
-  metadata.gz: f34781fd7662b6753273a430545843083515855cbf2f03aae46f8bc216de9d862d0b481f6b5e7432a2b88b40b4d6499d06f328f3ccdab562442e384e86fe4506
-  data.tar.gz: 3649a581630ff0ee8daf3289d471d6eac1a96b9fddeef4aa5b1c5a2955c7505e985c7d555e9136fbcd09ead021bba6f2a90bd50148a9b33dff63e563ccb4df1b
+  metadata.gz: 4189c039fc15e7f694d4154330164c631217a17df44a6d07b31651119481677d9517bebeaaf1bbfd9aa661068fa53cd006b5e781297e8547803ce1dd7b3bfe11
+  data.tar.gz: 1a07949f68f306ff7a992bbd4de05d619e2df95de63cf2bacbedc4dc8be0e7ea8feeff778b5d715acf8d84d8499f19f5211e84ef394a911be2edbdc0dde4143f

data/app/views/showcase/engine/_head.html.erb

@@ -2,9 +2,64 @@
 <%= javascript_include_tag "application" %>
 
 <script>
-  const color = "<%= BulletTrain::Themes::Light.color %>"
-  const secondaryColor = "<%= BulletTrain::Themes::Light.secondary_color %>"
+  const BulletTrain = {}
 
-  if (color) document.documentElement.classList.add(`theme-${color}`)
-  if (secondaryColor) document.documentElement.classList.add(`theme-secondary-${secondaryColor}`)
+  class ___theme {
+    start() {
+      this.color = "<%= BulletTrain::Themes::Light.color %>"
+      this.secondaryColor = "<%= BulletTrain::Themes::Light.secondary_color %>"
+    }
+
+    set color(value) {
+      this.removeMatching(/theme-\w+$/)
+      if (value) this.classList.add(`theme-${value}`)
+    }
+
+    set secondaryColor(value) {
+      this.removeMatching(/theme-secondary-\w+$/)
+      if (value) this.classList.add(`theme-secondary-${value}`)
+    }
+
+    removeMatching(matching) {
+      const values = Array.from(this.classList.values()).filter((key) => matching.test(key))
+      if (values.length) this.classList.remove(...values)
+    }
+
+    get classList() {
+      return document.documentElement.classList
+    }
+  }
+
+  BulletTrain.theme = new ___theme()
+  BulletTrain.theme.start()
+
+  function placeThemeSelector() {
+    const node = document.getElementById("bullet_train_theme_selects").content.cloneNode(true)
+    document.querySelector("main").appendChild(node)
+    const selectorNode = document.getElementById("bt-theme-selector")
+    document.querySelector("main").style.paddingBottom = selectorNode.offsetHeight + "px"
+  }
+
+  document.addEventListener("DOMContentLoaded", placeThemeSelector);
+  document.addEventListener("turbo:load", placeThemeSelector);
 </script>
+
+<template id="bullet_train_theme_selects">
+  <section class="border-t w-full p-4 flex justify-end left-0 bottom-0 fixed bg-white dark:sc-bg-neutral-900" id="bt-theme-selector">
+    <h3 class="pt-2">Bullet Train Light theme options</h3>
+
+    <div>
+      <label for="bullet_train_color" class="pl-4">Color</label>
+      <select id="bullet_train_color" class="rounded-lg text-xs" style="background-color: inherit !important;" onchange="BulletTrain.theme.color = this.value">
+        <option value=""></option>
+        <%= options_for_select BulletTrain::Themes::Light.colors.index_by(&:humanize), BulletTrain::Themes::Light.color %>
+      </select>
+
+      <label for="bullet_train_secondary_color" class="pl-4">Secondary Color</label>
+      <select id="bullet_train_secondary_color" class="rounded-lg text-xs" style="background-color: inherit !important;" onchange="BulletTrain.theme.secondaryColor = this.value">
+        <option value=""></option>
+        <%= options_for_select BulletTrain::Themes::Light.colors.index_by(&:humanize), BulletTrain::Themes::Light.secondary_color %>
+      </select>
+    </div>
+  </section>
+</template>

data/app/views/themes/light/fields/_field.html.erb

@@ -15,9 +15,18 @@ options ||= {}
 options[:id] ||= form.field_id(method)
 # options[:disabled] ||= !field_editable?(form.object, method) if user_signed_in?
 options[:placeholder] ||= labels.placeholder if labels.placeholder
+
 other_options ||= {}
 other_options[:help] = [other_options[:help], labels.help].compact.join(" ")
 
+if !other_options.key?(:required)
+  other_options[:required] = options.fetch(:required) { presence_validated?(form.object, method) }
+end
+
+if other_options[:required]
+  options[:"aria-required"] = true
+end
+
 errors = [method, method.to_s.gsub(/_id$/, '').to_sym].uniq.map { |attribute| form.object.errors.full_messages_for(attribute) }.flatten
 has_errors = errors.any? || partial.error? || other_options[:error].present?
 
@@ -31,7 +40,7 @@ end
 
 %>
 
-<div class="<%= 'required' if presence_validated?(form.object, method) %>">
+<div class="<%= 'required' if other_options[:required] %>">
 
   <% # the label. %>
   <% unless other_options[:hide_label] == true %>

data/lib/bullet_train/themes/light/version.rb

@@ -1,7 +1,7 @@
 module BulletTrain
   module Themes
     module Light
-      VERSION = "1.3.22"
+      VERSION = "1.3.24"
     end
   end
 end

data/lib/bullet_train/themes/light.rb

@@ -7,6 +7,32 @@ require "bullet_train/themes/light/custom_theme_file_replacer"
 module BulletTrain
   module Themes
     module Light
+      # Matches the color list in app/assets/stylesheets/light/tailwind/colors.css
+      mattr_accessor :colors, default: %w[
+        blue
+        slate
+        gray
+        zinc
+        neutral
+        stone
+        red
+        orange
+        amber
+        yellow
+        lime
+        green
+        emerald
+        teal
+        cyan
+        sky
+        indigo
+        violet
+        purple
+        fuchsia
+        pink
+        rose
+      ]
+
       # TODO Not sure this is the right place for this in the long-term.
       mattr_accessor :color, default: :blue
       mattr_accessor :secondary_color, default: nil

data/lib/tasks/application.rb

@@ -1,3 +1,5 @@
+require "masamune"
+
 module BulletTrain
   module Themes
     module Application
@@ -148,33 +150,16 @@ module BulletTrain
       end
 
       def self.install_theme(theme_name)
-        # Grabs the current theme from
-        # def current_theme
-        #   :theme_name
-        # end
-        current_theme_regexp = /(^    :)(.*)/
-        current_theme = nil
-
-        new_lines = []
-        [
-          "./app/helpers/application_helper.rb",
-          "./Procfile.dev",
-          "./package.json"
-        ].each do |file|
-          File.open(file, "r") do |f|
-            new_lines = f.readlines
-            new_lines = new_lines.map do |line|
-              # Make sure we get the current theme before trying to replace it in any of the files.
-              # We grab it from the first file in the array above.
-              current_theme = line.scan(current_theme_regexp).flatten.last if line.match?(current_theme_regexp)
-
-              line.gsub!(/#{current_theme}/, theme_name) unless current_theme.nil?
-              line
-            end
-          end
-
-          File.open(file, "w") do |f|
-            f.puts new_lines.join
+        helper = Pathname.new("./app/helpers/application_helper.rb")
+        msmn = Masamune::AbstractSyntaxTree.new(helper.readlines.join)
+        current_theme_def = msmn.method_definitions(name: "current_theme").pop
+        current_theme = msmn.symbols.find { |node| node[:line_number] > current_theme_def[:line_number] }[:token]
+        helper.write msmn.replace(type: :symbol, old_token: current_theme, new_token: theme_name)
+
+        [Pathname.new("./Procfile.dev"), Pathname.new("./package.json")].each do |file|
+          changed = file.read.gsub! current_theme, theme_name
+          if changed
+            file.write changed
           end
         end
       end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bullet_train-themes-light
 version: !ruby/object:Gem::Version
-  version: 1.3.22
+  version: 1.3.24
 platform: ruby
 authors:
 - Andrew Culver
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-09-01 00:00:00.000000000 Z
+date: 2023-09-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: standard