merb 0.0.8 → 0.0.9

data/lib/merb/session/merb_ar_session.rb

@@ -6,16 +6,18 @@ module Merb
 
     def setup_session
       MERB_LOGGER.info("Setting up session")
-      @session = Merb::Session.persist(cookies)
-      @fingerprint_before = Marshal.dump(@session).hash
+      before = cookies[session_id_key]
+      @session, cookies[session_id_key] = Merb::Session.persist(cookies[session_id_key])
+      @_fingerprint_before = Marshal.dump(@session).hash
+      @_new_cookie = cookies[session_id_key] != before
     end
 
     def finalize_session
       MERB_LOGGER.info("Finalize session")
-      unless Marshal.dump(@session).hash == @fingerprint_before
+      unless Marshal.dump(@session).hash == @_fingerprint_before
         @session.save
       end
-      @headers['Set-Cookie'] = @cookies.map { |k,v| "#{k}=#{escape(v)}; path=/" if v != @cookies[k] } - [nil]
+      set_cookie(session_id_key, cookies[session_id_key], Time.now+Merb::Const::WEEK*2) if @_new_cookie
     end 
 
   end
@@ -24,7 +26,6 @@ module Merb
     # Customizable data column name.  Defaults to 'data'.
     cattr_accessor :data_column_name
     self.data_column_name = 'data'
-  
     before_save :marshal_data!
     before_save :raise_on_session_data_overflow!
   
@@ -32,24 +33,22 @@ module Merb
   
     class << self
       # Generates a new session ID and creates a row for the new session in the database.
-      def generate(cookies)
+      def generate
         rand_max = RAND_CHARS.size
         sid = (0...32).inject("") { |ret,_| ret << RAND_CHARS[rand(rand_max)] }
-        sess = create(:session_id => sid, :data => {})
-        cookies[:session_id] = sess.session_id
-        sess
+        create(:session_id => sid, :data => {})
       end
 
       # Gets the existing session based on the <tt>session_id</tt> available in cookies.
       # If none is found, generates a new session.
-      def persist(cookies)
-        if cookies[:session_id]
-          session = find_by_session_id(cookies[:session_id])
+      def persist(session_id)
+        if session_id
+          session = find_by_session_id(session_id)
         end
         unless session
-          session = generate(cookies)
+          session = generate
         end
-        session
+        [session, session.session_id]
       end
       
       # Don't try to reload ARStore::Session in dev mode.

data/lib/merb/session/merb_memory_session.rb

@@ -0,0 +1,105 @@
+module Merb
+  
+  module SessionMixin
+
+    def setup_session
+      MERB_LOGGER.info("Setting up session")
+      before = cookies[session_id_key]
+      @session , cookies[session_id_key] = Merb::MemorySession.persist(cookies[session_id_key])
+      @_new_cookie = cookies[session_id_key] != before
+    end
+
+    def finalize_session
+      MERB_LOGGER.info("Finalize session")
+      set_cookie(session_id_key, cookies[session_id_key], Time.now+Merb::Const::WEEK*2) if @_new_cookie
+    end 
+
+  end
+  
+  class MemorySession
+        
+    class << self
+  
+      RAND_CHARS = [*'A'..'Z'] + [*'0'..'9'] + [*'a'..'z']
+
+      # Generates a new session ID and creates a row for the new session in the database.
+      def generate
+        rand_max = RAND_CHARS.size
+        sid = (0...32).inject("") { |ret,_| ret << RAND_CHARS[rand(rand_max)] }
+        [create(:session_id => sid, :data => {}), sid]
+      end
+      
+      # Gets the existing session based on the <tt>session_id</tt> available in cookies.
+      # If none is found, generates a new session.
+      def persist(session_id)
+        if session_id
+          session = self[session_id]
+          sid = session_id
+        end
+        unless session
+          session, sid = generate
+        end
+        [session, sid]
+      end
+      
+      def setup(opts={})
+        @opts = opts
+        @sessions = Hash.new
+        @timestamps = Hash.new
+        @mutex = Mutex.new
+        @session_ttl = opts.fetch(:session_ttl, 60*60) # default 1 hour
+        start_timer
+        self
+      end
+      
+      def create(opts={})
+        self[opts[:session_id]] = opts[:data]
+      end  
+      
+      def [](key)
+        @mutex.synchronize {
+          @timestamps[key] = Time.now
+          @sessions[key]
+        }
+      end  
+       
+      def []=(key, val) 
+        @mutex.synchronize {
+          @timestamps[key] = Time.now
+          @sessions[key] = val
+        } 
+      end
+      
+      def delete(key)
+        @mutex.synchronize {
+          @sessions.delete(key)
+        }
+      end
+      
+      def reap_old_sessions
+        @timestamps.each do |key,stamp|
+          if stamp + @session_ttl < Time.now
+            delete(key)
+          end  
+        end
+        GC.start
+      end  
+      
+      def start_timer
+        Thread.new do
+          loop {
+            sleep @session_ttl
+            reap_old_sessions
+          } 
+        end  
+      end  
+      
+      def sessions
+        @sessions
+      end  
+  
+    end # end singleton class
+    
+  end # end DRbSession
+
+end  

