bullet_train 1.3.15 → 1.3.17

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3fc370d1121df2825260d53e2b73da43644b952399992e520f2159522c3fa909
-  data.tar.gz: fd9ebef2d20fa5dec15e76b8500d44ea44f179177956d14170d882b70041c11d
+  metadata.gz: c51ee37f41fe5f9ca7f9532a7c17ce33bef715effb3fee84a598ebcae4900ce7
+  data.tar.gz: 8798d8b4a2badc16e5dcceeca245cadf4c2faf3fec55ee83a5fe8967566f128e
 SHA512:
-  metadata.gz: 544da7e87dd48e0503177822ec55e539885232da7e642a25adbe54538781e0603da94bd1a1031b9f43391b981b44724c5ee665b13ecd5992e0e1ba94b6fab4e5
-  data.tar.gz: 0d1c5bda4b465a70a6f9f1738d43d892c2c60d23b13e07a4331714bfc9a7019ecbf99f55173eb0f921938238e4087d9d64f8a93582f0efbcad41da0e9925a2a7
+  metadata.gz: 61e70c5ad42169a14357577569cdcb3beb1123e1029c16f98fd6c69ad7d23c3962af14db7a91de508d4e24fcbd00d630c9b41b5700986e244fb6251f34d6e8ae
+  data.tar.gz: 411fdfebfcb92c3a58229f42f618721f9a63c53013c9a945ebba425958a4b592f77e9751dc23c540085cbed3165b5b8a8552a9b28e49d8b9bdc11c748e0d084e

data/app/controllers/concerns/account/invitations/controller_base.rb

@@ -76,7 +76,7 @@ module Account::Invitations::ControllerBase
   # POST /invitations/1/resend
   def resend
     @invitation = Invitation.find_by(uuid: params[:id])
-    if @invitation
+    if @invitation&.touch
       UserMailer.invited(params[:id]).deliver_later
       redirect_to account_team_invitations_path(@invitation.membership.team), notice: I18n.t("invitations.notifications.resent")
     else

data/app/helpers/email_helper.rb

@@ -1,7 +1,7 @@
 module EmailHelper
-  def email_image_tag(image, **options)
+  def email_image_tag(image, **)
     image_underscore = image.tr("-", "_")
     attachments.inline[image_underscore] = File.read(Rails.root.join("app/assets/images/#{image}"))
-    image_tag attachments.inline[image_underscore].url, **options
+    image_tag(attachments.inline[image_underscore].url, **)
   end
 end

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

@@ -5,7 +5,6 @@ module Invitations::Base
     belongs_to :team
     belongs_to :from_membership, class_name: "Membership"
     has_one :membership, dependent: :nullify
-    has_many :roles, through: :membership
 
     accepts_nested_attributes_for :membership
 
@@ -15,6 +14,10 @@ module Invitations::Base
     after_create :send_invitation_email
 
     attribute :uuid, default: -> { SecureRandom.hex }
+
+    def roles
+      membership.roles
+    end
   end
 
   def set_added_by_membership

data/config/locales/en/invitations.en.yml

@@ -13,10 +13,26 @@ en:
       confirmations:
         destroy: Are you sure you want cancel the invitation to %{invitation_name}? The invitation they've received will no longer work. This can't be undone.
     fields: &fields
+      id:
+        _: &id Invitation ID
+        label: *id
+        heading: *id
       email:
-        name: &email Email Address
+        _: &email Email Address
         label: *email
         heading: *email
+      uuid:
+        name: &uuid Invitation UUID
+        label: *uuid
+        heading: *uuid
+      from_membership_id:
+        name: &from_membership_id Who sent ID
+        label: *from_membership_id
+        heading: *from_membership_id
+      team_id:
+        name: &team_id Team ID
+        label: *team_id
+        heading: *team_id
       roles: &role_ids
         name: &roles Special Privileges
         label: *roles
@@ -26,6 +42,9 @@ en:
       created_at:
         name: &created_at Sent
         heading: *created_at
+      updated_at:
+        name: &updated_at Updated
+        heading: *updated_at
     index:
       section: "Invitations for %{team_name}"
       header: Team Member Invitations
@@ -59,7 +78,6 @@ en:
       resent: 'Invitation was successfully resent.'
       resent_error: Sorry, we couldn't find an invitation to resend.
       doesnt_exist: Sorry, but we couldn't find your invitation. Please contact an administrator on the team to have them send you another one.
-      duplicate: 'Sorry, a member with the email %{user_email} has already been invited.'
     values:
       name: 'Invitation to Join %{team_name}'
   account:

data/docs/tunneling.md

@@ -11,7 +11,7 @@ You should specifically sign up for a paid account. Although ngrok offers a free
 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 --domain=YOUR-SUBDOMAIN 3000
 ```
 
 ## Updating Your Configuration

data/lib/bullet_train/resolver.rb

@@ -160,7 +160,7 @@ module BulletTrain
           _, partial_view_package, partial_path_without_package = @needle.partition(/(bullet_train-core\/)?bullet_train[a-z|\-._0-9]*/)
 
           # 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!("bullet_train-core/", "")
           partial_view_package.gsub!(/[-|.0-9]*$/, "") if partial_view_package.match?(/[-|.0-9]*$/)
 
           local_package_path = `bundle show #{partial_view_package}`.chomp

data/lib/bullet_train/version.rb

@@ -1,3 +1,3 @@
 module BulletTrain
-  VERSION = "1.3.15"
+  VERSION = "1.3.17"
 end

data/lib/tasks/bullet_train_tasks.rake

@@ -144,6 +144,7 @@ namespace :bullet_train do
             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 --link (custom path to package): " + "Pass a custom path to where your bullet_train-core gems are.".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
@@ -259,7 +260,7 @@ namespace :bullet_train do
   def set_core_gems(flag, link_flag_value, framework_packages)
     packages = framework_packages.keys
     gemfile_lines = File.readlines("./Gemfile")
-    version_regexp = /[\d|.]/
+    version_regexp = /^[\d|.]$/
 
     packages.each do |package|
       original_path = "gem \"#{package}\""
@@ -285,6 +286,9 @@ namespace :bullet_train do
                 "#{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"
+              elsif link_flag_value.present?
+                link_flag_value.gsub!(/\/$/, "") # Ensure the custom path doesn't have a slash at the end.
+                local_path.gsub(/path:.*/, "path: \"#{link_flag_value}/#{package}\"\n")
               else
                 line.gsub(original_path, local_path)
               end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bullet_train
 version: !ruby/object:Gem::Version
-  version: 1.3.15
+  version: 1.3.17
 platform: ruby
 authors:
 - Andrew Culver
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-08-24 00:00:00.000000000 Z
+date: 2023-08-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: standard