before_actions 1.0.2 → 1.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ea9d707f1d88575ff7beb6ee79a347f5284bf5b6
-  data.tar.gz: 914c0a5932b5b0081d41001e45e0904e0911bc9c
+  metadata.gz: 2e4ee37335a868dce4d6989fa8bcf2aa51211305
+  data.tar.gz: 04d348d389f0bf9b38a85f6a1c6280a4b28988dd
 SHA512:
-  metadata.gz: cd0cc56ec57da9eb2aedc71bed330b08ac9f17f249adc0b681ba85151e17f1598540373ded5ace62ff9aef8e6d8aaef433ec42c6563976ccff31d422c85759c7
-  data.tar.gz: fefc09e1cb6d87cb7d855f08f57275b656e76ddb97ffe3932a604719d9cc147fd93cb67dee8cea715d31cdc60067912d84c332d09b4108c18571bc27531123cc
+  metadata.gz: c34525ee42fbf171c2b3e390f05a4a7e39643b2e76980ce1fe1303c40ae33905fa2c9f33fc70546c12f036f4f301bf884370448ea9f87480d98e224d20a68d1e
+  data.tar.gz: 7a5453eaddb502f232981e1c56022fab78c2b3ca0b591537b099a014af8b0eba8a61cdb64db95315eccec84bd45b542fa6e120225a2168e21617966a82831a9f

data/README.md

