bullet_train 1.2.10 → 1.2.12

data/docs/tunneling.md

@@ -4,14 +4,14 @@ Before your application can take advantage of features that depend on incoming w
 
 ## Use a Paid Plan
 
-You should specifically sign up for a paid account. Although ngrok offers a free plan, their $25/month paid plan will allow you to reserve a custom subdomain for reuse each time you spin up your tunnel. This is a critical productivity improvement, because in practice you'll end up configuring your tunnel URL in a bunch of different places like `config/application.yml` but also in external systems like when you [configure payment providers to deliver webhooks to you](docs/billing/stripe.md).
+You should specifically sign up for a paid account. Although ngrok offers a free plan, their $25/month paid plan will allow you to reserve a custom subdomain for reuse each time you spin up your tunnel. This is a critical productivity improvement, because in practice you'll end up configuring your tunnel URL in a bunch of different places like `config/application.yml` but also in external systems like when you [configure payment providers to deliver webhooks to you](/docs/billing/stripe.md).
 
 ## Usage
 
 Once you have ngrok installed, you can start your tunnel like so, replacing `YOUR-SUBDOMAIN` with whatever subdomain you reserved in your ngrok account:
 
 ```
-ngrok http 3000 -subdomain=YOUR-SUBDOMAIN
+ngrok http 3000 --subdomain=YOUR-SUBDOMAIN
 ```
 
 ## Updating Your Configuration

data/docs/upgrades.md

@@ -43,7 +43,7 @@ git checkout -b updating-starter-repo
 git merge starter-repo/main
 ```
 
-It's quite possible you'll get some merge conflicts at this point. No big deal! Just go through and resolve them like you would if you were integrating code from another developer on your team. We tend to comment our code heavily, but if you have any questions about the code you're trying to understand, let us know on Slack!
+It's quite possible you'll get some merge conflicts at this point. No big deal! Just go through and resolve them like you would if you were integrating code from another developer on your team. We tend to comment our code heavily, but if you have any questions about the code you're trying to understand, let us know on Discord!
 
 ```
 git diff
@@ -55,6 +55,7 @@ git commit -m "Upgrading Bullet Train."
 
 ```
 rails test
+rails test:system
 ```
 
 ### 6. Merge into `main` and delete the branch.

data/lib/bullet_train/engine.rb

@@ -13,6 +13,12 @@ rescue LoadError
   # Devise isn't in the Gemfile, and we don't have any other load order dependencies.
 end
 
+begin
+  # Similarly we need to hoist showcase-rails, so our view paths can override Showcase.
+  require "showcase-rails"
+rescue LoadError
+end
+
 module BulletTrain
   class Engine < ::Rails::Engine
   end

data/lib/bullet_train/version.rb

@@ -1,3 +1,3 @@
 module BulletTrain
-  VERSION = "1.2.10"
+  VERSION = "1.2.12"
 end

data/lib/bullet_train.rb

@@ -13,6 +13,7 @@ require "colorizer"
 require "bullet_train/core_ext/string_emoji_helper"
 
 require "devise"
+require "xxhash"
 # require "devise-two-factor"
 # require "rqrcode"
 require "cancancan"
@@ -115,7 +116,7 @@ def cloudinary_enabled?
 end
 
 def two_factor_authentication_enabled?
-  ENV["TWO_FACTOR_ENCRYPTION_KEY"].present?
+  Rails.application.credentials.active_record_encryption&.primary_key.present?
 end
 
 # Don't redefine this if an application redefines it locally.

data/lib/colorizer.rb

@@ -11,7 +11,7 @@ module Colorizer
   end
 
   def colorize_similarly(object, saturation, lightness)
-    rnd = ((object.hash * 7) % 100) * 0.01
+    rnd = ((XXhash.xxh64(object) * 7) % 100) * 0.01
     hsl_to_rgb(rnd, saturation, lightness)
   end
 

data/lib/tasks/bullet_train_tasks.rake

@@ -218,15 +218,18 @@ namespace :bullet_train do
   def set_core_gems(flag, framework_packages)
     packages = framework_packages.keys
     gemfile_lines = File.readlines("./Gemfile")
