before_actions 1.0.3 → 2.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2e4ee37335a868dce4d6989fa8bcf2aa51211305
-  data.tar.gz: 04d348d389f0bf9b38a85f6a1c6280a4b28988dd
+  metadata.gz: 38d5782d5fc96b6f64457ca39615c5f14ebaffb6
+  data.tar.gz: 32e5ba5e92e3cdc20c4a189b3b18736c76b6ff80
 SHA512:
-  metadata.gz: c34525ee42fbf171c2b3e390f05a4a7e39643b2e76980ce1fe1303c40ae33905fa2c9f33fc70546c12f036f4f301bf884370448ea9f87480d98e224d20a68d1e
-  data.tar.gz: 7a5453eaddb502f232981e1c56022fab78c2b3ca0b591537b099a014af8b0eba8a61cdb64db95315eccec84bd45b542fa6e120225a2168e21617966a82831a9f
+  metadata.gz: 1232f85342de51775e3eae3e3253f0993ee5d76477aabb9a47c1623caf6a5335912060481248e6856136f65af48864953483e172fd44563e5667a7bd473f7631
+  data.tar.gz: ef712f8fb8f3cdced98e658639b83f04145758f83490f0261361d1214aa59accde3664abd441de9624315255666097915a2a113ecb23d71ccd9f3b532c93ab74

data/lib/before_actions.rb

@@ -1,12 +1,7 @@
 require "before_actions/engine"
-require "before_actions/controller"
+require "before_actions/controller/scope"
+require "before_actions/controller/controller"
+require "before_actions/monkey_patching"
 
 module BeforeActions
 end
-
-
-if defined? ActionController::Base
-  ActionController::Base.class_eval do
-    include BeforeActions::Controller
-  end
-end

data/lib/before_actions/controller/controller.rb

@@ -0,0 +1,18 @@
+module BeforeActions
+  module Controller
+    extend ActiveSupport::Concern
+
+    module ClassMethods
+      def before_actions(&block)
+        Scope.new(self, 'before_action').instance_eval(&block)
+      end
+      def after_actions(&block)
+        Scope.new(self, 'after_action').instance_eval(&block)
+      end
+      def around_actions(&block)
+        Scope.new(self, 'around_action').instance_eval(&block)
+      end
+    end
+
+  end
+end

data/lib/before_actions/controller/scope.rb

@@ -0,0 +1,24 @@
+module BeforeActions
+  module Controller
+    class Scope
+
+      def initialize(controller, the_method)
+        @controller = controller
+        @the_method = the_method
+      end
+
+      def all(&block)
+        @controller.send(@the_method, &block)
+      end
+
+      def only(*list, &block)
+        @controller.send(@the_method, {only: list}, &block)
+      end
+
+      def except(*list, &block)
+        @controller.send(@the_method, {only: list}, &block)
+      end
+
+    end
+  end
+end

data/lib/before_actions/monkey_patching.rb

@@ -0,0 +1,5 @@
+if defined? ActionController::Base
+  ActionController::Base.class_eval do
+    include BeforeActions::Controller
+  end
+end

data/lib/before_actions/version.rb

@@ -1,3 +1,3 @@
 module BeforeActions
-  VERSION = "1.0.3"
+  VERSION = "2.0.0"
 end

data/spec/controllers/bunny_controller_spec.rb

@@ -0,0 +1,29 @@
+require 'rails_helper'
+
+RSpec.describe BunnyController, :type => :controller do
+
+  describe "GET one" do
+    it "returns http success" do
+      get :one
+      expect(response).to have_http_status(:success)
+      expect(assigns(:bunny)).to eq("one")
+    end
+  end
+
+  describe "GET two" do
+    it "returns http success" do
+      get :two
+      expect(response).to have_http_status(:success)
+      expect(assigns(:bunny)).to eq("two-around two- -single-responsibility- -around two-")
+    end
+  end
+
+  describe "GET three" do
+    it "returns http success" do
+      get :three
+      expect(response).to have_http_status(:success)
+      expect(assigns(:bunny)).to eq("three")
+    end
+  end
+
+end

