Changeset 968

Show
Ignore:
Timestamp:
11/12/07 13:57:57 (1 year ago)
Author:
e.@brainspl.at
Message:

update all 3 ORM plugins to work properly with sessions

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • plugins/merb_activerecord/Rakefile

    r880 r968  
    44PLUGIN = "merb_activerecord" 
    55NAME = "merb_activerecord" 
    6 VERSION = "0.4.2" 
     6VERSION = "0.4.3" 
    77AUTHOR = "Duane Johnson" 
    88EMAIL = "canadaduane@gmail.com" 

  • plugins/merb_activerecord/lib/merb/session/active_record_session.rb

    r619 r968  
    66      MERB_LOGGER.info("Setting up session") 
    77      before = cookies[_session_id_key] 
    8       @_session, cookies[_session_id_key] = Merb::ActiveRecordSession.persist(cookies[_session_id_key]) 
    9       @_fingerprint = Marshal.dump(@_session.data).hash 
     8      request.session, cookies[_session_id_key] = Merb::ActiveRecordSession.persist(cookies[_session_id_key]) 
     9      @_fingerprint = Marshal.dump(request.session.data).hash 
    1010      @_new_cookie = cookies[_session_id_key] != before 
    1111    end 
    …… 
    1313    def finalize_session 
    1414      MERB_LOGGER.info("Finalize session") 
    15       @_session.save if @_fingerprint != Marshal.dump(@_session.data).hash 
    16       set_cookie(_session_id_key, @_session.session_id, _session_expiry) if (@_new_cookie || @_session.needs_new_cookie) 
     15      request.session.save if @_fingerprint != Marshal.dump(request.session.data).hash 
     16      set_cookie(_session_id_key, request.session.session_id, _session_expiry) if (@_new_cookie || request.session.needs_new_cookie) 
    1717    end 
    1818  end # ActiveRecordMixin 

  • plugins/merb_datamapper/Rakefile

    r915 r968  
    44PLUGIN = "merb_datamapper" 
    55NAME = "merb_datamapper" 
    6 VERSION = "0.4.3" 
     6VERSION = "0.4.4" 
    77AUTHOR = "Jason Toy" 
    88EMAIL = "jtoy@rubynow.com" 

  • plugins/merb_datamapper/lib/merb/session/data_mapper_session.rb

    r740 r968  
    66      MERB_LOGGER.info("Setting up session") 
    77      before = cookies[_session_id_key] 
    8       @_session, cookies[_session_id_key] = Merb::DataMapperSession.persist(cookies[_session_id_key]) 
    9       @_fingerprint = Marshal.dump(@_session.data).hash 
     8      request.session, cookies[_session_id_key] = Merb::DataMapperSession.persist(cookies[_session_id_key]) 
     9      @_fingerprint = Marshal.dump(request.session.data).hash 
    1010      @_new_cookie = cookies[_session_id_key] != before 
    1111    end 
    …… 
    1313    def finalize_session 
    1414      MERB_LOGGER.info("Finalize session") 
    15       @_session.save if @_fingerprint != Marshal.dump(@_session.data).hash 
    16       set_cookie(_session_id_key, @_session.session_id, _session_expiry) if (@_new_cookie || @_session.needs_new_cookie) 
     15      request.session.save if @_fingerprint != Marshal.dump(request.session.data).hash 
     16      set_cookie(_session_id_key, request.session.session_id, _session_expiry) if (@_new_cookie || request.session.needs_new_cookie) 
    1717    end 
    1818  end 

  • plugins/merb_sequel/Rakefile

    r858 r968  
    44PLUGIN = "merb_sequel" 
    55NAME = "merb_sequel" 
    6 VERSION = "0.4.0" 
     6VERSION = "0.4.1" 
    77AUTHOR = "Duane Johnson" 
    88EMAIL = "canadaduane@gmail.com" 

  • plugins/merb_sequel/lib/merb/session/sequel_session.rb

    r668 r968  
    44      MERB_LOGGER.info("Setting up session") 
    55      before = cookies[_session_id_key] 
    6       @_session, cookies[_session_id_key] = Merb::SequelSession.persist(cookies[_session_id_key]) 
    7       @_fingerprint = Marshal.dump(@_session.data).hash 
     6      request.session, cookies[_session_id_key] = Merb::SequelSession.persist(cookies[_session_id_key]) 
     7      @_fingerprint = Marshal.dump(request.session.data).hash 
    88      @_new_cookie = cookies[_session_id_key] != before 
    99    end 
    …… 
    1111    def finalize_session 
    1212      MERB_LOGGER.info("Finalize session") 
    13       @_session.save if @_fingerprint != Marshal.dump(@_session.data).hash 
    14       set_cookie(_session_id_key, @_session.values[:session_id], _session_expiry) if (@_new_cookie || @_session.needs_new_cookie) 
     13      request.session.save if @_fingerprint != Marshal.dump(request.session.data).hash 
     14      set_cookie(_session_id_key, request.session.values[:session_id], _session_expiry) if (@_new_cookie || request.session.needs_new_cookie) 
    1515    end 
    1616  end