bullet_train 1.6.23 → 1.6.25

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7c5688d90e9ae12f444c775df68efc7853c33c280f6759494f2c08d0bcd64353
-  data.tar.gz: 868a0282a864a22d7219d3f41e5e3e98e1ded8cda5bcc26bfed02c6cb84ca358
+  metadata.gz: 5f81b52d6132ac315898b8d8bf2130637b61403f706121737e801b3b434b62cb
+  data.tar.gz: 0e9cbc8a0898ee1d9055b5874d99884e344ecd9adabfa0805e29747a551e4e03
 SHA512:
-  metadata.gz: 0c0b78150f0fb9bf2e4ef109f5ae9c5d7a6840d5a55d301e8ee65ffe08f991fce408fb464530107bea7aa7b0a138b363921463761f2d33cafcd7a54b26cf4151
-  data.tar.gz: a333d9dd09a487ff5db181a7cbf412177099aeb9362e537718b5dc7f1d597a35629efb126be9bda6d8feccf1aab4db248a88e2fb877bfd80c6058f883ea8f683
+  metadata.gz: 76d8b82d7b66f719ee155bd6029970ac5725a627e1d3d55cee6926ca339cae4cd8ad6aea0eab36841514da14c206a34c74ee995c297afd99cba1711637cd8319
+  data.tar.gz: 633025d258e12c22ec1f2054416cf3bf52a2827cde8ee12e0285a1ec22529fa86e9db771d1ab5c06192d661ae1f23452806615b22c8dd78e23062ed9cf19dde7

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/app/views/layouts/docs.html.erb

@@ -143,10 +143,15 @@
                   <% end %>
                 <% end %>
 
-                <%= render 'account/shared/menu/item', url: 'https://github.com/bullet-train-co/magic_test', label: 'Magic Test' do |p| %>
+                <%= render 'account/shared/menu/item', url: 'https://github.com/bullet-train-co/magic_test' do |p| %>
                   <% p.icon do %>
                     <i class="fal fa-check ti ti-video-camera"></i>
                   <% end %>
+                  <% p.label do %>
+                    <span>
+                      Magic Test <i class="ti ti-new-window ml-1"></i>
+                    </span>
+                  <% end %>
                 <% end %>
 
                 <%= render 'account/shared/menu/item', url: '/docs/application-options', label: 'Application Options' do |p| %>
@@ -207,16 +212,26 @@
                   <% end %>
                 <% end %>
 
-                <%= render 'account/shared/menu/item', url: 'https://github.com/bullet-train-co/nice_partials', label: 'Nice Partials' do |p| %>
+                <%= render 'account/shared/menu/item', url: 'https://github.com/bullet-train-co/nice_partials' do |p| %>
                   <% p.icon do %>
                     <i class="fal fa-swatchbook ti ti-widget"></i>
                   <% end %>
+                  <% p.label do %>
+                    <span>
+                      Nice Partials <i class="ti ti-new-window ml-1"></i>
+                    </span>
+                  <% end %>
                 <% end %>
 
-                <%= render 'account/shared/menu/item', url: 'https://github.com/bullet-train-co/showcase', label: 'Showcase' do |p| %>
+                <%= render 'account/shared/menu/item', url: 'https://github.com/bullet-train-co/showcase' do |p| %>
                   <% p.icon do %>
                     <i class="fal fa-swatchbook ti ti-panel"></i>
                   <% end %>
+                  <% p.label do %>
+                    <span>
+                      Showcase <i class="ti ti-new-window ml-1"></i>
+                    </span>
+                  <% end %>
                 <% end %>
               <% end %>
 

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/docs/upgrades/yolo-130.md

@@ -281,7 +281,39 @@ git add -A
 git commit -m "Upgrading Bullet Train gems."
 ```
 
-### 5. Run Tests.
+### 5. Update `package.json``
+
+Likewise, we'll need to manually update the version of the `@bullet_train/*` JavaScript packages in
+`package.json`, by looking for these lines:
+
+```json
+    "@bullet-train/bullet-train": "1.3.0",
+    "@bullet-train/bullet-train-sortable": "1.3.0",
+    "@bullet-train/fields": "1.3.0",
+```
+
+And upgrading the version numbers like this:
+
+```json
+    "@bullet-train/bullet-train": "1.3.1",
+    "@bullet-train/bullet-train-sortable": "1.3.1",
+    "@bullet-train/fields": "1.3.1",
+```
+
+(As with the Gemfile, we have to do this since we didn't start explicitly tracking versions until 
+`1.4.0` and want to make sure that our gem versions match what the starter repo expects.)
+
+Then run `yarn install`
+
+Then go ahead and commit the changes.
+
+```
+git diff
+git add -A
+git commit -m "Upgrading Bullet Train js packages."
+```
+
+### 6. Run Tests.
 
 ```
 rails test
@@ -290,7 +322,7 @@ rails test:system
 
 If anything fails, investigate the failures and get things working again, and commit those changes.
 
-### 6. Merge into `main` and delete the branch.
+### 7. Merge into `main` and delete the branch.
 
 ```
 git checkout main

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.23"
+  VERSION = "1.6.25"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bullet_train
 version: !ruby/object:Gem::Version
-  version: 1.6.23
+  version: 1.6.25
 platform: ruby
 authors:
 - Andrew Culver
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-12-14 00:00:00.000000000 Z
+date: 2024-01-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: standard