data/spec/controllers/cat_controller_spec.rb

@@ -0,0 +1,29 @@
+require 'rails_helper'
+
+RSpec.describe CatController, :type => :controller do
+
+  describe "GET one" do
+    it "returns http success" do
+      get :one
+      expect(response).to have_http_status(:success)
+      expect(assigns(:cat)).to eq("one")
+    end
+  end
+
+  describe "GET two" do
+    it "returns http success" do
+      get :two
+      expect(response).to have_http_status(:success)
+      expect(assigns(:cat)).to eq("after two")
+    end
+  end
+
+  describe "GET three" do
+    it "returns http success" do
+      get :three
+      expect(response).to have_http_status(:success)
+      expect(assigns(:cat)).to eq("three")
+    end
+  end
+
+end

data/spec/controllers/dog_controller_spec.rb

@@ -0,0 +1,29 @@
+require 'rails_helper'
+
+RSpec.describe DogController, :type => :controller do
+
+  describe "GET one" do
+    it "returns http success" do
+      get :one
+      expect(response).to have_http_status(:success)
+      expect(assigns(:dog)).to eq("before one and two")
+    end
+  end
+
+  describe "GET two" do
+    it "returns http success" do
+      get :two
+      expect(response).to have_http_status(:success)
+      expect(assigns(:dog)).to eq("before one and two")
+    end
+  end
+
+  describe "GET three" do
+    it "returns http success" do
+      get :three
+      expect(response).to have_http_status(:success)
+      expect(assigns(:dog)).to eq("three")
+    end
+  end
+
+end

data/spec/controllers/squirrel_controller_spec.rb

@@ -0,0 +1,29 @@
+require 'rails_helper'
+
+RSpec.describe SquirrelController, :type => :controller do
+
+  describe "GET one" do
+    it "returns http success" do
+      get :one
+      expect(response).to have_http_status(:success)
+      expect(assigns(:squirrel)).to eq("except before one")
+    end
+  end
+
+  describe "GET two" do
+    it "returns http success" do
+      get :two
+      expect(response).to have_http_status(:success)
+      expect(assigns(:squirrel)).to eq("two")
+    end
+  end
+
+  describe "GET three" do
+    it "returns http success" do
+      get :three
+      expect(response).to have_http_status(:success)
+      expect(assigns(:squirrel)).to eq("three")
+    end
+  end
+
+end

data/spec/dummy/app/controllers/admin_foos_controller.rb

@@ -2,11 +2,11 @@ class AdminFoosController < ApplicationController
 
   # Use callbacks to share common setup or constraints between actions.
   before_actions do
-    actions(:new, :create, :edit, :update, :destroy) { render_not_authorized }
-    actions(:index)                          { @admin_foos = AdminFoo.all               }
-    actions(:new)                            { raise_it      }
-    actions(:create)                         { raise_it      }
-    actions(:show, :edit, :update, :destroy) { @admin_foo  = AdminFoo.find(params[:id]) }
+    only(:new, :create, :edit, :update, :destroy) { render_not_authorized }
+    only(:index)                          { @admin_foos = AdminFoo.all               }
+    only(:new)                            { raise_it      }
+    only(:create)                         { raise_it      }
+    only(:show, :edit, :update, :destroy) { @admin_foo  = AdminFoo.find(params[:id]) }
   end
 
   def index

data/spec/dummy/app/controllers/bunny_controller.rb

@@ -0,0 +1,24 @@
+class BunnyController < ApplicationController
+
+  before_actions do
+    all { @bunny = action_name }
+  end
+
+  around_actions do
+    only(:two) do |controller, action|
+      @bunny += "-around two-"
+      action.call
+      @bunny += "-around two-"
+    end
+  end
+
+  def one
+  end
+
+  def two
+    @bunny += " -single-responsibility- "
+  end
+
+  def three
+  end
+end

data/spec/dummy/app/controllers/cat_controller.rb

