bullet_train 1.2.23 → 1.2.25

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8d9110b69050fc6e8801f6e37118a735e84978d0d67b28988b4fee47a68fc3b1
-  data.tar.gz: 4bfc8a9ccb219b0fccf82fdc153c02a6076443cc29ed4e064a63bad97f8a2b40
+  metadata.gz: 765759c0952aaff0fb5eb2d2adfab6c0abc7f40f14ab19aefebeb2cdaa60b7f1
+  data.tar.gz: 1c0ce7b0f8724abe0ad5a0d1c1163d25820455d8973a33422a74ef8934fd4f7e
 SHA512:
-  metadata.gz: 9f43b9c8a0185d73c230fdad54405bb480219e04ca9917964d502f6db13ade9bf26d766ae4c7d0dc8926cfb66d5d745252775585fb1059fa35cac03d29e25033
-  data.tar.gz: a0b31fd936cd59281d3012972b682bc932bb3c70f9a6f80bdcdc0d6d1735550bf6a183b3a46699003b8bfde819894b463539c3b2799daf1d04f1a8b7e440a9c9
+  metadata.gz: 57b0fc73cde94ddd2b9f02163a5c7aa50208672de1fd4567a0d27c51ec6295e0cf84c4fb6a3d2c0c2b10af4e09563e5f484b1699060405f25489935139832873
+  data.tar.gz: 9e519f078ce8583947723f21099dd937d2f8c2046d8d491c4229798fdee5f2db72799be6b08ef339092b552fbd4ab791774ebb70b2e15d3de44dea2287cab510

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

@@ -73,6 +73,17 @@ module Account::Invitations::ControllerBase
     end
   end
 
+  # POST /invitations/1/resend
+  def resend
+    @invitation = Invitation.find_by(uuid: params[:id])
+    if @invitation
+      UserMailer.invited(params[:id]).deliver_later
+      redirect_to account_team_invitations_path(@invitation.membership.team), notice: I18n.t("invitations.notifications.resent")
+    else
+      redirect_to account_dashboard_path, alert: I18n.t("invitations.notifications.resent_error")
+    end
+  end
+
   # GET /invitations/new
   def new
     @invitation.build_membership

data/app/views/account/memberships/_membership.html.erb

@@ -24,6 +24,9 @@
     <% end %>
   </td>
   <td class="text-right">
+    <% if membership.unclaimed? %>
+      <%= button_to t('.buttons.resend'), resend_account_invitation_path(membership.invitation.uuid), class: 'button-secondary button-smaller' %>
+    <% end %>
     <%= link_to t('.buttons.show'), [:account, membership], class: 'button-secondary button-smaller' %>
   </td>
 </tr>

data/app/views/layouts/docs.html.erb

@@ -212,6 +212,12 @@
                     <i class="fab fa-stripe-s ti ti-money"></i>
                   <% end %>
                 <% end %>
+
+                <%= render 'account/shared/menu/item', url: '/docs/billing/usage', label: 'Usage' do |p| %>
+                  <% p.icon do %>
+                    <i class="fal fa-gauge ti ti-ruler"></i>
+                  <% end %>
+                <% end %>
               <% end %>
 
               <%= render 'account/shared/menu/section', title: 'Integration' do %>

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

@@ -56,6 +56,8 @@ en:
       created: 'Invitation was successfully created.'
       updated: 'Invitation was successfully updated.'
       destroyed: 'Invitation was successfully destroyed.'
+      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.
     values:
       name: 'Invitation to Join %{team_name}'

data/config/locales/en/memberships.en.yml

@@ -10,6 +10,7 @@ en:
     buttons: &buttons
       edit: Settings
       show: Details
+      resend: Resend
       update: Update Membership
       demote: Demote from Admin
       promote: Promote to Admin

data/config/routes.rb

@@ -37,6 +37,7 @@ Rails.application.routes.draw do
           member do
             get :accept
             post :accept
+            post :resend
           end
         end
 

data/docs/application-options.md

@@ -1,31 +1,17 @@
 # Application Options
 
