focused_controller 0.1.0 → 0.2.0

data/.travis.yml

@@ -3,13 +3,9 @@ rvm:
   - 1.9.3
   - 1.9.2
   - 1.8.7
-  - rbx-18mode
-  # - rbx-19mode # Seems to hang, try again another day
-  # Add JRuby support when poltergeist handles JRuby
+  - jruby-18mode
+  - jruby-19mode
 gemfile:
   - gemfiles/rails-3-2.gemfile
   - gemfiles/rails-3-1.gemfile
   - gemfiles/rails-3-0.gemfile
-before_script:
-  - "export DISPLAY=:99.0"
-  - "sh -e /etc/init.d/xvfb start"

data/Appraisals

@@ -8,4 +8,5 @@ end
 
 appraise 'rails-3-0' do
   gem 'rails', '~> 3.0.0'
+  gem 'rack-test', '~> 0.5.7'
 end

data/LICENSE

@@ -0,0 +1,20 @@
+Copyright (c) 2012 Jonathan Leighton
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of this software and associated documentation files (the
+"Software"), to deal in the Software without restriction, including
+without limitation the rights to use, copy, modify, merge, publish,
+distribute, sublicense, and/or sell copies of the Software, and to
+permit persons to whom the Software is furnished to do so, subject to
+the following conditions:
+
+The above copyright notice and this permission notice shall be
+included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

data/README.md

