bullet_train 1.0.61 → 1.0.64

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4fea59622718639896bc50bb9d91d934331a3f985fd65e22703c1ca19025d349
-  data.tar.gz: f50597d18f7d906c487ff60479b4bbe7ba8bc3cbf7111b1735b394fbc0c11a4f
+  metadata.gz: 93d142860f60bb40085ed4b5eb0cd69e5f86b486f133989ceff74e6dcd0ddf8d
+  data.tar.gz: e4c3d1fd54f92bc813452fe42e39e206d62d736638e9e59298689b826a8371c2
 SHA512:
-  metadata.gz: 41bb8cc66fcef89d33bb568dd2f656eda2c2de1614ca21188d188b35a8385f7407fa682ce67fbd686cc81c0f854195e3e360a9682b9627f6151ecc3a12bd972a
-  data.tar.gz: 8bf40a3c0748b733708d7ddd5dfb33c6034b62ff437101c96d8b0e1fe48cc512c07836f00f060b9e750a5d9146669b64f1f550e815a50fd8312ffa38c1710b45
+  metadata.gz: 5aad86cbc4c699e8dd68d00ee83f383c15d8fafec49433aaa9493d9fe59664500c46d1ebb36d8ac6b9c4fe86529f0e5782cf1b49e29a9de85318b9b69fa7aef3
+  data.tar.gz: 8eaefe2917709c48a2cb66f9a450bb47be0952cdc7fbe15d354e372fc59597a996bcf013c2cccfe0e06cb79d7b47458e578140a87429375e9332158ac0ff68b2

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

@@ -7,6 +7,7 @@ module Controllers::Base
     include InvitationsHelper
 
     include DeviseCurrentAttributes
+    include Pagy::Backend
 
     around_action :set_locale
     layout :layout_by_resource

data/app/helpers/concerns/helpers/base.rb

@@ -0,0 +1,6 @@
+# TODO Why is this required?
+require "pagy"
+
+module Helpers::Base
+  include Pagy::Frontend
+end

data/config/initializers/concerns/inflections_base.rb

@@ -0,0 +1,6 @@
+ActiveSupport::Inflector.inflections(:en) do |inflect|
+  # "_by" is a particularly common suffix for associations in Bullet Train applications (e.g. `created_by`, etc.)
+  # but it gets pluralized incorrectly as "_bies". This should fix both Super Scaffolding for those fields and
+  # the resulting invocations of the scope validator that are generated by Super Scaffolding.
+  inflect.irregular "by", "bys"
+end

data/docs/super-scaffolding.md

@@ -108,6 +108,11 @@ rake db:migrate
 
 As you can see, when we're using `crud-field`, we don't need to supply the chain of ownership back to `Team`.
 
+If you want to scaffold a new field to use for read-only purposes, add the following option to omit the field from the form and all other files that apply:
+```
+bin/super-scaffold crud-field Project description:trix_editor{readonly}
+```
+
 ### 4. Adding Option Fields with Fixed, Translatable Options
 
 Continuing with the earlier example, let's address the following new requirement:

data/lib/bullet_train/resolver.rb

@@ -92,7 +92,16 @@ module BulletTrain
       result[:absolute_path] = class_path || partial_path || locale_path || file_path
 
       if result[:absolute_path]
-        base_path = "bullet_train" + result[:absolute_path].partition("/bullet_train").last
+        if result[:absolute_path].include?("devise")
+          # The annotated path for devise doesn't actually return an absolute path,
+          # so we have to do some extra steps to get the correct string.
+          relative_partial_path = result[:absolute_path]
+          # If it's a devise partial, it should be coming from bullet_train-base
+          base_path = "#{`bundle show bullet_train`.chomp}/" + relative_partial_path
+          result[:absolute_path] = base_path
+        else
+          base_path = "bullet_train" + result[:absolute_path].partition("/bullet_train").last
+        end
 
         # Try to calculate which package the file is from, and what it's path is within that project.
         ["app", "config", "lib"].each do |directory|
@@ -127,7 +136,7 @@ module BulletTrain
 
     def partial_path
       annotated_path = ApplicationController.render(template: "bullet_train/partial_resolver", layout: nil, assigns: {needle: @needle}).lines[1].chomp
