focused_controller 1.2.1 → 2.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 77bb894756850c9467c74064dc48aa1aba860eb3
-  data.tar.gz: 40b2a2f999435a7fc7d36a6d5cacbde80ad0e238
+  metadata.gz: 4520f2d723515817447f6298824b627fd5cd610d
+  data.tar.gz: 5396abeb1c3bd9c627f67ce079bfb9113a660572
 SHA512:
-  metadata.gz: 48f77a5556e2577a08ef8dc8b79c9266efb538611f2a958820e3608f9f90182fa481da5208de5e287fdefa65c96277853f8460daaff07c7a1ccd42d21ca708e9
-  data.tar.gz: 6a821c1669cc5b67ee2ba8452f84ebdc49eac722a2ea46b387c696e6f91373ee55fd3a26e1a876b5fe3b17b1b1c6bc89480b9e320228710b20f66c7abf10d72f
+  metadata.gz: 59ea160ee59f7fe685cc2f97db55f14c7625f061ccbe9dfe0da5626affce78e65cd6a519234f2161c182d0c86a8b014a035af9d0bc1d60a391dab55247e8e606
+  data.tar.gz: 48429585b521b53d891064926918333a4c8a8a35bf9414e6b0ac758fd496d9cb4db1e8156e4e8cbad52d70592d36cf73b832e6c0c30d3fe99483fb59857247a4

data/.travis.yml

@@ -1,11 +1,12 @@
 language: ruby
+
 rvm:
+  - 2.2.3
   - 2.1.2
   - 2.0.0
-  - 1.9.3
-  - jruby-19mode
+
 gemfile:
+  - gemfiles/rails_4_2.gemfile
   - gemfiles/rails_4_1.gemfile
-  - gemfiles/rails_4_0.gemfile
-  - gemfiles/rails_3_2.gemfile
-  - gemfiles/rails_3_1.gemfile
+
+sudo: false

data/Appraisals

@@ -1,16 +1,7 @@
-appraise 'rails-4-1' do
-  gem 'rails', '~> 4.1.0'
-  gem 'minitest', '~> 5.1.0'
-end
-
-appraise 'rails-4-0' do
-  gem 'rails', '~> 4.0.0'
+appraise 'rails-4-2' do
+  gem 'rails', '~> 4.2.0'
 end
 
-appraise 'rails-3-2' do
-  gem 'rails', '~> 3.2.0'
-end
-
-appraise 'rails-3-1' do
-  gem 'rails', '~> 3.1.0'
+appraise 'rails-4-1' do
+  gem 'rails', '~> 4.1.0'
 end

data/CHANGELOG.md

@@ -1,3 +1,11 @@
+## 2.0.0 ##
+
+* Rails 3.X and 4.0 no longer supported
+* Ruby 1.9 no longer officially supported (it may still work)
+* Isolated unit tests (via `stub_url`) no longer supported. Use the
+  Spring preloader to keep your app warm instead.
+* Rails 4.2 support added
+
 ## Version 1.2.1 ##
 
 * Fix gemspec

data/README.md

@@ -241,34 +241,6 @@ describe UsersController do
 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

data/focused_controller.gemspec

@@ -18,13 +18,13 @@ 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', '< 4.2'
+  s.add_dependency 'actionpack', '~> 4.1', '< 4.3'
 
   s.add_development_dependency 'minitest'
-  s.add_development_dependency 'capybara',               '~> 2.1'
+  s.add_development_dependency 'capybara',               '~> 2.5'
   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 'poltergeist',            '~> 1.6'
+  s.add_development_dependency 'rspec',                  '~> 3.0'
+  s.add_development_dependency 'rspec-rails',            '~> 3.0'
   s.add_development_dependency 'appraisal',              '~> 1.0'
 end

data/gemfiles/rails_4_1.gemfile

@@ -3,6 +3,5 @@
 source "http://rubygems.org"
 
 gem "rails", "~> 4.1.0"
-gem "minitest", "~> 5.1.0"
 
 gemspec :path => "../"

data/gemfiles/{rails_3_1.gemfile → rails_4_2.gemfile}

