Changeset 1048

Show
Ignore:
Timestamp:
11/25/07 16:21:33 (10 months ago)
Author:
e.@brainspl.at
Message:

fix up datamapper sessions in merb_datamapper plugin. closes #331

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • plugins/merb_datamapper/README

    r740 r1048  
    1 merb_data_mapper 
     1merb_datamapper 
    22================= 
    33 
    …… 
    55 
    66To use sessions: 
    7 set the session store to data_mapper in merb.yml 
    8 add the dependency in dependencies.rb: dependency "merb_data_mapper" 
     71. set the session store to datamapper in merb.yml: 
     8    :session_store: datamapper 
     92. add the dependency in dependencies.rb: 
     10    use_orm :datamapper 

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

    r1030 r1048  
    1919              # Convert string keys to symbols 
    2020              full_config = Erubis.load_yaml_file(config_file) 
    21               config = (Merb::Plugins.config[:merb_data_mapper] = {}) 
     21              config = (Merb::Plugins.config[:merb_datamapper] = {}) 
    2222              (full_config[MERB_ENV.to_sym] || full_config[MERB_ENV]).each { |k, v| config[k.to_sym] = v } 
    2323              config 

  • plugins/merb_datamapper/lib/merb/orms/data_mapper/tasks/databases.rb

    r889 r1048  
    1919    desc "Clears sessions" 
    2020    task :clear => :merb_env do 
    21       table_name = (Merb::Plugins.config[:data_mapper][:session_table_name] || "sessions") 
     21      table_name = (Merb::Plugins.config[:datamapper][:session_table_name] || "sessions") 
    2222      #Merb::Orms::DataMapper.connect.execute("DELETE FROM #{table_name}") 
    2323    end 

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

    r1036 r1048  
    1818  end 
    1919 
    20   table_name = (Merb::Plugins.config[:merb_data_mapper][:session_table_name] || "sessions") 
     20  table_name = (Merb::Plugins.config[:merb_datamapper][:session_table_name] || "sessions") 
    2121   
    2222  class DataMapperSession < DataMapper::Base 
    …… 
    7979      @unmarshalled_data || @unmarshalled_data = self.class.unmarshal(@data) 
    8080    end 
    81  
     81     
     82    def data=(data) 
     83      @data, @unmarshalled_data = data, data 
     84    end 
    8285   
    8386  private 

  • plugins/merb_datamapper/lib/merb_datamapper.rb

    r882 r1048  
    22if defined?(Merb::Plugins) 
    33  if Merb::Server.app_loaded? 
    4     puts "Warning: The merb_data_mapper gem must be loaded before the application" 
     4    puts "Warning: The merb_datamapper gem must be loaded before the application" 
    55  else 
    66    require "merb/orms/data_mapper/connection"