rpms/rubygem-activerecord/F-11 rubygem-activerecord-2.3.2-fix-reset_session.patch, NONE, 1.1 import.log, 1.4, 1.5 rubygem-activerecord.spec, 1.14, 1.15

[Jeroen van Meeuwen]

Author: kanarip

Update of /cvs/pkgs/rpms/rubygem-activerecord/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29059/F-11

Modified Files:
	import.log rubygem-activerecord.spec 
Added Files:
	rubygem-activerecord-2.3.2-fix-reset_session.patch 
Log Message:
2.3.2-4

rubygem-activerecord-2.3.2-fix-reset_session.patch:
 session_store.rb |   10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

--- NEW FILE rubygem-activerecord-2.3.2-fix-reset_session.patch ---
commit f339b3b47cb6400c66ab5a84268aa63abcfbb58a
Author: Joshua Peek <josh at joshpeek.com>
Date:   Sun May 17 14:45:06 2009 -0500

    Missed a file from the previous commit

diff --git a/activerecord/lib/active_record/session_store.rb b/activerecord/lib/active_record/session_store.rb
index 3cc4640..c91b943 100644
--- a/activerecord/lib/active_record/session_store.rb
+++ b/activerecord/lib/active_record/session_store.rb
@@ -295,7 +295,7 @@ module ActiveRecord
 
       def set_session(env, sid, session_data)
         Base.silence do
-          record = env[SESSION_RECORD_KEY] ||= find_session(sid)
+          record = get_session_model(env, sid)
           record.data = session_data
           return false unless record.save
 
@@ -309,6 +309,14 @@ module ActiveRecord
 
         return true
       end
+      
+      def get_session_model(env, sid)
+        if env[ENV_SESSION_OPTIONS_KEY][:id].nil?
+          env[SESSION_RECORD_KEY] = find_session(sid)
+        else
+          env[SESSION_RECORD_KEY] ||= find_session(sid)
+        end
+      end
 
       def find_session(id)
         @@session_class.find_by_session_id(id) ||


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/rubygem-activerecord/F-11/import.log,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- import.log	20 Oct 2009 12:49:13 -0000	1.4
+++ import.log	21 Oct 2009 14:36:22 -0000	1.5
@@ -2,3 +2,4 @@ rubygem-activerecord-2_2_2-1_fc10:HEAD:r
 rubygem-activerecord-2_3_2-1_fc10:HEAD:rubygem-activerecord-2.3.2-1.fc10.src.rpm:1237202080
 rubygem-activerecord-2_3_3-1_fc11:F-11:rubygem-activerecord-2.3.3-1.fc11.src.rpm:1248605341
 rubygem-activerecord-2_3_2-3_fc12:F-11:rubygem-activerecord-2.3.2-3.fc12.src.rpm:1256042940
+rubygem-activerecord-2_3_2-4_fc12:F-11:rubygem-activerecord-2.3.2-4.fc12.src.rpm:1256135768


Index: rubygem-activerecord.spec
===================================================================
RCS file: /cvs/pkgs/rpms/rubygem-activerecord/F-11/rubygem-activerecord.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -p -r1.14 -r1.15
--- rubygem-activerecord.spec	20 Oct 2009 12:49:13 -0000	1.14
+++ rubygem-activerecord.spec	21 Oct 2009 14:36:23 -0000	1.15
@@ -1,27 +1,25 @@
-# Generated from activerecord-1.15.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 activerecord
 %define geminstdir %{gemdir}/gems/%{gemname}-%{version}
 
-Summary: Implements the ActiveRecord pattern for ORM
-Name: rubygem-%{gemname}
-Epoch: 1
-Version: 2.3.2
-Release: 3%{?dist}
-Group: Development/Languages
-License: MIT
-URL: http://www.rubyonrails.org
-
-Source0: http://gems.rubyforge.org/gems/%{gemname}-%{version}.gem
-Patch0: rubygem-activerecord-2.3.2-fix-mysql-binary-default.patch
-
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-Requires: rubygems
-Requires: rubygem(activesupport) = %{version}
-BuildRequires: rubygems
-BuildArch: noarch
-Provides: rubygem(%{gemname}) = %{version}
+Summary:        Implements the ActiveRecord pattern for ORM
+Name:           rubygem-%{gemname}
+Epoch:          1
+Version:        2.3.2
+Release:        4%{?dist}
+Group:          Development/Languages
+License:        MIT
+URL:            http://www.rubyonrails.org
+Source0:        http://gems.rubyforge.org/gems/%{gemname}-%{version}.gem
+Patch0:         rubygem-activerecord-2.3.2-fix-mysql-binary-default.patch
+Patch1:         rubygem-activerecord-2.3.2-fix-reset_session.patch
+BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+Requires:       rubygems
+Requires:       rubygem(activesupport) = %{version}
+BuildRequires:  rubygems
+BuildArch:      noarch
+Provides:       rubygem(%{gemname}) = %{version}
 
 %description
 Implements the ActiveRecord pattern (Fowler, PoEAA) for ORM. It ties database
@@ -41,6 +39,7 @@ gem install --local --install-dir %{buil
 
 pushd %{buildroot}%{geminstdir}
 patch -s -p2 --fuzz=0 < %{PATCH0}
+patch -s -p2 --fuzz=0 < %{PATCH1}
 popd
 
 # Remove backup files
@@ -79,6 +78,9 @@ rm -rf %{buildroot}
 %{gemdir}/specifications/%{gemname}-%{version}.gemspec
 
 %changelog
+* Wed Oct 21 2009 Jeroen van Meeuwen <j.van.meeuwen at ogd.nl> - 1:2.3.2-4
+- Apply cherry-picked fix for reset_session from 2-3-stable (#2200 upstream)
+
 * Tue Oct 20 2009 Jeroen van Meeuwen <j.van.meeuwen at ogd.nl> - 1:2.3.2-3
 - Backport fix for default values on MySQL Binary and VarBinary columns