@@ -2,6 +2,6 @@
 
 source "http://rubygems.org"
 
-gem "rails", "~> 3.1.0"
+gem "rails", "~> 4.2.0"
 
-gemspec :path=>"../"
+gemspec :path => "../"

data/lib/focused_controller/route_mapper.rb

@@ -13,13 +13,10 @@ module FocusedController
       options = @options.dup
 
       if to = to_option
-        options[:to]         = FocusedController::Route.new(to)
-
-        # This causes rails to spit out a bit of extra useful information in the case
-        # of a routing error. The :action option is also necessary for the routing to
-        # work on Rails <= 3.1.
         options[:action]     = FocusedController.action_name
         options[:controller] = to.underscore
+
+        options.delete :to
       end
 
       options
@@ -34,21 +31,19 @@ module FocusedController
         else
           @options[:to]
         end
+      elsif @options[:controller]
+        @options[:controller]
       elsif @options[:action] && @scope[:controller]
         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
+      "#{controller.to_s.underscore}_controller/#{action.to_s.underscore}"
     end
   end
 
-  class ActionDispatch::Routing::Mapper
+  module RoutingExtensions
     def focused_controller_routes(&block)
       prev, @scope[:focused_controller_routes] = @scope[:focused_controller_routes], true
       yield
@@ -56,16 +51,47 @@ module FocusedController
       @scope[:focused_controller_routes] = false
     end
 
-    class Mapping
-      def initialize_with_focused_controller(set, scope, path, options)
-        if scope[:focused_controller_routes]
-          options = FocusedController::RouteMapper.new(scope, options).options
-        end
+    def focused_controller_enabled?
+      @scope[:focused_controller_routes]
+    end
 
-        initialize_without_focused_controller(set, scope, path, options)
+    def add_route(action, options)
+      if focused_controller_enabled?
+        super(
+          action,
+          FocusedController::RouteMapper.new(
+            @scope,
+            { action: action }.merge(options)
+          ).options
+        )
+      else
+        super
       end
+    end
+  end
+
+  module RouteDispatcherExtensions
+    private
 
-      alias_method_chain :initialize, :focused_controller
+    FOCUSED_CONTROLLER = "_controller/"
+
+    def controller_reference(controller_param)
+      if controller_param.include?(FOCUSED_CONTROLLER)
+        const_name = @controller_class_names[controller_param] ||= controller_param.camelize
+        ActiveSupport::Dependencies.constantize(const_name)
+      else
+        super
+      end
     end
   end
 end
+
+module ActionDispatch::Routing
+  class Mapper
+    include FocusedController::RoutingExtensions
+  end
+
+  class RouteSet::Dispatcher
+    prepend FocusedController::RouteDispatcherExtensions
+  end
+end

data/lib/focused_controller/rspec_helper.rb

@@ -1,15 +1,6 @@
 require 'focused_controller/test_helper'
 require 'focused_controller/rspec_controller_class'
-
-begin
-  # Requiring specific files rather than just 'rspec/rails' because I don't
-  # want to force the configuration that 'rspec/rails' adds on people if they
-  # haven't specifically chosen to receive it.
-  require 'rails/version' unless defined?(Rails)
-  require 'rspec/rails/matchers'
-  require 'rspec/rails/adapters'
-rescue LoadError
-end
+require 'rspec/rails'
 
 module FocusedController
   module RSpecHelper
@@ -18,27 +9,16 @@ module FocusedController
         # This must get included higher in the ancestor chain than
         # this module so that inheritance works as desired
         include FocusedController::TestHelper
-        extend ClassMethods
+        extend FocusedController::RSpecControllerClass
+
+        include RSpec::Rails::RailsExampleGroup
+        include RSpec::Rails::Matchers::RedirectTo
+        include RSpec::Rails::Matchers::RenderTemplate
+
         subject { controller }
       end
 
       super
     end