@@ -0,0 +1,106 @@
+# Before Actions
+
+Organize your controllers by grouping your before and after filters.
+
+## Status
+
+[![Gem Version](https://badge.fury.io/rb/before_actions.png)](http://badge.fury.io/rb/before_actions)
+[![Dependency Status](https://gemnasium.com/before-actions-gem/before_actions.svg)](https://gemnasium.com/before-actions-gem/before_actions)
+[![Inline docs](http://inch-ci.org/github/before-actions-gem/before_actions.png)](http://inch-ci.org/github/before-actions-gem/before_actions)
+[![Code Climate](https://codeclimate.com/github/before-actions-gem/before_actions.png)](https://codeclimate.com/github/before-actions-gem/before_actions)
+[![Code Climate](https://codeclimate.com/github/before-actions-gem/before_actions/coverage.png)](https://codeclimate.com/github/before-actions-gem/before_actions)
+[![License](http://img.shields.io/badge/license-MIT-blue.svg?style=flat)](https://github.com/before-actions-gem/before_actions/blob/master/LICENSE.md)
+
+
+## References
+
+* Home page: https://github.com/before-actions-gem/before_actions
+* API Doc: http://rdoc.info/gems/before_actions
+* Version: https://rubygems.org/gems/before_actions
+* Trello Board: https://trello.com/b/PMRfJAqq/before-actions-gem
+
+## Support
+
+* Bugs/Issues: https://github.com/before-actions-gem/before_actions/issues
+* Support: http://stackoverflow.com/questions/tagged/before_actions
+* Support/Chat: [![Gitter chat](https://badges.gitter.im/before-actions-gem/before_actions.png)](https://gitter.im/before-actions-gem/before_actions)
+
+
+## Installation
+
+Add this line to your application's Gemfile:
+
+```ruby
+gem 'before_actions'
+```
+
+And then execute:
+
+```bash
+bundle
+rails g before_actions:install
+```
+
+
+
+
+
+## Demo
+
+Check this gem in use: [app/controllers/contacts_controller.rb](https://github.com/before-actions-gem/before_actions/blob/master/readme_images/contacts_controller.rb)
+
+```ruby
+class ContactsController < ApplicationController
+
+  # load and authorize resources
+  before_actions do
+    # all actions
+    # actions {  }
+
+    # list actions
+    actions(:index) { @contacts = Contact.all }
+
+    # building actions
+    actions(:new)    { @contact = Contact.new }
+    actions(:create) { @contact = Contact.new(contact_params) }
+
+    # member actions, will raise a 404 if the model is not found
+    actions(:show, :edit, :update, :destroy) { @contact = Contact.find(params[:id]) }
+
+    # all actions
+    # actions {  }
+  end
+
+  ...
+
+  def contact_params
+    params.require(:contact).permit(:name)
+  end
+end
+```
+
+#### Demo Resource
+
+<img src="readme_images/controller.jpg" alt="controller.jpg" />
+
+#### Demo Nested Resource
+
+<img src="readme_images/nested.png" alt="nested.png" />
+
+
+
+
+
+
+
+## Contributing
+
+1. Fork it ( https://github.com/github.com/before-actions-gem/before_actions/fork )
+2. Create your feature branch (`git checkout -b my-new-feature`)
+3. Commit your changes (`git commit -am 'Add some feature'`)
+4. Push to the branch (`git push origin my-new-feature`)
+5. Create a new Pull Request
+
+## Versioning
+
+__Before Actions__ uses [Semantic Versioning 2.0.0](http://semver.org)

data/Rakefile

@@ -1,34 +1,28 @@
+#!/usr/bin/env rake
+
 begin
   require 'bundler/setup'
 rescue LoadError
   puts 'You must `gem install bundler` and `bundle install` to run rake tasks'
 end
 
-require 'rdoc/task'
+APP_RAKEFILE = File.expand_path("../spec/dummy/Rakefile", __FILE__)
+load 'rails/tasks/engine.rake'
 
-RDoc::Task.new(:rdoc) do |rdoc|
-  rdoc.rdoc_dir = 'rdoc'
-  rdoc.title    = 'BeforeActions'
-  rdoc.options << '--line-numbers'
-  rdoc.rdoc_files.include('README.rdoc')
-  rdoc.rdoc_files.include('lib/**/*.rb')
-end
+Bundler::GemHelper.install_tasks
 
-APP_RAKEFILE = File.expand_path("../test/dummy/Rakefile", __FILE__)
-load 'rails/tasks/engine.rake'
 
 
 
-Bundler::GemHelper.install_tasks
 
-require 'rake/testtask'
+Dir[File.join(File.dirname(__FILE__), 'tasks/**/*.rake')].each {|f| load f }
+
+require 'rspec/core'
+require 'rspec/core/rake_task'
+require 'rspec/rails'
 
-Rake::TestTask.new(:test) do |t|
-  t.libs << 'lib'
-  t.libs << 'test'
-  t.pattern = 'test/**/*_test.rb'
-  t.verbose = false
-end
 
+desc "Run all specs in spec directory (excluding plugin specs)"
+RSpec::Core::RakeTask.new(:spec => 'app:db:test:prepare')
 
-task default: :test
+task :default => :spec

data/app/controllers/before_actions/foo_controller.rb

@@ -0,0 +1,8 @@
+require_dependency "before_actions/application_controller"
+
+module BeforeActions
+  class FooController < ApplicationController
+    def bar
+    end
+  end
+end

data/lib/before_actions.rb

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

data/lib/before_actions/controller.rb

@@ -3,36 +3,45 @@ module BeforeActions
     extend ActiveSupport::Concern
 
     module ClassMethods
-      attr_reader :before_actions_block, :after_actions_block
       def before_actions(&block)
-        @before_actions_block = block
-        before_filter :execute_before_actions
+        TheBefore.new(self).instance_eval(&block)
       end
       def after_actions(&block)
-        @after_actions_block = block
-        after_filter :execute_after_actions
+        TheAfter.new(self).instance_eval(&block)
       end
     end
 
-    def execute_before_actions
-      block = self.class.before_actions_block
-      _execute_command(&block)
-    end
+    class TheBefore
+
+      def initialize(controller)
+        @controller = controller
+      end
+
+      def actions(*list, &block)
+        if list.empty?
+          @controller.before_action(&block)
+        else
+          @controller.before_action({only: list}, &block)
+        end
+      end
 
-    def execute_after_actions
-      block = self.class.after_actions_block
-      _execute_command(&block)
     end
 
-    def _execute_command(&block)
-      Command.new(self).instance_eval(&block)
+    class TheAfter
+
+      def initialize(controller)
+        @controller = controller
+      end
+
+      def actions(*list, &block)
+        if list.empty?
+          @controller.after_action(&block)
+        else
+          @controller.after_action({only: list}, &block)
+        end
+      end
+
     end
 
   end
 end
-
-if defined? ActionController::Base
-  ActionController::Base.class_eval do
-    include BeforeActions::Controller
-  end
-end

data/lib/before_actions/engine.rb

@@ -1,5 +1,12 @@
 module BeforeActions
   class Engine < ::Rails::Engine
     isolate_namespace BeforeActions
+
+    config.generators do |g|
+      g.test_framework :rspec, :view_specs => false#, :fixture => false
+      # g.fixture_replacement :factory_girl, :dir => 'spec/factories'
+      g.assets false
+      g.helper false
+    end
   end
 end

data/lib/before_actions/version.rb

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

data/spec/controllers/admin_foos_controller_spec.rb

@@ -0,0 +1,78 @@
+require 'rails_helper'
+
+RSpec.describe AdminFoosController, :type => :controller do
+
+  let(:valid_attributes) {
+    {bar: 'cool'}
+  }
+
+  let(:invalid_attributes) {
+    {bar: ''}
+  }
+
+  let(:valid_session) { {} }
+
+
+
+
+  describe "read-only" do
+    describe "GET index" do
+      it "assigns all admin_foos as @admin_foos" do
+        admin_foo = AdminFoo.create! valid_attributes
+        get :index, {}, valid_session
+        expect(assigns(:admin_foos)).to eq([admin_foo])
+      end
+    end
+
+    describe "GET show" do
+      it "assigns the requested admin_foo as @admin_foo" do
+        admin_foo = AdminFoo.create! valid_attributes
+        get :show, {:id => admin_foo.to_param}, valid_session
+        expect(assigns(:admin_foo)).to eq(admin_foo)
+      end
+    end
+
+    after { expect(response).to have_http_status(200) }
+  end
+
+  describe "writing" do
+    describe "GET new" do
+      it "does not assign @admin_foo" do
+        get :new, {}, valid_session
+      end
+    end
+
+    describe "GET edit" do
+      it "does not assign @admin_foo" do
+        admin_foo = AdminFoo.create! valid_attributes
+        get :edit, {:id => admin_foo.to_param}, valid_session
+      end
+    end
+
+    describe "POST create" do
+      it "does not assign @admin_foo" do
+        post :create, {:admin_foo => valid_attributes}, valid_session
+      end
+    end
+
+    describe "PUT update" do
+      it "does not assign @admin_foo" do
+        admin_foo = AdminFoo.create! valid_attributes
+        put :update, {:id => admin_foo.to_param, :admin_foo => valid_attributes}, valid_session
+      end
+    end
+
+    describe "DELETE destroy" do
+      it "does not assign @admin_foo" do
+        admin_foo = AdminFoo.create! valid_attributes
+        delete :destroy, {:id => admin_foo.to_param}, valid_session
+      end
+    end
+
+    after do
+      expect(assigns(:admin_foo)).to eq(nil)
+      expect(response).to have_http_status(401)
+    end
+  end
+
+end

data/spec/controllers/foos_controller_spec.rb

@@ -0,0 +1,139 @@
+require 'rails_helper'
+
+RSpec.describe FoosController, :type => :controller do
+
+  let(:valid_attributes) {
+    {bar: 'cool'}
+  }
+
+  let(:invalid_attributes) {
+    {bar: ''}
+  }
+
+  let(:valid_session) { {} }
+
+
+
+
+
+  describe "GET index" do
+    it "assigns all foos as @foos" do
+      foo = Foo.create! valid_attributes
+      get :index, {}, valid_session
+      expect(assigns(:foos)).to eq([foo])
+    end
+  end
+
+  describe "GET show" do
+    it "assigns the requested foo as @foo" do
+      foo = Foo.create! valid_attributes
+      get :show, {:id => foo.to_param}, valid_session
+      expect(assigns(:foo)).to eq(foo)
+    end
+  end
+
+  describe "GET new" do
+    it "assigns a new foo as @foo" do
+      get :new, {}, valid_session
+      expect(assigns(:foo)).to be_a_new(Foo)
+    end
+  end
+
+  describe "GET edit" do
+    it "assigns the requested foo as @foo" do
+      foo = Foo.create! valid_attributes
+      get :edit, {:id => foo.to_param}, valid_session
+      expect(assigns(:foo)).to eq(foo)
+    end
+  end
+
+  describe "POST create" do
+    describe "with valid params" do
+      it "creates a new Foo" do
+        expect {
+          post :create, {:foo => valid_attributes}, valid_session
+        }.to change(Foo, :count).by(1)
+      end
+
+      it "assigns a newly created foo as @foo" do
+        post :create, {:foo => valid_attributes}, valid_session
+        expect(assigns(:foo)).to be_a(Foo)
+        expect(assigns(:foo)).to be_persisted
+      end
+
+      it "redirects to the created foo" do
+        post :create, {:foo => valid_attributes}, valid_session
+        expect(response).to redirect_to(Foo.last)
+      end
+    end
+
+    describe "with invalid params" do
+      it "assigns a newly created but unsaved foo as @foo" do
+        post :create, {:foo => invalid_attributes}, valid_session
+        expect(assigns(:foo)).to be_a_new(Foo)
+      end
+
+      it "re-renders the 'new' template" do
+        post :create, {:foo => invalid_attributes}, valid_session
+        expect(response).to render_template("new")
+      end
+    end
+  end
+
+  describe "PUT update" do
+    describe "with valid params" do
+      let(:new_attributes) {
+        {bar: "yay"}
+      }
+
+      it "updates the requested foo" do
+        foo = Foo.create! valid_attributes
+        put :update, {:id => foo.to_param, :foo => new_attributes}, valid_session
+        foo.reload
+        expect(assigns(:foo).bar).to eq('yay')
+      end
+
+      it "assigns the requested foo as @foo" do
+        foo = Foo.create! valid_attributes
+        put :update, {:id => foo.to_param, :foo => valid_attributes}, valid_session
+        expect(assigns(:foo)).to eq(foo)
+      end
+
+      it "redirects to the foo" do
+        foo = Foo.create! valid_attributes
+        put :update, {:id => foo.to_param, :foo => valid_attributes}, valid_session
+        expect(response).to redirect_to(foo)
+      end
+    end
+
+    describe "with invalid params" do
+      it "assigns the foo as @foo" do
+        foo = Foo.create! valid_attributes
+        put :update, {:id => foo.to_param, :foo => invalid_attributes}, valid_session
+        expect(assigns(:foo)).to eq(foo)
+      end
+
+      it "re-renders the 'edit' template" do
+        foo = Foo.create! valid_attributes
+        put :update, {:id => foo.to_param, :foo => invalid_attributes}, valid_session
+        expect(response).to render_template("edit")
+      end
+    end
+  end
+
+  describe "DELETE destroy" do
+    it "destroys the requested foo" do
+      foo = Foo.create! valid_attributes
+      expect {
+        delete :destroy, {:id => foo.to_param}, valid_session
+      }.to change(Foo, :count).by(-1)
+    end
+
+    it "redirects to the foos list" do
+      foo = Foo.create! valid_attributes
+      delete :destroy, {:id => foo.to_param}, valid_session
+      expect(response).to redirect_to(foos_url)
+    end
+  end
+
+end