bullet_train 1.0.11 → 1.0.15

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: fe8d2496703f3d58b654d6a86b7fa9f5b0e1a29d7f6abc392c4393e0033147fc
-  data.tar.gz: 4d2eec433d7d5b7b8c9d65adb600c338e561b905fb659925dd70d162a979cfc5
+  metadata.gz: 301b2a691f3affe527a614392681f2038544d45203e0bc339fc01bc253209273
+  data.tar.gz: c124ba84eba0dc3745bc1da337331bb58168832f670a88ba08ad1c669691fb38
 SHA512:
-  metadata.gz: 52f166965026e286f9d8f1c36bee7dc002192eb754ab5186ad6d225de5317b124fc58865b16ac371336c2df38742c0c46deb34cf2a3321357f385284ea35fe61
-  data.tar.gz: 5fdadbf567930300788d5a5806495cc39331bd160425e722e2ebb515af2f3880ae7b0b0471f6ccc4e19cd27c40fc7b0bfb82f847c8050c840a7ff38be2c66515
+  metadata.gz: b9794f6f91d92c294f1b631b8666411ae7fc37c255c42a44c5b753c2498f65a6b8fcdd5c2eb064671e4b9eaaeb5ef2fa86d67e4eab6f102292dae4471caa3183
+  data.tar.gz: b58aca98a77c6281e46ebd31c22d175557ca8c265a0a6d383d2810d2b06867da01015712a0e4724f507f0896331ecb201a4d785907104935d9574bfb71b64fb6

data/app/controllers/account/memberships_controller.rb

@@ -1,3 +1,22 @@
 class Account::MembershipsController < Account::ApplicationController
   include Account::Memberships::ControllerBase
+
+  private
+
+  def permitted_fields
+    [
+      # 🚅 super scaffolding will insert new fields above this line.
+    ]
+  end
+
+  def permitted_arrays
+    {
+      # 🚅 super scaffolding will insert new arrays above this line.
+    }
+  end
+
+  def process_params(strong_params)
+    # 🚅 super scaffolding will insert processing for new fields above this line.
+    strong_params
+  end
 end

data/app/controllers/account/teams_controller.rb

@@ -1,3 +1,22 @@
 class Account::TeamsController < Account::ApplicationController
   include Account::Teams::ControllerBase
+
+  private
+
+  def permitted_fields
+    [
+      # 🚅 super scaffolding will insert new fields above this line.
+    ]
+  end
+
+  def permitted_arrays
+    {
+      # 🚅 super scaffolding will insert new arrays above this line.
+    }
+  end
+
+  def process_params(strong_params)
+    # 🚅 super scaffolding will insert processing for new fields above this line.
+    strong_params
+  end
 end

data/app/controllers/account/users_controller.rb

@@ -1,3 +1,22 @@
 class Account::UsersController < Account::ApplicationController
   include Account::Users::ControllerBase
+
+  private
+
+  def permitted_fields
+    [
+      # 🚅 super scaffolding will insert new fields above this line.
+    ]
+  end
+
+  def permitted_arrays
+    {
+      # 🚅 super scaffolding will insert new arrays above this line.
+    }
+  end
+
+  def process_params(strong_params)
+    # 🚅 super scaffolding will insert processing for new fields above this line.
+    strong_params
+  end
 end

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

@@ -112,6 +112,18 @@ module Account::Invitations::ControllerBase
 
   private
 
+  def permitted_fields
+    raise "It looks like you've removed `permitted_fields` from your controller. This will break Super Scaffolding."
+  end
+
+  def permitted_arrays
+    raise "It looks like you've removed `permitted_arrays` from your controller. This will break Super Scaffolding."
+  end
+
+  def process_params(strong_params)
+    raise "It looks like you've removed `process_params` from your controller. This will break Super Scaffolding."
+  end
+
   def manageable_role_keys
     helpers.current_membership.manageable_roles.map(&:key)
   end
@@ -143,8 +155,6 @@ module Account::Invitations::ControllerBase
 
     end
 
-    # 🚅 super scaffolding will insert processing for new fields above this line.
-
     strong_params
   end
 end

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