-
-    if defined?(RSpec::Rails)
-      include RSpec::Rails::SetupAndTeardownAdapter
-      include RSpec::Rails::TestUnitAssertionAdapter
-      include RSpec::Rails::Matchers
-      include RSpec::Rails::Matchers::RedirectTo
-      include RSpec::Rails::Matchers::RenderTemplate
-    end
-
-    module ClassMethods
-      include FocusedController::RSpecControllerClass
-
-      def stub_url(*helper_names)
-        before { stub_url(*helper_names) }
-      end
-    end
   end
 end

data/lib/focused_controller/test_helper.rb

@@ -11,14 +11,6 @@ module FocusedController
       _process_options(options)
       @_render_options = options
     end
-
-    def url_for(options = nil)
-      if options.is_a?(StubbedURL)
-        options
-      else
-        super
-      end
-    end
   end
 
   class TestRequest < ActionDispatch::TestRequest
@@ -39,35 +31,6 @@ module FocusedController
   class TestResponse < ActionDispatch::TestResponse
   end
 
-  class StubbedURL
-    attr_reader :helper_name, :args
-
-    def initialize(helper_name, args)
-      @helper_name = helper_name.to_s
-      @args        = args
-    end
-
-    def ==(other)
-      other.is_a?(self.class) &&
-        helper_name == other.helper_name &&
-        args        == other.args
-    end
-
-    # Deals with _compute_redirect_to_location in action_controller/metal/redirecting
-    # (I don't feel proud about this...)
-    def gsub(*)
-      self
-    end
-
-    def delete(*)
-      self
-    end
-
-    def to_s
-      "#{helper_name}(#{args.each(&:to_s).join(', ')})"
-    end
-  end
-
   module TestHelper
     extend ActiveSupport::Concern
     include ActionDispatch::Assertions::ResponseAssertions
@@ -87,13 +50,11 @@ module FocusedController
 
       def include_routes
         if controller_class.respond_to?(:_routes) && controller_class._routes
-          include controller_class._routes.named_routes.module
+          if mod = controller_class._routes.url_helpers
+            include mod
+          end
         end
       end
-
-      def stub_url(*names)
-        setup { stub_url(*names) }
-      end
     end
 
     def controller
@@ -144,8 +105,12 @@ module FocusedController
       controller.url_for(*args)
     end
 
+    def _routes_included?
+      defined?(@_routes_included) && @_routes_included
+    end
+
     def respond_to?(*args)
-      unless defined?(@_routes_included) && @_routes_included
+      unless _routes_included?
         self.class.include_routes
         @_routes_included = true
       end
@@ -154,29 +119,13 @@ module FocusedController
     end
 
     def method_missing(method_name, *args, &block)
-      if respond_to?(method_name)
+      if !_routes_included? && respond_to?(method_name)
         send(method_name, *args, &block)
       else
         super
       end
     end
 
-    def stub_url(*names)
-      [self, controller].each do |host|
-        host.singleton_class.class_eval do
-          names.each do |name|
-            define_method("#{name}_url") do |*args|
-              StubbedURL.new("#{name}_url", args)
-            end
-
-            define_method("#{name}_path") do |*args|
-              StubbedURL.new("#{name}_path", args)
-            end
-          end
-        end
-      end
-    end
-
     def optimize_routes_generation?(*)
       false
     end

data/lib/focused_controller/version.rb

@@ -1,3 +1,3 @@
 module FocusedController
-  VERSION = "1.2.1"
+  VERSION = "2.0.0"
 end

data/lib/focused_controller.rb

@@ -1,4 +1,3 @@
 require 'focused_controller/version'
-require 'focused_controller/route'
 require 'focused_controller/mixin'
 require 'focused_controller/route_mapper'

data/test/acceptance/app_test.rb

@@ -1,4 +1,4 @@
-require 'helper'
+require_relative '../helper'
 require 'capybara'
 require 'capybara_minitest_spec'
 require 'capybara/poltergeist'
@@ -94,7 +94,7 @@ describe 'acceptance test' do
 
         yield
 
-        Process.kill('KILL', out.pid)
+        Process.kill('QUIT', File.read("tmp/pids/server.pid").to_i)
       end
     end
   end
@@ -103,7 +103,7 @@ describe 'acceptance test' do
     run_without_bundle_exec "bundle check >/dev/null || bundle update >/dev/null"
   end
 
