bullet_train 1.2.21 → 1.2.22

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: aded6e1793584701eb001f64681e06d155528f81465185b23bc3f5265c3bcec7
-  data.tar.gz: e496895bf0a74a0470b3aae6954dbeb19240467892fa4b9d655318faf17b93e1
+  metadata.gz: d03b4bc2028c88dac20f3223cd1cd6ef395cae53b6cf84377360b0b068a0c0e8
+  data.tar.gz: 3524f24af8fd64c3be1ae14ddf99562fd9ba251faed18e88f35800ff11c3a7f2
 SHA512:
-  metadata.gz: 6770a9c6974333bc0c21e3aaa7d8ef07dbb7d7f89dd34f857304f36df0357ccffe56b977247c028531277ae12e2a87b793aa0ccae31691fed7a7a2ae293c8a01
-  data.tar.gz: 382f88ff873e58f3ca8bb4b4d491b5fec91d99a2e317279d381fa61e165f2afaa0cd50db132ffc86be241b3fd802ded9dd9b1d6e29a9768c7c09ed0caf6a5942
+  metadata.gz: 7da1cc8e9a9acaef9fa0eeeab6c135f7d3c7d6261c2518c4b29c572711fe2e347ce3da8e7476a6fd2f8515af6d6c442df77f1d7566b7d9ba95c9dc0f59026078
+  data.tar.gz: 622671f75556fe2358107f3acdba1f917da32347df64b325514ad670c09044b85baad4e56ed3d7edc45ae761e4bf07cac91170cbeb5ea73254e3d0f124bb3985

data/app/models/concerns/invitations/base.rb

@@ -11,9 +11,10 @@ module Invitations::Base
 
     validates :email, presence: true
 
-    before_create :generate_uuid
     after_create :set_added_by_membership
     after_create :send_invitation_email
+
+    attribute :uuid, default: -> { SecureRandom.hex }
   end
 
   def set_added_by_membership
@@ -24,10 +25,6 @@ module Invitations::Base
     UserMailer.invited(uuid).deliver_later
   end
 
-  def generate_uuid
-    self.uuid = SecureRandom.hex
-  end
-
   def accept_for(user)
     User.transaction do
       user.memberships << membership

data/app/models/concerns/memberships/base.rb

@@ -128,7 +128,7 @@ module Memberships::Base
 
   def last_initial
     return nil unless last_name.present?
-    "#{last_name}."
+    "#{last_name[0]}."
   end
 
   def first_name_last_initial

data/app/views/devise/sessions/new.html.erb

@@ -44,11 +44,7 @@
           </div>
 
           <% if devise_mapping.rememberable? %>
-            <% # TODO This needs to be its own component. Can't have this kind of styling here. %>
-            <div class="flex items-center">
-              <%= form.check_box :remember_me, class: "h-4 w-4 text-blue focus:ring-blue-800 border-slate-300 rounded dark:bg-slate-800 dark:border-slate-900" %>
-              <%= form.label :remember_me, class: "ml-2 block" %>
-            </div>
+            <%= render 'shared/fields/option', method: :remember_me, form: form, single_check_box: true %>
           <% end %>
         <% end %>
       <% end %>

data/docs/application-options.md

@@ -15,6 +15,7 @@ The helper methods below can also be directly invoked in your application if you
 | FONTAWESOME_NPM_AUTH_TOKEN | String | `"your_font_awesome_token"` | `font_awesome?` |
 | SILENCE_LOGS | Boolean | `"true"` | `silence_logs?` |
 | TESTING_PROVISION_KEY | String | `"asdf123"` | N/A |
+| OPENAI_ACCESS_TOKEN | String |`your_openai_token`| `openai_enabled?` |
 
 | Option | Description |
 | --- | --- |
@@ -27,3 +28,4 @@ The helper methods below can also be directly invoked in your application if you
 | FONTAWESOME_NPM_AUTH_TOKEN | Enables use of Font Awesome. |
 | SILENCE_LOGS | Silences Super Scaffolding logs. |
 | TESTING_PROVISION_KEY | Creates a test `Platform::Application` by accessing `/testing/provision?key=your_provision_key` |