metadata

@@ -1,10 +1,10 @@
 --- !ruby/object:Gem::Specification 
-rubygems_version: 0.9.0
+rubygems_version: 0.9.0.9
 specification_version: 1
 name: merb
 version: !ruby/object:Gem::Version 
-  version: 0.0.8
-date: 2006-12-17 00:00:00 -08:00
+  version: 0.0.9
+date: 2007-01-14 00:00:00 -08:00
 summary: Merb == Mongrel + Erb. Pocket rocket web framework.
 require_paths: 
 - lib
@@ -34,22 +34,22 @@ files:
 - Rakefile
 - TODO
 - bin/merb
-- test/test_helper.rb
-- test/unit
-- test/unit/route_matcher_test.rb
 - lib/merb
 - lib/merb.rb
 - lib/merb_tasks.rb
 - lib/tasks
 - lib/merb/core_ext
 - lib/merb/core_ext.rb
+- lib/merb/generators
 - lib/merb/merb_constants.rb
 - lib/merb/merb_controller.rb
 - lib/merb/merb_drb_server.rb
 - lib/merb/merb_exceptions.rb
 - lib/merb/merb_handler.rb
+- lib/merb/merb_mailer.rb
 - lib/merb/merb_request.rb
 - lib/merb/merb_router.rb
+- lib/merb/merb_server.rb
 - lib/merb/merb_upload_handler.rb
 - lib/merb/merb_upload_progress.rb
 - lib/merb/merb_view_context.rb
@@ -66,134 +66,24 @@ files:
 - lib/merb/core_ext/merb_object.rb
 - lib/merb/core_ext/merb_string.rb
 - lib/merb/core_ext/merb_symbol.rb
+- lib/merb/generators/merb_app
+- lib/merb/generators/merb_app/merb_app.rb
 - lib/merb/mixins/basic_authentication_mixin.rb
 - lib/merb/mixins/controller_mixin.rb
 - lib/merb/mixins/erubis_capture_mixin.rb
-- lib/merb/mixins/javascript_mixin.rb
+- lib/merb/mixins/form_control_mixin.rb
 - lib/merb/mixins/merb_status_codes.rb
 - lib/merb/mixins/render_mixin.rb
 - lib/merb/mixins/responder_mixin.rb
+- lib/merb/mixins/view_context_mixin.rb
 - lib/merb/session/merb_ar_session.rb
-- lib/merb/session/merb_drb_session.rb
+- lib/merb/session/merb_memory_session.rb
 - lib/merb/vendor/paginator
 - lib/merb/vendor/paginator/paginator.rb
 - lib/merb/vendor/paginator/README.txt
 - lib/tasks/db.rake