-  let(:s) { Capybara::Session.new(:poltergeist, nil) }
+  let(:s) { Capybara::Session.new(:poltergeist) }
 
   it 'does basic CRUD actions successfully' do
     start_server do
@@ -144,10 +144,6 @@ describe 'acceptance test' do
     run_command "ruby -Itest test/unit/controllers/posts_controller_test.rb"
   end
 
-  it 'runs an isolated unit test' do
-    run_command "ruby -Itest test/unit/controllers/posts_controller_isolated_test.rb"
-  end
-
   it 'runs a functional spec' do
     run_command "rspec spec/controllers/posts_controller_spec.rb"
   end
@@ -155,8 +151,4 @@ describe 'acceptance test' do
   it 'runs a unit spec' do
     run_command "rspec spec/unit/controllers/posts_controller_spec.rb"
   end
-
-  it 'runs an isolated unit spec' do
-    run_command "rspec spec/unit/controllers/posts_controller_isolated_spec.rb"
-  end
 end

data/test/app/Gemfile

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

data/test/app/config/application.rb

@@ -9,6 +9,7 @@ module App
   class Application < Rails::Application
     # Configure the default encoding used in templates for Ruby 1.9.
     config.encoding = "utf-8"
+    config.active_support.test_order = :sorted
   end
 end
 I18n.enforce_available_locales = false

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

@@ -8,7 +8,13 @@ App::Application.configure do
   config.cache_classes = true
 
   # Configure static asset server for tests with Cache-Control for performance
-  config.serve_static_assets = true
+  if config.respond_to?(:serve_static_files)
+    config.serve_static_files = true
+  else
+    # Remove when we drop Rails 4.1
+    config.serve_static_assets = true
+  end
+
   config.static_cache_control = "public, max-age=3600"
 
   # Show full error reports and disable caching

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

@@ -4,4 +4,4 @@
 # Rails.backtrace_cleaner.add_silencer { |line| line =~ /my_noisy_library/ }
 
 # You can also remove all the silencers if you're trying to debug a problem that might stem from framework code.
-# Rails.backtrace_cleaner.remove_silencers!
+Rails.backtrace_cleaner.remove_silencers!

data/test/app/config/secrets.yml

@@ -0,0 +1,3 @@
+development:
+  secret_token:    "123"
+  secret_key_base: "123"

data/test/helper.rb

@@ -1,20 +1,38 @@
-require 'bundler/setup'
-gem 'minitest'
-require 'active_support'
-require 'minitest/autorun'
-require 'test/unit/testcase'
-require 'active_support/test_case'
-require 'minitest/spec'
-require 'minitest/autorun'
-require 'focused_controller'
-require 'pathname'
-require 'ostruct'
-require 'rspec/core'
-require 'rails/version'
+require "bundler/setup"
+
+require "rails/all"
+require "active_support/all"
+require "yaml"
+
+require "focused_controller"
+
+# Remove conditional when we drop Rails 4.1
+if ActiveSupport.respond_to?(:test_order)
+  ActiveSupport.test_order = :random
+end
+
+require "active_support/test_case"
+
+require "minitest/autorun"
+require "minitest/spec"
+
+module Kernel
+  alias minitest_describe describe
+end
+
+# Require rspec, but avoid using its 'describe'
+require "rspec/core"
+RSpec.configure do |config|
+  config.expose_dsl_globally = false
+end
+[singleton_class, Module].each do |mod|
+  mod.class_eval { alias describe minitest_describe }
+end
 
 TEST_ROOT = File.expand_path('..', __FILE__)
 
-# Don't want to actually use RSpec to run our tests
-module RSpec::Core::DSL
-  remove_method :describe
+class RailsApplication < Rails::Application
+  config.root            = TEST_ROOT + "/app"
+  config.secret_key_base = "123"
+  config.secret_token    = "123"
 end

data/test/unit/functional_test_helper_test.rb

@@ -1,4 +1,4 @@
-require 'helper'
+require_relative '../helper'
 require 'focused_controller/functional_test_helper'
 require 'action_controller'
 