-Bullet Train features a list of options available at your disposal to enable/disable functionalities that would otherwise take a significant amount of time to implement. Simply add any of the following environment variables to `config/application.yml` in your main Bullet Train application and restart your server for the options to apply.
+The following configuration options are available for your Bullet Train application. For local development, you can set these values in `config/application.yml`. For hosting providers that we provide first-party support for, you can consult [Render's documentation](https://render.com/docs/environment-variables) and [Heroku's documentation](https://devcenter.heroku.com/articles/config-vars) for how to set these values.
 
-The helper methods below can also be directly invoked in your application if you wish to have parts of your code depend on the functionality in question.
-
-| Option | Type | Example | Helper Methods |
+| Option | Purpose | Example Value <sup><a href="#footnote-1">1</a></sup> | Helper Methods |
 | --- | --- | --- | --- |
-| HIDE_THINGS | Boolean | `"true"` | `scaffolding_things_disabled?` |
-| HIDE_EXAMPLES | Boolean | `"true"` | `scaffolding_things_disabled?` |
-| STRIPE_CLIENT_ID | String | `"your_stripe_client_id"` | `stripe_enabled?` |
-| CLOUDINARY_URL | String | `"cloudinary://your_cloudinary_token_here"` | `cloudinary_enabled?` |
-| TWO_FACTOR_ENCRYPTION_KEY | String | `"your_encryption_key"` | `two_factor_enabled_authentication?` |
-| INVITATION_KEYS | String | `"ofr9h5h9ghzeodh, ofr9h5h9ghzeodi"` | `invitation_keys` `invitation_only?` |
-| 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?` |
+| `BASE_URL` | Specify the full URL where the application is hosted | `https://app.yourproduct.com` | |
+| `HIDE_THINGS` | [Hide the "Creative Concept" demo model and "Tangible Thing" template model](/docs/super-scaffolding.md) | `true` | `scaffolding_things_disabled?` |
+| `STRIPE_CLIENT_ID` | [Enable the example OAuth2 integration with Stripe Connect](/docs/oauth.md) | `ca_DBOenflO97IalW31IEvpvSKGHjOWhGzJ` | `stripe_enabled?` |
+| `CLOUDINARY_URL` | Enable Cloudinary-powered image uploads, including profile photos | `cloudinary://9149...:3HSd...@hfytqhfzj` | `cloudinary_enabled?` |
+| `INVITATION_KEYS` | [Restrict new sign-ups](/docs/authentication.md) | `89dshwxja, a9y29ihs1` | `invitation_keys` `invitation_only?` |
+| `FONTAWESOME_NPM_AUTH_TOKEN` | [Enable Font Awesome Pro](/docs/font-awesome-pro.md) | `5DC62AA7-5741-4C45-874B-EA9CAA4EE085` | `font_awesome?` |
+| `OPENAI_ACCESS_TOKEN` | Enable OpenAI-powered UX improvements | `sk-Tnko8PI15i6du03KkxVExTz3lbkFJV...` | `openai_enabled?` |
+| `REDOCLY_ORGANIZATION_ID` | Enable Redocly-powered API documentation | `your-organization-name` | |
+| `REDOCLY_API_KEY` | Enable Redocly-powered API documentation |`orgsk_lfyrXAAym8nbSrar9b8wvTN+...`| |
 
-| Option | Description |
-| --- | --- |
-| HIDE_THINGS | Hides Bullet Train demo models such as `CreativeConcept` and `TangibleThing`. |
-| HIDE_EXAMPLES | Hides base models such as `CreativeConcept` and `TangibleThing`.
-| STRIPE_CLIENT_ID | See [Bullet Train Billing for Stripe](/docs/billing/stripe.md) for more information and related environment variables. |
-| CLOUDINARY_URL | Enables use of Cloudinary for handling images. |
-| TWO_FACTOR_ENCRYPTION_KEY | Enables two-factor authentication through Devise. |
-| INVITATION_KEYS | See [Invitation Only](/docs/authentication.md) for more information. |
-| 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. |
+<sup><a name="footnote-1"></a>1</sup> Any credentials listed here aren't real, but we wanted you to know what each looks like so you can recognize the correct value from each provider.

data/docs/billing/stripe.md

@@ -38,6 +38,8 @@ cp `bundle show --paths | grep bullet_train-billing-stripe | sort | head -n 1`/d
 
 Note this is different than how many Rails engines ask you to install migrations. This is intentional, as we want to maintain the original timestamps associated with these migrations.
 
+<aside><small>TODO Let's create a `rake bullet_train:billing:stripe:install` task.</small></aside>
+
 ### 2.4. Run Migrations
 
 ```

data/docs/heroku.md

@@ -14,7 +14,7 @@ We've included the "entry-level but production-grade" service tier across the bo
  - [Heroku Postgres](https://elements.heroku.com/addons/heroku-postgresql)
  - [Heroku Redis](https://elements.heroku.com/addons/heroku-redis) to support Sidekiq and Action Cable.
  - [Memcachier](https://elements.heroku.com/addons/memcachier) to support Rails Cache.
- - [HDrive](https://elements.heroku.com/addons/hdrive) to support off-server file uploads backed by AWS S3.
+ - [Bucketeer](https://elements.heroku.com/addons/bucketeer) to support off-server file uploads backed by AWS S3.
  - [Cloudinary](https://cloudinary.com) to support off-server image uploads and ImageMagick processing.
  - [Heroku Scheduler](https://elements.heroku.com/addons/scheduler) for cron jobs.
  - [Rails Autoscale](https://railsautoscale.com) for best-of-breed reactive performance monitoring.
@@ -81,3 +81,13 @@ heroku certs:auto
 ```
 
 You should be done now and your app should be available at `https://app.YOURDOMAIN.COM/account` and any hits to `https://app.YOURDOMAIN.COM` (e.g. when users sign out, etc.) will be redirected to your marketing site.
+
+### 5. Configure CORS on Your Bucketeer S3 Bucket
+
+Before you can upload to your freshly provisioned S3 bucket, you need to run (on Heroku) a rake task we've created for you to set the appropriate CORS settings.
+
+```
+heroku run rake aws:set_cors
+```
+
+Note: If you change `ENV["BASE_URL"]`, you need to re-run this task.

data/docs/index.md

@@ -37,6 +37,7 @@
 
 ## Billing
  - [Stripe](/docs/billing/stripe.md)
+ - [Usage Limits](/docs/billing/usage.md)
 
 ## Integration
  - [REST API](/docs/api.md)

data/lib/bullet_train/resolver.rb

@@ -104,7 +104,7 @@ module BulletTrain
 
       if result[:absolute_path]
         if result[:absolute_path].include?("/bullet_train")
-          regex = /#{"bullet_train-core" if result[:absolute_path].include?("bullet_train-core")}\/bullet_train[.\-_a-z|0-9]*.*/
+          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.
@@ -152,7 +152,7 @@ module BulletTrain
           @needle = partial_parts.join("/")
         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-core\/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 `bullet_train-core` and the gem's version so we can call `bundle show` correctly.
           partial_view_package.gsub!(/bullet_train-core\//, "")
@@ -165,7 +165,7 @@ module BulletTrain
           puts "`#{@needle}`".red
           puts ""
           puts "Check the string one more time to see if the package name is there."
-          puts "i.e.: bullet_train-base/app/views/layouts/devise.html.erb".blue
+          puts "i.e.: bullet_train-1.2.24/app/views/layouts/devise.html.erb".blue
           puts ""
           puts "If you're not sure what the package name is, run `bin/resolve --interactive`, follow the prompt, and pass the annotated path."
           puts "i.e.: <!-- BEGIN /your/local/path/bullet_train-base/app/views/layouts/devise.html.erb -->".blue

data/lib/bullet_train/version.rb

@@ -1,3 +1,3 @@
 module BulletTrain
-  VERSION = "1.2.23"
+  VERSION = "1.2.25"
 end

data/lib/tasks/bullet_train_tasks.rake

@@ -72,7 +72,7 @@ namespace :bullet_train do
     end
   end
 
-  task :develop, [:all_options] => :environment do |t, arguments|
+  task :hack, [:all_options] => :environment do |t, arguments|
     def stream(command, prefix = "  ")
       puts ""
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bullet_train
 version: !ruby/object:Gem::Version
-  version: 1.2.23
+  version: 1.2.25
 platform: ruby
 authors:
 - Andrew Culver
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-04-01 00:00:00.000000000 Z
+date: 2023-05-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: standard