Let BubbleScoped find its own bucket

Then it will be easier to break things that are double nested out of
that nesting.

app/controllers/assignments_controller.rb

@@ -1,5 +1,5 @@
 class AssignmentsController < ApplicationController
-  include BubbleScoped, BucketScoped
+  include BubbleScoped
 
   def new
     render partial: "bubbles/assignment", locals: { bubble: @bubble }

app/controllers/boosts_controller.rb

@@ -1,5 +1,5 @@
 class BoostsController < ApplicationController
-  include BubbleScoped, BucketScoped
+  include BubbleScoped
 
   def create
     count = if params[:boost_count].to_i == @bubble.boosts_count

app/controllers/bubbles/engagements_controller.rb

@@ -1,5 +1,5 @@
 class Bubbles::EngagementsController < ApplicationController
-  include BubbleScoped, BucketScoped
+  include BubbleScoped
 
   def create
     @bubble.engage

app/controllers/bubbles/images_controller.rb

@@ -1,5 +1,5 @@
 class Bubbles::ImagesController < ApplicationController
-  include BubbleScoped, BucketScoped
+  include BubbleScoped
 
   def destroy
     @bubble.image.purge_later

app/controllers/bubbles/pins_controller.rb

@@ -1,5 +1,5 @@
 class Bubbles::PinsController < ApplicationController
-  include BubbleScoped, BucketScoped
+  include BubbleScoped
 
   def show
   end

app/controllers/bubbles/pops_controller.rb

@@ -1,5 +1,5 @@
 class Bubbles::PopsController < ApplicationController
-  include BubbleScoped, BucketScoped
+  include BubbleScoped
 
   def create
     @bubble.pop!(user: Current.user, reason: params[:reason])

app/controllers/bubbles/publishes_controller.rb

@@ -1,5 +1,5 @@
 class Bubbles::PublishesController < ApplicationController
-  include BubbleScoped, BucketScoped
+  include BubbleScoped
 
   def create
     @bubble.publish

app/controllers/bubbles/recovers_controller.rb

@@ -1,5 +1,5 @@
 class Bubbles::RecoversController < ApplicationController
-  include BubbleScoped, BucketScoped
+  include BubbleScoped
 
   def create
     redirect_to @bubble.recover_abandoned_creation

app/controllers/bubbles/stagings_controller.rb

@@ -1,5 +1,5 @@
 class Bubbles::StagingsController < ApplicationController
-  include BubbleScoped, BucketScoped
+  include BubbleScoped
 
   def create
     if params[:stage_id].present?

app/controllers/bubbles/watches_controller.rb

@@ -1,5 +1,5 @@
 class Bubbles::WatchesController < ApplicationController
-  include BubbleScoped, BucketScoped
+  include BubbleScoped
 
   def create
     set_watching_and_redirect(true)

app/controllers/comments_controller.rb

@@ -1,5 +1,5 @@
 class CommentsController < ApplicationController
-  include BubbleScoped, BucketScoped
+  include BubbleScoped
   before_action :set_comment, only: [ :show, :edit, :update, :destroy ]
   before_action :require_own_comment, only: [ :edit, :update, :destroy ]
 

app/controllers/concerns/bubble_scoped.rb

@@ -2,11 +2,15 @@ module BubbleScoped
   extend ActiveSupport::Concern
 
   included do
-    before_action :set_bubble
+    before_action :set_bubble, :set_bucket
   end
 
   private
     def set_bubble
-      @bubble = @bucket.bubbles.find(params[:bubble_id])
+      @bubble = Bubble.find(params[:bubble_id])
+    end
+
+    def set_bucket
+      @bucket = Current.user.buckets.find(@bubble.bucket_id)
     end
 end

app/controllers/readings_controller.rb

@@ -1,5 +1,5 @@
 class ReadingsController < ApplicationController
-  include BubbleScoped, BucketScoped
+  include BubbleScoped
 
   def create
     mark_bubble_notifications_read

app/controllers/taggings_controller.rb

@@ -1,5 +1,5 @@
 class TaggingsController < ApplicationController
-  include BubbleScoped, BucketScoped
+  include BubbleScoped
 
   def new
     render partial: "bubbles/tagging", locals: { bubble: @bubble, tags: Current.account.tags }