data/test/unit/mixin_test.rb

@@ -1,4 +1,4 @@
-require 'helper'
+require_relative '../helper'
 require 'action_controller'
 
 module FocusedController

data/test/unit/route_mapper_test.rb

@@ -1,4 +1,4 @@
-require 'helper'
+require_relative '../helper'
 
 # RouteSet is missing some requires
 require 'active_support/core_ext/uri'
@@ -12,16 +12,13 @@ module FocusedController
       method = (environment[:method] || "GET").to_s.upcase
       env    = Rack::MockRequest.env_for(path, {:method => method})
       req    = route_set.request_class.new(env)
-
-      if route_set.respond_to?(:router)
-        router = route_set.router # Rails 3.2+
-      else
-        router = route_set.set    # Rails 3.0, 3.1
-      end
+      router = route_set.router
 
       router.recognize(req) do |route, matches, params|
         return route
       end
+
+      raise ArgumentError, "'#{path}' not recognized"
     end
 
     it 'creates routes that map to focused controllers' do
@@ -32,12 +29,16 @@ module FocusedController
 
           resources :comments do
             resources :replies
+
+            get 'a/:foo' => 'PostsController::Index', on: :collection
+            get 'b/:foo', action: :index, on: :collection
           end
 
           resource :account
 
           namespace :admin do
             resources :comments
+            get 'foo' => 'FooController::Show'
           end
         end
       end
@@ -50,12 +51,14 @@ module FocusedController
         [:put, '/comments/4']         => 'CommentsController::Update',
         [:get, '/account']            => 'AccountsController::Show',
         [:get, '/comments/4/replies'] => 'RepliesController::Index',
-        [:get, '/admin/comments']     => 'Admin::CommentsController::Index'
+        [:get, '/admin/comments']     => 'Admin::CommentsController::Index',
+        [:get, '/comments/a/omg']     => 'PostsController::Index',
+        [:get, '/comments/b/omg']     => 'CommentsController::Index',
+        [:get, '/admin/foo']          => 'Admin::FooController::Show',
       }
 
       mappings.each do |(method, path), controller|
         route = recognize(path, :method => method)
-        route.app.name.must_equal controller
         route.defaults[:action].must_equal FocusedController.action_name
         route.defaults[:controller].must_equal controller.underscore
       end
@@ -70,7 +73,13 @@ module FocusedController
           get 'posts' => app
         end
       end
-      recognize('/posts').app.must_equal app
+      route = recognize('/posts')
+      app   = route.app
+
+      # Remove this when we drop Rails 4.1
+      app = app.app if app.respond_to?(:app)
+
+      app.must_equal app
     end
 
     it "generates a route with url_for" do

data/test/unit/rspec_functional_helper.rb

@@ -1,4 +1,4 @@
-require 'helper'
+require_relative '../helper'
 require 'focused_controller/rspec_functional_helper'
 
 module FocusedController

data/test/unit/rspec_helper_test.rb

@@ -1,4 +1,4 @@
-require 'helper'
+require_relative '../helper'
 require 'action_controller'
 require 'focused_controller/rspec_helper'
 
@@ -21,13 +21,13 @@ module FocusedController
       end
     end
 
-    index_spec = RSpec::Core::ExampleGroup.describe FakePostsController::Index do
+    index_spec = RSpec.describe FakePostsController::Index do
       include FocusedController::RSpecHelper
     end
 
     show_spec = nil
     inner_show_spec = nil
-    RSpec::Core::ExampleGroup.describe FakePostsController do
+    RSpec.describe FakePostsController do
       show_spec = describe FakePostsController::Show do
         include FocusedController::RSpecHelper
 
@@ -36,7 +36,7 @@ module FocusedController
       end
     end
 
-    edit_spec = RSpec::Core::ExampleGroup.describe "the edit action" do
+    edit_spec = RSpec.describe "the edit action" do
       include FocusedController::RSpecHelper
       self.controller_class = FakePostsController::Edit
     end

data/test/unit/test_helper_test.rb

