diff options
| -rw-r--r-- | .gitignore | 1 | ||||
| -rw-r--r-- | rubygem-actionpack-2.3.5-rack-compat.patch | 174 | ||||
| -rw-r--r-- | rubygem-actionpack-2.3.8-enable-test.patch (renamed from rubygem-actionpack-2.3.4-enable-test.patch) | 8 | ||||
| -rw-r--r-- | rubygem-actionpack.spec | 31 | ||||
| -rw-r--r-- | sources | 2 |
5 files changed, 27 insertions, 189 deletions
@@ -1 +1,2 @@ actionpack-2.3.5.gem +actionpack-2.3.8.gem diff --git a/rubygem-actionpack-2.3.5-rack-compat.patch b/rubygem-actionpack-2.3.5-rack-compat.patch deleted file mode 100644 index 5e6451f..0000000 --- a/rubygem-actionpack-2.3.5-rack-compat.patch +++ /dev/null @@ -1,174 +0,0 @@ ---- Rakefile.debug 2010-01-07 03:03:57.000000000 +0900 -+++ Rakefile 2010-01-28 00:43:00.000000000 +0900 -@@ -80,7 +80,7 @@ - s.requirements << 'none' - - s.add_dependency('activesupport', '= 2.3.5' + PKG_BUILD) -- s.add_dependency('rack', '~> 1.0.0') -+ s.add_dependency('rack', '>= 1.0.0') - - s.require_path = 'lib' - s.autorequire = 'action_controller' ---- lib/action_controller.rb.debug 2010-01-07 03:03:57.000000000 +0900 -+++ lib/action_controller.rb 2010-01-28 00:43:00.000000000 +0900 -@@ -31,7 +31,7 @@ - end - end - --gem 'rack', '~> 1.0.1' -+gem 'rack', '>= 1.0.1' - require 'rack' - require 'action_controller/cgi_ext' - ---- lib/action_controller/integration.rb.debug 2010-01-07 03:03:57.000000000 +0900 -+++ lib/action_controller/integration.rb 2010-01-07 18:46:03.000000000 +0900 -@@ -320,9 +320,25 @@ - - @headers = Rack::Utils::HeaderHash.new(headers) - -- (@headers['Set-Cookie'] || "").split("\n").each do |cookie| -- name, value = cookie.match(/^([^=]*)=([^;]*);/)[1,2] -- @cookies[name] = value -+ # Umm.. it seems that with rack 1.1.0 @headers is an array -+ # instead of a string which rack 1.0.0 returned -+ # FIXME!! -+ -+ headers_cookie = @headers['Set-Cookie'] -+ if headers_cookie.is_a?(Array) -+ headers_cookie.each do |cookie_arr| -+ cookie_arr.split("\n").each do |cookie| -+ name, value = cookie.match(/^([^=]*)=([^;]*);/)[1,2] -+ @cookies[name] = value -+ end -+ end -+ -+ else -+ -+ (headers_cookie || "").split("\n").each do |cookie| -+ name, value = cookie.match(/^([^=]*)=([^;]*);/)[1,2] -+ @cookies[name] = value -+ end - end - - @body = "" ---- lib/action_controller/response.rb.debug 2010-01-07 03:03:57.000000000 +0900 -+++ lib/action_controller/response.rb 2010-01-07 19:40:44.000000000 +0900 -@@ -112,6 +112,12 @@ - end - - def etag? -+ -+ # FIXME!! -+ if Rack::VERSION[0] == 1 && Rack::VERSION[1] >= 1 -+ return headers.include?('ETag') && !headers['ETag'].nil? -+ end -+ - headers.include?('ETag') - end - -@@ -218,8 +224,15 @@ - # Don't set the Content-Length for block-based bodies as that would mean - # reading it all into memory. Not nice for, say, a 2GB streaming file. - def set_content_length! -+ -+ ## FIXME -+ - if status && status.to_s[0..2] == '204' - headers.delete('Content-Length') -+ -+ elsif Rack::VERSION[0] == 1 && Rack::VERSION[1] >= 1 && status && status.to_s[0..2] == '304' -+ headers.delete('Content-Length') -+ - elsif length = headers['Content-Length'] - headers['Content-Length'] = length.to_s - elsif !body.respond_to?(:call) && (!status || status.to_s[0..2] != '304') ---- test/controller/integration_test.rb.debug 2010-01-07 03:03:57.000000000 +0900 -+++ test/controller/integration_test.rb 2010-01-07 05:44:37.000000000 +0900 -@@ -306,7 +306,9 @@ - assert_equal "Gone", status_message - assert_response 410 - assert_response :gone -- assert_equal "cookie_1=; path=/\ncookie_3=chocolate; path=/", headers["Set-Cookie"] -+ # Okay if cookies coincides. -+ # With rake 1.1.0 headers["Set-Cookie"] is an array instread of a string -+ #assert_equal "cookie_1=; path=/\ncookie_3=chocolate; path=/", headers["Set-Cookie"] - assert_equal({"cookie_1"=>"", "cookie_2"=>"oatmeal", "cookie_3"=>"chocolate"}, cookies) - assert_equal "Gone", response.body - end ---- test/controller/rack_test.rb.debug 2010-01-07 03:03:57.000000000 +0900 -+++ test/controller/rack_test.rb 2010-01-07 05:40:49.000000000 +0900 -@@ -215,11 +215,16 @@ - - status, headers, body = @response.to_a - assert_equal 200, status -+ if headers['Set-Cookie'].is_a?(Array) -+ cookie_must = [] -+ else -+ cookie_must = "" -+ end - assert_equal({ - "Content-Type" => "text/html; charset=utf-8", - "Cache-Control" => "private, max-age=0, must-revalidate", - "ETag" => '"65a8e27d8879283831b664bd8b7f0ad4"', -- "Set-Cookie" => "", -+ "Set-Cookie" => cookie_must, - "Content-Length" => "13" - }, headers) - -@@ -234,11 +239,16 @@ - - status, headers, body = @response.to_a - assert_equal 200, status -+ if headers['Set-Cookie'].is_a?(Array) -+ cookie_must = [] -+ else -+ cookie_must = "" -+ end - assert_equal({ - "Content-Type" => "text/html; charset=utf-8", - "Cache-Control" => "private, max-age=0, must-revalidate", - "ETag" => '"ebb5e89e8a94e9dd22abf5d915d112b2"', -- "Set-Cookie" => "", -+ "Set-Cookie" => cookie_must, - "Content-Length" => "8" - }, headers) - end -@@ -251,10 +261,15 @@ - - status, headers, body = @response.to_a - assert_equal 200, status -+ if headers['Set-Cookie'].is_a?(Array) -+ cookie_must = [] -+ else -+ cookie_must = "" -+ end - assert_equal({ - "Content-Type" => "text/html; charset=utf-8", - "Cache-Control" => "no-cache", -- "Set-Cookie" => "" -+ "Set-Cookie" => cookie_must - }, headers) - - parts = [] ---- test/controller/session/cookie_store_test.rb.debug 2010-01-07 03:03:57.000000000 +0900 -+++ test/controller/session/cookie_store_test.rb 2010-01-07 05:47:37.000000000 +0900 -@@ -145,7 +145,8 @@ - with_test_route_set do - get '/no_session_access' - assert_response :success -- assert_equal "", headers['Set-Cookie'] -+ #assert_equal "", headers['Set-Cookie'] -+ assert headers['Set-Cookie'].empty? - end - end - -@@ -155,7 +156,8 @@ - "fef868465920f415f2c0652d6910d3af288a0367" - get '/no_session_access' - assert_response :success -- assert_equal "", headers['Set-Cookie'] -+ #assert_equal "", headers['Set-Cookie'] -+ assert headers['Set-Cookie'].empty? - end - end - diff --git a/rubygem-actionpack-2.3.4-enable-test.patch b/rubygem-actionpack-2.3.8-enable-test.patch index 0164c4c..752841d 100644 --- a/rubygem-actionpack-2.3.4-enable-test.patch +++ b/rubygem-actionpack-2.3.8-enable-test.patch @@ -1,9 +1,9 @@ ---- test/active_record_unit.rb.debug 2009-09-18 01:45:17.000000000 +0900 -+++ test/active_record_unit.rb 2009-09-18 02:08:19.000000000 +0900 -@@ -17,7 +17,7 @@ +--- 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.dirname(__FILE__)}/../../activerecord/lib" + 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 diff --git a/rubygem-actionpack.spec b/rubygem-actionpack.spec index 851cc49..e8ba364 100644 --- a/rubygem-actionpack.spec +++ b/rubygem-actionpack.spec @@ -9,25 +9,25 @@ Summary: Web-flow and rendering framework putting the VC in MVC Name: rubygem-%{gemname} Epoch: 1 -Version: 2.3.5 +Version: 2.3.8 Release: 2%{?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.4-enable-test.patch +Patch0: rubygem-actionpack-2.3.8-enable-test.patch # # Please someone fix the following Patch2!! (mtasaka) # -Patch2: rubygem-actionpack-2.3.5-rack-compat.patch +#Patch2: rubygem-actionpack-2.3.8-rack-compat.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Requires: rubygems Requires: rubygem(activesupport) = %{version} -Requires: rubygem(rack) >= 1.0.0 +Requires: rubygem(rack) >= 1.1.0 Requires: ruby(abi) = %{rubyabi} BuildRequires: rubygems BuildRequires(check): rubygem(rake) -BuildRequires(check): rubygem(rack) >= 1.0.0 +BuildRequires(check): rubygem(rack) >= 1.1.0 BuildRequires(check): rubygem(mocha) >= 0.9.7 BuildRequires(check): rubygem(activerecord) = %{version} BuildRequires(check): rubygem(sqlite3-ruby) @@ -49,11 +49,10 @@ gem install --local --install-dir .%{gemdir} \ # forcely modify gemspec for rack dependency sed -i -e '/rack/s|~>|>=|' \ - ./%{gemdir}/specifications/*gemspec + ./%{gemdir}/specifications/*gemspec pushd .%{geminstdir} -%patch0 -p0 -%patch2 -p0 +%patch0 -p1 # create missing symlink pushd test/fixtures/layout_tests/layouts/ @@ -70,6 +69,12 @@ 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 @@ -111,11 +116,11 @@ rake test --trace %defattr(-, root, root, -) %dir %{geminstdir} %doc %{geminstdir}/CHANGELOG -%doc %{geminstdir}/install.rb %{geminstdir}/lib %doc %{geminstdir}/MIT-LICENSE -%{geminstdir}/Rakefile %doc %{geminstdir}/README +%doc %{geminstdir}/install.rb +%{geminstdir}/Rakefile %doc %{geminstdir}/RUNNING_UNIT_TESTS %doc %{geminstdir}/test/ %doc %{gemdir}/doc/%{gemname}-%{version} @@ -124,6 +129,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 Aug 09 2010 Mohammed Morsi <mmorsi@redhat.com> - 1:2.3.8-1 +- Update to 2.3.8 + * 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 during rpmbuild are cleaned up @@ -1 +1 @@ -c32297f6e4af8ac9971dbc116e98a636 actionpack-2.3.5.gem +75d7e35afa5a5bfaac5c8fe5f8967ed7 actionpack-2.3.8.gem |