bullet_train 1.3.11 → 1.3.13

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3e978873b55ca6a15b2b500915937a0eaa092d9bc5a8a8b2f8dc1f10d6ac27f7
-  data.tar.gz: 8756fd456af1bc3f70429c78234175e00d28fbefe04fa9253182831fefb084a3
+  metadata.gz: cebee7b2e16992167700e7be651823752180c0a94ac4dceb2000bb1363b62d9e
+  data.tar.gz: bb64b9ea40fea04936812eabf14cc9b0261c4d11a2f8ff9c62de17ea756de55d
 SHA512:
-  metadata.gz: 9988ba16cd8b3c98161e4ba478e97f93b87152211592c93b62f4ba898fd6131e3a6abfd3190e0975a9e7ab1bef9fb53b3c0e783d481823dd0e37423fa44f4845
-  data.tar.gz: 42f98d7b289251a81263282265b307e4f3901e8e5379c7b95f4ba4451318e1aa4b9f9b99a1b96a75c0e9aa4ee3cd2afd5c4b82896705e3542bbe63d13b9a0f01
+  metadata.gz: a4861d4e94ad6060fae8d4ea6859c6569c9acb3c1f7765675cee1d6d473850657ae2a7c6fcdff2f5e89b5524575ff11b9dca3d962ab732502b6615c255bd06ff
+  data.tar.gz: dec3c199b727d7dac9e9f9b188b332aa049dddbf3380c7d156b07ca91903d46ccf473ee339d1b238d0588953035bd28454fce16acf1a68ba14baf3e415386063

data/app/controllers/concerns/controllers/base.rb

@@ -85,15 +85,14 @@ module Controllers::Base
     end
   end
 
-  def set_locale
-    I18n.locale = [
+  def set_locale(&action)
+    locale = [
       current_user&.locale,
       current_user&.current_team&.locale,
       http_accept_language.compatible_language_from(I18n.available_locales),
       I18n.default_locale.to_s
     ].compact.find { |potential_locale| I18n.available_locales.include?(potential_locale.to_sym) }
-    yield
-    I18n.locale = I18n.default_locale
+    I18n.with_locale(locale, &action)
   end
 
   # Whitelist the account namespace and prevent JavaScript

data/app/controllers/concerns/documentation_support.rb

@@ -1,6 +1,8 @@
 module DocumentationSupport
   extend ActiveSupport::Concern
 
+  BULLET_TRAIN_BASE_PATH = `bundle show bullet_train`.chomp
+
   def docs
     target = params[:page].presence || "index"
 
@@ -8,8 +10,7 @@ module DocumentationSupport
     # all_paths = ([Rails.root.to_s] + `bundle show --paths`.lines.map(&:chomp))
     # @path = all_paths.map { |path| path + "/docs/#{target}.md" }.detect { |path| File.exist?(path) }
 
-    # TODO Trying to just brute force this for now.
-    @path = `bundle show bullet_train`.chomp + "/docs/#{target}.md"
+    @path = "#{BULLET_TRAIN_BASE_PATH}/docs/#{target}.md"
 
     render :docs, layout: "docs"
   end

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

@@ -9,7 +9,7 @@ module Invitations::Base
 
     accepts_nested_attributes_for :membership
 
-    validates :email, presence: true
+    validates :email, presence: true, uniqueness: {scope: :team}
 
     after_create :set_added_by_membership
     after_create :send_invitation_email

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

@@ -21,6 +21,8 @@ module Memberships::Base
     # Image uploading
     has_one_attached :user_profile_photo
 
+    validates :user_email, uniqueness: {scope: :team}
+
     after_destroy do
       # if we're destroying a user's membership to the team they have set as
       # current, then we need to remove that so they don't get an error.

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

@@ -71,7 +71,7 @@ module Users::Base
   def create_default_team
     # This creates a `Membership`, because `User` `has_many :teams, through: :memberships`
     default_team = teams.create(name: I18n.t("teams.new.default_team_name"), time_zone: time_zone)
-    memberships.find_by(team: default_team).update role_ids: [Role.admin.id]
+    memberships.find_by(team: default_team).update(user_email: email, role_ids: [Role.admin.id])
     update(current_team: default_team)
   end
 

data/config/locales/en/base.yml

@@ -10,9 +10,9 @@
 #
 #     <%= t("hello") %>
 #
-# To use a different locale, set it with `I18n.locale`:
+# To use a different locale, set it with `I18n.with_locale`:
 #
-#     I18n.locale = :es
+#     I18n.with_locale(:es, &block)
 #
 # This would use the information in config/locales/es.yml.
 #

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

@@ -59,6 +59,7 @@ 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/field-partials/file-field.md

@@ -9,6 +9,7 @@ In addition, Bullet Train has integrated the direct-uploads feature of Active St
 ## Example
 
 The following steps illustrate how to add a `document` file attachment to a `Post` model.
+
 Add the following to `app/models/post.rb`:
 
 ```ruby
@@ -22,3 +23,30 @@ Run the following command to generate the scaffolding for the `document` field o
 ```bash
 ./bin/super-scaffold crud-field Post document:file_field
 ```
+
+## Multiple Attachment Example
+
+The following steps illustrate how to add multiple `document` file attachments to a `Post` model.
+
+Add the following to `app/models/post.rb`:
+
+```ruby
+has_many_attached :documents
+```
+
+Note, no database migration is required as ActiveStorage uses its own tables to store the attachments.
+
+Run the following command to generate the scaffolding for the `documents` field on the `Post` model:
+
+```bash
+./bin/super-scaffold crud-field Post documents:file_field{multiple}
+```
+
+## Generating a Model & Super Scaffold Example
+
+If you're starting fresh, and don't have an existing model you can do something like this:
+
+```
+rails g model Project team:references name:string specification:attachment documents:attachments
+bin/super-scaffold crud Project Team name:text_field specification:file_field documents:file_field{multiple}
+```

data/lib/bullet_train/version.rb

@@ -1,3 +1,3 @@
 module BulletTrain
-  VERSION = "1.3.11"
+  VERSION = "1.3.13"
 end

metadata

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