merb 0.0.8 → 0.0.9

data/lib/merb/session/merb_drb_session.rb

@@ -1,65 +0,0 @@
-module Merb
-  
-  module SessionMixin
-
-    def setup_session
-      MERB_LOGGER.info("Setting up session")
-      @session = Merb::Session.persist(cookies)
-      @fingerprint_before = Marshal.dump(@session).hash
-    end
-
-    def finalize_session
-      MERB_LOGGER.info("Finalize session")
-      unless Marshal.dump(@session).hash == @fingerprint_before
-        @session.save
-      end
-      @headers['Set-Cookie'] = @cookies.map { |k,v| "#{k}=#{escape(v)}; path=/" if v != @k[k] } - [nil]
-    end 
-
-  end
-  
-  class Session
-  
-    attr_reader :sess_id
-  
-    def []=(k, v) # :nodoc:
-        (@data||={})[k] = v rescue nil
-    end
-    def [](k) # :nodoc:
-        @data[k] rescue nil
-    end
-  
-    def initialize(sess_id,data={})
-      @data = data || {}
-      @sess_id = sess_id
-    end  
-    
-    def save
-      Merb::DRbSession[@sess_id] = @data
-    end  
-  
-    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 self.generate(cookies)
-      rand_max = RAND_CHARS.size
-      sid = (0...32).inject("") { |ret,_| ret << RAND_CHARS[rand(rand_max)] }
-      sess = Merb::DRbSession.create(:sess_id => sid, :data => {})
-      cookies[:sess_id] = sid
-      new(sid, sess)
-    end
-  
-    # Gets the existing session based on the <tt>camping_sid</tt> available in cookies.
-    # If none is found, generates a new session.
-    def self.persist cookies
-      if cookies[:sess_id]
-        session = new(cookies[:sess_id], Merb::DRbSession[cookies[:sess_id]])
-      end
-      unless session
-        session = Merb::Session.generate(cookies)
-      end
-      session
-    end
-  end
-  
-end  

data/test/test_helper.rb

@@ -1 +0,0 @@
-require 'test/unit'

data/test/unit/route_matcher_test.rb

@@ -1,46 +0,0 @@
-require File.dirname(__FILE__) + '/../test_helper'
-require File.dirname(__FILE__) + '/../../lib/merb/merb_router'
-require File.dirname(__FILE__) + '/../../lib/merb/merb_utils'
-require 'set'
-class RouteMatcherTest < Test::Unit::TestCase
-  
-  def assert_same_hash(hsh1, hsh2)
-    assert_equal hsh1.keys.map(&:to_s).sort, hsh2.keys.map(&:to_s).sort
-    assert_equal hsh1.values.map(&:to_s).sort, hsh2.values.map(&:to_s).sort
-  end
-  
-  def setup
-    Merb::RouteMatcher.prepare do |r|
-      r.add '/foo/:bar/baz/:id', :controller => 'Test', :action => 'foo'
-      r.add '/:controller/:action/:id'
-      r.add '/bar/:*rest', :controller => 'Test', :action => 'glob'
-    end
-  end  
-  
-  def test_compiled_statement
-    r = Merb::RouteMatcher.new
-    assert( r.compiled_statement.kind_of?(String))
-    assert( r.compiled_statement =~ /lambda\{\|path/)
-    assert( r.compiled_statement =~ /Regexp\.new/)
-    assert( r.compiled_statement =~ /merge\(@sections\)/)
-  end
-  
-  def test_route_matching
-    routes = Merb::RouteMatcher.new
-    assert_same_hash( {:controller=>"Test", :id =>"456", :bar =>"123", :action=>"foo"}, routes.route_request("/foo/123/baz/456"))
-    routes = Merb::RouteMatcher.new
-    assert_same_hash({:controller=>"upload", :id=>"12", :action=>"test"},routes.route_request( "/upload/test/12"))
-    routes = Merb::RouteMatcher.new
-    assert_same_hash({:controller=>"upload", :id=>nil, :action=>"index"},routes.route_request( "/upload"))
-    routes = Merb::RouteMatcher.new
-    assert_same_hash({:controller=>"nik",  :action=>"nak", :id => nil},routes.route_request( "/nik/nak"))
-    routes = Merb::RouteMatcher.new
-    assert_same_hash({:controller=>"lots",  :action=>"of", :id => "12"},routes.route_request( "/lots/of/12"))
-  end  
-  
-  def test_catch_all_glob_route
-    routes = Merb::RouteMatcher.new
-    assert_same_hash({:controller=>"Test",  :action=>"glob", :rest => "hey/you/guys"},routes.route_request( "/bar/hey/you/guys"))
-  end  
-
-end