+| OPENAI_ACCESS_TOKEN | Enables use [OpenAI](https://openai.com/) with the [ruby-openai](https://github.com/alexrudall/ruby-openai) gem. |

data/docs/field-partials.md

@@ -114,7 +114,7 @@ Certain form field partials like `buttons` and `super_select` can also have thei
 | `boolean`                                              | `boolean`    |                  | `assign_boolean`        |                                                                                   |                                                                                          |
 | [`buttons`](/docs/field-partials/buttons.md)           | `string`     | Optionally       | `assign_checkboxes`     |                                                                                   |                                                                                          |
 | `cloudinary_image`                                     | `string`     |                  |                         |                                                                                   |                                                                                          |
-| `color_picker`                                         |              |                  |                         | [pickr](https://simonwep.github.io/pickr/)                                        |                                                                                          |
+| `color_picker`                                         | `string`     |                  |                         | [pickr](https://simonwep.github.io/pickr/)                                        |                                                                                          |
 | `date_and_time_field`                                  | `datetime`   |                  | `assign_date_and_time`  | [Date Range Picker](https://www.daterangepicker.com)                              |                                                                                          |
 | `date_field`                                           | `date`       |                  | `assign_date`           | [Date Range Picker](https://www.daterangepicker.com)                              |                                                                                          |
 | `email_field`                                          | `string`     |                  |                         |                                                                                   |                                                                                          |

data/docs/super-scaffolding/sortable.md

@@ -12,7 +12,7 @@ The `--sortable` option:
 
 1. Wraps the table's body in a `sortable` Stimulus controller, providing drag-and-drop re-ordering;
 2. Adds a `reorder` action to your resource via `include SortableActions`, triggered automatically on re-order;
-3. Adds a migration to add the `sort_order` column to your model to store the ordering;
+3. Adds a `sort_order` attribute to your model to store the ordering;
 4. Adds a `default_scope` which orders by `sort_order` and auto increments `sort_order` on create via `include Sortable` on the model.
 
 ## Disabling Saving on Re-order
@@ -134,4 +134,4 @@ And on the `sortable` element, catch the `sortable:drop`, `sortable:drag` (for c
   data-confirm-reorder-target="sortable"
   ...
 >
-```
+```

data/lib/bullet_train/resolver.rb

@@ -72,7 +72,10 @@ module BulletTrain
         if open
           path = source_file[:package_name] ? source_file[:absolute_path] : (source_file[:project_path]).to_s
           puts "Opening `#{path}`.\n".green
-          exec "open #{path}"
+
+          # TODO: Use TerminalCommands to open this file
+          open_command = `which open`.present? ? "open" : "xdg-open"
+          exec "#{open_command} #{path}"
         end
       else
         puts "Couldn't resolve `#{@needle}`.".red
@@ -101,7 +104,8 @@ module BulletTrain
 
       if result[:absolute_path]
         if result[:absolute_path].include?("/bullet_train")
-          base_path = "bullet_train" + result[:absolute_path].partition("/bullet_train").last
+          regex = /#{"bullet_train-core" if result[:absolute_path].include?("bullet_train-core")}\/bullet_train[.\-_a-z|0-9]*.*/
+          base_path = result[:absolute_path].scan(regex).pop
 
           # Try to calculate which package the file is from, and what it's path is within that project.
           ["app", "config", "lib"].each do |directory|
@@ -146,14 +150,13 @@ module BulletTrain
           # all we need to do is change it to "shared/attributes/code"
           partial_parts.last.gsub!(/(_)|(\.html\.erb)/, "")
           @needle = partial_parts.join("/")
-        elsif @needle.match?(/bullet_train-/)
+        elsif @needle.match?(/bullet_train/)
           # If it's a full path, we need to make sure we're getting it from the right package.
-          _, partial_view_package, partial_path_without_package = @needle.partition(/bullet_train-[a-z|\-_0-9.]*/)
+          _, partial_view_package, partial_path_without_package = @needle.partition(/bullet_train-core\/bullet_train[a-z|\-_0-9.]*/)
 
-          # Pop off the version so we can call `bundle show` correctly.
-          # Also change `bullet_train-base` to `bullet_train`.
+          # Pop off `bullet_train-core` and the gem's version so we can call `bundle show` correctly.
+          partial_view_package.gsub!(/bullet_train-core\//, "")
           partial_view_package.gsub!(/[-|.0-9]*$/, "") if partial_view_package.match?(/[-|.0-9]*$/)
-          partial_view_package.gsub!("-base", "") if /base/.match?(@needle)
 
           local_package_path = `bundle show #{partial_view_package}`.chomp
           return local_package_path + partial_path_without_package

data/lib/bullet_train/version.rb

@@ -1,3 +1,3 @@
 module BulletTrain
-  VERSION = "1.2.21"
+  VERSION = "1.2.22"
 end

data/lib/bullet_train.rb

@@ -33,6 +33,7 @@ require "commonmarker"
 require "extended_email_reply_parser"
 require "pagy"
 require "devise/pwned_password"
+require "openai"
 
 module BulletTrain
   mattr_accessor :routing_concerns, default: []
@@ -152,3 +153,11 @@ end
 def silence_logs?
   ENV["SILENCE_LOGS"].present?
 end
+
+def openai_enabled?
+  ENV["OPENAI_ACCESS_TOKEN"].present?
+end
+
+def openai_organization_exists?
+  ENV["OPENAI_ORGANIZATION_ID"]
+end

data/lib/tasks/bullet_train_tasks.rake

@@ -112,15 +112,23 @@ namespace :bullet_train do
             puts ""
             puts "bin/hack: " + "Clone bullet_train-core and link up gems (will only link up gems if already cloned).".blue
             puts "bin/hack --link: " + "Link all of your Bullet Train gems to `local/bullet_train-core`.".blue
+            puts "bin/hack --link github: " + "Link all of your Bullet Train gems to the public repositories on GitHub".blue
             puts "bin/hack --link (version-number): " + "Link all of your Bullet Train gems to the version number passed.".blue
             puts "bin/hack --reset: " + "Resets all of your gems to their original definition.".blue
             puts "bin/hack --watch-js: " + "Watches for any changes in JavaScript files gems that have an npm package.".blue
             puts "bin/hack --clean-js: " + "Resets all of your npm packages from `local/bullet_train-core` to their original definition.".blue
             exit
           when "--link", "--reset"
-            version = process[:values].pop
-            set_core_gems(process[:flag], version, framework_packages)
-            stream "bundle install"
+            link_flag_value = process[:values].pop
+            set_core_gems(process[:flag], link_flag_value, framework_packages)
+
+            # Bundler will throw an error if we try to `bundle install` right after adding the GitHub link to the Gemfile.
+            if link_flag_value == "github"
+              puts ""
+              puts "Now you can run `bundle install` to check out the public repositories on GitHub."
+            else
+              stream "bundle install"
+            end
           when "--watch-js", "--clean-js"
             package_name = process[:values].pop
             framework_package = framework_packages.select { |k, v| k.to_s == package_name }
@@ -218,9 +226,10 @@ namespace :bullet_train do
   end
 
   # Pass "--link" or "--reset" as a flag to set the gems.
-  def set_core_gems(flag, version, framework_packages)
+  def set_core_gems(flag, link_flag_value, framework_packages)
     packages = framework_packages.keys
     gemfile_lines = File.readlines("./Gemfile")
+    version_regexp = /[\d|.]/
 
     packages.each do |package|
       original_path = "gem \"#{package}\""
@@ -241,7 +250,14 @@ namespace :bullet_train do
               puts "We can't do anything with this. Sorry! We'll proceed, but you have to link this package yourself.".red
             elsif `cat Gemfile | grep "gem \\\"#{package}\\\""`.chomp.present?
               puts "#{package} is directly present in the `Gemfile`, so we'll update that line.".green
-              line = version.present? ? "#{line.chomp}, \"#{version}\"\n" : line.gsub(original_path, local_path)
+
+              line = if link_flag_value == "github"
+                "#{line.chomp}, git: 'http://github.com/bullet-train-co/bullet_train-core.git'\n"
+              elsif link_flag_value&.match?(version_regexp)
+                "#{line.chomp}, \"#{link_flag_value}\"\n"
+              else
+                line.gsub(original_path, local_path)
+              end
             end
           elsif flag == "--reset"
             if line.match?(/bullet_train/)
@@ -258,8 +274,10 @@ namespace :bullet_train do
       if flag == "--link"
         unless match_found
           puts "Could not find #{package}. Adding to the end of the Gemfile.".blue
-          new_lines << if version
-            "#{original_path.chomp}, \"#{version}\"\n"
+          new_lines << if link_flag_value == "github"
+            "#{original_path.chomp}, git: 'http://github.com/bullet-train-co/bullet_train-core.git'\n"
+          elsif link_flag_value&.match?(version_regexp)
+            "#{original_path.chomp}, \"#{link_flag_value}\"\n"
           else
             "#{local_path}\n"
           end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bullet_train
 version: !ruby/object:Gem::Version
-  version: 1.2.21
+  version: 1.2.22
 platform: ruby
 authors:
 - Andrew Culver
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-03-11 00:00:00.000000000 Z
+date: 2023-03-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: standard
@@ -388,6 +388,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: ruby-openai
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: unicode-emoji
   requirement: !ruby/object:Gem::Requirement
@@ -722,7 +736,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.4.1
+rubygems_version: 3.3.7
 signing_key:
 specification_version: 4
 summary: Bullet Train