tabulous 1.0.2 → 1.0.3

data/CHANGELOG.rdoc

@@ -1,3 +1,6 @@
+== 1.0.3 (November 6, 2011)
+* Added support for Rails 3.1 (finally!).
+
 == 1.0.2 (April 19, 2011)
 * Fixed bug where the tabs generator would crash if there were index routes that were not named.
 

data/README.rdoc

@@ -6,7 +6,7 @@ Tabulous provides an easy way to add tabs to your Rails application.
 
 == Requirements
 
-Tabulous only works with Rails 3.  It has been tested on Ruby 1.8.7 and 1.9.2.
+Tabulous only works with Rails 3.0 and 3.1.  It has been tested on Ruby 1.8.7 and 1.9.2.
 
 == Usage
 

data/Rakefile

@@ -9,15 +9,31 @@ require 'rake/rdoctask'
 require 'rake/testtask'
 
 namespace :test do
-  Dir['test/applications/*'].each do |filename|
-    if File.directory?(filename)
-      name = filename.split('/').last
-      desc "run tests for the test application #{name}"
-      Rake::TestTask.new(name) do |t|
-        t.libs << 'lib'
-        t.libs << 'test'
-        t.pattern = "test/applications/#{name}/**/*_test.rb"
-        t.verbose = false
+  namespace :rails30 do
+    Dir['test/applications/rails30/*'].each do |filename|
+      if File.directory?(filename)
+        name = filename.split('/').last
+        desc "run tests for the Rails 3.0 test application #{name}"
+        Rake::TestTask.new(name) do |t|
+          t.libs << 'lib'
+          t.libs << 'test'
+          t.pattern = "test/applications/rails30/#{name}/**/*_test.rb"
+          t.verbose = false
+        end
+      end
+    end
+  end
+  namespace :rails31 do
+    Dir['test/applications/rails31/*'].each do |filename|
+      if File.directory?(filename)
+        name = filename.split('/').last
+        desc "run tests for the Rails 3.1 test application #{name}"
+        Rake::TestTask.new(name) do |t|
+          t.libs << 'lib'
+          t.libs << 'test'
+          t.pattern = "test/applications/rails31/#{name}/**/*_test.rb"
+          t.verbose = false
+        end
       end
     end
   end
@@ -32,11 +48,18 @@ end
 task :test do
   # we cannot load more than one Rails app at a time so we run the rake tasks
   # from the shell so that each has its own process
-  Dir['test/applications/*'].each do |filename|
+  Dir['test/applications/rails30/*'].each do |filename|
+    if File.directory?(filename)
+      name = filename.split('/').last
+      puts "Running tests for the Rails 3.0 test application \"#{name}\"".magenta
+      puts %x{rake test:rails30:#{name}}
+    end
+  end
+  Dir['test/applications/rails31/*'].each do |filename|
     if File.directory?(filename)
       name = filename.split('/').last
-      puts "Running tests for test application \"#{name}\"".magenta
-      puts %x{rake test:#{name}}
+      puts "Running tests for the Rails 3.1 test application \"#{name}\"".magenta
+      puts %x{rake test:rails31:#{name}}
     end
   end
   puts "Running unit tests".magenta

data/lib/tabulous/version.rb

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

data/tabulous.gemspec

@@ -15,7 +15,7 @@ Gem::Specification.new do |s|
   s.rubyforge_project         = "tabulous"
 
   s.add_dependency "colored", "~> 1.2.0"
-  s.add_dependency "rails", "~> 3.0.0"
+  s.add_dependency "rails", "~> 3.0"
   s.add_development_dependency "bundler", "~> 1.0.10"
   s.add_development_dependency "capybara", "~> 0.4.1.2"
   if RUBY_VERSION < "1.9"

data/test/applications/{simple_tabs → rails30/main}/Gemfile

@@ -3,5 +3,5 @@ source :rubygems
 # Do not add gems directly to this file.  Add them to the test/test_application_gemfile
 # instead and they will be automatically loaded in.
 
-require File.expand_path('../../test_application_gemfile', File.dirname(__FILE__))
-shared_test_application_gems(self)
+require File.expand_path('../../../test_application_gemfile', File.dirname(__FILE__))
+shared_test_application_gems(self, '3.0')

data/test/applications/{main → rails30/main}/test/integration_test_helper.rb

@@ -1,5 +1,5 @@
 require File.expand_path('test_helper', File.dirname(__FILE__))
-require File.expand_path('../../../test_application_integration_test_helper', File.dirname(__FILE__))
+require File.expand_path('../../../../test_application_integration_test_helper', File.dirname(__FILE__))
 
 # This file contains integration test code specific to this test application.  Integration
 # test code that is shared among all test applications should live in

data/test/applications/{subtabs → rails30/main}/test/test_helper.rb

@@ -1,7 +1,7 @@
 ENV["RAILS_ENV"] = "test"
 require File.expand_path('../../config/environment', __FILE__)
 require 'rails/test_help'
-require File.expand_path('../../../test_application_test_helper', File.dirname(__FILE__))
+require File.expand_path('../../../../test_application_test_helper', File.dirname(__FILE__))
 
 # This file contains test code specific to this test application.  Helper
 # test code that is shared among all test applications should live in

data/test/applications/{main → rails30/simple_tabs}/Gemfile

@@ -3,5 +3,5 @@ source :rubygems
 # Do not add gems directly to this file.  Add them to the test/test_application_gemfile
 # instead and they will be automatically loaded in.
 
-require File.expand_path('../../test_application_gemfile', File.dirname(__FILE__))
-shared_test_application_gems(self)
+require File.expand_path('../../../test_application_gemfile', File.dirname(__FILE__))
+shared_test_application_gems(self, '3.0')

data/test/applications/{subtabs → rails30/simple_tabs}/test/integration_test_helper.rb

@@ -1,5 +1,5 @@
 require File.expand_path('test_helper', File.dirname(__FILE__))
-require File.expand_path('../../../test_application_integration_test_helper', File.dirname(__FILE__))
+require File.expand_path('../../../../test_application_integration_test_helper', File.dirname(__FILE__))
 
 # This file contains integration test code specific to this test application.  Integration
 # test code that is shared among all test applications should live in

data/test/applications/{main → rails30/simple_tabs}/test/test_helper.rb

@@ -1,7 +1,7 @@
 ENV["RAILS_ENV"] = "test"
 require File.expand_path('../../config/environment', __FILE__)
 require 'rails/test_help'
-require File.expand_path('../../../test_application_test_helper', File.dirname(__FILE__))
+require File.expand_path('../../../../test_application_test_helper', File.dirname(__FILE__))
 
 # This file contains test code specific to this test application.  Helper
 # test code that is shared among all test applications should live in

data/test/applications/{subtabs → rails30/subtabs}/Gemfile

@@ -3,5 +3,5 @@ source :rubygems
 # Do not add gems directly to this file.  Add them to the test/test_application_gemfile
 # instead and they will be automatically loaded in.
 
-require File.expand_path('../../test_application_gemfile', File.dirname(__FILE__))
-shared_test_application_gems(self)
+require File.expand_path('../../../test_application_gemfile', File.dirname(__FILE__))
+shared_test_application_gems(self, '3.0')