trellis 0.0.5 → 0.0.6

data/History.txt

@@ -1,3 +1,9 @@
+== 0.0.6
+* 2 major enhancement:
+  * added dup.call for thread safety
+  * added ability to select Rack::Session middleware implementation 
+    between cookie, pool and memcached
+
 == 0.0.5
 * 2 major enhancements:
   * template can now use erb (erubis using Processing Instructions (PI))

data/Manifest.txt

@@ -84,6 +84,7 @@ examples/hilo/html/guess.xhtml
 examples/hilo/html/start.xhtml
 examples/hilo/source/hilo.rb
 examples/routing/source/routing.rb
+examples/sessions/source/sessions.rb
 examples/simplest/source/simplest.rb
 examples/stateful_counters/html/counters.xhtml
 examples/stateful_counters/html/style/main.css

data/examples/sessions/source/sessions.rb

@@ -0,0 +1,42 @@
+require 'rubygems'
+require 'trellis'
+
+include Trellis
+
+module Sessions
+  
+  class Sessions < Application
+    home :start
+    
+    session :pool, { :key => 'rack.session', :path => '/', :expire_after => 2592000 }
+  end
+  
+  class Start < Page 
+    persistent :results 
+    
+    def on_select
+      logger.info "processing on_select"
+      @results = rand(9)
+      self
+    end
+    
+    template do # using Markaby
+      xhtml_strict { 
+        head { title "Simplest Trellis Application" }
+        body { 
+          h1 "Persistent Fields via Session" 
+          p "This application uses Rack::Session::Pool for in-memory, cookie backed HTTP sessions"
+          p {
+            text "The value is: "
+            text %[<trellis:value name="results">${results}.</trellis:value>]
+          }
+          p {
+            text %[[<trellis:action_link>Click Me</trellis:action_link>]]
+          }
+        }
+      } 
+    end
+  end
+  
+  Sessions.new.start 3012 if __FILE__ == $PROGRAM_NAME
+end

data/lib/trellis/trellis.rb

@@ -40,6 +40,7 @@ require 'bluecloth'
 require 'facets'
 require 'directory_watcher'
 require 'erubis'
+require 'ostruct'
 
 module Trellis
 
@@ -54,8 +55,10 @@ module Trellis
     # holding homepage, dependent pages, static resource routing paths
     def self.inherited(child) #:nodoc:
       child.class_attr_reader(:homepage)
+      child.class_attr_reader(:session_config)
       child.attr_array(:static_routes)
       child.meta_def(:logger) { Application.logger }
+      child.instance_variable_set(:@session_config, OpenStruct.new({:impl => :cookie}))
       super
     end
 
@@ -63,6 +66,10 @@ module Trellis
     # the entry point is the URL pattern / where the application is mounted
     def self.home(sym)
       @homepage = sym   
+    end
+    
+    def self.session(sym, options={})
+      @session_config = OpenStruct.new({:impl => sym, :options => options}) 
     end 
     
     # define url paths for static resources
@@ -77,7 +84,7 @@ module Trellis
       directory_watcher = configure_directory_watcher
       directory_watcher.start
 
-      Rack::Handler::Mongrel.run configured_instance, :Port => port do |server|
+      Rack::Handler::Mongrel.run configured, :Port => port do |server|
         trap(:INT) do
           Application.logger.info "Exiting Trellis Application #{self.class}"
           directory_watcher.stop
@@ -88,13 +95,23 @@ module Trellis
       Application.logger.warn "#{ e } (#{ e.class })!"
     end
     
-    def configured_instance
+    def configured
       # configure rack middleware
       application = Rack::ShowStatus.new(self)
       application = Rack::ShowExceptions.new(application)
       application = Rack::Reloader.new(application)
       application = Rack::CommonLogger.new(application, Application.logger)
-      application = Rack::Session::Cookie.new(application)
+      
+      # configure rack session
+      session_config = self.class.session_config
+      case session_config.impl
+      when :pool
+        application = Rack::Session::Pool.new(application, session_config.options)
+      when :memcached
+        application = Rack::Session::Memcache.new(application, session_config.options)
+      else
+        application = Rack::Session::Cookie.new(application)
+      end
 
       # set all static resource paths
       self.class.static_routes.each do |path|
@@ -109,8 +126,13 @@ module Trellis
       match ? match.router : DefaultRouter.new(:application => self)
     end
     
-    # implements the rack specification
+    # Rack call interface.
     def call(env)
+      dup.call!(env)
+    end
+    
+    # implements the rack specification
+    def call!(env)
       response = Rack::Response.new
       request = Rack::Request.new(env)
 
@@ -654,7 +676,6 @@ module Trellis
       unless @page.class.format == :eruby
         @parser.parse(@page.class.parsed_template.to_html)
       else
-        puts "eruby context is #{@eruby_context}"
         preprocessed = Erubis::PI::Eruby.new(@page.class.parsed_template.to_html, :trim => false).evaluate(@eruby_context)
         @parser.parse(preprocessed)
       end

data/lib/trellis/version.rb

@@ -28,7 +28,7 @@ module Trellis
   module VERSION #:nodoc:
     MAJOR = 0
     MINOR = 0
-    TINY  = 5
+    TINY  = 6
 
     STRING = [MAJOR, MINOR, TINY].join('.')
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: trellis
 version: !ruby/object:Gem::Version 
-  version: 0.0.5
+  version: 0.0.6
 platform: ruby
 authors: 
 - Brian Sam-Bodden
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-11-08 00:00:00 -07:00
+date: 2009-11-09 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -313,6 +313,7 @@ files:
 - examples/hilo/html/start.xhtml
 - examples/hilo/source/hilo.rb
 - examples/routing/source/routing.rb
+- examples/sessions/source/sessions.rb
 - examples/simplest/source/simplest.rb
 - examples/stateful_counters/html/counters.xhtml
 - examples/stateful_counters/html/style/main.css