merb_datamapper 0.4.4 → 0.5

data/README

@@ -1,8 +1,10 @@
-merb_data_mapper
+merb_datamapper
 =================
 
 A plugin for the Merb framework that provides DataMapper access
 
 To use sessions:
-set the session store to data_mapper in merb.yml
-add the dependency in dependencies.rb: dependency "merb_data_mapper"
+1. set the session store to datamapper in merb.yml:
+    :session_store: datamapper
+2. add the dependency in dependencies.rb:
+    use_orm :datamapper

data/Rakefile

@@ -3,7 +3,7 @@ require 'rake/gempackagetask'
 
 PLUGIN = "merb_datamapper"
 NAME = "merb_datamapper"
-VERSION = "0.4.4"
+VERSION = "0.5"
 AUTHOR = "Jason Toy"
 EMAIL = "jtoy@rubynow.com"
 HOMEPAGE = "http://merbivore.com"
@@ -20,7 +20,7 @@ spec = Gem::Specification.new do |s|
   s.author = AUTHOR
   s.email = EMAIL
   s.homepage = HOMEPAGE
-  s.add_dependency('merb', '>= 0.4.0')
+  s.add_dependency('merb', '>= 0.5')
   s.add_dependency('datamapper', '>= 0.2.3')
   s.require_path = 'lib'
   s.autorequire = PLUGIN
@@ -35,3 +35,7 @@ task :install do
   sh %{rake package}
   sh %{sudo gem install pkg/#{NAME}-#{VERSION}}
 end
+
+task :release => :package do
+  sh %{rubyforge add_release merb #{PLUGIN} #{VERSION} pkg/#{NAME}-#{VERSION}.gem}
+end

data/lib/merb/orms/data_mapper/connection.rb

@@ -5,8 +5,8 @@ module Merb
   module Orms
     module DataMapper
       class << self
-        def config_file() MERB_ROOT / "config" / "database.yml" end
-        def sample_dest() MERB_ROOT / "config" / "database.sample.yml" end
+        def config_file() Merb.root / "config" / "database.yml" end
+        def sample_dest() Merb.root / "config" / "database.sample.yml" end
         def sample_source() File.dirname(__FILE__) / "database.sample.yml" end
       
         def copy_sample_config
@@ -18,8 +18,8 @@ module Merb
             begin
               # Convert string keys to symbols
               full_config = Erubis.load_yaml_file(config_file)
-              config = (Merb::Plugins.config[:merb_data_mapper] = {})
-              (full_config[MERB_ENV.to_sym] || full_config[MERB_ENV]).each { |k, v| config[k.to_sym] = v }
+              config = (Merb::Plugins.config[:merb_datamapper] = {})
+              (full_config[Merb.environment.to_sym] || full_config[Merb.environment]).each { |k, v| config[k.to_sym] = v }
               config
             end
         end
@@ -31,7 +31,7 @@ module Merb
             ::DataMapper::Database.setup(config)
           else
             copy_sample_config
-            puts "No database.yml file found in #{MERB_ROOT}/config."
+            puts "No database.yml file found in #{Merb.root}/config."
             puts "A sample file was created called database.sample.yml for you to copy and edit."
             exit(1)
           end
@@ -40,7 +40,7 @@ module Merb
         # Registering this ORM lets the user choose DataMapper as a session store
         # in merb.yml's session_store: option.
         def register_session_type
-          Merb::Server.register_session_type("data_mapper",
+          Merb::BootLoader.register_session_type("datamapper",
             "merb/session/data_mapper_session",
             "Using DataMapper database sessions")
         end

data/lib/merb/orms/data_mapper/tasks/databases.rb

@@ -4,21 +4,21 @@ namespace :dm do
   namespace :db do
     desc "Perform automigration"
     task :automigrate => :merb_env do
-      DataMapper::Base.auto_migrate!
+      DataMapper::Persistence.auto_migrate!
     end
   end
   
   namespace :sessions do
     desc "Creates session migration"
     task :create => :merb_env do
-      dest = File.join(MERB_ROOT, "schema", "migrations","001_add_sessions_table.rb")
+      dest = File.join(Merb.root, "schema", "migrations","001_add_sessions_table.rb")
       source = File.join(File.dirname(__FILE__), "merb", "session","001_add_sessions_table.rb")
       #FileUtils.cp source, dest unless File.exists?(dest)
     end
     
     desc "Clears sessions"
     task :clear => :merb_env do
-      table_name = (Merb::Plugins.config[:data_mapper][:session_table_name] || "sessions")
+      table_name = (Merb::Plugins.config[:datamapper][:session_table_name] || "sessions")
       #Merb::Orms::DataMapper.connect.execute("DELETE FROM #{table_name}")
     end
   end

data/lib/merb/session/data_mapper_session.rb

@@ -3,7 +3,7 @@ require 'base64'
 module Merb
   module SessionMixin
     def setup_session
-      MERB_LOGGER.info("Setting up session")
+      Merb.logger.info("Setting up session")
       before = cookies[_session_id_key]
       request.session, cookies[_session_id_key] = Merb::DataMapperSession.persist(cookies[_session_id_key])
       @_fingerprint = Marshal.dump(request.session.data).hash
@@ -11,19 +11,19 @@ module Merb
     end
   
     def finalize_session
-      MERB_LOGGER.info("Finalize session")
+      Merb.logger.info("Finalize session")
       request.session.save if @_fingerprint != Marshal.dump(request.session.data).hash
       set_cookie(_session_id_key, request.session.session_id, _session_expiry) if (@_new_cookie || request.session.needs_new_cookie)
     end
   end
 
-  table_name = (Merb::Plugins.config[:merb_data_mapper][:session_table_name] || "sessions")
+  table_name = (Merb::Plugins.config[:merb_datamapper][:session_table_name] || "sessions")
   
   class DataMapperSession < DataMapper::Base
     
     set_table_name "sessions"
-    property :session_id, :text
-    property :data, :text
+    property :session_id, :text, :lazy => false, :key => true
+    property :data,       :text, :lazy => false
   
     attr_accessor :needs_new_cookie
   
@@ -37,7 +37,7 @@ module Merb
       # If none is found, generates a new session.
       def persist(session_id)
         if session_id
-          session = self[:session_id => session_id]
+          session = self[session_id]
         end
         unless session
           session = generate
@@ -63,10 +63,18 @@ module Merb
     end
   
     # Lazy-delete of session data 
-    def delete
-      data = {}
+    def delete(key = nil)
+      key ? self.data.delete(key) : self.data.clear
+    end
+    
+    def empty?
+      data.empty?
     end
   
+    def each(&b)
+      data.each(&b)
+    end
+    
     def [](key)
       data[key]
     end
@@ -78,7 +86,10 @@ module Merb
     def data
       @unmarshalled_data || @unmarshalled_data = self.class.unmarshal(@data)
     end
-
+    
+    def data=(data)
+      @data, @unmarshalled_data = data, data
+    end
   
   private
     

data/lib/merb_datamapper.rb

@@ -1,7 +1,7 @@
 # make sure we're running inside Merb
 if defined?(Merb::Plugins)
-  if Merb::Server.app_loaded?
-    puts "Warning: The merb_data_mapper gem must be loaded before the application"
+  if Merb::BootLoader.app_loaded?
+    puts "Warning: The merb_datamapper gem must be loaded before the application"
   else
     require "merb/orms/data_mapper/connection"
     Merb::Orms::DataMapper.connect

metadata

@@ -1,10 +1,10 @@
 --- !ruby/object:Gem::Specification 
-rubygems_version: 0.9.2
+rubygems_version: 0.9.0
 specification_version: 1
 name: merb_datamapper
 version: !ruby/object:Gem::Version 
-  version: 0.4.4
-date: 2007-11-12 00:00:00 -06:00
+  version: "0.5"
+date: 2008-01-09 00:00:00 -08:00
 summary: Merb plugin that provides DataMapper support for Merb
 require_paths: 
 - lib
@@ -88,7 +88,7 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 0.4.0
+        version: "0.5"
     version: 
 - !ruby/object:Gem::Dependency 
   name: datamapper