focused_controller 1.1.1 → 1.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 64bbf1cbd70b5c981b090907d47cb17ccae247cc
-  data.tar.gz: 7dd77442333a3cc8786f4a6664ff5ab3f251c15c
+  metadata.gz: eb0b82cc33ac4d72d02c04f0d5e5d80d3277f659
+  data.tar.gz: aa5cb4c9903708ed68c1615c1e47ce018cb18723
 SHA512:
-  metadata.gz: ca4d406ffce23448c7bb478933f08cb3bfc9c6bb237a75659dc53c033d3ed4749d8cb67e64bc6b2135e7f3bac28d1b82e978c1f10365822114d21f67e59aff1b
-  data.tar.gz: 816e20545e95ee31b1dbf9710eba3002876ec1145601925250ca62daf051544de8d2e13b10ea23e901f2e8068d4643c0d2a3cbba0a3ac831463a9f091731d629
+  metadata.gz: ac7e1861452ca3ba23d540d843e0b621e75a7d47bee8997c5fc34fb81da3112e918a154377574c6859a9a0c4dae93cf38089594ae20c343c10ee19436e7b8c7f
+  data.tar.gz: 6d1c7de6432fb55c7ba93f1f7ca574df848a11e7a3ab6bee4706f34d2ce587d55e8dd1e3cb1ec3c2550cfb9f465c34648e0024a11d42ff33382d1480fe83ff9f

data/.travis.yml

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

data/Appraisals

@@ -1,3 +1,8 @@
+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'
 end

data/CHANGELOG.md

@@ -1,3 +1,7 @@
+## Version 1.2.0 ##
+
+* Rails 4.1 support
+
 ## Version 1.1.1 ##
 
 * Fix issue with `url_for` in Rails 4.0.1

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.1'
+  s.add_dependency 'actionpack', '>= 3.0', '<= 4.1'
 
-  s.add_development_dependency 'minitest',               '~> 4.2'
+  s.add_development_dependency 'minitest'
   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'
+  s.add_development_dependency 'appraisal',              '~> 1.0'
 end

data/gemfiles/rails_4_1.gemfile

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

data/lib/focused_controller/rspec_helper.rb

@@ -5,6 +5,7 @@ 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

data/lib/focused_controller/version.rb

@@ -1,3 +1,3 @@
 module FocusedController
-  VERSION = "1.1.1"
+  VERSION = "1.2.0"
 end

data/test/acceptance/app_test.rb

@@ -66,7 +66,13 @@ describe 'acceptance test' do
   # actually run the test.
   def start_server
     within_test_app do
-      IO.popen("bundle exec rails s -p #{FocusedController::Test.port} 2>&1") do |out|
+      command = if Gem::Version.new(Rails::VERSION::STRING) < Gem::Version.new('4.1.0')
+                  "bundle exec rails s -p #{FocusedController::Test.port} 2>&1"
+                else
+                  "./bin/rails s -p #{FocusedController::Test.port} 2>&1"
+                end
+
+      IO.popen(command) do |out|
         start   = Time.now
         started = false
         output  = ""

data/test/app/Gemfile

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

data/test/app/bin/bundle

@@ -0,0 +1,3 @@
+#!/usr/bin/env ruby
+ENV['BUNDLE_GEMFILE'] ||= File.expand_path('../../Gemfile', __FILE__)
+load Gem.bin_path('bundler', 'bundle')

data/test/app/bin/rails

@@ -0,0 +1,4 @@
+#!/usr/bin/env ruby
+APP_PATH = File.expand_path('../../config/application',  __FILE__)
+require_relative '../config/boot'
+require 'rails/commands'

data/test/app/bin/rake

@@ -0,0 +1,4 @@
+#!/usr/bin/env ruby
+require_relative '../config/boot'
+require 'rake'
+Rake.application.run

data/test/app/config/application.rb

@@ -11,6 +11,7 @@ module App
     config.encoding = "utf-8"
   end
 end
+I18n.enforce_available_locales = false
 
 # Check out the awesome database
 POSTS = []

data/test/app/test/isolated_test_helper.rb

@@ -1,5 +1,4 @@
 require 'bundler/setup'
-require 'test/unit'
 require 'active_support/test_case'
 require 'focused_controller/test_helper'
 

data/test/helper.rb