@@ -0,0 +1,19 @@
+class CatController < ApplicationController
+
+  before_actions do
+    all { @cat = action_name }
+  end
+
+  after_actions do
+    only(:two) { @cat = "after two" }
+  end
+
+  def one
+  end
+
+  def two
+  end
+
+  def three
+  end
+end

data/spec/dummy/app/controllers/dog_controller.rb

@@ -0,0 +1,18 @@
+class DogController < ApplicationController
+
+  before_actions do
+    all              { @dog = action_name }
+    only(:one)       { @dog = "before one" }
+    only(:one, :two) { @dog = "before one and two" }
+  end
+
+  def one
+  end
+
+  def two
+  end
+
+  def three
+  end
+
+end

data/spec/dummy/app/controllers/foos_controller.rb

@@ -2,12 +2,12 @@ class FoosController < ApplicationController
 
   # Use callbacks to share common setup or constraints between actions.
   before_actions do
-    actions                                  {  } # load your nested resource's parent here if you need one
-    actions(:index)                          { @foos = Foo.all                }
-    actions(:new)                            { @foo  = Foo.new                }
-    actions(:create)                         { @foo  = Foo.new(foo_params)    }
-    actions(:show, :edit, :update, :destroy) { @foo  = Foo.find(params[:id])  }
-    actions                                  {  } # run your authorization logic here if you need one
+    # all                                   {  } # load your nested resource's parent here if you need one
+    only(:index)                          { @foos = Foo.all                }
+    only(:new)                            { @foo  = Foo.new                }
+    only(:create)                         { @foo  = Foo.new(foo_params)    }
+    only(:show, :edit, :update, :destroy) { @foo  = Foo.find(params[:id])  }
+    # all                                   {  } # run your authorization logic here if you need one
   end
 
   # GET /foos

data/spec/dummy/app/controllers/squirrel_controller.rb

@@ -0,0 +1,16 @@
+class SquirrelController < ApplicationController
+
+  before_actions do
+    all              { @squirrel = action_name }
+    except(:one)     { @squirrel = "except before one" }
+  end
+
+  def one
+  end
+
+  def two
+  end
+
+  def three
+  end
+end

data/spec/dummy/app/views/bunny/one.html.erb

@@ -0,0 +1,2 @@
+<h1>Bunny#one</h1>
+<p>Find me in app/views/bunny/one.html.erb</p>

data/spec/dummy/app/views/bunny/three.html.erb

@@ -0,0 +1,2 @@
+<h1>Bunny#three</h1>
+<p>Find me in app/views/bunny/three.html.erb</p>

data/spec/dummy/app/views/bunny/two.html.erb

@@ -0,0 +1,2 @@
+<h1>Bunny#two</h1>
+<p>Find me in app/views/bunny/two.html.erb</p>

data/spec/dummy/app/views/cat/one.html.erb

@@ -0,0 +1,2 @@
+<h1>Cat#one</h1>
+<p>Find me in app/views/cat/one.html.erb</p>

data/spec/dummy/app/views/cat/three.html.erb

@@ -0,0 +1,2 @@
+<h1>Cat#three</h1>
+<p>Find me in app/views/cat/three.html.erb</p>

data/spec/dummy/app/views/cat/two.html.erb

@@ -0,0 +1,2 @@
+<h1>Cat#two</h1>
+<p>Find me in app/views/cat/two.html.erb</p>

data/spec/dummy/app/views/dog/one.html.erb

@@ -0,0 +1,2 @@
+<h1>Dog#one</h1>
+<p>Find me in app/views/dog/one.html.erb</p>

data/spec/dummy/app/views/dog/three.html.erb

@@ -0,0 +1,2 @@
+<h1>Dog#three</h1>
+<p>Find me in app/views/dog/three.html.erb</p>

data/spec/dummy/app/views/dog/two.html.erb

@@ -0,0 +1,2 @@
+<h1>Dog#two</h1>
+<p>Find me in app/views/dog/two.html.erb</p>

data/spec/dummy/app/views/squirrel/one.html.erb