@@ -2,7 +2,9 @@ module Account::Memberships::ControllerBase
   extend ActiveSupport::Concern
 
   included do
-    account_load_and_authorize_resource :membership, :team, member_actions: [:demote, :promote, :reinvite], collection_actions: [:search]
+    account_load_and_authorize_resource :membership, :team,
+      member_actions: [:demote, :promote, :reinvite] + (defined?(MEMBER_ACTIONS) ? MEMBER_ACTIONS : []),
+      collection_actions: [:search] + (defined?(COLLECTION_ACTIONS) ? COLLECTION_ACTIONS : [])
   end
 
   def index
@@ -104,8 +106,8 @@ module Account::Memberships::ControllerBase
       :user_first_name,
       :user_last_name,
       :user_profile_photo_id,
-      # 🚅 super scaffolding will insert new fields above this line.
-      # 🚅 super scaffolding will insert new arrays above this line.
+      *permitted_fields,
+      *permitted_arrays,
     )
 
     # after that, we have to be more careful how we update the roles.
@@ -131,6 +133,6 @@ module Account::Memberships::ControllerBase
 
     # 🚅 super scaffolding will insert processing for new fields above this line.
 
-    strong_params
+    process_params(strong_params)
   end
 end

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

@@ -2,7 +2,9 @@ module Account::Teams::ControllerBase
   extend ActiveSupport::Concern
 
   included do
-    load_and_authorize_resource :team, class: "Team", prepend: true
+    load_and_authorize_resource :team, class: "Team", prepend: true,
+      member_actions: (defined?(MEMBER_ACTIONS) ? MEMBER_ACTIONS : []),
+      collection_actions: (defined?(COLLECTION_ACTIONS) ? COLLECTION_ACTIONS : [])
 
     prepend_before_action do
       if params["action"] == "new"
@@ -111,16 +113,28 @@ module Account::Teams::ControllerBase
 
   private
 
+  def permitted_fields
+    raise "It looks like you've removed `permitted_fields` from your controller. This will break Super Scaffolding."
+  end
+
+  def permitted_arrays
+    raise "It looks like you've removed `permitted_arrays` from your controller. This will break Super Scaffolding."
+  end
+
+  def process_params(strong_params)
+    raise "It looks like you've removed `process_params` from your controller. This will break Super Scaffolding."
+  end
+
   # Never trust parameters from the scary internet, only allow the white list through.
   def team_params