@@ -1,4 +1,7 @@
 require 'bundler/setup'
+gem 'minitest'
+require 'active_support'
+require 'minitest/autorun'
 require 'test/unit/testcase'
 require 'active_support/test_case'
 require 'minitest/spec'
@@ -7,6 +10,7 @@ require 'focused_controller'
 require 'pathname'
 require 'ostruct'
 require 'rspec/core'
+require 'rails/version'
 
 TEST_ROOT = File.expand_path('..', __FILE__)
 
@@ -14,29 +18,3 @@ TEST_ROOT = File.expand_path('..', __FILE__)
 module RSpec::Core::DSL
   remove_method :describe
 end
-
-# Annoying monkey-patches. "require 'rspec/rails'" pulls in 'capybara/rails', if it
-# 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
-    VERSION::STRING
-  end
-
-  def self.root
-    Pathname.new('')
-  end
-
-  def self.application
-    OpenStruct.new(:env_config => {}, :env_defaults => {})
-  end
-end

data/test/unit/test_helper_test.rb

@@ -165,7 +165,11 @@ module FocusedController
         subject.flash[:foo].must_equal 'omg'
 
         # This is consistent with the behaviour of standard rails functional tests
-        subject.flash['foo'].must_equal nil
+        if Gem::Version.new(Rails::VERSION::STRING) < Gem::Version.new('4.1.0')
+          subject.flash['foo'].must_equal nil
+        else
+          subject.flash['foo'].must_equal 'omg'
+        end
       end
 
       it 'supports cookies' do

metadata

@@ -1,133 +1,133 @@
 --- !ruby/object:Gem::Specification
 name: focused_controller
 version: !ruby/object:Gem::Version
-  version: 1.1.1
+  version: 1.2.0
 platform: ruby
 authors:
 - Jon Leighton
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-10-23 00:00:00.000000000 Z
+date: 2014-06-20 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'
-    - - <
+    - - "<="
       - !ruby/object:Gem::Version
         version: '4.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     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
     requirements:
-    - - ~>
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '4.2'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '4.2'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: capybara
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '2.1'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '2.1'
 - !ruby/object:Gem::Dependency
   name: capybara_minitest_spec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.0'
 - !ruby/object:Gem::Dependency
   name: poltergeist
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.3'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '2.8'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '2.8'
 - !ruby/object:Gem::Dependency
   name: rspec-rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '2.8'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '2.8'
 - !ruby/object:Gem::Dependency
   name: appraisal
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.4'
+        version: '1.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.4'
+        version: '1.0'
 description: Write Rails controllers with one class per action
 email:
 - j@jonathanleighton.com
@@ -135,8 +135,8 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
-- .travis.yml
+- ".gitignore"
+- ".travis.yml"
 - Appraisals
 - CHANGELOG.md
 - Gemfile
@@ -147,6 +147,7 @@ files:
 - gemfiles/rails_3_1.gemfile
 - gemfiles/rails_3_2.gemfile
 - gemfiles/rails_4_0.gemfile
+- gemfiles/rails_4_1.gemfile
 - lib/focused_controller.rb
 - lib/focused_controller/action_name.rb
 - lib/focused_controller/functional_test_helper.rb
@@ -173,6 +174,9 @@ files:
 - test/app/app/views/posts/index.html.erb
 - test/app/app/views/posts/new.html.erb
 - test/app/app/views/posts/show.html.erb
+- test/app/bin/bundle
+- test/app/bin/rails
+- test/app/bin/rake
 - test/app/config.ru
 - test/app/config/application.rb
 - test/app/config/boot.rb
@@ -232,17 +236,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: focused_controller
-rubygems_version: 2.1.9
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: Write Rails controllers with one class per action
@@ -262,6 +266,9 @@ test_files:
 - test/app/app/views/posts/index.html.erb
 - test/app/app/views/posts/new.html.erb
 - test/app/app/views/posts/show.html.erb
+- test/app/bin/bundle
+- test/app/bin/rails
+- test/app/bin/rake
 - test/app/config.ru
 - test/app/config/application.rb
 - test/app/config/boot.rb
@@ -312,4 +319,3 @@ test_files:
 - test/unit/rspec_functional_helper.rb
 - test/unit/rspec_helper_test.rb
 - test/unit/test_helper_test.rb
-has_rdoc: