bullet_train 1.6.24 → 1.6.26

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 708a366b5a3bdffa47379d99b19a3694541bf26c2040eacb762a4a67762e4bb0
-  data.tar.gz: 0d615787ce778281522e6d7c13c1ce56c83938df41b8fb6472d78dee3f6304f3
+  metadata.gz: d3e2fd3aba6cf448d187f5e547da2a4805c2f4fca950c7404d4860fa0b3d9d2c
+  data.tar.gz: 5d36424ce555adb7799cddf0ec7dcc8f3c518d1816259011eb0ad3ec050da9fa
 SHA512:
-  metadata.gz: 20abc5aa4f3ff18243f7a182e8cda7dd732660eccf3c2e927b28bb9c1b8a4f757d8159b93a73fa0696fa5d9d691e0d2089b4c5274d96edb464357cdc4f6c45de
-  data.tar.gz: 0ecb17393d0c22c6b1700567571e12b08ed5675dc307267c8e3fe658d51b78fd30783675b1bfb3a1e6fb6b5040a17ed883c27d62e95532cbcb7ce3d31e58b66a
+  metadata.gz: 125b3a8f12808dbe1bef928909814ff82404d2a74e163e9995a305d1eb09e47efaaf5d08b26b26008daca30cad879bb0dc02f7eff2e5f3de7521703423097b8b
+  data.tar.gz: 63b2848fb196682e54184ad9fe7ed5955e0f0f0cc99044cdb7ff6b9bf2e2832cd35b6386e26e5a66213ba1ee632a1da714e67d097f4e7e7eddcaea57451549d1

data/app/helpers/account/markdown_helper.rb

@@ -1,13 +1,9 @@
 module Account::MarkdownHelper
   def markdown(string)
-    if defined?(Commonmarker.to_html)
-      Commonmarker.to_html(string, options: {
-        extensions: {header_ids: true},
-        plugins: {syntax_highlighter: {theme: "InspiredGitHub"}},
-        render: {width: 120, unsafe: true}
-      }).html_safe
-    else
-      CommonMarker.render_html(string, :UNSAFE, [:table]).html_safe
-    end
+    Commonmarker.to_html(string, options: {
+      extensions: {header_ids: true},
+      plugins: {syntax_highlighter: {theme: "InspiredGitHub"}},
+      render: {width: 120, unsafe: true}
+    }).html_safe
   end
 end

data/app/views/account/onboarding/user_details/edit.html.erb

@@ -30,7 +30,7 @@
           <div class="sm:col-span-2">
             <%= render 'shared/fields/super_select', form: f, method: :time_zone,
               choices: time_zone_options_for_select(@user.time_zone, nil, ActiveSupport::TimeZone),
-              other_options: {search: true, required: true} %>
+              other_options: {search: true, required: true, use_browser_time_zone: true} %>
           </div>
         </div>
 
@@ -60,14 +60,18 @@
     // figure out the rails timezone value.
     var railsValue = jsTimezoneMapping[jstz.determine().name()];
 
-    // set the form accordingly.
-    var $option = $("#user_time_zone option[value=\"" + railsValue + "\"]")
-    $option.prop('selected', true);
+    var useBrowserTimeZone = $("#user_time_zone")[0].dataset.useBrowserTimeZone
 
-    // update the select2 as well. is there a better way to handle this?
-    // why don't _they_ handle this for us?
-    $("#select2-user_time_zone-container").attr('title', $option.text());
-    $("#select2-user_time_zone-container").text($option.text());
+    if (useBrowserTimeZone == "true") {
+      // set the form accordingly.
+      var $option = $("#user_time_zone option[value=\"" + railsValue + "\"]")
+      $option.prop('selected', true);
+
+      // update the select2 as well. is there a better way to handle this?
+      // why don't _they_ handle this for us?
+      $("#select2-user_time_zone-container").attr('title', $option.text());
+      $("#select2-user_time_zone-container").text($option.text());
+    }
 
   });
 </script>

data/docs/action-models.md

@@ -63,9 +63,9 @@ Don't forget to run `bundle install` and `rails restart`.
 You can get detailed information about using Super Scaffolding to generate different types of Action Models like so:
 
 ```
-bin/super-scaffold action-model:targets-many
-bin/super-scaffold action-model:targets-one
-bin/super-scaffold action-model:targets-one-parent
+rails generate super_scaffold:action_model:targets_many
+rails generate super_scaffold:action_model:targets_one
+rails generate super_scaffold:action_model:targets_one_parent
 ```
 
 ## Basic Example
@@ -73,13 +73,13 @@ bin/super-scaffold action-model:targets-one-parent
 ### 1. Generate and scaffold an example `Project` model.
 
 ```
-bin/super-scaffold crud Project Team name:text_field
+rails generate super_scaffold Project Team name:text_field
 ```
 
 ### 2. Generate and scaffold an archive action for projects.
 
 ```
-bin/super-scaffold action-model:targets-many Archive Project Team
+rails generate super_scaffold:action_model:targets_many Archive Project Team
 ```
 
 ### 3. Implement the action logic.

data/docs/field-partials/super-select.md

@@ -61,6 +61,21 @@ Here is the same example, with search enabled:
   html_options: {multiple: true}, other_options: {search: true} %>
 </code></pre>
 
+## Overriding Browser Time Zone
+
+When using super-select with Time Zone options, passing `use_browser_time_zone:
+false` will override the automatic setting of the timezone value from the
+browser.
+
+
+Here is the an example setting the selected value to `@user.time_zone` which
+will not be overridden by the browser time zone.
+
+<pre><code><%= render 'shared/fields/super_select', form: f, method: :time_zone,
+    choices: time_zone_options_for_select(@user.time_zone, nil, ActiveSupport::TimeZone),
+    other_options: {search: true, required: true, use_browser_time_zone: false } %>
+</code></pre>
+
 ## Accepting New Entries
 
 Here is an example allowing a new option to be entered by the user:

data/docs/super-scaffolding.md

@@ -43,6 +43,14 @@ rails generate super_scaffold
 | `rails generate super_scaffold:join_model` | Scaffolds a join model (must have two existing models to join before scaffolding) |
 | `rails generate super_scaffold:oauth_provider` | Scaffolds logic to use OAuth2 with the provider of your choice |
 
+The following commands are for use specifically with [Action Models](action-models).
+
+| `rails generate` Command | Scaffolding Type |
+|--------------------------|------------------|
+| `rails generate super_scaffold:action_models:targets_many` | Generates an action that targets many records |
+| `rails generate super_scaffold:action_models:targets_one` | Generates an action that targets one record |
+| `rails generate super_scaffold:action_models:targets_one_parent` | Generates an action that targets the parent of the specified model |
+
 ## Examples
 
 ### 1. Basic CRUD Scaffolding

data/lib/bullet_train/resolver.rb

@@ -113,7 +113,7 @@ module BulletTrain
         package_name: nil,
       }
 
-      result[:absolute_path] = file_path || class_path || locale_path || partial_path
+      result[:absolute_path] = file_path || class_path || locale_path || js_or_stylesheet_path || partial_path
 
       # If we get the partial resolver template itself, that means we couldn't find the file.
       if result[:absolute_path].match?("app/views/bullet_train/partial_resolver.html.erb") || result[:absolute_path].nil?
@@ -251,10 +251,47 @@ module BulletTrain
       nil
     end
 
+    # In this search, we prioritize files in local themes
+    # and then look in theme gems if nothing is found.
+    def js_or_stylesheet_path
+      file_name = @needle.split("/").last
+
+      # Prioritize the current theme and fall back to
+      # the default `light` theme if nothing is found locally.
+      puts "Searching under current theme: #{current_theme.blue}"
+
+      asset_globs = [
+        "*.js", # Include JavaScript files under the app's root directory.
+        "app/assets/javascript/**/*.#{current_theme}.js",
+        "app/assets/javascript/#{current_theme}/**/*.js",
+        "app/assets/stylesheets/**/*.#{current_theme}.css",
+        "app/assets/stylesheets/#{current_theme}/**/*.css",
+      ]
+
+      files = Dir.glob(asset_globs).reject { |file| file.match?("/builds/") }
+      absolute_file_path = files.find { |file| file.end_with?(file_name) }
+
+      if absolute_file_path
+        absolute_file_path
+      else
+        # Search for the file in its respective gem. Fall back to the `light` theme if no gem is available.
+        gem_path = [`bundle show bullet_train-themes-#{current_theme}`, `bundle show bullet_train-themes-light`].map(&:chomp).find(&:present?)
+        return nil unless gem_path
+
+        # At this point we can be more generic since we're inside the gem.
+        files = Dir.glob(["#{gem_path}/**/*.js", "#{gem_path}/**/*.css"])
+        files.find { |file| file.end_with?(file_name) }
+      end
+    end
+
     def ejected_theme?
-      current_theme_symbol = File.read("#{Rails.root}/app/helpers/application_helper.rb").split("\n").find { |str| str.match?(/\s+:.*/) }
-      current_theme = current_theme_symbol.delete(":").strip
       current_theme != "light" && Dir.exist?("#{Rails.root}/app/assets/stylesheets/#{current_theme}")
     end
+
+    def current_theme
+      msmn = Masamune::AbstractSyntaxTree.new(Rails.root.join("app/helpers/application_helper.rb").read)
+      current_theme_def = msmn.method_definitions.find { |node| node.token_value == "current_theme" }
+      msmn.symbols.find { |sym| sym.line_number == current_theme_def.line_number + 1 }.token_value
+    end
   end
 end

data/lib/bullet_train/version.rb

@@ -1,3 +1,3 @@
 module BulletTrain
-  VERSION = "1.6.24"
+  VERSION = "1.6.26"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bullet_train
 version: !ruby/object:Gem::Version
-  version: 1.6.24
+  version: 1.6.26
 platform: ruby
 authors:
 - Andrew Culver
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2024-01-02 00:00:00.000000000 Z
+date: 2024-01-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: standard
@@ -394,14 +394,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.0.0
 - !ruby/object:Gem::Dependency
   name: extended_email_reply_parser
   requirement: !ruby/object:Gem::Requirement