zorglub 0.0.1 → 0.0.2

data/lib/zorglub/config.rb

@@ -9,7 +9,11 @@ module Zorglub
             :layout => 'default',
             :view_dir => 'view',
             :layout_dir => 'layout',
-            :session_on => false
+            :session_on => false,
+            :session_key => 'zorglub.sid',
+            :session_secret => 'session-secret-secret',
+            :session_sid_len => 64
+        #
         }
         @engines = { }
         class << self

data/lib/zorglub/rack_session.rb

@@ -0,0 +1,13 @@
+# -*- coding: UTF-8 -*-
+#
+module Zorglub
+    #
+    class Node
+        #
+        def session
+            @request.session
+        end
+        #
+    end
+    #
+end

data/lib/zorglub/session.rb

@@ -5,73 +5,147 @@ require 'securerandom'
 module Zorglub
     #
     class Node
+        #
+        @sessions = {}
+        #
+        class << self
+            attr_reader :sessions
+        end
         #
         def session
-            @session ||= Session.new @request
+            @session ||= SessionHash.new @request, @response, Node.sessions
         end
     end
     #
-    class SessionHash
+    class SessionHash < Hash
         #
-        @data = {}
-        class << self
-            attr_reader :data
+        def initialize req, resp, sessions
+            @request = req
+            @response = resp
+            @sessions = sessions
+            @sid = nil
+            super()
         end
         #
-        def initialize sid
-            @sid = sid
-            # TODO if sid is nil, one should be created
-            @session_data = SessionHash.data[sid]||={}
+        def [] key
+            load_data!
+            super key
         end
         #
-        def exists?
-            not @sid.nil?
+        def has_key? key
+            load_data!
+            super key
         end
+        alias :key? :has_key?
+        alias :include? :has_key?
         #
-        def [] idx
-            @session_data[idx]
+        def []= key, value
+            load_data!
+            super key, value
         end
         #
-        def []= idx, v
-            @session_data[idx] = v
+        def clear
+            load_data!
+#            @response.delete_cookie Zorglub::Config.session_key
+#            @sessions.delete @sid
+#            @sid = nil
+            super
         end
-    end
-    #
-    class Session
         #
-        @session_key =  'zorglub.sid'
-        @session_kls = Zorglub::SessionHash
-        class << self
-            attr_accessor :session_key, :session_kls
+        def to_hash
+            load_data!
+            h = {}.replace(self)
+            h.delete_if { |k,v| v.nil? }
+            h
         end
         #
-        def initialize req
-            @request = req
-            @instance = nil
+        def update hash
+            load_data!
+            super stringify_keys(hash)
         end
         #
-        def setup!
-            if Config.session_on
-                @instance = Session.session_kls.new @request.cookies[Session.session_key]
+        def delete key
+            load_data!
+            super key
+        end
+        #
+        def inspect
+            if loaded?
+                super
             else
-                @instance = {}
+                "#<#{self.class}:0x#{self.object_id.to_s(16)} not yet loaded>"
             end
         end
-        private :setup!
         #
         def exists?
-            setup! if @instance.nil?
-            @instance.exists?
+            ( loaded? ? @sessions.has_key?(@sid) : false )
         end
         #
-        def [] idx
-            setup! if @instance.nil?
-            @instance[idx]
+        def loaded?
+            not @sid.nil?
+        end
+        #
+        def empty?
+            load_data!
+            super
+        end
+        #
+        private
+        #
+        def load_data!
+            return if loaded?
+            if Config.session_on
+                sid = @request.cookies[Zorglub::Config.session_key]
+                if sid.nil?
+                    sid = generate_sid!
+                    @response.set_cookie Zorglub::Config.session_key, sid
+                end
+                replace @sessions[sid] ||={}
+                @sessions[sid] = self
+                @sid = sid
+            end
         end
         #
-        def []= idx, v
-            setup! if @instance.nil?
-            @instance[idx] = v
+        def stringify_keys other
+            hash = {}
+            other.each do |key, value|
+                hash[key] = value
+            end
+            hash
+        end
+        #
+        def generate_sid!
+            begin sid = sid_algorithm end while @sessions.has_key? sid
+            sid
+        end
+        #
+        begin
+            require 'securerandom'
+            # Using SecureRandom, optional length.
+            # SecureRandom is available since Ruby 1.8.7.
+            # For Ruby versions earlier than that, you can require the uuidtools gem,
+            # which has a drop-in replacement for SecureRandom.
+            def sid_algorithm; SecureRandom.hex(Zorglub::Config.session_sid_len); end
+        rescue LoadError
+            require 'openssl'
+            # Using OpenSSL::Random for generation, this is comparable in performance
+            # with stdlib SecureRandom and also allows for optional length, it should
+            # have the same behaviour as the SecureRandom::hex method of the
+            # uuidtools gem.
+            def sid_algorithm
+                OpenSSL::Random.random_bytes(Zorglub::Config.session_sid_len / 2).unpack('H*')[0]
+            end
+        rescue LoadError
+            # Digest::SHA2::hexdigest produces a string of length 64, although
+            # collisions are not very likely, the entropy is still very low and
+            # length is not optional.
+            #
+            # Replacing it with OS-provided random data would take a lot of code and
+            # won't be as cross-platform as Ruby.
+            def sid_algorithm
+                entropy = [ srand, rand, Time.now.to_f, rand, $$, rand, object_id ]
+                Digest::SHA2.hexdigest(entropy.join)
+            end
         end
         #
     end

data/lib/zorglub.rb

@@ -7,7 +7,7 @@ require './lib/zorglub/app'
 #
 module Zorglub
     #
-    VERSION = '0.0.1'
+    VERSION = '0.0.2'
     #
 end
 #

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: zorglub
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
   prerelease: 
 platform: ruby
 authors:
@@ -13,7 +13,7 @@ date: 2012-01-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rack
-  requirement: &12631340 !ruby/object:Gem::Requirement
+  requirement: &15670960 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: 1.4.0
   type: :runtime
   prerelease: false
-  version_requirements: *12631340
+  version_requirements: *15670960
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &12630520 !ruby/object:Gem::Requirement
+  requirement: &15670060 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: 0.8.0
   type: :runtime
   prerelease: false
-  version_requirements: *12630520
+  version_requirements: *15670060
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &12629940 !ruby/object:Gem::Requirement
+  requirement: &15669580 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: 0.8.7
   type: :development
   prerelease: false
-  version_requirements: *12629940
+  version_requirements: *15669580
 - !ruby/object:Gem::Dependency
   name: bones
-  requirement: &12629360 !ruby/object:Gem::Requirement
+  requirement: &15668980 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,7 +54,7 @@ dependencies:
         version: 3.7.3
   type: :development
   prerelease: false
-  version_requirements: *12629360
+  version_requirements: *15668980
 description: a nano web application framework based on rack[http://rack.rubyforge.org/]
 email: jeremy@asynk.ch
 executables: []
@@ -69,6 +69,7 @@ files:
 - lib/zorglub.rb
 - lib/zorglub/session.rb
 - lib/zorglub/app.rb
+- lib/zorglub/rack_session.rb
 - lib/zorglub/node.rb
 - lib/zorglub/config.rb
 - spec/data/view/node0/do_partial