bullet_train 1.1.1 → 1.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9b766f450a6f4015dc33ff340dbca7fc53957ec141989ab6d16767eb3a1346d0
-  data.tar.gz: cc618ee0814669b150d82213304dd51cff59f63b5e7642532965cee14012b9c1
+  metadata.gz: 900a416d92d49a556a9724c2cc3ee3c45ebea3e76b2c2d11cf53fcdfef728cb4
+  data.tar.gz: 13fc0d4b2fb24253d37ce6bcfb5f3f959356b5d71c59ea3811952139337c56f8
 SHA512:
-  metadata.gz: e37d31a4c45c4c321b7cbadb72a0916a0ec3d66786075c56331d4582574248c5cca4875595979eb6baf3856fa11a27b962a5964a699dcc53429352ec97e2405c
-  data.tar.gz: 3aadef0e8b9e0a7048fb948a98f7266ec609dd5940d25b43d3f256e47d14207951f68954a80d62b6002b3d42704933360f139a47598b3266eb7cc9b25a6ab238
+  metadata.gz: 224cb043db7a958c081f4b2df5f03ca8de76e39be57150e83f04978953d6988caf666069f7649ea3dd528b460cb7ea97d363fddf81fd7c002528288f132778fc
+  data.tar.gz: 474e9b7e9fc40a886d1b43e69c562ce0aec7970c974c4e2a53b7c38627af422e4595c55d9a902fe39525de800a94b88988c4467d877f1eb606b48ff3a641a901

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

@@ -18,6 +18,10 @@ module Account::Teams::ControllerBase
       # for magic locales.
       @child_object = @team
     end
+
+    private
+
+    include strong_parameters_from_api
   end
 
   # GET /teams
@@ -124,17 +128,4 @@ module Account::Teams::ControllerBase
   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
-    strong_params = params.require(:team).permit(
-      :name,
-      :time_zone,
-      :locale,
-      *permitted_fields,
-      *permitted_arrays,
-    )
-
-    process_params(strong_params)
-  end
 end

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

@@ -55,6 +55,7 @@ module Account::Users::ControllerBase
   end
 
   # Never trust parameters from the scary internet, only allow the white list through.
+  # TODO Update this to use `include strong_parameters_from_api`.
   def user_params
     # TODO enforce permissions on updating the user's team name.
     strong_params = params.require(:user).permit(

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

@@ -134,9 +134,9 @@ module Controllers::Base
   def process_params(strong_params)
   end
 
-  def delegate_json_to_api
+  def delegate_json_to_api(&block)
     respond_to do |format|
-      format.html
+      format.html(&block)
       format.json { render "#{params[:controller].gsub(/^account\//, "api/#{BulletTrain::Api.current_version}/")}/#{params[:action]}" }
     end
   end

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

@@ -20,6 +20,7 @@ module Users::Base
     has_many :memberships, dependent: :destroy
     has_many :scaffolding_absolutely_abstract_creative_concepts_collaborators, through: :memberships
     has_many :teams, through: :memberships
+    has_many :collaborating_users, through: :teams, source: :users
     belongs_to :current_team, class_name: "Team", optional: true
     accepts_nested_attributes_for :current_team
 

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

@@ -60,8 +60,11 @@ en:
         heading: *locale
       # 🚅 super scaffolding will insert new fields above this line.
       created_at:
-        _: &created_at Created
+        _: &created_at Signed Up At
         heading: *created_at
+      updated_at:
+        _: &updated_at Updated At
+        heading: *updated_at
     _: &self
       name:
         label: Your Team Name
@@ -84,3 +87,4 @@ en:
         locale: *locale
         # 🚅 super scaffolding will insert new activerecord attributes above this line.
         created_at: *created_at
+        updated_at: *updated_at

data/config/locales/en/users.en.yml

@@ -27,6 +27,10 @@ en:
     notifications:
       updated: User was successfully updated.
     fields: &fields
+      id:
+        _: &id Team ID
+        label: *id
+        heading: *id
       name:
         heading: Name
       first_name:
@@ -64,8 +68,11 @@ en:
         help: By default the interface language will adjust based on each team's language setting, but you can set a global personal preference for your account here.
       # 🚅 super scaffolding will insert new fields above this line.
       created_at:
-        _: &created_at Signed Up
+        _: &created_at Signed Up At
         heading: *created_at
+      updated_at:
+        _: &updated_at Updated At
+        heading: *updated_at
     # this is how we define customizations to fields for a specific namespace.
     _: &self
       email:
@@ -105,6 +112,7 @@ en:
         time_zone: *time_zone
         locale: *locale
         # 🚅 super scaffolding will insert new activerecord attributes above this line.
-        created_at: *created_at
         password: *password
         password_confirmation: *password_confirmation
+        created_at: *created_at
+        updated_at: *updated_at

data/lib/bullet_train/version.rb

@@ -1,3 +1,3 @@
 module BulletTrain
-  VERSION = "1.1.1"
+  VERSION = "1.1.4"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bullet_train
 version: !ruby/object:Gem::Version
-  version: 1.1.1
+  version: 1.1.4
 platform: ruby
 authors:
 - Andrew Culver
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-09-04 00:00:00.000000000 Z
+date: 2022-09-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: standard