focused_controller 1.0.0 → 1.1.0

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: bba50f15d9a2bb936bd4b78ed12ae12c8dde7970
+  data.tar.gz: 07c4280195ca55e71849e1ede1f32ba274d51af8
+SHA512:
+  metadata.gz: fc77f35481b3d741e8988495362e67d28862ff379f300b131927a39b80636be07dea2fec7b7f97fe41eb1af41269b6d80faa1aeab78d19dc21f1a3bcdfc86268
+  data.tar.gz: a58a337acdeb40611d7632abc5a4a22df6670feaad647d5e5973a990e1d68f529b7248bf6fc5da17cb92673c92b1e5dfaca49065d386c25c8bae6b3988b9ed56

data/.travis.yml

@@ -1,11 +1,9 @@
 language: ruby
 rvm:
+  - 2.0.0
   - 1.9.3
-  - 1.9.2
-  - 1.8.7
-  - jruby-18mode
   - jruby-19mode
 gemfile:
-  - gemfiles/rails-3-2.gemfile
-  - gemfiles/rails-3-1.gemfile
-  - gemfiles/rails-3-0.gemfile
+  - gemfiles/rails_4_0.gemfile
+  - gemfiles/rails_3_2.gemfile
+  - gemfiles/rails_3_1.gemfile

data/Appraisals

@@ -1,3 +1,7 @@
+appraise 'rails-4-0' do
+  gem 'rails', '~> 4.0.0'
+end
+
 appraise 'rails-3-2' do
   gem 'rails', '~> 3.2.0'
 end
@@ -5,8 +9,3 @@ end
 appraise 'rails-3-1' do
   gem 'rails', '~> 3.1.0'
 end
-
-appraise 'rails-3-0' do
-  gem 'rails', '~> 3.0.0'
-  gem 'rack-test', '~> 0.5.7'
-end

data/CHANGELOG.md

@@ -0,0 +1,3 @@
+## Version 1.1.0 ##
+
+* Rails 4 support

data/README.md

@@ -10,6 +10,9 @@ 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.
 
+[I wrote a blog post to fully explain the
+idea](http://jonathanleighton.com/articles/2012/explaining-focused-controller/).
+
 There is a [mailing list](http://groups.google.com/group/focused_controller)
 for discussion.
 
@@ -108,6 +111,7 @@ to be called as it would always be `#call`. So this is omitted:
 
 ``` ruby
 require 'focused_controller/functional_test_helper'
+require_dependency 'users_controller'
 
 module UsersController
   class CreateTest < ActionController::TestCase
@@ -181,6 +185,7 @@ It also provides accessors for these objects in your test class.
 
 ``` ruby
 require 'focused_controller/test_helper'
+require_dependency 'users_controller'
 
 module UsersController
   class CreateTest < ActiveSupport::TestCase

data/focused_controller.gemspec

@@ -18,12 +18,12 @@ Gem::Specification.new do |s|
   s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
   s.require_paths = ["lib"]
 
-  s.add_dependency 'actionpack', '~> 3.0'
+  s.add_dependency 'actionpack', '>= 3.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 'minitest',               '~> 4.2'
+  s.add_development_dependency 'capybara',               '~> 2.1'
+  s.add_development_dependency 'capybara_minitest_spec', '~> 1.0'
+  s.add_development_dependency 'poltergeist',            '~> 1.3'
   s.add_development_dependency 'rspec',                  '~> 2.8'
   s.add_development_dependency 'rspec-rails',            '~> 2.8'
   s.add_development_dependency 'appraisal',              '~> 0.4'

data/gemfiles/rails_4_0.gemfile

@@ -0,0 +1,7 @@
+# This file was generated by Appraisal
+
+source "http://rubygems.org"
+
+gem "rails", "~> 4.0.0"
+
+gemspec :path=>"../"

data/lib/focused_controller/functional_test_helper.rb

@@ -3,23 +3,34 @@ require 'active_support/concern'
 module FocusedController
   module FunctionalTestHelper
     def get(*args)
-      super(FocusedController.action_name, *args)
+      new_args = args_with_action_name(*args)
+      super(*new_args)
     end
 
     def post(*args)
-      super(FocusedController.action_name, *args)
+      super(*args_with_action_name(*args))
     end
 
     def put(*args)
-      super(FocusedController.action_name, *args)
+      super(*args_with_action_name(*args))
     end
 
     def delete(*args)
-      super(FocusedController.action_name, *args)
+      super(*args_with_action_name(*args))
     end
 
     def head(*args)
-      super(FocusedController.action_name, *args)
+      super(*args_with_action_name(*args))
+    end
+
+    private
+
+    def args_with_action_name(*args)
+      if args.first.is_a?(Symbol)
+        args
+      else
+        [FocusedController.action_name] + args
+      end
     end
   end
 end

data/lib/focused_controller/mixin.rb

@@ -13,7 +13,7 @@ module FocusedController
     end
 
     module ClassMethods
-      def controller_path
+      def focused_controller_path
         @focused_controller_path ||= name && name.sub(/\:\:[^\:]+$/, '').sub(/Controller$/, '').underscore
       end
 
@@ -44,6 +44,10 @@ module FocusedController
       end
     end
 
+    def _prefixes
+      super.dup.unshift(self.class.focused_controller_path)
+    end
+
     def action_name
       self.class.name.demodulize.underscore
     end

data/lib/focused_controller/rspec_helper.rb

@@ -7,7 +7,6 @@ begin
   # haven't specifically chosen to receive it.
   require 'rspec/rails/matchers'
   require 'rspec/rails/adapters'
-  require 'rspec/rails/example/rails_example_group'
 rescue LoadError
 end
 
@@ -26,7 +25,9 @@ module FocusedController
     end
 
     if defined?(RSpec::Rails)
-      include RSpec::Rails::RailsExampleGroup
+      include RSpec::Rails::SetupAndTeardownAdapter
+      include RSpec::Rails::TestUnitAssertionAdapter
+      include RSpec::Rails::Matchers
       include RSpec::Rails::Matchers::RedirectTo
       include RSpec::Rails::Matchers::RenderTemplate
     end

data/lib/focused_controller/test_helper.rb

@@ -28,7 +28,7 @@ module FocusedController
     end
 
     def cookie_jar
-      @cookie_jar ||= ActionDispatch::Cookies::CookieJar.new
+      @cookie_jar ||= ActionDispatch::Cookies::CookieJar.build(self)
     end
 
     def flash
@@ -59,6 +59,10 @@ module FocusedController
       self
     end
 
+    def delete(*)
+      self
+    end
+
     def to_s
       "#{helper_name}(#{args.each(&:to_s).join(', ')})"
     end
@@ -172,5 +176,9 @@ module FocusedController
         end
       end
     end
+
+    def optimize_routes_generation?(*)
+      false
+    end
   end
 end

data/lib/focused_controller/version.rb

@@ -1,3 +1,3 @@
 module FocusedController
-  VERSION = "1.0.0"
+  VERSION = "1.1.0"
 end

data/test/app/Gemfile

@@ -1,6 +1,6 @@
 source 'http://rubygems.org'
 
-gem 'rails', ENV['RAILS_VERSION'] || '~> 3.2.1'
+gem 'rails', ENV['RAILS_VERSION'] || '~> 4.0.0'
 gem 'focused_controller', :path => '../..'
 gem 'rspec'
 gem 'rspec-rails'

data/test/app/app/models/post.rb

@@ -1,3 +1,5 @@
+require 'active_model'
+
 class Post
   extend ActiveModel::Naming
   include ActiveModel::Validations

data/test/app/app/views/posts/index.html.erb

@@ -13,7 +13,7 @@
     <td><%= post.body %></td>
     <td><%= link_to 'Show', post %></td>
     <td><%= link_to 'Edit', edit_post_path(post) %></td>
-    <td><%= link_to 'Destroy', post, :confirm => 'Are you sure?', :method => :delete %></td>
+    <td><%= link_to 'Destroy', post, :method => :delete %></td>
   </tr>
 <% end %>
 </table>

data/test/app/config/environments/development.rb

@@ -6,9 +6,6 @@ App::Application.configure do
   # since you don't have to restart the web server when you make code changes.
   config.cache_classes = false
 
-  # Log error messages when you accidentally call methods on nil.
-  config.whiny_nils = true
-
   # Show full error reports and disable caching
   config.consider_all_requests_local       = true
   config.action_controller.perform_caching = false
@@ -18,4 +15,6 @@ App::Application.configure do
 
   # Only use best-standards-support built into browsers
   config.action_dispatch.best_standards_support = :builtin
+
+  config.eager_load = false
 end

data/test/app/config/environments/test.rb

@@ -11,9 +11,6 @@ App::Application.configure do
   config.serve_static_assets = true
   config.static_cache_control = "public, max-age=3600"
 
-  # Log error messages when you accidentally call methods on nil
-  config.whiny_nils = true
-
   # Show full error reports and disable caching
   config.consider_all_requests_local       = true
   config.action_controller.perform_caching = false
@@ -26,4 +23,6 @@ App::Application.configure do
 
   # Print deprecation notices to the stderr
   config.active_support.deprecation = :stderr
+
+  config.eager_load = false
 end

data/test/app/config/initializers/secret_token.rb

@@ -5,3 +5,4 @@
 # Make sure the secret is at least 30 characters and all random,
 # no regular words or you'll be exposed to dictionary attacks.
 App::Application.config.secret_token = '0bdf8849022e542ad15148bd7052bff324953e0b40f3545d0cb3f11f0347837d9cde80c10af262744b5725e85838a432fbd3bab2f2f82ede04da29877dfa5358'
+App::Application.config.secret_key_base = '0bdf8849022e542ad15148bd7052bff324953e0b40f3545d0cb3f11f0347837d9cde80c10af262744b5725e85838a432fbd3bab2f2f82ede04da29877dfa5358'

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

@@ -1,4 +1,5 @@
 require 'test_helper'
+require_dependency 'posts_controller'
 
 module PostsController
   class TestCase < ActionController::TestCase

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

@@ -1,4 +1,5 @@
 require 'test_helper'
+require_dependency 'posts_controller'
 
 module PostsController
   class TestCase < ActiveSupport::TestCase

data/test/helper.rb

@@ -19,8 +19,17 @@ end
 # can, and capybara/rails assumes there is a full rails env present. So this is a
 # hack to make it not fail.
 module Rails
+  module VERSION
+    MAJOR = 3
+    MINOR = 0
+    TINY  = 0
+    PRE   = ""
+
+    STRING = [MAJOR, MINOR, TINY, PRE].compact.join(".")
+  end
+
   def self.version
-    '3.0'
+    VERSION::STRING
   end
 
   def self.root

data/test/unit/functional_test_helper_test.rb

@@ -29,6 +29,20 @@ module FocusedController
     describe FunctionalTestHelper do
       subject { FakePostsController::IndexTest.new }
 
+      def record_last_process
+        subject.singleton_class.class_eval do
+          attr_reader :last_process
+
+          def process(action_name, *args)
+            if ActionPack::VERSION::MAJOR < 4
+              args.unshift args.pop
+            end
+
+            @last_process = [action_name, *args]
+          end
+        end
+      end
+
       it 'automatically determines the controller class' do
         FakePostsController::IndexTest.controller_class.
           must_equal FakePostsController::Index
@@ -37,28 +51,51 @@ module FocusedController
       end
 
       it "doesn't require using the action name to dispatch the action" do
-        subject.singleton_class.class_eval do
-          attr_reader :last_process
+        record_last_process
 
-          def process(*args)
-            @last_process = args
-          end
-        end
+        parameters = {:foo => "bar"}
+        session = {:baz => "bat"}
+        flash = {:quux => "wibble"}
+
+        subject.get parameters, session, flash
+        subject.last_process.must_equal ['call', 'GET', parameters, session, flash]
+
+        subject.post parameters, session, flash
+        subject.last_process.must_equal ['call', 'POST', parameters, session, flash]
+
+        subject.put parameters, session, flash
+        subject.last_process.must_equal ['call', 'PUT', parameters, session, flash]
+
+        subject.delete parameters, session, flash
+        subject.last_process.must_equal ['call', 'DELETE', parameters, session, flash]
 
-        subject.get :foo, :bar, :baz
-        subject.last_process.must_equal ['call', :foo, :bar, :baz, 'GET']
+        subject.head parameters, session, flash
+        subject.last_process.must_equal ['call', 'HEAD', parameters, session, flash]
+      end
+
+      describe "testing a non-focused controller" do
+        it "allows using the action name to dispatch the action" do
+          record_last_process
+
+          parameters = {:foo => "bar"}
+          session = {:baz => "bat"}
+          flash = {:quux => "wibble"}
 
-        subject.post :foo, :bar, :baz
-        subject.last_process.must_equal ['call', :foo, :bar, :baz, 'POST']
+          subject.get :show, parameters, session, flash
+          subject.last_process.must_equal [:show, 'GET', parameters, session, flash]
 
-        subject.put :foo, :bar, :baz
-        subject.last_process.must_equal ['call', :foo, :bar, :baz, 'PUT']
+          subject.post :create, parameters, session, flash
+          subject.last_process.must_equal [:create, 'POST', parameters, session, flash]
 
-        subject.delete :foo, :bar, :baz
-        subject.last_process.must_equal ['call', :foo, :bar, :baz, 'DELETE']
+          subject.put :update, parameters, session, flash
+          subject.last_process.must_equal [:update, 'PUT', parameters, session, flash]
 
-        subject.head :foo, :bar, :baz
-        subject.last_process.must_equal ['call', :foo, :bar, :baz, 'HEAD']
+          subject.delete :destroy, parameters, session, flash
+          subject.last_process.must_equal [:destroy, 'DELETE', parameters, session, flash]
+
+          subject.head :show, parameters, session, flash
+          subject.last_process.must_equal [:show, 'HEAD', parameters, session, flash]
+        end
       end
     end
   end

data/test/unit/mixin_test.rb

@@ -30,8 +30,8 @@ module FocusedController
 
       subject { klass.new }
 
-      it "has a .controller_path of 'posts'" do
-        klass.controller_path.must_equal 'posts'
+      it "has a .focused_controller_path of 'posts'" do
+        klass.focused_controller_path.must_equal 'posts'
       end
 
       it "has a .call which dispatches the #call action" do

data/test/unit/route_mapper_test.rb

@@ -27,8 +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/all' => 'posts#index'
+          get 'posts'     => 'PostsController::Index'
+          get 'posts/all' => 'posts#index'
 
           resources :comments do
             resources :replies
@@ -67,7 +67,7 @@ module FocusedController
 
       route_set.draw do
         focused_controller_routes do
-          match 'posts' => app
+          get 'posts' => app
         end
       end
       recognize('/posts').app.must_equal app

metadata

@@ -1,100 +1,94 @@
 --- !ruby/object:Gem::Specification
 name: focused_controller
 version: !ruby/object:Gem::Version
-  version: 1.0.0
-  prerelease: 
+  version: 1.1.0
 platform: ruby
 authors:
 - Jon Leighton
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-09-20 00:00:00.000000000 Z
+date: 2013-10-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: actionpack
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - '>='
       - !ruby/object:Gem::Version
         version: '3.0'
+    - - <
+      - !ruby/object:Gem::Version
+        version: '4.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - '>='
       - !ruby/object:Gem::Version
         version: '3.0'
+    - - <
+      - !ruby/object:Gem::Version
+        version: '4.1'
 - !ruby/object:Gem::Dependency
   name: minitest
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '2.11'
+        version: '4.2'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '2.11'
+        version: '4.2'
 - !ruby/object:Gem::Dependency
   name: capybara
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '1.1'
+        version: '2.1'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '1.1'
+        version: '2.1'
 - !ruby/object:Gem::Dependency
   name: capybara_minitest_spec
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '0.2'
+        version: '1.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '0.2'
+        version: '1.0'
 - !ruby/object:Gem::Dependency
   name: poltergeist
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '0.7'
+        version: '1.3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '0.7'
+        version: '1.3'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -102,7 +96,6 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -110,7 +103,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec-rails
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -118,7 +110,6 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -126,7 +117,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: appraisal
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -134,7 +124,6 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -149,14 +138,15 @@ files:
 - .gitignore
 - .travis.yml
 - Appraisals
+- CHANGELOG.md
 - Gemfile
 - LICENSE
 - README.md
 - Rakefile
 - focused_controller.gemspec
-- gemfiles/rails-3-0.gemfile
-- gemfiles/rails-3-1.gemfile
-- gemfiles/rails-3-2.gemfile
+- gemfiles/rails_3_1.gemfile
+- gemfiles/rails_3_2.gemfile
+- gemfiles/rails_4_0.gemfile
 - lib/focused_controller.rb
 - lib/focused_controller/action_name.rb
 - lib/focused_controller/functional_test_helper.rb
@@ -235,27 +225,26 @@ files:
 - test/unit/test_helper_test.rb
 homepage: http://github.com/jonleighton/focused_controller
 licenses: []
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: focused_controller
-rubygems_version: 1.8.24
+rubygems_version: 2.1.9
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Write Rails controllers with one class per action
 test_files:
 - test/acceptance/app_test.rb

data/gemfiles/rails-3-0.gemfile

@@ -1,8 +0,0 @@
-# This file was generated by Appraisal
-
-source "http://rubygems.org"
-
-gem "rails", "~> 3.0.0"
-gem "rack-test", "~> 0.5.7"
-
-gemspec :path=>"../"