rack-datamapper-session 0.1 → 0.2

data/lib/rack-datamapper-session.rb

@@ -1,9 +1,10 @@
 require 'rack/session/abstract/id'
+require 'dm-core'
 
 module Rack
   module Session
-    class DataMapperSession
-      include DataMapper::Resource
+    class Rack::Session::DataMapperSession
+      include ::DataMapper::Resource
 
       property :id, Serial
       property :sid, String, :length => 128
@@ -28,12 +29,12 @@ module Rack
     
     class DataMapper < Abstract::ID
       def get_session(env, sid)
-        session = DataMapperSession.first(:sid => sid) if sid
+        session = Rack::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 = DataMapperSession.new(:sid => sid)
+          session = Rack::Session::DataMapperSession.new(:sid => sid)
           raise 'Unable to store session' unless session.save
         end
 
@@ -45,13 +46,13 @@ module Rack
         expiry = options[:expire_after]
         expiry = expiry.nil? ? 0 : expiry + 1
 
-        session = DataMapperSession.first(:sid => sid) if sid
+        session = Rack::Session::DataMapperSession.first(:sid => sid) if sid
 
         if options[:renew] or options[:drop]
           session.destroy
           return false if options[:drop]
           sid = generate_sid
-          session = DataMapperSession.new(:sid => sid)
+          session = Rack::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.1'
+  s.version = '0.2'
 
   s.authors = ['Phil Pirozhkov']
   s.date = '2009-11-03'
@@ -12,5 +12,4 @@ 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'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: rack-datamapper-session
 version: !ruby/object:Gem::Version 
-  version: "0.1"
+  version: "0.2"
 platform: ruby
 authors: 
 - Phil Pirozhkov
@@ -22,16 +22,6 @@ 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"
-    version: 
 description: Datamapper session for any Rack based application. Don't forget to automigrate.
 email: 
 - pirj@mail.ru