Changeset 1242

Show
Ignore:
Timestamp:
01/09/08 18:31:41 (11 months ago)
Author:
wayneesegu..@gmail.com
Message:

Preparing merb_datamapper for 0.5.0

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • plugins/merb_datamapper/lib/merb/orms/data_mapper/connection.rb

    r1230 r1242  
    2020              full_config = Erubis.load_yaml_file(config_file) 
    2121              config = (Merb::Plugins.config[:merb_datamapper] = {}) 
    22               (full_config[MERB_ENV.to_sym] || full_config[MERB_ENV]).each { |k, v| config[k.to_sym] = v } 
     22              (full_config[Merb.environment.to_sym] || full_config[Merb.environment]).each { |k, v| config[k.to_sym] = v } 
    2323              config 
    2424            end 

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

    r1152 r1242  
    44  module SessionMixin 
    55    def setup_session 
    6       MERB_LOGGER.info("Setting up session") 
     6      Merb.logger.info("Setting up session") 
    77      before = cookies[_session_id_key] 
    88      request.session, cookies[_session_id_key] = Merb::DataMapperSession.persist(cookies[_session_id_key]) 
    …… 
    1212   
    1313    def finalize_session 
    14       MERB_LOGGER.info("Finalize session") 
     14      Merb.logger.info("Finalize session") 
    1515      request.session.save if @_fingerprint != Marshal.dump(request.session.data).hash 
    1616      set_cookie(_session_id_key, request.session.session_id, _session_expiry) if (@_new_cookie || request.session.needs_new_cookie)