-- examples/app_skeleton
-- examples/sample_app
-- examples/app_skeleton/dist
-- examples/app_skeleton/log
-- examples/app_skeleton/plugins
-- examples/app_skeleton/Rakefile
-- examples/app_skeleton/scripts
-- examples/app_skeleton/test
-- examples/app_skeleton/dist/app
-- examples/app_skeleton/dist/conf
-- examples/app_skeleton/dist/lib
-- examples/app_skeleton/dist/plugins
-- examples/app_skeleton/dist/public
-- examples/app_skeleton/dist/schema
-- examples/app_skeleton/dist/app/controllers
-- examples/app_skeleton/dist/app/helpers
-- examples/app_skeleton/dist/app/models
-- examples/app_skeleton/dist/app/views
-- examples/app_skeleton/dist/app/helpers/global_helper.rb
-- examples/app_skeleton/dist/app/views/layout
-- examples/app_skeleton/dist/conf/merb.yml
-- examples/app_skeleton/dist/conf/merb_init.rb
-- examples/app_skeleton/dist/conf/mup.conf
-- examples/app_skeleton/dist/conf/router.rb
-- examples/app_skeleton/dist/public/files
-- examples/app_skeleton/dist/public/images
-- examples/app_skeleton/dist/public/javascripts
-- examples/app_skeleton/dist/public/stylesheets
-- examples/app_skeleton/dist/schema/migrations
-- examples/app_skeleton/scripts/merb_stop
-- examples/app_skeleton/scripts/new_migration
-- examples/app_skeleton/test/fixtures
-- examples/app_skeleton/test/spec
-- examples/app_skeleton/test/test_helper.rb
-- examples/app_skeleton/test/unit
-- examples/sample_app/dist
-- examples/sample_app/foo.txt
-- examples/sample_app/log
-- examples/sample_app/plugins
-- examples/sample_app/Rakefile
-- examples/sample_app/script
-- examples/sample_app/test
-- examples/sample_app/dist/app
-- examples/sample_app/dist/conf
-- examples/sample_app/dist/lib
-- examples/sample_app/dist/plugins
-- examples/sample_app/dist/public
-- examples/sample_app/dist/schema
-- examples/sample_app/dist/app/controllers
-- examples/sample_app/dist/app/helpers
-- examples/sample_app/dist/app/models
-- examples/sample_app/dist/app/views
-- examples/sample_app/dist/app/controllers/files.rb
-- examples/sample_app/dist/app/controllers/posts.rb
-- examples/sample_app/dist/app/controllers/test.rb
-- examples/sample_app/dist/app/helpers/global_helper.rb
-- examples/sample_app/dist/app/helpers/posts_helper.rb
-- examples/sample_app/dist/app/models/comment.rb
-- examples/sample_app/dist/app/models/post.rb
-- examples/sample_app/dist/app/views/files
-- examples/sample_app/dist/app/views/layout
-- examples/sample_app/dist/app/views/posts
-- examples/sample_app/dist/app/views/shared
-- examples/sample_app/dist/app/views/test
-- examples/sample_app/dist/app/views/files/progress.jerb
-- examples/sample_app/dist/app/views/files/start.herb
-- examples/sample_app/dist/app/views/files/upload.herb
-- examples/sample_app/dist/app/views/layout/application.herb
-- examples/sample_app/dist/app/views/layout/foo.herb
-- examples/sample_app/dist/app/views/posts/_comments.herb
-- examples/sample_app/dist/app/views/posts/comment.jerb
-- examples/sample_app/dist/app/views/posts/list.herb
-- examples/sample_app/dist/app/views/posts/new.herb
-- examples/sample_app/dist/app/views/posts/show.herb
-- examples/sample_app/dist/app/views/posts/xml_test.xerb
-- examples/sample_app/dist/app/views/shared/_test.herb
-- examples/sample_app/dist/app/views/test/foo.herb
-- examples/sample_app/dist/app/views/test/hello.herb
-- examples/sample_app/dist/app/views/test/json.jerb
-- examples/sample_app/dist/conf/merb.yml
-- examples/sample_app/dist/conf/merb_init.rb
-- examples/sample_app/dist/conf/mup.conf
-- examples/sample_app/dist/conf/router.rb
-- examples/sample_app/dist/public/files
-- examples/sample_app/dist/public/images
-- examples/sample_app/dist/public/javascripts
-- examples/sample_app/dist/public/stylesheets
-- examples/sample_app/dist/public/test.html
-- examples/sample_app/dist/public/images/bg.jpg
-- examples/sample_app/dist/public/images/book.gif
-- examples/sample_app/dist/public/images/booksmall.gif
-- examples/sample_app/dist/public/images/greenright.jpg
-- examples/sample_app/dist/public/images/louiecon.gif
-- examples/sample_app/dist/public/images/menu.gif
-- examples/sample_app/dist/public/images/menuleft.gif
-- examples/sample_app/dist/public/images/menuright.gif
-- examples/sample_app/dist/public/images/mountain.jpg
-- examples/sample_app/dist/public/images/n3.jpg
-- examples/sample_app/dist/public/images/nautica.jpg
-- examples/sample_app/dist/public/javascripts/application.js
-- examples/sample_app/dist/public/javascripts/effects.js
-- examples/sample_app/dist/public/javascripts/mup.js
-- examples/sample_app/dist/public/javascripts/prototype.js
-- examples/sample_app/dist/public/stylesheets/merb.css
-- examples/sample_app/dist/schema/migrations
-- examples/sample_app/dist/schema/schema.rb
-- examples/sample_app/dist/schema/migrations/001_add_comments_to_posts.rb
-- examples/sample_app/dist/schema/migrations/002_add_sessions_table.rb
-- examples/sample_app/log/merb.4000.pid
-- examples/sample_app/script/merb_stop
-- examples/sample_app/script/new_migration
-- examples/sample_app/test/fixtures
-- examples/sample_app/test/spec
-- examples/sample_app/test/test_helper.rb
-- examples/sample_app/test/unit
+- examples/README_EXAMPLES
+- examples/skeleton.tar
 test_files: []
 
 rdoc_options: 