-      if annotated_path =~ /<!-- BEGIN (.*) -->/
+      if annotated_path =~ /<!-- BEGIN (\S*) -->/
         $1
       else
         raise "It looks like `config.action_view.annotate_rendered_view_with_filenames` isn't enabled?"

data/lib/bullet_train/version.rb

@@ -1,3 +1,3 @@
 module BulletTrain
-  VERSION = "1.0.61"
+  VERSION = "1.0.64"
 end

data/lib/tasks/bullet_train_tasks.rake

@@ -79,64 +79,64 @@ namespace :bullet_train do
     # TODO Extract this into a YAML file.
     framework_packages = {
       "bullet_train" => {
-        git: "https://github.com/bullet-train-co/bullet_train-base",
+        git: "bullet-train-co/bullet_train-base",
         npm: "@bullet-train/bullet-train"
       },
       "bullet_train-api" => {
-        git: "https://github.com/bullet-train-co/bullet_train-api",
+        git: "bullet-train-co/bullet_train-api",
       },
       "bullet_train-fields" => {
-        git: "https://github.com/bullet-train-co/bullet_train-fields",
+        git: "bullet-train-co/bullet_train-fields",
         npm: "@bullet-train/fields"
       },
       "bullet_train-has_uuid" => {
-        git: "https://github.com/bullet-train-co/bullet_train-has_uuid",
+        git: "bullet-train-co/bullet_train-has_uuid",
       },
       "bullet_train-incoming_webhooks" => {
-        git: "https://github.com/bullet-train-co/bullet_train-incoming_webhooks",
+        git: "bullet-train-co/bullet_train-incoming_webhooks",
       },
       "bullet_train-integrations" => {
-        git: "https://github.com/bullet-train-co/bullet_train-integrations",
+        git: "bullet-train-co/bullet_train-integrations",
       },
       "bullet_train-integrations-stripe" => {
-        git: "https://github.com/bullet-train-co/bullet_train-base-integrations-stripe",
+        git: "bullet-train-co/bullet_train-base-integrations-stripe",
       },
       "bullet_train-obfuscates_id" => {
-        git: "https://github.com/bullet-train-co/bullet_train-obfuscates_id",
+        git: "bullet-train-co/bullet_train-obfuscates_id",
       },
       "bullet_train-outgoing_webhooks" => {
-        git: "https://github.com/bullet-train-co/bullet_train-outgoing_webhooks",
+        git: "bullet-train-co/bullet_train-outgoing_webhooks",
       },
       "bullet_train-outgoing_webhooks-core" => {
-        git: "https://github.com/bullet-train-co/bullet_train-outgoing_webhooks-core",
+        git: "bullet-train-co/bullet_train-outgoing_webhooks-core",
       },
       "bullet_train-scope_questions" => {
-        git: "https://github.com/bullet-train-co/bullet_train-scope_questions",
+        git: "bullet-train-co/bullet_train-scope_questions",
       },
       "bullet_train-scope_validator" => {
-        git: "https://github.com/bullet-train-co/bullet_train-scope_validator",
+        git: "bullet-train-co/bullet_train-scope_validator",
       },
       "bullet_train-sortable" => {
-        git: "https://github.com/bullet-train-co/bullet_train-sortable",
+        git: "bullet-train-co/bullet_train-sortable",
         npm: "@bullet-train/bullet-train-sortable"
       },
       "bullet_train-super_scaffolding" => {
-        git: "https://github.com/bullet-train-co/bullet_train-super_scaffolding",
+        git: "bullet-train-co/bullet_train-super_scaffolding",
       },
       "bullet_train-super_load_and_authorize_resource" => {
-        git: "https://github.com/bullet-train-co/bullet_train-super_load_and_authorize_resource",
+        git: "bullet-train-co/bullet_train-super_load_and_authorize_resource",
       },
       "bullet_train-themes" => {
-        git: "https://github.com/bullet-train-co/bullet_train-themes",
+        git: "bullet-train-co/bullet_train-themes",
       },
       "bullet_train-themes-base" => {
-        git: "https://github.com/bullet-train-co/bullet_train-themes-base",
+        git: "bullet-train-co/bullet_train-themes-base",
       },
       "bullet_train-themes-light" => {
-        git: "https://github.com/bullet-train-co/bullet_train-themes-light",
+        git: "bullet-train-co/bullet_train-themes-light",
       },
       "bullet_train-themes-tailwind_css" => {
-        git: "https://github.com/bullet-train-co/bullet_train-themes-tailwind_css",
+        git: "bullet-train-co/bullet_train-themes-tailwind_css",
       },
     }
 