@@ -1,4 +1,4 @@
-require 'helper'
+require_relative '../helper'
 require 'focused_controller/test_helper'
 require 'action_controller'
 
@@ -23,13 +23,11 @@ module FocusedController
 
         def self._routes
           OpenStruct.new(
-            :named_routes => OpenStruct.new(
-              :module => Module.new do
-                def foo_path
-                  '/foo'
-                end
+            :url_helpers => Module.new do
+              def foo_path
+                '/foo'
               end
-            )
+            end
           )
         end
       end
@@ -37,13 +35,11 @@ module FocusedController
       class Show < Action
         def self._routes
           OpenStruct.new(
-            :named_routes => OpenStruct.new(
-              :module => Module.new do
-                def bar_path
-                  '/bar'
-                end
+            :url_helpers => Module.new do
+              def bar_path
+                '/bar'
               end
-            )
+            end
           )
         end
       end
@@ -178,38 +174,6 @@ module FocusedController
 
         subject.cookies[:foo].must_equal 'omg'
       end
-
-      describe 'url stubbing' do
-        before do
-          subject.stub_url :foo, :bar
-        end
-
-        it 'handles equality' do
-          foo, bar = Object.new, Object.new
-          StubbedURL.new(:foo_path, [foo]).must_equal StubbedURL.new(:foo_path, [foo])
-          StubbedURL.new(:foo_path, [foo, bar]).wont_equal StubbedURL.new(:foo_path, [foo])
-          StubbedURL.new(:foo_path, [bar]).wont_equal StubbedURL.new(:foo_path, [foo])
-          StubbedURL.new(:bar_path, [foo]).wont_equal StubbedURL.new(:foo_path, [foo])
-        end
-
-        it 'has a to_s' do
-          StubbedURL.new(:foo_path, ['omg', 'lol']).to_s.must_equal "foo_path(omg, lol)"
-        end
-
-        it 'creates a stub method on the test and controller instances' do
-          foo = Object.new
-          subject.foo_path(foo).must_equal StubbedURL.new(:foo_path, [foo])
-          subject.controller.foo_path(foo).must_equal StubbedURL.new(:foo_path, [foo])
-          subject.foo_url(foo).must_equal StubbedURL.new(:foo_url, [foo])
-          subject.controller.foo_url(foo).must_equal StubbedURL.new(:foo_url, [foo])
-        end
-
-        it 'works with a controller' do
-          foo = Object.new
-          subject.controller.redirect_to StubbedURL.new(:foo_path, [foo])
-          must_succeed { subject.assert_redirected_to StubbedURL.new(:foo_path, [foo]) }
-        end
-      end
     end
   end
 end

metadata

@@ -1,35 +1,35 @@
 --- !ruby/object:Gem::Specification
 name: focused_controller
 version: !ruby/object:Gem::Version
-  version: 1.2.1
+  version: 2.0.0
 platform: ruby
 authors:
 - Jon Leighton
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-06-26 00:00:00.000000000 Z
+date: 2015-09-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: actionpack
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '4.1'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '4.2'
+        version: '4.3'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '4.1'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '4.2'
+        version: '4.3'
 - !ruby/object:Gem::Dependency
   name: minitest
   requirement: !ruby/object:Gem::Requirement
@@ -50,14 +50,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.1'
+        version: '2.5'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.1'
+        version: '2.5'
 - !ruby/object:Gem::Dependency
   name: capybara_minitest_spec
   requirement: !ruby/object:Gem::Requirement
@@ -78,42 +78,42 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.3'
+        version: '1.6'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.3'
+        version: '1.6'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.8'
+        version: '3.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.8'
+        version: '3.0'
 - !ruby/object:Gem::Dependency
   name: rspec-rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.8'
+        version: '3.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.8'
+        version: '3.0'
 - !ruby/object:Gem::Dependency
   name: appraisal
   requirement: !ruby/object:Gem::Requirement
@@ -144,15 +144,12 @@ files:
 - README.md
 - Rakefile
 - focused_controller.gemspec
