update to actionpack 3.0.3

10 files changed, 255 insertions, 41 deletions

diff --git a/.gitignore b/.gitignore
index a13919e..216b99a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,4 @@
 actionpack-2.3.5.gem
 actionpack-2.3.8.gem
+/actionpack-3.0.3.gem
+/actionpack-tests.tgz
diff --git a/Rakefile b/Rakefile
new file mode 100644
index 0000000..30e81b6
--- /dev/null
+++ b/Rakefile
@@ -0,0 +1,65 @@
+require 'rake'
+require 'rake/testtask'
+require 'rake/packagetask'
+require 'rake/gempackagetask'
+
+desc "Default Task"
+task :default => :test
+
+# Run the unit tests
+
+desc "Run all unit tests"
+task :test => [:test_action_pack, :test_active_record_integration]
+
+Rake::TestTask.new(:test_action_pack) do |t|
+  t.libs << 'test'
+
+  # make sure we include the tests in alphabetical order as on some systems
+  # this will not happen automatically and the tests (as a whole) will error
+  t.test_files = Dir.glob('test/{abstract,controller,dispatch,template}/**/*_test.rb').sort
+
+  # t.warning = true
+end
+
+namespace :test do
+  Rake::TestTask.new(:isolated) do |t|
+    t.pattern = 'test/ts_isolated.rb'
+  end
+end
+
+desc 'ActiveRecord Integration Tests'
+Rake::TestTask.new(:test_active_record_integration) do |t|
+  t.libs << 'test'
+  t.test_files = Dir.glob("test/activerecord/*_test.rb")
+end
+
+desc "Release to gemcutter"
+task :release => :package do
+  require 'rake/gemcutter'
+  Rake::Gemcutter::Tasks.new(spec).define
+  Rake::Task['gem:push'].invoke
+end
+
+task :lines do
+  lines, codelines, total_lines, total_codelines = 0, 0, 0, 0
+
+  for file_name in FileList["lib/**/*.rb"]
+    next if file_name =~ /vendor/
+    f = File.open(file_name)
+
+    while line = f.gets
+      lines += 1
+      next if line =~ /^\s*$/
+      next if line =~ /^\s*#/
+      codelines += 1
+    end
+    puts "L: #{sprintf("%4d", lines)}, LOC #{sprintf("%4d", codelines)} | #{file_name}"
+
+    total_lines     += lines
+    total_codelines += codelines
+
+    lines, codelines = 0, 0
+  end
+
+  puts "Total: Lines #{total_lines}, LOC #{total_codelines}"
+end
diff --git a/actionpack-add-rack-mount-deps.patch b/actionpack-add-rack-mount-deps.patch
new file mode 100644
index 0000000..5f769ee
--- /dev/null
+++ b/actionpack-add-rack-mount-deps.patch
@@ -0,0 +1,29 @@
+--- specifications/actionpack-3.0.3.gemspec.orig	2011-02-01 17:55:54.677899001 -0500
++++ specifications/actionpack-3.0.3.gemspec	2011-02-01 17:56:04.943899003 -0500
+@@ -30,6 +30,8 @@ Gem::Specification.new do |s|
+       s.add_runtime_dependency(%q<rack>, [">= 1.1.0"])
+       s.add_runtime_dependency(%q<rack-test>, [">= 0.5.4"])
+       s.add_runtime_dependency(%q<rack-mount>, [">= 0.6.13"])
++      s.add_runtime_dependency(%q<multimap>, [">= 1.1.2"])
++      s.add_runtime_dependency(%q<regin>, [">= 0.3.7"])
+       s.add_runtime_dependency(%q<tzinfo>, ["~> 0.3.23"])
+       s.add_runtime_dependency(%q<erubis>, ["~> 2.6.5"])
+     else
+@@ -40,6 +42,8 @@ Gem::Specification.new do |s|
+       s.add_dependency(%q<rack>, [">= 1.1.0"])
+       s.add_dependency(%q<rack-test>, [">= 0.5.4"])
+       s.add_dependency(%q<rack-mount>, [">= 0.6.13"])
++      s.add_dependency(%q<multimap>, [">= 1.1.2"])
++      s.add_dependency(%q<regin>, [">= 0.3.7"])
+       s.add_dependency(%q<tzinfo>, ["~> 0.3.23"])
+       s.add_dependency(%q<erubis>, ["~> 2.6.5"])
+     end
+@@ -51,6 +55,8 @@ Gem::Specification.new do |s|
+     s.add_dependency(%q<rack>, [">= 1.1.0"])
+     s.add_dependency(%q<rack-test>, [">= 0.5.4"])
+     s.add_dependency(%q<rack-mount>, [">= 0.6.13"])
++    s.add_dependency(%q<multimap>, [">= 1.1.2"])
++    s.add_dependency(%q<regin>, [">= 0.3.7"])
+     s.add_dependency(%q<tzinfo>, ["~> 0.3.23"])
+     s.add_dependency(%q<erubis>, ["~> 2.6.5"])
+   end
diff --git a/actionpack-downgrade-dependencies.patch b/actionpack-downgrade-dependencies.patch
new file mode 100644
index 0000000..94f268c
--- /dev/null
+++ b/actionpack-downgrade-dependencies.patch
@@ -0,0 +1,43 @@
+--- specifications/actionpack-3.0.3.gemspec.orig	2011-01-18 16:24:30.469405214 -0500
++++ specifications/actionpack-3.0.3.gemspec	2011-01-18 16:26:01.445405000 -0500
+@@ -27,31 +27,31 @@ Gem::Specification.new do |s|
+       s.add_runtime_dependency(%q<activemodel>, ["= 3.0.3"])
+       s.add_runtime_dependency(%q<builder>, ["~> 2.1.2"])
+       s.add_runtime_dependency(%q<i18n>, ["~> 0.4"])
+-      s.add_runtime_dependency(%q<rack>, [">= 1.2.1"])
+-      s.add_runtime_dependency(%q<rack-test>, [">= 0.5.6"])
++      s.add_runtime_dependency(%q<rack>, [">= 1.1.0"])
++      s.add_runtime_dependency(%q<rack-test>, [">= 0.5.4"])
+       s.add_runtime_dependency(%q<rack-mount>, [">= 0.6.13"])
+       s.add_runtime_dependency(%q<tzinfo>, ["~> 0.3.23"])
+-      s.add_runtime_dependency(%q<erubis>, ["~> 2.6.6"])
++      s.add_runtime_dependency(%q<erubis>, ["~> 2.6.5"])
+     else
+       s.add_dependency(%q<activesupport>, ["= 3.0.3"])
+       s.add_dependency(%q<activemodel>, ["= 3.0.3"])
+       s.add_dependency(%q<builder>, ["~> 2.1.2"])
+       s.add_dependency(%q<i18n>, ["~> 0.4"])
+-      s.add_dependency(%q<rack>, [">= 1.2.1"])
+-      s.add_dependency(%q<rack-test>, [">= 0.5.6"])
++      s.add_dependency(%q<rack>, [">= 1.1.0"])
++      s.add_dependency(%q<rack-test>, [">= 0.5.4"])
+       s.add_dependency(%q<rack-mount>, [">= 0.6.13"])
+       s.add_dependency(%q<tzinfo>, ["~> 0.3.23"])
+-      s.add_dependency(%q<erubis>, ["~> 2.6.6"])
++      s.add_dependency(%q<erubis>, ["~> 2.6.5"])
+     end
+   else
+     s.add_dependency(%q<activesupport>, ["= 3.0.3"])
+     s.add_dependency(%q<activemodel>, ["= 3.0.3"])
+     s.add_dependency(%q<builder>, ["~> 2.1.2"])
+     s.add_dependency(%q<i18n>, ["~> 0.4"])
+-    s.add_dependency(%q<rack>, [">= 1.2.1"])
+-    s.add_dependency(%q<rack-test>, [">= 0.5.6"])
++    s.add_dependency(%q<rack>, [">= 1.1.0"])
++    s.add_dependency(%q<rack-test>, [">= 0.5.4"])
+     s.add_dependency(%q<rack-mount>, [">= 0.6.13"])
+     s.add_dependency(%q<tzinfo>, ["~> 0.3.23"])
+-    s.add_dependency(%q<erubis>, ["~> 2.6.6"])
++    s.add_dependency(%q<erubis>, ["~> 2.6.5"])
+   end
+ end
diff --git a/actionpack-rakefile-fix.patch b/actionpack-rakefile-fix.patch
new file mode 100644
index 0000000..a40e09a
--- /dev/null
+++ b/actionpack-rakefile-fix.patch
@@ -0,0 +1,15 @@
+--- Rakefile.orig	2011-01-10 23:10:34.423506056 -0500
++++ Rakefile	2011-01-10 23:10:40.651504324 -0500
+@@ -33,12 +33,6 @@ Rake::TestTask.new(:test_active_record_i
+   t.test_files = Dir.glob("test/activerecord/*_test.rb")
+ end
+ 
+-spec = eval(File.read('actionpack.gemspec'))
+-
+-Rake::GemPackageTask.new(spec) do |p|
+-  p.gem_spec = spec
+-end
+-
+ desc "Release to gemcutter"
+ task :release => :package do
+   require 'rake/gemcutter'
diff --git a/actionpack-tests-fix.patch b/actionpack-tests-fix.patch
new file mode 100644
index 0000000..90af2e4
--- /dev/null
+++ b/actionpack-tests-fix.patch
@@ -0,0 +1,8 @@
+--- test/abstract_unit.rb.orig	2011-01-10 23:22:06.245506019 -0500
++++ test/abstract_unit.rb	2011-01-10 23:22:18.633505885 -0500
+@@ -1,4 +1,4 @@
+-require File.expand_path('../../../load_paths', __FILE__)
++require 'rubygems'
+ 
+ lib = File.expand_path("#{File.dirname(__FILE__)}/../lib")
+ $:.unshift(lib) unless $:.include?('lib') || $:.include?(lib)
diff --git a/rubygem-actionpack-2.3.8-enable-test.patch b/rubygem-actionpack-2.3.8-enable-test.patch
deleted file mode 100644
index 752841d..0000000
--- a/rubygem-actionpack-2.3.8-enable-test.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- actionpack-2.3.8/test/active_record_unit.rb.orig	2010-07-01 14:22:29.000000000 -0400
-+++ actionpack-2.3.8/test/active_record_unit.rb	2010-07-01 14:22:41.000000000 -0400
-@@ -17,7 +17,7 @@ else
-   $stderr.print 'Attempting to load Active Record... '
-   begin
-     PATH_TO_AR = File.expand_path('../../../activerecord/lib', __FILE__)
--    raise LoadError, "#{PATH_TO_AR} doesn't exist" unless File.directory?(PATH_TO_AR)
-+    #raise LoadError, "#{PATH_TO_AR} doesn't exist" unless File.directory?(PATH_TO_AR)
-     $LOAD_PATH.unshift PATH_TO_AR
-     require 'active_record'
-     require 'active_record/fixtures'
diff --git a/rubygem-actionpack-enable-test.patch b/rubygem-actionpack-enable-test.patch
new file mode 100644
index 0000000..d620f83
--- /dev/null
+++ b/rubygem-actionpack-enable-test.patch
@@ -0,0 +1,19 @@
+--- test/active_record_unit.rb.orig	2011-01-10 23:31:54.197506001 -0500
++++ test/active_record_unit.rb	2011-01-11 00:09:09.152505905 -0500
+@@ -13,12 +13,12 @@ end
+ # Try to grab AR
+ unless defined?(ActiveRecord) && defined?(Fixtures)
+   begin
+-    PATH_TO_AR = "#{File.dirname(__FILE__)}/../../activerecord/lib"
+-    raise LoadError, "#{PATH_TO_AR} doesn't exist" unless File.directory?(PATH_TO_AR)
+-    $LOAD_PATH.unshift PATH_TO_AR
++    #PATH_TO_AR = "#{File.dirname(__FILE__)}/../../activerecord/lib"
++    #raise LoadError, "#{PATH_TO_AR} doesn't exist" unless File.directory?(PATH_TO_AR)
++    #$LOAD_PATH.unshift PATH_TO_AR
+     require 'active_record'
+   rescue LoadError => e
+-    $stderr.print "Failed to load Active Record. Skipping Active Record assertion tests: #{e}"
++    #$stderr.print "Failed to load Active Record. Skipping Active Record assertion tests: #{e}"
+     ActiveRecordTestConnector.able_to_connect = false
+   end
+ end
diff --git a/rubygem-actionpack.spec b/rubygem-actionpack.spec
index e8ba364..f404c8f 100644
--- a/rubygem-actionpack.spec
+++ b/rubygem-actionpack.spec
@@ -1,5 +1,4 @@
 # Generated from actionpack-1.13.5.gem by gem2rpm -*- rpm-spec -*-
-%define ruby_sitelib %(ruby -rrbconfig -e "puts Config::CONFIG['sitelibdir']")
 %define gemdir %(ruby -rubygems -e 'puts Gem::dir' 2>/dev/null)
 %define gemname actionpack
 %define geminstdir %{gemdir}/gems/%{gemname}-%{version}
@@ -9,28 +8,68 @@
 Summary: Web-flow and rendering framework putting the VC in MVC
 Name: rubygem-%{gemname}
 Epoch: 1
-Version: 2.3.8
-Release: 2%{?dist}
+Version: 3.0.3
+Release: 1%{?dist}
 Group: Development/Languages
 License: MIT
 URL: http://www.rubyonrails.org
-Source0: http://gems.rubyforge.org/gems/%{gemname}-%{version}.gem
-Patch0:  rubygem-actionpack-2.3.8-enable-test.patch
+Source0: http://rubygems.org/downloads/actionpack-%{version}.gem
+
+# The actionpack gem doesn't ship with the upstream Rakefile
+Source1: http://github.com/rails/rails/raw/v%{version}/%{gemname}/Rakefile
+
+# Also the actionpack gem doesn't ship with the test suite.
+# You may check it out like so
+# git clone http://github.com/rails/rails.git
+# cd rails/actionpack/
+# git checkout v3.0.3
+# tar czvf actionpack-tests.tgz test/
+Source2: actionpack-tests.tgz
+
+Patch0:  rubygem-actionpack-enable-test.patch
+
+# Remove a task which breaks the Rakefile due to the gemspec
+# not being present in the gem
+Patch1: actionpack-rakefile-fix.patch
+
+# Removes code which breaks the test suite due to a
+# dependency on a file in the greater rails proj
+Patch2: actionpack-tests-fix.patch
+
+Patch3: actionpack-downgrade-dependencies.patch
+
+Patch4: actionpack-add-rack-mount-deps.patch
+
 #
 # Please someone fix the following Patch2!! (mtasaka)
 #
-#Patch2:  rubygem-actionpack-2.3.8-rack-compat.patch
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+#Patch2:  rubygem-actionpack-2.3.5-rack-compat.patch
+
 Requires: rubygems
 Requires: rubygem(activesupport) = %{version}
-Requires: rubygem(rack) >= 1.1.0
+Requires: rubygem(activemodel) = %{version}
+Requires: rubygem(builder) = 2.1.2
+Requires: rubygem(i18n) = 0.4.2
+Requires: rubygem(rack) >= 1.0.0
+Requires: rubygem(rack-test)
+Requires: rubygem(rack-mount)
+Requires: rubygem(tzinfo) >= 0.3.23
+Requires: rubygem(erubis) = 2.6.5
 Requires: ruby(abi) = %{rubyabi}
 BuildRequires: rubygems
-BuildRequires(check): rubygem(rake)
-BuildRequires(check): rubygem(rack) >= 1.1.0
-BuildRequires(check): rubygem(mocha) >= 0.9.7
-BuildRequires(check): rubygem(activerecord) = %{version}
-BuildRequires(check): rubygem(sqlite3-ruby)
+BuildRequires: rubygem(rake)
+BuildRequires: rubygem(mocha) >= 0.9.7
+BuildRequires: rubygem(activesupport) = %{version}
+BuildRequires: rubygem(activemodel)   = %{version}
+BuildRequires: rubygem(activerecord)  = %{version}
+BuildRequires: rubygem(sqlite3)
+BuildRequires: rubygem(builder) = 2.1.2
+BuildRequires: rubygem(i18n) = 0.4.2
+BuildRequires: rubygem(rack) >= 1.0.0
+BuildRequires: rubygem(rack-test)
+BuildRequires: rubygem(rack-mount)
+BuildRequires: rubygem(tzinfo) >= 0.3.23
+BuildRequires: rubygem(erubis) = 2.6.5
 BuildArch: noarch
 Provides: rubygem(%{gemname}) = %{version}
 
@@ -49,10 +88,18 @@ gem install --local --install-dir .%{gemdir} \
 
 # forcely modify gemspec for rack dependency
 sed -i -e '/rack/s|~>|>=|' \
- ./%{gemdir}/specifications/*gemspec
+	./%{gemdir}/specifications/*gemspec
+
+# move the Rakefile in place
+cp %{SOURCE1} .%{geminstdir}
+
+# move the tests into place
+tar xzvf %{SOURCE2} -C .%{geminstdir}
 
 pushd .%{geminstdir}
-%patch0 -p1
+%patch0 -p0
+#%patch1 -p0
+%patch2 -p0
 
 # create missing symlink
 pushd test/fixtures/layout_tests/layouts/
@@ -61,6 +108,10 @@ popd
 
 popd
 
+pushd .%{gemdir}
+%patch3 -p0
+%patch4 -p0
+
 # Remove backup files
 # No! these are needed for rake test
 # find ./%{geminstdir} -type f -name "*~" -delete
@@ -69,12 +120,6 @@ popd
 # No! these are also needed for rake test
 # find ./%{geminstdir} -type f -size 0c -exec rm -rvf {} \;
 
-# Fix wrong-file-end-of-line-encoding errors
-# No! these are also needed for rake test
-#for file in test/fixtures/multipart/* ; do
-#  sed -i 's/\r//' $file
-#done
-
 # Fix anything executable that does not have a shebang
 for file in `find ./%{geminstdir} -type f -perm /a+x`; do
     [ -z "`head -n 1 $file | grep \"^#!/\"`" ] && chmod -v 644 $file
@@ -88,7 +133,6 @@ done
 %build
 
 %install
-rm -rf %{buildroot}
 mkdir -p %{buildroot}%{gemdir}
 cp -a .%{gemdir}/* %{buildroot}%{gemdir}
 
@@ -118,10 +162,8 @@ rake test --trace
 %doc %{geminstdir}/CHANGELOG
 %{geminstdir}/lib
 %doc %{geminstdir}/MIT-LICENSE
-%doc %{geminstdir}/README
-%doc %{geminstdir}/install.rb
 %{geminstdir}/Rakefile
-%doc %{geminstdir}/RUNNING_UNIT_TESTS
+%doc %{geminstdir}/README.rdoc
 %doc %{geminstdir}/test/
 %doc %{gemdir}/doc/%{gemname}-%{version}
 %{gemdir}/cache/%{gemname}-%{version}.gem
@@ -129,11 +171,12 @@ rake test --trace
 
 
 %changelog
-* Thu Aug 12 2010 Mohammed Morsi <mmorsi@redhat.com> - 1:2.3.8-2
-- Bumped actionpack rack dependency to version 1.1.0
+* Mon Jan 10 2011 Mohammed Morsi <mmorsi@redhat.com> - 1:3.0.3-1
+- Update to rails 3
 
-* Mon Aug 09 2010 Mohammed Morsi <mmorsi@redhat.com> - 1:2.3.8-1
-- Update to 2.3.8
+* Wed Sep 15 2010 Mohammed Morsi <mmorsi@redhat.com> - 1:2.3.5-3
+- additional rack compat fix (in patch2)
+- https://bugzilla.redhat.com/show_bug.cgi?id=617803
 
 * Mon May 17 2010 Mamoru Tasaka <mtasaka@ioa.s.u-tokyo.ac.jp> - 1:2.3.5-2
 - Set TMPDIR environment at %%check to make it sure all files created
diff --git a/sources b/sources
index a58f24f..00926e7 100644
--- a/sources
+++ b/sources
@@ -1 +1,2 @@
-75d7e35afa5a5bfaac5c8fe5f8967ed7  actionpack-2.3.8.gem
+37a4f755d5ea4a8628001eae50c64abb  actionpack-3.0.3.gem
+0153de620fdea0d778fab010ef8471e8  actionpack-tests.tgz