@@ -169,7 +169,7 @@ namespace :bullet_train do
         # TODO We should check whether the local copy is in a clean state, and if it is, check out `main`.
         # TODO We should also pull `origin/main` to make sure we're on the most up-to-date version of the package.
       else
-        stream "git clone #{details[:git]} local/#{gem}"
+        stream "git clone git@github.com:#{details[:git]}.git local/#{gem}"
       end
 
       # TODO Ask them whether they want to check out a specific branch to work on. (List available remote branches.)
@@ -210,12 +210,12 @@ namespace :bullet_train do
       puts ""
       if details[:npm]
         puts "This package also has an npm package, so we'll link that up as well.".blue
-        stream "cd local/#{gem} && yarn install && yarn link && cd ../.. && yarn link \"#{details[:npm]}\""
+        stream "cd local/#{gem} && yarn install && npx yalc link && cd ../.. && npx yalc link \"#{details[:npm]}\""
 
         puts ""
         puts "And now we're going to watch for any changes you make to the JavaScript and recompile as we go.".blue
         puts "When you're done, you can hit <Control + C> and we'll clean all off this up.".blue
-        stream "cd local/#{gem} && yarn build --watch"
+        stream "cd local/#{gem} && yarn watch"
       else
         puts "This package has no npm package, so we'll just hang out here and do nothing. However, when you hit <Enter> here, we'll start the process of cleaning all of this up.".blue
         $stdin.gets

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bullet_train
 version: !ruby/object:Gem::Version
-  version: 1.0.61
+  version: 1.0.64
 platform: ruby
 authors:
 - Andrew Culver
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-05-01 00:00:00.000000000 Z
+date: 2022-05-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: standard
@@ -193,7 +193,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: pry
+  name: awesome_print
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -207,7 +207,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: pry-stack_explorer
+  name: microscope
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -221,7 +221,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: awesome_print
+  name: http_accept_language
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -235,21 +235,21 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: microscope
+  name: cable_ready
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 5.0.0.pre9
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 5.0.0.pre9
 - !ruby/object:Gem::Dependency
-  name: http_accept_language
+  name: hiredis
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -263,21 +263,21 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: cable_ready
+  name: nice_partials
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 5.0.0.pre9
+        version: '0.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 5.0.0.pre9
+        version: '0.1'
 - !ruby/object:Gem::Dependency
-  name: hiredis
+  name: premailer-rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -291,21 +291,21 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: nice_partials
+  name: figaro
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '0.1'
+        version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '0.1'
+        version: '0'
 - !ruby/object:Gem::Dependency
-  name: premailer-rails
+  name: valid_email
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -319,7 +319,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: figaro
+  name: commonmarker
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -333,7 +333,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: valid_email
+  name: extended_email_reply_parser
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -347,13 +347,13 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: commonmarker
+  name: pry
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-  type: :runtime
+  type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
@@ -361,13 +361,13 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: extended_email_reply_parser
+  name: pry-stack_explorer
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-  type: :runtime
+  type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
@@ -388,6 +388,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: pagy
+  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'
 description: Bullet Train
 email:
 - andrew.culver@gmail.com
@@ -434,6 +448,7 @@ files:
 - app/helpers/account/users_helper.rb
 - app/helpers/attributes_helper.rb
 - app/helpers/base_helper.rb
+- app/helpers/concerns/helpers/base.rb
 - app/helpers/email_helper.rb
 - app/helpers/images_helper.rb
 - app/helpers/invitation_only_helper.rb
@@ -522,6 +537,7 @@ files:
 - app/views/public/home/docs.html.erb
 - app/views/user_mailer/invited.html.erb
 - app/views/user_mailer/welcome.html.erb
+- config/initializers/concerns/inflections_base.rb
 - config/locales/en/base.yml
 - config/locales/en/devise.en.yml
 - config/locales/en/doorkeeper.en.yml