-- gemfiles/rails_3_1.gemfile
-- gemfiles/rails_3_2.gemfile
-- gemfiles/rails_4_0.gemfile
 - gemfiles/rails_4_1.gemfile
+- gemfiles/rails_4_2.gemfile
 - lib/focused_controller.rb
 - lib/focused_controller/action_name.rb
 - lib/focused_controller/functional_test_helper.rb
 - lib/focused_controller/mixin.rb
-- lib/focused_controller/route.rb
 - lib/focused_controller/route_mapper.rb
 - lib/focused_controller/rspec_controller_class.rb
 - lib/focused_controller/rspec_functional_helper.rb
@@ -190,6 +187,7 @@ files:
 - test/app/config/initializers/session_store.rb
 - test/app/config/locales/en.yml
 - test/app/config/routes.rb
+- test/app/config/secrets.yml
 - test/app/db/seeds.rb
 - test/app/doc/README_FOR_APP
 - test/app/lib/assets/.gitkeep
@@ -207,14 +205,11 @@ files:
 - test/app/spec/controllers/posts_controller_spec.rb
 - test/app/spec/isolated_spec_helper.rb
 - test/app/spec/spec_helper.rb
-- test/app/spec/unit/controllers/posts_controller_isolated_spec.rb
 - test/app/spec/unit/controllers/posts_controller_spec.rb
 - test/app/test/functional/.gitkeep
 - test/app/test/functional/posts_controller_test.rb
-- test/app/test/isolated_test_helper.rb
 - test/app/test/test_helper.rb
 - test/app/test/unit/.gitkeep
-- test/app/test/unit/controllers/posts_controller_isolated_test.rb
 - test/app/test/unit/controllers/posts_controller_test.rb
 - test/app/vendor/assets/javascripts/.gitkeep
 - test/app/vendor/assets/stylesheets/.gitkeep
@@ -223,7 +218,6 @@ files:
 - test/unit/functional_test_helper_test.rb
 - test/unit/mixin_test.rb
 - test/unit/route_mapper_test.rb
-- test/unit/route_test.rb
 - test/unit/rspec_functional_helper.rb
 - test/unit/rspec_helper_test.rb
 - test/unit/test_helper_test.rb
@@ -246,7 +240,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: focused_controller
-rubygems_version: 2.2.2
+rubygems_version: 2.4.5
 signing_key: 
 specification_version: 4
 summary: Write Rails controllers with one class per action
@@ -282,6 +276,7 @@ test_files:
 - test/app/config/initializers/session_store.rb
 - test/app/config/locales/en.yml
 - test/app/config/routes.rb
+- test/app/config/secrets.yml
 - test/app/db/seeds.rb
 - test/app/doc/README_FOR_APP
 - test/app/lib/assets/.gitkeep
@@ -299,14 +294,11 @@ test_files:
 - test/app/spec/controllers/posts_controller_spec.rb
 - test/app/spec/isolated_spec_helper.rb
 - test/app/spec/spec_helper.rb
-- test/app/spec/unit/controllers/posts_controller_isolated_spec.rb
 - test/app/spec/unit/controllers/posts_controller_spec.rb
 - test/app/test/functional/.gitkeep
 - test/app/test/functional/posts_controller_test.rb
-- test/app/test/isolated_test_helper.rb
 - test/app/test/test_helper.rb
 - test/app/test/unit/.gitkeep
-- test/app/test/unit/controllers/posts_controller_isolated_test.rb
 - test/app/test/unit/controllers/posts_controller_test.rb
 - test/app/vendor/assets/javascripts/.gitkeep
 - test/app/vendor/assets/stylesheets/.gitkeep
@@ -315,7 +307,6 @@ test_files:
 - test/unit/functional_test_helper_test.rb
 - test/unit/mixin_test.rb
 - test/unit/route_mapper_test.rb
-- test/unit/route_test.rb
 - test/unit/rspec_functional_helper.rb
 - test/unit/rspec_helper_test.rb
 - test/unit/test_helper_test.rb

data/gemfiles/rails_3_2.gemfile

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

data/gemfiles/rails_4_0.gemfile

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

data/lib/focused_controller/route.rb