-    params.require(:team).permit(
+    strong_params = params.require(:team).permit(
       :name,
       :time_zone,
       :locale,
-      # 🚅 super scaffolding will insert new fields above this line.
-      # 🚅 super scaffolding will insert new arrays above this line.
+      *permitted_fields,
+      *permitted_arrays,
     )
 
-    # 🚅 super scaffolding will insert processing for new fields above this line.
+    process_params(strong_params)
   end
 end

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

@@ -2,7 +2,9 @@ module Account::Users::ControllerBase
   extend ActiveSupport::Concern
 
   included do
-    load_and_authorize_resource
+    load_and_authorize_resource :user, class: "User", prepend: true,
+      member_actions: (defined?(MEMBER_ACTIONS) ? MEMBER_ACTIONS : []),
+      collection_actions: (defined?(COLLECTION_ACTIONS) ? COLLECTION_ACTIONS : [])
 
     before_action do
       # for magic locales.
@@ -40,24 +42,39 @@ module Account::Users::ControllerBase
 
   private
 
+  def permitted_fields
+    raise "It looks like you've removed `permitted_fields` from your controller. This will break Super Scaffolding."
+  end
+
+  def permitted_arrays
+    raise "It looks like you've removed `permitted_arrays` from your controller. This will break Super Scaffolding."
+  end
+
+  def process_params(strong_params)
+    raise "It looks like you've removed `process_params` from your controller. This will break Super Scaffolding."
+  end
+
   # Never trust parameters from the scary internet, only allow the white list through.
   def user_params
     # TODO enforce permissions on updating the user's team name.
-    params.require(:user).permit(
-      :email,
-      :first_name,
-      :last_name,
-      :time_zone,
-      :current_password,
-      :password,
-      :password_confirmation,
-      :profile_photo_id,
-      :locale,
-      # 🚅 super scaffolding will insert new fields above this line.
-      current_team_attributes: [:name],
-      # 🚅 super scaffolding will insert new arrays above this line.
+    strong_params = params.require(:user).permit(
+      *([
+        :email,
+        :first_name,
+        :last_name,
+        :time_zone,
+        :current_password,
+        :password,
+        :password_confirmation,
+        :profile_photo_id,
+        :locale,
+      ] + permitted_fields + [
+        {
+          current_team_attributes: [:name]
+        }.merge(permitted_arrays)
+      ])
     )
 
-    # 🚅 super scaffolding will insert processing for new fields above this line.
+    process_params(strong_params)
   end
 end

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

@@ -0,0 +1 @@
+<%# 🚅 super scaffolding will insert new fields above this line. %>

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

@@ -35,6 +35,7 @@
     <% end %>
   <% end %>
 
+  <%= render "account/memberships/fields", membership: membership, form: form %>
   <%# 🚅 super scaffolding will insert new fields above this line. %>
 
   <div class="buttons">

data/app/views/account/teams/_fields.html.erb

@@ -0,0 +1 @@
+<%# 🚅 super scaffolding will insert new fields above this line. %>

data/app/views/account/teams/_form.html.erb

@@ -12,6 +12,7 @@
       <%= render 'shared/fields/buttons', method: :locale, options: t("locale.locales") %>
     <% end %>
 
+    <%= render "account/teams/fields", team: team, form: form %>
     <%# 🚅 super scaffolding will insert new fields above this line. %>
   <% end %>
 

data/app/views/account/users/_fields.html.erb

@@ -0,0 +1 @@
+<%# 🚅 super scaffolding will insert new fields above this line. %>

data/app/views/account/users/_form.html.erb

@@ -30,6 +30,9 @@
           <%= render 'shared/fields/buttons', method: :locale, options: {"": t("locale.default")}.merge(t("locale.locales")) %>
         </div>
       <% end %>
+
+      <%= render "account/users/fields", user: user, form: form %>
+      <%# 🚅 super scaffolding will insert new fields above this line. %>
     </div>
   <% end %>
 

data/config/locales/en/teams.en.yml

@@ -77,7 +77,7 @@ en:
     teams: *teams
   activerecord:
     attributes:
-      user:
+      team:
         name: *name
         time_zone: *time_zone
         locale: *locale

data/lib/bullet_train/version.rb

@@ -1,3 +1,3 @@
 module BulletTrain
-  VERSION = "1.0.11"
+  VERSION = "1.0.15"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bullet_train
 version: !ruby/object:Gem::Version
-  version: 1.0.11
+  version: 1.0.15
 platform: ruby
 authors:
 - Andrew Culver
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-02-12 00:00:00.000000000 Z
+date: 2022-02-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -24,6 +24,62 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 7.0.0
+- !ruby/object:Gem::Dependency
+  name: bullet_train-roles
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 0.1.4
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 0.1.4
+- !ruby/object:Gem::Dependency
+  name: bullet_train-super_load_and_authorize_resource
+  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: bullet_train-has_uuid
+  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: bullet_train-scope_validator
+  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
@@ -94,6 +150,7 @@ files:
 - 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
 - app/views/account/memberships/_index.html.erb
 - app/views/account/memberships/_menu_item.html.erb
@@ -104,6 +161,7 @@ files:
 - app/views/account/onboarding/user_details/edit.html.erb
 - app/views/account/onboarding/user_email/edit.html.erb
 - app/views/account/teams/_breadcrumbs.html.erb
+- app/views/account/teams/_fields.html.erb
 - app/views/account/teams/_form.html.erb
 - app/views/account/teams/_index.html.erb
 - app/views/account/teams/_menu_item.html.erb
@@ -117,6 +175,7 @@ files:
 - app/views/account/two_factors/create.js.erb
 - app/views/account/two_factors/destroy.js.erb
 - app/views/account/users/_breadcrumbs.html.erb
+- app/views/account/users/_fields.html.erb
 - app/views/account/users/_form.html.erb
 - app/views/account/users/edit.html.erb
 - app/views/account/users/show.html.erb