@@ -247,12 +137,3 @@ dependencies:
       - !ruby/object:Gem::Version 
         version: 0.0.0
     version: 
-- !ruby/object:Gem::Dependency 
-  name: mime-types
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Version::Requirement 
-    requirements: 
-    - - ">"
-      - !ruby/object:Gem::Version 
-        version: 0.0.0
-    version: 

data/examples/app_skeleton/Rakefile

@@ -1,82 +0,0 @@
-require 'rake'
-require 'rake/rdoctask'
-require 'rake/testtask'
-require 'code_statistics' 
-require 'fileutils'
-require 'rubygems'
-require 'merb'
-require MERB_FRAMEWORK_ROOT+'/merb_tasks'
-MERB_ROOT = File.dirname(__FILE__)
-include FileUtils
-
-
-#desc "Packages up Merb."
-#task :default => [:package]
-
-desc "load merb_init.rb"
-task :merb_init do
-  require 'merb'
-  require File.dirname(__FILE__)+'/dist/conf/merb_init.rb'
-end  
-
-desc "Load db schema"
-task :load_schema => [:merb_init] do
-  require File.dirname(__FILE__)+'/dist/schema/schema.rb'
-end
-
-task :uninstall => [:clean] do
-  sh %{sudo gem uninstall #{NAME}}
-end
-
-desc 'Run unit tests'
-Rake::TestTask.new('test_unit') do |t|
-  t.libs << 'test'
-  t.pattern = 'test/unit/*_test.rb'
-  t.verbose = true
-end
-
-desc 'Run functional tests'
-Rake::TestTask.new('test_functional') do |t|
-  t.libs << 'test'
-  t.pattern = 'test/functional/*_test.rb'
-  t.verbose = true
-end
-
-desc 'Run all tests'
-Rake::TestTask.new('test') do |t|
-  t.libs << 'test'
-  t.pattern = 'test/**/*_test.rb'
-  t.verbose = true
-end
-
-desc 'Run all tests, specs and finish with rcov'
-task :aok do
-  sh %{rake rcov}
-  sh %{rake spec}
-end
-
-##############################################################################
-# Statistics
-##############################################################################
-
-STATS_DIRECTORIES = [
-  %w(Code               lib/),
-  %w(Unit\ tests        test/unit),
-  %w(Functional\ tests  test/functional)
-].collect { |name, dir| [ name, "./#{dir}" ] }.select { |name, dir| File.directory?(dir) }
-
-desc "Report code statistics (KLOCs, etc) from the application"
-task :stats do
-  #require 'extra/stats'
-  verbose = true
-  CodeStatistics.new(*STATS_DIRECTORIES).to_s
-end
-
-##############################################################################
-# SVN
-##############################################################################
-
-desc "Add new files to subversion"
-task :svn_add do
-   system "svn status | grep '^\?' | sed -e 's/? *//' | sed -e 's/ /\ /g' | xargs svn add"
-end

data/examples/app_skeleton/dist/app/helpers/global_helper.rb

@@ -1,6 +0,0 @@
-module Merb
-  module GlobalHelper
-  end
-end    
-    
-