@@ -1,17 +0,0 @@
-require "action_dispatch/routing"
-
-module FocusedController
-  class Route < ActionDispatch::Routing::RouteSet::Dispatcher
-    attr_reader :name
-
-    def initialize(name)
-      @name = name
-    end
-
-    def call(env)
-      name.constantize.call(env)
-    end
-
-    alias to_s name
-  end
-end

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

@@ -1,68 +0,0 @@
-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
-  stub_url :post, :posts
-
-  before do
-    @post = Post.create(:title => 'Hello', :body => 'Omg')
-  end
-
-  describe PostsController::Index do
-    it "should get index" do
-      subject.call
-      response.should be_success
-      subject.posts.should_not be(:nil)
-    end
-  end
-
-  describe PostsController::New do
-    it "should get new" do
-      subject.call
-      response.should be_success
-    end
-  end
-
-  describe PostsController::Create do
-    it "should create post" do
-      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
-      subject.params = { :id => @post.id }
-      subject.call
-      response.should be_success
-    end
-  end
-
-  describe PostsController::Edit do
-    it "should get edit" do
-      subject.params = { :id => @post.id }
-      subject.call
-      response.should be_success
-    end
-  end
-
-  describe PostsController::Update do
-    it "should update post" do
-      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
-      subject.params = { :id => @post.id }
-      expect { subject.call }.to change(Post, :count).by(-1)
-      response.should redirect_to(posts_url)
-    end
-  end
-end

data/test/app/test/isolated_test_helper.rb

@@ -1,6 +0,0 @@
-require 'bundler/setup'
-require 'active_support/test_case'
-require 'focused_controller/test_helper'
-
-APP_ROOT = File.expand_path('../../app', __FILE__)
-POSTS    = []

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

@@ -1,78 +0,0 @@
-require 'isolated_test_helper'
-require APP_ROOT + '/controllers/application_controller'
-require APP_ROOT + '/controllers/posts_controller'
-require APP_ROOT + '/models/post'
-
-module PostsController
-  class TestCase < ActiveSupport::TestCase
-    include FocusedController::TestHelper
-    stub_url :post, :posts
-
-    setup do
-      @post = Post.create(:title => 'Hello', :body => 'Omg')
-    end
-  end
-
-  class IndexTest < TestCase
-    test "should get index" do
-      controller.call
-      assert_response :success
-      assert_not_nil controller.posts
-    end
-  end
-
-  class NewTest < TestCase
-    test "should get new" do
-      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
-        controller.call
-      end
-
-      assert_redirected_to post_url(controller.post)
-    end
-  end
-
-  class ShowTest < TestCase
-    test "should show post" do
-      controller.params = { :id => @post.id }
-      controller.call
-      assert_response :success
-    end
-  end
-
-  class EditTest < TestCase
-    test "should get edit" do
-      controller.params = { :id => @post.id }
-      controller.call
-      assert_response :success
-    end
-  end
-
-  class UpdateTest < TestCase
-    test "should update post" do
-      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
-        controller.call
-      end
-
-      assert_redirected_to posts_url
-    end
-  end
-end

data/test/unit/route_test.rb

@@ -1,39 +0,0 @@
-require 'helper'
-
-module FocusedController
-  module Test
-  end
-
-  describe Route do
-    let(:controller) { Object.new }
-    subject { Route.new('FocusedController::Test::RouteTestController') }
-
-    before do
-      Test.const_set(:RouteTestController, controller)
-    end
-
-    after do
-      Test.send(:remove_const, :RouteTestController)
-    end
-
-    describe '#call' do
-      it 'constantizes the name and invokes #call on the constant' do
-        env, resp = Object.new, Object.new
-
-        # Not using MiniTest::Mock for this because it caused problems
-        # with Rubinius
-        controller.singleton_class.send :define_method, :call do |call_env|
-          resp if call_env == env
-        end
-
-        subject.call(env).must_equal resp
-      end
-    end
-
-    describe '#to_s' do
-      it "returns the the name" do
-        subject.to_s.must_equal 'FocusedController::Test::RouteTestController'
-      end
-    end
-  end
-end