-    new_lines = gemfile_lines.map do |line|
-      packages.each do |package|
+
+    packages.each do |package|
+      original_path = "gem \"#{package}\""
+      local_path = "gem \"#{package}\", path: \"local/bullet_train-core/#{package}\""
+      match_found = false
+
+      new_lines = gemfile_lines.map do |line|
         if line.match?(/"#{package}"/)
-          original_path = "gem \"#{package}\""
-          local_path = "gem \"#{package}\", path: \"local/bullet_train-core/#{package}\""
+          match_found = true
 
-          case flag
-          when "--link"
-            if `cat Gemfile | grep "gem \\\"#{package}\\\", path: \\\"local/#{package}\\\""`.chomp.present?
+          if flag == "--link"
+            if `cat Gemfile | grep "gem \\\"#{package}\\\", path: \\\"local/bullet_train-core/#{package}\\\""`.chomp.present?
               puts "#{package} is already linked to a checked out copy in `local` in the `Gemfile`.".green
             elsif `cat Gemfile | grep "gem \\\"#{package}\\\","`.chomp.present?
               puts "#{package} already has some sort of alternative source configured in the `Gemfile`.".yellow
@@ -235,18 +238,32 @@ namespace :bullet_train do
               puts "#{package} is directly present in the `Gemfile`, so we'll update that line.".green
               line.gsub!(original_path, local_path)
             end
-            break
-          when "--reset"
+          elsif flag == "--reset"
             line.gsub!(local_path, original_path)
             puts "Resetting '#{package}' package in the Gemfile...".blue
-            break
           end
         end
+        line
       end
-      line
+
+      # Add/Remove any packages that aren't primarily in the Gemfile.
+      if flag == "--link"
+        unless match_found
+          puts "Could not find #{package}. Adding to the end of the Gemfile.".blue
+          new_lines << "#{local_path}\n"
+        end
+      elsif flag == "--reset"
+        gem_regexp = /bullet_train-[a-z|A-Z_-]+/
+        while new_lines.last.match?(gem_regexp)
+          puts "Removing #{new_lines.last.scan(gem_regexp).first} from the Gemfile.".yellow
+          new_lines.pop
+        end
+      end
+
+      gemfile_lines = new_lines
     end
 
-    File.write("./Gemfile", new_lines.join)
+    File.write("./Gemfile", gemfile_lines.join)
   end
 
   def set_npm_package(flag, package)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bullet_train
 version: !ruby/object:Gem::Version
-  version: 1.2.10
+  version: 1.2.12
 platform: ruby
 authors:
 - Andrew Culver
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-12-31 00:00:00.000000000 Z
+date: 2023-03-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: standard
@@ -150,6 +150,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: xxhash
+  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: cancancan
   requirement: !ruby/object:Gem::Requirement
@@ -290,6 +304,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.1'
+- !ruby/object:Gem::Dependency
+  name: showcase-rails
+  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: premailer-rails
   requirement: !ruby/object:Gem::Requirement
@@ -465,7 +493,6 @@ files:
 - app/controllers/concerns/sessions/controller_base.rb
 - app/controllers/registrations_controller.rb
 - app/controllers/sessions_controller.rb
-- app/controllers/turbo_devise_controller.rb
 - app/helpers/account/buttons_helper.rb
 - app/helpers/account/dates_helper.rb
 - app/helpers/account/forms_helper.rb
@@ -486,6 +513,8 @@ files:
 - app/javascript/controllers/bulk_action_form_controller.js
 - app/javascript/controllers/bulk_actions_controller.js
 - app/javascript/controllers/clipboard_controller.js
+- app/javascript/controllers/connection_workflow_controller.js
+- app/javascript/controllers/desktop_menu_controller.js
 - app/javascript/controllers/form_controller.js
 - app/javascript/controllers/index.js
 - app/javascript/controllers/mobile_menu_controller.js
@@ -493,6 +522,7 @@ files:
 - app/javascript/controllers/text_toggle_controller.js
 - app/javascript/electron/index.js
 - app/javascript/index.js