@@ -1 +1,274 @@
+# Focused Controller #
+
 [![Build Status](https://secure.travis-ci.org/jonleighton/focused_controller.png?branch=master)](http://travis-ci.org/jonleighton/focused_controller)
+
+Focused Controller alters Rails' conventions so that each individual action in
+a controller is represented by its own class. This makes it easier to break up
+the code within an action and share code between different actions.
+
+Focused Controller also provides test helpers which enable you to write unit
+tests for your controller code. This is much faster than functional testing,
+and better suited to testing fine grained logic that may exist in your actions.
+
+There is a [mailing list](http://groups.google.com/group/focused_controller)
+for discussion.
+
+## Synopsis ##
+
+``` ruby
+class ApplicationController
+  include FocusedController::Mixin
+end
+
+module PostsController
+  class Index < ApplicationController
+    expose(:posts) { Post.recent.limit(5) }
+  end
+
+  class New < ApplicationController
+    expose(:post) { Post.new }
+  end
+
+  class Singular < ApplicationController
+    expose(:post) { Post.find params[:id] }
+    before_filter { redirect_to root_path unless post.accessible_to?(current_user) }
+  end
+
+  class Show < Singular
+  end
+
+  class Update < Singular
+    def call
+      if post.update_attributes(params[:post])
+        # ...
+      else
+        # ...
+      end
+    end
+  end
+end
+```
+
+Some notes:
+
+* You can include `FocusedController::Mixin` anywhere, so you don't have
+  to use Focused Controller in every single controller if you don't want
+  to
+* `expose` makes the object returned by the block available in your view
+  template. It also memoizes the result so the block will only be
+  executed once.
+* It is not necessary to specify `:only` or `:except` on the before
+  filter, since we declare the filter for exactly the actions we want it
+  to run on. Rails has many methods which accept action names to limit
+  what they get applied to - this is basically irrelevant with Focused
+  Controller due to the increased granularity that having a class for each
+  action gives us.
+* The `#call` method is what gets invoked when the action runs, so put
+  the 'active ingredients' in here.
+
+## Routing ##
+
+Rails' normal routing assumes your actions are methods inside an object
+whose name ends with 'controller'. For example:
+
+``` ruby
+get '/posts/new' => 'posts#new'
+```
+
+will route `GET /posts/new` to `PostsController#new`.
+
+To get around this, we use the `focused_controller_routes` helper:
+
+``` ruby
+Loco2::Application.routes.draw do
+  focused_controller_routes do
+    get '/posts/new' => 'posts#new'
+  end
+end
+```
+
+The route will now map to `PostsController::New#call`.
+
+All the normal routing macros are also supported:
+
+``` ruby
+focused_controller_routes do
+  resources :posts
+end
+```
+
+## Functional Testing ##
+
+If you wish, focused controllers can be tested in the classical
+'functional' style. It no longer makes sense to specify the method name
+to be called as it would always be `#call`. So this is omitted:
+
+``` ruby
+require 'focused_controller/functional_test_helper'
+
+module UsersController
+  class CreateTest < ActionController::TestCase
+    include FocusedController::FunctionalTestHelper
+
+    test "should create user" do
+      assert_difference('User.count') do
+        post user: { name: 'Jon' }
+      end
+
+      assert_redirected_to user_path(@controller.user)
+    end
+  end
+end
+```
+
+There is also an equivalent helper for RSpec:
+
+``` ruby
+require 'focused_controller/rspec_functional_helper'
+
+describe UsersController do
+  include FocusedController::RSpecFunctionalHelper
+
+  describe UsersController::Create do
+    it "should create user" do
+      expect { post user: { name: 'Jon' } }.to change(User, :count).by(1)
+      response.should redirect_to(user_path(subject.user))
+    end
+  end
+end
+```
+
+## Unit Testing ##
+
+Unit testing is faster and better suited to testing logic than
+functional testing. To do so, you instantiate your action class and call
+methods on it:
+
+``` ruby
+module UsersController
+  class ShowTest < ActiveSupport::TestCase
+    test 'finds the user' do
+      user = User.create
+
+      controller = UsersController::Show.new
+      controller.params = { id: user.id }
+
+      assert_equal user, controller.user
+    end
+  end
+end
+```
+
+### The `#call` method ###
+
+Testing the code in your `#call` method is a little more involved,
+depending on what's in it. For example, your `#call` method may use
+(explicitly or implicitly) any of the following objects:
+
+* request
+* response
+* params
+* session
+* flash
+* cookies
+
+To make the experience smoother, Focused Controller sets up mock
+versions of these objects, much like with classical functional testing.
+It also provides accessors for these objects in your test class.
+
+``` ruby
+require 'focused_controller/test_helper'
+
+module UsersController
+  class CreateTest < ActiveSupport::TestCase
+    include FocusedController::TestHelper
+
+    test "should create user" do
+      controller.params = { user: { name: 'Jon' } }
+
+      assert_difference('User.count') do
+        controller.call
+      end
+
+      assert_redirected_to user_path(controller.user)
+    end
+  end
+end
+```
+
+### Assertions ###
+
+You have access to the normal assertions found in Rails' functional tests:
+
+* `assert_template`
+* `assert_response`
+* `assert_redirected_to`
+
+### Filters ###
+
+In unit tests, we're not testing through the Rack stack. We're just calling the
+`#call` method. Therefore, filters do not get run. If some filter code is
+crucial to what your action is doing then you should move it out of the filter.
+If the filter code is separate, then you might want to unit-test it separately,
+or you might decide that covering it in integration/acceptance tests is
+sufficient.
+
+### RSpec ###
+
+There is a helper for RSpec as well:
+
+``` ruby
+require 'focused_controller/rspec_helper'
+
+describe UsersController do
+  include FocusedController::RSpecHelper
+
+  describe UsersController::Create do
+    test "should create user" do
+      subject.params = { user: { name: 'Jon' } }
+      expect { subject.call }.to change(User, :count).by(1)
+      response.should redirect_to(user_path(subject.user))
+    end
+  end
+end
+```
+
+## Isolated unit tests ##
+
+It is possible to completely decouple your focused controller tests from the
+Rails application. This means you don't have to pay the penalty of starting up
+Rails every time you want to run a test. This is an advanced feature and your
+mileage may vary. The benefit this brings will depend on how coupled your
+controllers/tests are to other dependencies.
+
+Your `config/routes.rb` file is a dependency. When you use a URL helper
+you are depending on that file. As this is a common dependency, Focused
+Controller provides a way to stub out URL helpers:
+
+``` ruby
+module UsersController
+  class CreateTest < ActiveSupport::TestCase
+    include FocusedController::TestHelper
+    stub_url :user
+
+    # ...
+  end
+end
+```
+
+The `stub_url` declaration will make the `user_path` and `user_url`
+methods in your test and your controller return stub objects. These can
+be compared, so `user_path(user1) == user_path(user1)`, but
+`user_path(user1) != user_path(user2)`.
+
+## More examples ##
+
+The [acceptance
+tests](https://github.com/jonleighton/focused_controller/tree/master/test/acceptance)
+for Focused Controller exercise a [complete Rails
+application](https://github.com/jonleighton/focused_controller/tree/master/test/app),
+which uses the plugin. Therefore, you might wish to look there to get
+more of an idea about how it can be used.
+
+(Note that the code there is based on Rails' scaffolding, not how I
+would typically write controllers and tests.)

data/focused_controller.gemspec

@@ -8,8 +8,8 @@ Gem::Specification.new do |s|
   s.authors     = ["Jon Leighton"]
   s.email       = ["j@jonathanleighton.com"]
   s.homepage    = "http://github.com/jonleighton/focused_controller"
-  s.summary     = %q{Write Rails controllers that don't violate SRP}
-  s.description = %q{Write Rails controllers that don't violate SRP}
+  s.summary     = %q{Write Rails controllers with one class per action}
+  s.description = %q{Write Rails controllers with one class per action}
 
   s.rubyforge_project = "focused_controller"
 
@@ -20,11 +20,11 @@ Gem::Specification.new do |s|
 
   s.add_dependency 'actionpack', '~> 3.0'
 
-  s.add_development_dependency 'minitest', '~> 2.11.2'
-  s.add_development_dependency 'capybara', '~> 1.1.2'
-  s.add_development_dependency 'capybara_minitest_spec', '~> 0.2.1'
-  s.add_development_dependency 'poltergeist', '~> 0.4.0'
-  s.add_development_dependency 'rspec', '~> 2.8.0'
-  s.add_development_dependency 'rspec-rails', '~> 2.8.0'
-  s.add_development_dependency 'appraisal', '~> 0.4.1'
+  s.add_development_dependency 'minitest',               '~> 2.11'
+  s.add_development_dependency 'capybara',               '~> 1.1'
+  s.add_development_dependency 'capybara_minitest_spec', '~> 0.2'
+  s.add_development_dependency 'poltergeist',            '~> 0.7'
+  s.add_development_dependency 'rspec',                  '~> 2.8'
+  s.add_development_dependency 'rspec-rails',            '~> 2.8'
+  s.add_development_dependency 'appraisal',              '~> 0.4'
 end

data/gemfiles/rails-3-0.gemfile

@@ -3,5 +3,6 @@
 source "http://rubygems.org"
 
 gem "rails", "~> 3.0.0"
+gem "rack-test", "~> 0.5.7"
 
 gemspec :path=>"../"

data/lib/focused_controller/action_name.rb

@@ -2,5 +2,5 @@ module FocusedController
   class << self
     attr_accessor :action_name
   end
-  self.action_name = 'run'
+  self.action_name = 'call'
 end

data/lib/focused_controller/mixin.rb

@@ -20,6 +20,28 @@ module FocusedController
       def call(env)
         action(FocusedController.action_name).call(env)
       end
+
+      def expose(name, &block)
+        if block_given?
+          define_method(name) do |*args|
+            ivar = "@#{name}"
+
+            if instance_variable_defined?(ivar)
+              instance_variable_get(ivar)
+            else
+              instance_variable_set(ivar, instance_exec(block, *args, &block))
+            end
+          end
+        else
+          attr_reader name
+        end
+
+        helper_method name
+      end
+
+      def controller_name
+        name.split('::')[-2].sub(/Controller$/, '').underscore
+      end
     end
 
     def action_name
@@ -38,7 +60,7 @@ module FocusedController
       end
     end
 
-    def run
+    def call
     end
   end
 end

data/lib/focused_controller/route_mapper.rb

@@ -24,15 +24,23 @@ module FocusedController
 
     def to_option
       if @options[:to] && !@options[:to].respond_to?(:call)
-        @options[:to]
+        if @options[:to].include?('#')
+          stringify_controller_and_action(*@options[:to].split('#'))
+        else
+          @options[:to]
+        end
       elsif @options[:action] && @scope[:controller]
-        name = ''
-        name << @scope[:module].camelize << '::' if @scope[:module]
-        name << @scope[:controller].camelize << 'Controller::'
-        name << @options[:action].to_s.camelize
-        name
+        stringify_controller_and_action(@scope[:controller], @options[:action])
       end
     end
+
+    def stringify_controller_and_action(controller, action)
+      name = ''
+      name << @scope[:module].camelize << '::' if @scope[:module]
+      name << controller.camelize << 'Controller::'
+      name << action.to_s.camelize
+      name
+    end
   end
 
   class ActionDispatch::Routing::Mapper

data/lib/focused_controller/test_helper.rb

@@ -110,13 +110,6 @@ module FocusedController
       @response ||= TestResponse.new
     end
 
-    def req(params = nil, session = nil, flash = nil)
-      controller.params = params        if params
-      controller.session.update session if session
-      controller.flash.update flash     if flash
-      controller.run
-    end
-
     def session
       controller.session
     end
@@ -147,7 +140,7 @@ module FocusedController
       controller.url_for(*args)
     end
 
-    def respond_to?(method_name)
+    def respond_to?(*args)
       unless defined?(@_routes_included) && @_routes_included
         self.class.include_routes
         @_routes_included = true

data/lib/focused_controller/version.rb

@@ -1,3 +1,3 @@
 module FocusedController
-  VERSION = "0.1.0"
+  VERSION = "0.2.0"
 end

data/test/app/app/controllers/posts_controller.rb

@@ -1,38 +1,20 @@
-class PostsController
+module PostsController
   class Action < ApplicationController
   end
 
   class Index < Action
-    def posts
-      @posts ||= Post.all
-    end
-    helper_method :posts
-  end
-
-  class Singular < Action
-    def post
-      @post ||= begin
-        if params[:id]
-          Post.find(params[:id])
-        else
-          Post.new(params[:post])
-        end
-      end
-    end
-    helper_method :post
-  end
-
-  class Show < Singular
+    expose(:posts) { Post.all }
   end
 
-  class New < Singular
+  class Initializer < Action
+    expose(:post) { Post.new params[:post] }
   end
 
-  class Edit < Singular
+  class New < Initializer
   end
 
-  class Create < Singular
-    def run
+  class Create < Initializer
+    def call
       if post.save
         redirect_to post, :notice => 'Post was successfully created.'
       else
@@ -41,8 +23,18 @@ class PostsController
     end
   end
 
-  class Update < Singular
-    def run
+  class Finder < Action
+    expose(:post) { Post.find params[:id] }
+  end
+
+  class Show < Finder
+  end
+
+  class Edit < Finder
+  end
+
+  class Update < Finder
+    def call
       if post.update_attributes(params[:post])
         redirect_to post, :notice => 'Post was successfully updated.'
       else
@@ -51,8 +43,8 @@ class PostsController
     end
   end
 
-  class Destroy < Singular
-    def run
+  class Destroy < Finder
+    def call
       post.destroy
       redirect_to posts_url
     end

data/test/app/spec/isolated_spec_helper.rb

@@ -1,9 +1,6 @@
 require 'bundler/setup'
 require 'rspec'
 require 'focused_controller/rspec_helper'
-require 'focused_controller/rspec_functional_helper'
 
-require 'active_support/dependencies'
-ActiveSupport::Dependencies.autoload_paths += Dir[File.expand_path('../../app/*', __FILE__)]
-
-POSTS = []
+APP_ROOT = File.expand_path('../../app', __FILE__)
+POSTS    = []

data/test/app/spec/unit/controllers/posts_controller_isolated_spec.rb

@@ -1,4 +1,7 @@
 require 'isolated_spec_helper'
+require APP_ROOT + '/controllers/application_controller'
+require APP_ROOT + '/controllers/posts_controller'
+require APP_ROOT + '/models/post'
 
 describe PostsController do
   include FocusedController::RSpecHelper
@@ -10,7 +13,7 @@ describe PostsController do
 
   describe PostsController::Index do
     it "should get index" do
-      req
+      subject.call
       response.should be_success
       subject.posts.should_not be(:nil)
     end
@@ -18,42 +21,47 @@ describe PostsController do
 
   describe PostsController::New do
     it "should get new" do
-      req
+      subject.call
       response.should be_success
     end
   end
 
   describe PostsController::Create do
     it "should create post" do
-      expect { req :post => @post.attributes }.to change(Post, :count).by(1)
+      subject.params = { :post => @post.attributes }
+      expect { subject.call }.to change(Post, :count).by(1)
       response.should redirect_to(post_url(subject.post))
     end
   end
 
   describe PostsController::Show do
     it "should show post" do
-      req :id => @post.id
+      subject.params = { :id => @post.id }
+      subject.call
       response.should be_success
     end
   end
 
   describe PostsController::Edit do
     it "should get edit" do
-      req :id => @post.id
+      subject.params = { :id => @post.id }
+      subject.call
       response.should be_success
     end
   end
 
   describe PostsController::Update do
     it "should update post" do
-      req :id => @post.id
+      subject.params = { :id => @post.id }
+      subject.call
       response.should redirect_to(post_url(subject.post))
     end
   end
 
   describe PostsController::Destroy do
     it "should destroy post" do
-      expect { req :id => @post.id }.to change(Post, :count).by(-1)
+      subject.params = { :id => @post.id }
+      expect { subject.call }.to change(Post, :count).by(-1)
       response.should redirect_to(posts_url)
     end
   end

data/test/app/spec/unit/controllers/posts_controller_spec.rb

@@ -9,7 +9,7 @@ describe PostsController do
 
   describe PostsController::Index do
     it "should get index" do
-      req
+      subject.call
       response.should be_success
       subject.posts.should_not be(:nil)
     end
@@ -17,42 +17,47 @@ describe PostsController do
 
   describe PostsController::New do
     it "should get new" do
-      req
+      subject.call
       response.should be_success
     end
   end
 
   describe PostsController::Create do
     it "should create post" do
-      expect { req :post => @post.attributes }.to change(Post, :count).by(1)
+      subject.params = { :post => @post.attributes }
+      expect { subject.call }.to change(Post, :count).by(1)
       response.should redirect_to(post_path(subject.post))
     end
   end
 
   describe PostsController::Show do
     it "should show post" do
-      req :id => @post.id
+      subject.params = { :id => @post.id }
+      subject.call
       response.should be_success
     end
   end
 
   describe PostsController::Edit do
     it "should get edit" do
-      req :id => @post.id
+      subject.params = { :id => @post.id }
+      subject.call
       response.should be_success
     end
   end
 
   describe PostsController::Update do
     it "should update post" do
-      req :id => @post.id
+      subject.params = { :id => @post.id }
+      subject.call
       response.should redirect_to(post_path(subject.post))
     end
   end
 
   describe PostsController::Destroy do
     it "should destroy post" do
-      expect { req :id => @post.id }.to change(Post, :count).by(-1)
+      subject.params = { :id => @post.id }
+      expect { subject.call }.to change(Post, :count).by(-1)
       response.should redirect_to(posts_path)
     end
   end

data/test/app/test/functional/posts_controller_test.rb

@@ -1,6 +1,6 @@
 require 'test_helper'
 
-class PostsController
+module PostsController
   class TestCase < ActionController::TestCase
     include FocusedController::FunctionalTestHelper
 

data/test/app/test/isolated_test_helper.rb

@@ -1,10 +1,7 @@
 require 'bundler/setup'
 require 'test/unit'
 require 'active_support/test_case'
-require 'focused_controller/functional_test_helper'
 require 'focused_controller/test_helper'
 
-require 'active_support/dependencies'
-ActiveSupport::Dependencies.autoload_paths += Dir[File.expand_path('../../app/*', __FILE__)]
-
-POSTS = []
+APP_ROOT = File.expand_path('../../app', __FILE__)
+POSTS    = []

data/test/app/test/unit/controllers/posts_controller_isolated_test.rb

@@ -1,7 +1,9 @@
 require 'isolated_test_helper'
-require_dependency 'posts_controller'
+require APP_ROOT + '/controllers/application_controller'
+require APP_ROOT + '/controllers/posts_controller'
+require APP_ROOT + '/models/post'
 
-class PostsController
+module PostsController
   class TestCase < ActiveSupport::TestCase
     include FocusedController::TestHelper
     stub_url :post, :posts
@@ -13,7 +15,7 @@ class PostsController
 
   class IndexTest < TestCase
     test "should get index" do
-      req
+      controller.call
       assert_response :success
       assert_not_nil controller.posts
     end
@@ -21,15 +23,17 @@ class PostsController
 
   class NewTest < TestCase
     test "should get new" do
-      req
+      controller.call
       assert_response :success
     end
   end
 
   class CreateTest < TestCase
     test "should create post" do
+      controller.params = { :post => @post.attributes }
+
       assert_difference('Post.count') do
-        req :post => @post.attributes
+        controller.call
       end
 
       assert_redirected_to post_url(controller.post)
@@ -38,29 +42,34 @@ class PostsController
 
   class ShowTest < TestCase
     test "should show post" do
-      req :id => @post.id
+      controller.params = { :id => @post.id }
+      controller.call
       assert_response :success
     end
   end
 
   class EditTest < TestCase
     test "should get edit" do
-      req :id => @post.id
+      controller.params = { :id => @post.id }
+      controller.call
       assert_response :success
     end
   end
 
   class UpdateTest < TestCase
     test "should update post" do
-      req :id => @post.id
+      controller.params = { :id => @post.id }
+      controller.call
       assert_redirected_to post_url(controller.post)
     end
   end
 
   class DestroyTest < TestCase
     test "should destroy post" do
+      controller.params = { :id => @post.id }
+
       assert_difference('Post.count', -1) do
-        req :id => @post.id
+        controller.call
       end
 
       assert_redirected_to posts_url

data/test/app/test/unit/controllers/posts_controller_test.rb

@@ -1,6 +1,6 @@
 require 'test_helper'
 
-class PostsController
+module PostsController
   class TestCase < ActiveSupport::TestCase
     include FocusedController::TestHelper
 
@@ -11,7 +11,7 @@ class PostsController
 
   class IndexTest < TestCase
     test "should get index" do
-      req
+      controller.call
       assert_response :success
       assert_not_nil controller.posts
     end
@@ -19,15 +19,17 @@ class PostsController
 
   class NewTest < TestCase
     test "should get new" do
-      req
+      controller.call
       assert_response :success
     end
   end
 
   class CreateTest < TestCase
     test "should create post" do
+      controller.params = { :post => @post.attributes }
+
       assert_difference('Post.count') do
-        req :post => @post.attributes
+        controller.call
       end
 
       assert_redirected_to post_path(controller.post)
@@ -36,29 +38,34 @@ class PostsController
 
   class ShowTest < TestCase
     test "should show post" do
-      req :id => @post.id
+      controller.params = { :id => @post.id }
+      controller.call
       assert_response :success
     end
   end
 
   class EditTest < TestCase
     test "should get edit" do
-      req :id => @post.id
+      controller.params = { :id => @post.id }
+      controller.call
       assert_response :success
     end
   end
 
   class UpdateTest < TestCase
     test "should update post" do
-      req :id => @post.id
+      controller.params = { :id => @post.id }
+      controller.call
       assert_redirected_to post_path(controller.post)
     end
   end
 
   class DestroyTest < TestCase
     test "should destroy post" do
+      controller.params = { :id => @post.id }
+
       assert_difference('Post.count', -1) do
-        req :id => @post.id
+        controller.call
       end
 
       assert_redirected_to posts_path

data/test/unit/functional_test_helper_test.rb

@@ -4,7 +4,7 @@ require 'action_controller'
 
 module FocusedController
   module FunctionalTestHelper
-    class FakePostsController
+    module FakePostsController
       class Action < ActionController::Base; end
       class Index < Action; end
       class Show < Action; end
@@ -46,19 +46,19 @@ module FocusedController
         end
 
         subject.get :foo, :bar, :baz
-        subject.last_process.must_equal ['run', :foo, :bar, :baz, 'GET']
+        subject.last_process.must_equal ['call', :foo, :bar, :baz, 'GET']
 
         subject.post :foo, :bar, :baz
-        subject.last_process.must_equal ['run', :foo, :bar, :baz, 'POST']
+        subject.last_process.must_equal ['call', :foo, :bar, :baz, 'POST']
 
         subject.put :foo, :bar, :baz
-        subject.last_process.must_equal ['run', :foo, :bar, :baz, 'PUT']
+        subject.last_process.must_equal ['call', :foo, :bar, :baz, 'PUT']
 
         subject.delete :foo, :bar, :baz
-        subject.last_process.must_equal ['run', :foo, :bar, :baz, 'DELETE']
+        subject.last_process.must_equal ['call', :foo, :bar, :baz, 'DELETE']
 
         subject.head :foo, :bar, :baz
-        subject.last_process.must_equal ['run', :foo, :bar, :baz, 'HEAD']
+        subject.last_process.must_equal ['call', :foo, :bar, :baz, 'HEAD']
       end
     end
   end

data/test/unit/mixin_test.rb

@@ -34,9 +34,9 @@ module FocusedController
         klass.controller_path.must_equal 'posts'
       end
 
-      it "has a .call which dispatches the #run action" do
+      it "has a .call which dispatches the #call action" do
         def klass.action(name)
-          if name.to_s == 'run'
+          if name.to_s == 'call'
             proc { |env| "omg" }
           end
         end
@@ -48,8 +48,12 @@ module FocusedController
         subject.action_name.must_equal 'show'
       end
 
-      it "uses the run method for the action" do
-        subject.method_for_action('whatever').must_equal 'run'
+      it "has a #controller_name of 'posts'" do
+        subject.controller_name.must_equal 'posts'
+      end
+
+      it "uses the call method for the action" do
+        subject.method_for_action('whatever').must_equal 'call'
       end
 
       it "removes all view assigns by default" do
@@ -62,8 +66,72 @@ module FocusedController
         subject.view_assigns['foo'].must_equal('bar')
       end
 
-      it "has a #run method by default" do
-        subject.run.must_equal nil
+      it "has a #call method by default" do
+        subject.call.must_equal nil
+      end
+    end
+
+    describe '.expose' do
+      subject do
+        @klass = Class.new do
+          include FocusedController::Mixin
+
+          @helper_methods = []
+
+          class << self
+            attr_reader :helper_methods
+
+            def helper_method(name)
+              @helper_methods << name
+            end
+          end
+        end
+      end
+
+      it 'defines a method' do
+        subject.expose(:foo) { 'bar' }
+        subject.new.foo.must_equal 'bar'
+      end
+
+      it 'declares the method a helper method' do
+        subject.expose(:foo) { 'bar' }
+        subject.helper_methods.must_equal [:foo]
+      end
+
+      it 'memoizes the result' do
+        count = 0
+        counter = proc { count += 1 }
+        subject.expose(:foo) { counter.call }
+
+        obj = subject.new
+        obj.foo.must_equal 1
+        obj.foo.must_equal 1
+      end
+
+      it 'it memoizes falsey values' do
+        val = true
+        meth = proc { val = !val }
+        subject.expose(:foo) { meth.call }
+
+        obj = subject.new
+        obj.foo.must_equal false
+        obj.foo.must_equal false
+      end
+
+      it 'instance evals the block' do
+        subject.expose(:foo) { @bar }
+        obj = subject.new
+        obj.instance_variable_set('@bar', 'bar')
+        obj.foo.must_equal 'bar'
+      end
+
+      it 'declares an attr_reader when called without a block' do
+        subject.expose :foo
+        subject.helper_methods.must_equal [:foo]
+
+        obj = subject.new
+        obj.instance_variable_set('@foo', 'bar')
+        obj.foo.must_equal 'bar'
       end
     end
   end

data/test/unit/route_mapper_test.rb

@@ -27,7 +27,8 @@ module FocusedController
     it 'creates routes that map to focused controllers' do
       route_set.draw do
         focused_controller_routes do
-          match 'posts' => 'PostsController::Index'
+          match 'posts'     => 'PostsController::Index'
+          match 'posts/all' => 'posts#index'
 
           resources :comments do
             resources :replies
@@ -43,6 +44,7 @@ module FocusedController
 
       mappings = {
         [:get, '/posts']              => 'PostsController::Index',
+        [:get, '/posts/all']          => 'PostsController::Index',
         [:get, '/comments']           => 'CommentsController::Index',
         [:get, '/comments/4']         => 'CommentsController::Show',
         [:put, '/comments/4']         => 'CommentsController::Update',
@@ -54,7 +56,7 @@ module FocusedController
       mappings.each do |(method, path), controller|
         route = recognize(path, :method => method)
         route.app.name.must_equal controller
-        route.defaults[:action].must_equal 'run'
+        route.defaults[:action].must_equal 'call'
       end
     end
 

data/test/unit/test_helper_test.rb

@@ -9,7 +9,7 @@ module FocusedController
       end
 
       class Index < Action
-        def run
+        def call
           if params[:omg]
             "omg"
           elsif params[:set_session]
@@ -86,6 +86,8 @@ module FocusedController
         end
       end
 
+      let(:controller) { subject.controller }
+
       subject { FakePostsController::IndexTest.new }
 
       def must_fail(&block)
@@ -149,13 +151,17 @@ module FocusedController
       end
 
       it 'supports session' do
-        subject.req(:set_session => true)
+        controller.params = { :set_session => true }
+        controller.call
+
         subject.session[:foo].must_equal 'omg'
         subject.session['foo'].must_equal 'omg'
       end
 
       it 'supports flash' do
-        subject.req(:set_flash => true)
+        controller.params = { :set_flash => true }
+        controller.call
+
         subject.flash[:foo].must_equal 'omg'
 
         # This is consistent with the behaviour of standard rails functional tests
@@ -163,40 +169,10 @@ module FocusedController
       end
 
       it 'supports cookies' do
-        subject.req(:set_cookie => true)
-        subject.cookies[:foo].must_equal 'omg'
-      end
-
-      describe "#req" do
-        it "sets params and calls the controller's #run" do
-          subject.req(:omg => true).must_equal 'omg'
-        end
-
-        it 'sets session' do
-          subject.req(nil, { :foo => 'bar' })
-          subject.session[:foo].must_equal 'bar'
-        end
+        controller.params = { :set_cookie => true }
+        controller.call
 
-        it 'set flash' do
-          subject.req(nil, nil, { :foo => 'bar' })
-          subject.flash[:foo].must_equal 'bar'
-        end
-
-        it "doesn't overwrite existing params, session, or flash if new ones aren't provided" do
-          subject.controller.params[:param] = true
-          subject.controller.flash[:flash] = true
-          subject.controller.session[:session] = true
-
-          subject.req
-
-          subject.controller.params[:param].must_equal true
-          subject.controller.flash[:flash].must_equal true
-          subject.controller.session[:session].must_equal true
-
-          subject.req({})
-
-          subject.controller.params[:param].must_equal(nil)
-        end
+        subject.cookies[:foo].must_equal 'omg'
       end
 
       describe 'url stubbing' do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: focused_controller
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.2.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-02-22 00:00:00.000000000 Z
+date: 2012-08-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: actionpack
-  requirement: &9754840 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,85 +21,125 @@ dependencies:
         version: '3.0'
   type: :runtime
   prerelease: false
-  version_requirements: *9754840
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '3.0'
 - !ruby/object:Gem::Dependency
   name: minitest
-  requirement: &9754340 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 2.11.2
+        version: '2.11'
   type: :development
   prerelease: false
-  version_requirements: *9754340
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '2.11'
 - !ruby/object:Gem::Dependency
   name: capybara
-  requirement: &9753880 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.1.2
+        version: '1.1'
   type: :development
   prerelease: false
-  version_requirements: *9753880
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '1.1'
 - !ruby/object:Gem::Dependency
   name: capybara_minitest_spec
-  requirement: &9753420 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.2.1
+        version: '0.2'
   type: :development
   prerelease: false
-  version_requirements: *9753420
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '0.2'
 - !ruby/object:Gem::Dependency
   name: poltergeist
-  requirement: &9752960 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.4.0
+        version: '0.7'
   type: :development
   prerelease: false
-  version_requirements: *9752960
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '0.7'
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &9752500 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 2.8.0
+        version: '2.8'
   type: :development
   prerelease: false
-  version_requirements: *9752500
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '2.8'
 - !ruby/object:Gem::Dependency
   name: rspec-rails
-  requirement: &9752040 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 2.8.0
+        version: '2.8'
   type: :development
   prerelease: false
-  version_requirements: *9752040
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '2.8'
 - !ruby/object:Gem::Dependency
   name: appraisal
-  requirement: &9751580 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.4.1
+        version: '0.4'
   type: :development
   prerelease: false
-  version_requirements: *9751580
-description: Write Rails controllers that don't violate SRP
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '0.4'
+description: Write Rails controllers with one class per action
 email:
 - j@jonathanleighton.com
 executables: []
@@ -110,6 +150,7 @@ files:
 - .travis.yml
 - Appraisals
 - Gemfile
+- LICENSE
 - README.md
 - Rakefile
 - focused_controller.gemspec
@@ -212,10 +253,10 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: focused_controller
-rubygems_version: 1.8.15
+rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
-summary: Write Rails controllers that don't violate SRP
+summary: Write Rails controllers with one class per action
 test_files:
 - test/acceptance/app_test.rb
 - test/app/.gitignore
@@ -282,4 +323,3 @@ test_files:
 - test/unit/rspec_functional_helper.rb
 - test/unit/rspec_helper_test.rb
 - test/unit/test_helper_test.rb
-has_rdoc: