rack-datamapper-session 0.2 → 0.3

data/lib/rack-datamapper-session.rb

@@ -3,8 +3,8 @@ require 'dm-core'
 
 module Rack
   module Session
-    class Rack::Session::DataMapperSession
-      include ::DataMapper::Resource
+    class DataMapperSession
+      include DataMapper::Resource
 
       property :id, Serial
       property :sid, String, :length => 128
@@ -14,10 +14,26 @@ module Rack
         data[key]
       end
       
+      def fetch key
+        data[key]
+      end
+      
       def []= key, value
         data[key] = value
       end
       
+      def store key, value
+        data[key] = value
+      end
+      
+      def delete key
+        data.delete key
+      end
+      
+      def clear
+        data.clear
+      end
+      
       def data
         self.data_object ||= {}
       end
@@ -29,12 +45,12 @@ module Rack
     
     class DataMapper < Abstract::ID
       def get_session(env, sid)
-        session = Rack::Session::DataMapperSession.first(:sid => sid) if sid
+        session = DataMapperSession.first(:sid => sid) if sid
 
         unless sid and session
           env['rack.errors'].puts("Session '#{sid.inspect}' not found, initializing...") if $VERBOSE and not sid.nil?
           sid = generate_sid
-          session = Rack::Session::DataMapperSession.new(:sid => sid)
+          session = DataMapperSession.new(:sid => sid)
           raise 'Unable to store session' unless session.save
         end
 
@@ -46,13 +62,13 @@ module Rack
         expiry = options[:expire_after]
         expiry = expiry.nil? ? 0 : expiry + 1
 
-        session = Rack::Session::DataMapperSession.first(:sid => sid) if sid
+        session = DataMapperSession.first(:sid => sid) if sid
 
         if options[:renew] or options[:drop]
           session.destroy
           return false if options[:drop]
           sid = generate_sid
-          session = Rack::Session::DataMapperSession.new(:sid => sid)
+          session = DataMapperSession.new(:sid => sid)
         end
         
         session.data = new_session.data

data/rack-datamapper-session.gemspec

@@ -2,7 +2,7 @@
 
 Gem::Specification.new do |s|
   s.name = 'rack-datamapper-session'
-  s.version = '0.2'
+  s.version = '0.3'
 
   s.authors = ['Phil Pirozhkov']
   s.date = '2009-11-03'
@@ -12,4 +12,5 @@ Gem::Specification.new do |s|
   s.summary ='Datamapper session for any Rack based application'
 
   s.add_dependency 'rack', '>= 1.0'
+  s.add_dependency 'dm-core', '>= 0.9.10'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: rack-datamapper-session
 version: !ruby/object:Gem::Version 
-  version: "0.2"
+  version: "0.3"
 platform: ruby
 authors: 
 - Phil Pirozhkov
@@ -22,6 +22,16 @@ dependencies:
       - !ruby/object:Gem::Version 
         version: "1.0"
     version: 
+- !ruby/object:Gem::Dependency 
+  name: dm-core
+  type: :runtime
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: 0.9.10
+    version: 
 description: Datamapper session for any Rack based application. Don't forget to automigrate.
 email: 
 - pirj@mail.ru