+- app/javascript/support/turn.js
 - app/mailers/concerns/mailers/base.rb
 - app/mailers/devise_mailer.rb
 - app/mailers/user_mailer.rb
@@ -513,11 +543,8 @@ files:
 - app/models/users.rb
 - app/views/account/invitations/_breadcrumbs.html.erb
 - app/views/account/invitations/_form.html.erb
-- app/views/account/invitations/_invitation.json.jbuilder
-- app/views/account/invitations/index.json.jbuilder
 - app/views/account/invitations/new.html.erb
 - app/views/account/invitations/show.html.erb
-- app/views/account/invitations/show.json.jbuilder
 - app/views/account/memberships/_breadcrumbs.html.erb
 - app/views/account/memberships/_fields.html.erb
 - app/views/account/memberships/_form.html.erb
@@ -536,15 +563,13 @@ files:
 - app/views/account/teams/_index.html.erb
 - app/views/account/teams/_menu_item.html.erb
 - app/views/account/teams/_team.html.erb
-- app/views/account/teams/_team.json.jbuilder
 - app/views/account/teams/edit.html.erb
 - app/views/account/teams/index.html.erb
-- app/views/account/teams/index.json.jbuilder
 - app/views/account/teams/new.html.erb
 - app/views/account/teams/show.html.erb
-- app/views/account/teams/show.json.jbuilder
 - app/views/account/two_factors/create.js.erb
 - app/views/account/two_factors/destroy.js.erb
+- app/views/account/two_factors/verify.js.erb
 - app/views/account/users/_breadcrumbs.html.erb
 - app/views/account/users/_fields.html.erb
 - app/views/account/users/_form.html.erb
@@ -572,6 +597,7 @@ files:
 - app/views/layouts/docs.html.erb
 - app/views/layouts/mailer.html.erb
 - app/views/public/home/docs.html.erb
+- app/views/showcase/engine/_stylesheets.html.erb
 - app/views/user_mailer/invited.html.erb
 - app/views/user_mailer/welcome.html.erb
 - config/initializers/concerns/inflections_base.rb

data/app/controllers/turbo_devise_controller.rb

@@ -1,19 +0,0 @@
-# NOTE: This is a workaround to get Devise working with Turbo
-class TurboDeviseController < ApplicationController
-  class Responder < ActionController::Responder
-    def to_turbo_stream
-      controller.render(options.merge(formats: :html))
-    rescue ActionView::MissingTemplate => error
-      if get?
-        raise error
-      elsif has_errors? && default_action
-        render rendering_options.merge(formats: :html, status: :unprocessable_entity)
-      else
-        redirect_to navigation_location
-      end
-    end
-  end
-
-  self.responder = Responder
-  respond_to :html, :turbo_stream
-end

data/app/views/account/invitations/_invitation.json.jbuilder

@@ -1,7 +0,0 @@
-json.extract! invitation,
-  :id,
-  :email,
-  # 🚅 super scaffolding will insert new fields above this line.
-  :created_at,
-  :updated_at
-json.url account_invitation_url(invitation, format: :json)

data/app/views/account/invitations/index.json.jbuilder

@@ -1 +0,0 @@
-json.array! @invitations, partial: "invitations/invitation", as: :invitation

data/app/views/account/invitations/show.json.jbuilder

@@ -1 +0,0 @@
-json.partial! "invitations/invitation", invitation: @invitation

data/app/views/account/teams/_team.json.jbuilder

@@ -1,9 +0,0 @@
-json.extract! team,
-  :id,
-  :name,
-  :time_zone,
-  :locale,
-  # 🚅 super scaffolding will insert new fields above this line.
-  :created_at,
-  :updated_at
-json.url account_team_url(team, format: :json)

data/app/views/account/teams/index.json.jbuilder

@@ -1 +0,0 @@
-json.array! @teams, partial: "teams/team", as: :team

data/app/views/account/teams/show.json.jbuilder

@@ -1 +0,0 @@
-json.partial! "teams/team", team: @team