@@ -0,0 +1,2 @@
+<h1>Squirrel#one</h1>
+<p>Find me in app/views/squirrel/one.html.erb</p>

data/spec/dummy/app/views/squirrel/three.html.erb

@@ -0,0 +1,2 @@
+<h1>Squirrel#three</h1>
+<p>Find me in app/views/squirrel/three.html.erb</p>

data/spec/dummy/app/views/squirrel/two.html.erb

@@ -0,0 +1,2 @@
+<h1>Squirrel#two</h1>
+<p>Find me in app/views/squirrel/two.html.erb</p>

data/spec/dummy/config/routes.rb

@@ -1,8 +1,24 @@
 Rails.application.routes.draw do
 
-  resources :admin_foos
+  get 'squirrel/one'
+
+  get 'squirrel/two'
+
+  get 'squirrel/three'
+
+  get 'bunny/one'
+  get 'bunny/two'
+  get 'bunny/three'
 
+  get 'cat/one'
+  get 'cat/two'
+  get 'cat/three'
+
+  get 'dog/one'
+  get 'dog/two'
+  get 'dog/three'
+
+  resources :admin_foos
   resources :foos
 
-  mount BeforeActions::Engine => "/load_resource"
 end

data/spec/dummy/lib/templates/rails/scaffold_controller/controller.rb

@@ -7,12 +7,13 @@ class <%= controller_class_name %>Controller < ApplicationController
 
   # Use callbacks to share common setup or constraints between actions.
   before_actions do
-    actions                                  {  } # load your nested resource's parent here if you need one
-    actions(:index)                          { @<%= plural_table_name %> = <%= orm_class.all(class_name) %>                }
-    actions(:new)                            { @<%= singular_table_name %>  = <%= orm_class.build(class_name) %>                }
-    actions(:create)                         { @<%= singular_table_name %>  = <%= orm_class.build(class_name, "#{singular_table_name}_params") %> }
-    actions(:show, :edit, :update, :destroy) { @<%= singular_table_name %>  = <%= orm_class.find(class_name, "params[:id]") %>  }
-    actions                                  {  } # run your authorization logic here if you need one
+    # all                                   {  } # pre-fetching authorization step
+    # all                                   {  } # load your nested resource's parent here
+    only(:index)                          { @<%= plural_table_name %> = <%= orm_class.all(class_name) %>                }
+    only(:new)                            { @<%= singular_table_name %>  = <%= orm_class.build(class_name) %>                }
+    only(:create)                         { @<%= singular_table_name %>  = <%= orm_class.build(class_name, "#{singular_table_name}_params") %> }
+    only(:show, :edit, :update, :destroy) { @<%= singular_table_name %>  = <%= orm_class.find(class_name, "params[:id]") %>  }
+    # all                                   {  } # post-fetching authorization step
   end
 
   # GET <%= route_url %>
@@ -26,25 +27,11 @@ class <%= controller_class_name %>Controller < ApplicationController
 
 
 
+
   # GET <%= route_url %>/new
   def new
   end
 
-  # GET <%= route_url %>/1
-  # GET <%= route_url %>/1.json
-  def show
-    respond_to do |format|
-      format.html # show.html.erb
-      format.json { render json: <%= "@#{singular_table_name}" %> }
-    end
-  end
-
-  # GET <%= route_url %>/1/edit
-  def edit
-  end
-
-
-
   # POST <%= route_url %>
   # POST <%= route_url %>.json
   def create
@@ -59,6 +46,23 @@ class <%= controller_class_name %>Controller < ApplicationController
     end
   end
 
+
+
+
+
+  # GET <%= route_url %>/1
+  # GET <%= route_url %>/1.json
+  def show
+    respond_to do |format|
+      format.html # show.html.erb
+      format.json { render json: <%= "@#{singular_table_name}" %> }
+    end
+  end
+
+  # GET <%= route_url %>/1/edit
+  def edit
+  end
+
   # PATCH/PUT <%= route_url %>/1
   # PATCH/PUT <%= route_url %>/1.json
   def update