nitro 0.28.0 → 0.29.0

data/lib/nitro/server.rb

@@ -77,7 +77,7 @@ class Server
   
   def dispatcher
     unless @dispatcher
-      @dispatcher = Dispatcher.new(self.map)
+      @dispatcher = Dispatcher.new(@map)
     end
     @dispatcher
   end
@@ -87,6 +87,17 @@ class Server
   def start(options = {})    
     @map['/'] = options[:controller] if options[:controller]
     @dispatcher = options[:dispatcher] || Dispatcher.new(@map)
+
+    # Create the actual store. Copy values already inserted
+    # in the temporary cache.
+    #--
+    # FIXME: cleanup this code
+    #++
+    
+    temp = $global
+    $global = $application = Context.global_cache_class.new
+    $global.update(temp)
+
     return self
   end
 

data/lib/nitro/server/runner.rb

@@ -124,6 +124,14 @@ class Runner
         self.class.mode = :live
       end
 
+      opts.on('--address IP', 'Force the server to run on this address.') do |a|
+        @server_address = a
+      end
+
+      opts.on('--port PORT', 'Force the server to run on this port.') do |p|
+        @server_port = p.to_i
+      end
+
       opts.on('-w', '--webrick', 'Use a webrick server [default].') do
         @server = :webrick
       end
@@ -293,6 +301,10 @@ class Runner
   def invoke_server(server)
     spider_thread = nil
     
+    # FIXME refactor !
+    server.address = @server_address if @server_address
+    server.port = @server_port if @server_port
+    
     case @action
     when :start
       

data/lib/nitro/session.rb

@@ -7,7 +7,6 @@ require 'facet/times'
 require 'glue'
 require 'glue/attribute'
 require 'glue/configuration'
-require 'glue/logger'
 require 'glue/expirable'
 
 require 'nitro/cgi/cookie'
@@ -31,7 +30,7 @@ module Nitro
 #++
 
 class Session < Hash
-  include Expirable
+  include Glue::Expirable
 
   # Session id salt.
 
@@ -50,14 +49,6 @@ class Session < Hash
   
   setting :keepalive, :default => 30.minutes, :doc => 'The session keepalive time'
 
-  # The address of the Session cache / store (if distibuted).
-
-  setting :cache_address, :default => '127.0.0.1', :doc => 'The address of the Session cache'
-  
-  # The port of the Session DRb cache / store (if distributed).
-
-  setting :cache_port, :default => 9069, :doc => 'The port of the Session cache'
-
   # The sessions cache (store). 
 
   cattr_accessor :cache
@@ -70,8 +61,8 @@ class Session < Hash
     # * :memory [default]
     # * :drb
     # * :og 
-    # * :file (not safe yet with multiple process as in fastcgi)
-    # * :memcached (not available yet)
+    # * :file
+    # * :memcached
 
     def cache_type=(cache_type)
       # gmosx: RDoc friendly. 

data/lib/nitro/session/drb.rb

@@ -3,12 +3,9 @@ require 'nitro/session'
 
 module Nitro
 
-Logger.debug "Using DRb sessions at #{Session.cache_address}:#{Session.cache_port}."
+Logger.debug "Using DRb sessions at #{Glue::DrbCache.address}:#{Glue::DrbCache.port}." if defined?(Logger)
 
-Session.cache = DrbCache.new(
-  :address => Session.cache_address, 
-  :port => Session.cache_port
-)
+Session.cache = Glue::DrbCache.new
 
 end
 

data/lib/nitro/session/file.rb

@@ -5,9 +5,9 @@ module Nitro
   
 # A Session manager that persists sessions on disk.
 
-Logger.debug "Using File sessions."
+Logger.debug "Using File sessions." if defined?(Logger)
 
-Session.cache = FileCache.new("session_#{Session.cookie_name}", Session.keepalive)
+Session.cache = Glue::FileCache.new("session_#{Session.cookie_name}", Session.keepalive)
 
 end
 

data/lib/nitro/session/memcached.rb

@@ -0,0 +1,14 @@
+require 'glue/cache/memcached'
+require 'nitro/session'
+
+module Nitro
+  
+# A Session manager that persists sessions on disk.
+
+Logger.debug "Using MemCached sessions." if defined?(Logger)
+
+Session.cache = Glue::MemCached.new("session_#{Session.cookie_name}", Session.keepalive)
+
+end
+
+# * Guillaume Pierronnet <guillaume.pierronnet@gmail.com>

data/lib/nitro/session/memory.rb

@@ -1,36 +1,13 @@
 require 'glue/cache/memory'
 require 'nitro/session'
+require 'glue/logger'
 
 module Nitro
 
-Logger.debug "Using Memory sessions."
+Logger.debug "Using Memory sessions." if defined?(Logger)
 
-Session.cache = MemoryCache.new
+Session.cache = Glue::MemoryCache.new
 
 end
 
 # * George Moschovitis  <gm@navel.gr>
-
-=begin
-
-module Nitro
-
-  class MemorySessionStore < SyncHash
-
-    # Perform session garbage collection. Typically this method
-    # is called from a cron like mechanism (for example using
-    # script/runner).
-    
-    def gc!
-      delete_if { |key, s| s.expired? }
-    end
-
-    alias :all :values
-  end
-
-  Session.store = MemorySessionStore.new
-
-end
-
-# * George Moschovitis  <gm@navel.gr>
-=end

data/lib/nitro/session/og.rb

@@ -5,7 +5,7 @@ module Nitro
 
 # A Session manager that persists sessions on an Og store.
 
-Logger.debug "Using Og sessions."
+Logger.debug "Using Og sessions." if defined?(Logger)
 
 Session.cache = OgCache.new("session_#{Session.cookie_name}", Session.keepalive)
 

data/lib/nitro/test/assertions.rb

@@ -137,7 +137,7 @@ module Test::Unit::Assertions
     assert_block(msg) { cookie.value == value }
   end
 
-  # :section: Template related assertions.
+  # :section: Glue::Template related assertions.
   
   # :section: Redirection assertions.
 

data/lib/nitro/test/context.rb

@@ -40,11 +40,17 @@ end
 # to include methods useful for testing.
 
 class Context
+  attr_writer :session, :cookies
+  
   def session
     @session || @session = {}
-  end  
+  end
+  
+  def cookies
+    @cookies || @cookies = {}
+  end
+     
 end
 
 end
-
 # * George Moschovitis  <gm@navel.gr>

data/lib/nitro/test/testcase.rb

@@ -10,8 +10,11 @@ module Test::Unit
 class TestCase
   include Nitro
 
-  def controller(klass)
-    @server = Server.run(klass)
+  def reset_context
+    @context_config = OpenStruct.new(
+      :dispatcher => Nitro::Dispatcher.new(Nitro::Server.map)
+    )
+    @context = Nitro::Context.new(@context_config)
   end
 
   # Send a request to the controller. Alternatively you can use
@@ -29,17 +32,23 @@ class TestCase
     uri = options[:uri]
     uri = "/#{uri}" unless uri =~ /^\//
    
-    context = @context = Context.new(@server)
-
+    reset_context unless @context
+    context = @context
+    if @last_response_cookies
+      @last_response_cookies.each do |cookie|
+        context.cookies.merge! cookie.name => cookie.value
+      end
+    end
     context.params = options[:params] || {}
     context.headers = options[:headers] || options[:env] || {}
     context.headers['REQUEST_URI'] = uri
     context.headers['REQUEST_METHOD'] = options[:method].to_s.upcase
-    context.cookies = options[:cookies]
-    context.session = options[:session] if options[:session]
+    context.headers['REMOTE_ADDR'] ||= '127.0.0.1'
+    context.cookies.merge! options[:cookies] if options[:cookies]
+    context.session.merge! options[:session] if options[:session]
     
     context.render(context.path)
-    
+    @last_response_cookies = context.response_cookies
     return context.body
   end
 

data/proto/public/error.xhtml

@@ -1,5 +1,17 @@
 <html>
   <head>
+    <script lang="javascript" type="text/javascript">
+  // <!--
+    function toggleVisible(element) {
+      if (element.style.display == 'block') {
+        element.style.display = 'none';
+       } else {
+         element.style.display = 'block';
+       }
+       return false;      
+    }          
+    // -->
+    </script>
     <title>Error</title>
     <style>
       .path { 
@@ -38,27 +50,52 @@
     <?r  for error, path in @context.rendering_errors ?>
       <div class="path"><strong>Path:</strong> #{path}</div>
       <div class="error"><strong>#{CGI.escapeHTML(error.to_s)}</strong></div>
-      <div class="load">Click here to <strong><a href="#{request.uri}">reload</a></strong>.</div>
-      <div class="load">Click here to go to the <strong><a href="#{request.referer}">referer</a></strong> or the <strong><a href="/">home page</a></strong>.</div>
-      <?r if error.respond_to?(:source_extract) ?>
-        <div class="source">
-        <?r 
-          extract = error.source_extract.split("\n")
-          extract.each_with_index do |line, idx|
-            line = sanitize(line)
-            if 4 == idx
-        ?>
-            <div style="background: #eee">#{line}</div>
-        <?r  else ?>
-            <div>#{line}</div>
-        <?r  
-            end 
-          end
-        ?>
-        </div>
-      <?r end ?>
-      <h2><a href="#" onclick="document.getElementById('trace').style.display = 'block'; return false">Stack Trace</a></h2>
-      <p id="trace" style="display: none">#{error.backtrace.join('<br />')}</p>
+      <div class="load">
+        <strong><a href="#{request.uri}">Reload</a></strong> this page. 
+        Go to the <strong><a href="#{request.referer}">referer</a></strong> or the <strong><a href="/">home page</a></strong>.
+      </div>
+      <div class="source">
+      <?r 
+        extract = error.source_extract.split("\n")
+      ?>
+      In file <b>'#{error.hot_file}'</b> #{error.hot_file =~ /\.xhtml$/ ? '(line numbering is aproximate due to template transformation)' : nil}:
+      <br /><br />
+      <?r
+        extract.each_with_index do |line, idx|
+          line = sanitize(line)
+          if 5 == idx
+      ?>
+          <div style="background: #eee">#{line}</div>
+      <?r  else ?>
+          <div>#{line}</div>
+      <?r  
+          end 
+        end
+      ?>
+      </div>
+      <h2><a href="#" onclick="return toggleVisible(document.getElementById('trace'));">Stack Trace</a></h2>
+      <div id="trace" style="display: none;">
+        <?r error.backtrace.zip(error.source_for_backtrace).each_with_index do |step,step_idx| ?>
+      <div><a href="#" onclick="return toggleVisible(document.getElementById('trace_#{step_idx}'));">#{sanitize(step.first)}</a></div>
+      <div class="source" id="trace_#{step_idx}" style="display: none;">
+      <?r 
+        extract = step.last.split("\n")      
+        extract.each_with_index do |line, idx|
+          line = sanitize(line)
+          if 5 == idx
+      ?>
+          <div style="background: #eee">#{line}</div>
+      <?r  else ?>
+          <div>#{line}</div>
+      <?r  
+          end 
+        end
+      ?>
+      </div>
+
+        
+        <?r end ?>
+      </div>
     <?r end ?>
 
     <h2><a href="#" onclick="document.getElementById('request').style.display = 'block'; return false">Request</a></h2>

data/proto/public/js/controls.js

@@ -152,6 +152,12 @@ Autocompleter.Base.prototype = {
         setTimeout(this.onObserverEvent.bind(this), this.options.frequency*1000);
   },
 
+  activate: function() {
+    this.changed = false;
+    this.hasFocus = true;
+    this.getUpdatedChoices();
+  },
+
   onHover: function(event) {
     var element = Event.findElement(event, 'LI');
     if(this.index != element.autocompleteIndex) 
@@ -477,9 +483,10 @@ Ajax.InPlaceEditor.prototype = {
       formClassName: 'inplaceeditor-form',
       highlightcolor: Ajax.InPlaceEditor.defaultHighlightColor,
       highlightendcolor: "#FFFFFF",
-      externalControl:  null,
+      externalControl: null,
       submitOnBlur: false,
-      ajaxOptions: {}
+      ajaxOptions: {},
+      evalScripts: false
     }, options || {});
 
     if(!this.options.formId && this.element.id) {
@@ -548,6 +555,7 @@ Ajax.InPlaceEditor.prototype = {
       okButton = document.createElement("input");
       okButton.type = "submit";
       okButton.value = this.options.okText;
+      okButton.className = 'editor_ok_button';
       this.form.appendChild(okButton);
     }
 
@@ -556,6 +564,7 @@ Ajax.InPlaceEditor.prototype = {
       cancelLink.href = "#";
       cancelLink.appendChild(document.createTextNode(this.options.cancelText));
       cancelLink.onclick = this.onclickCancel.bind(this);
+      cancelLink.className = 'editor_cancel';      
       this.form.appendChild(cancelLink);
     }
   },
@@ -584,6 +593,7 @@ Ajax.InPlaceEditor.prototype = {
       textField.name = "value";
       textField.value = text;
       textField.style.backgroundColor = this.options.highlightcolor;
+      textField.className = 'editor_field';
       var size = this.options.size || this.options.cols || 0;
       if (size != 0) textField.size = size;
       if (this.options.submitOnBlur)
@@ -597,6 +607,7 @@ Ajax.InPlaceEditor.prototype = {
       textArea.value = this.convertHTMLLineBreaks(text);
       textArea.rows = this.options.rows;
       textArea.cols = this.options.cols || 40;
+      textArea.className = 'editor_field';      
       if (this.options.submitOnBlur)
         textArea.onblur = this.onSubmit.bind(this);
       this.editField = textArea;
@@ -649,19 +660,26 @@ Ajax.InPlaceEditor.prototype = {
     // to be displayed indefinitely
     this.onLoading();
     
-    new Ajax.Updater(
-      { 
-        success: this.element,
-         // don't update on failure (this could be an option)
-        failure: null
-      },
-      this.url,
-      Object.extend({
-        parameters: this.options.callback(form, value),
-        onComplete: this.onComplete.bind(this),
-        onFailure: this.onFailure.bind(this)
-      }, this.options.ajaxOptions)
-    );
+    if (this.options.evalScripts) {
+      new Ajax.Request(
+        this.url, Object.extend({
+          parameters: this.options.callback(form, value),
+          onComplete: this.onComplete.bind(this),
+          onFailure: this.onFailure.bind(this),
+          asynchronous:true, 
+          evalScripts:true
+        }, this.options.ajaxOptions));
+    } else  {
+      new Ajax.Updater(
+        { success: this.element,
+          // don't update on failure (this could be an option)
+          failure: null }, 
+        this.url, Object.extend({
+          parameters: this.options.callback(form, value),
+          onComplete: this.onComplete.bind(this),
+          onFailure: this.onFailure.bind(this)
+        }, this.options.ajaxOptions));
+    }
     // stop the event to avoid a page refresh in Safari
     if (arguments.length > 1) {
       Event.stop(arguments[0]);
@@ -743,6 +761,33 @@ Ajax.InPlaceEditor.prototype = {
   }
 };
 
+Ajax.InPlaceCollectionEditor = Class.create();
+Object.extend(Ajax.InPlaceCollectionEditor.prototype, Ajax.InPlaceEditor.prototype);
+Object.extend(Ajax.InPlaceCollectionEditor.prototype, {
+  createEditField: function() {
+    if (!this.cached_selectTag) {
+      var selectTag = document.createElement("select");
+      var collection = this.options.collection || [];
+      var optionTag;
+      collection.each(function(e,i) {
+        optionTag = document.createElement("option");
+        optionTag.value = (e instanceof Array) ? e[0] : e;
+        if(this.options.value==optionTag.value) optionTag.selected = true;
+        optionTag.appendChild(document.createTextNode((e instanceof Array) ? e[1] : e));
+        selectTag.appendChild(optionTag);
+      }.bind(this));
+      this.cached_selectTag = selectTag;
+    }
+
+    this.editField = this.cached_selectTag;
+    if(this.options.loadTextURL) this.loadExternalText();
+    this.form.appendChild(this.editField);
+    this.options.callback = function(form, value) {
+      return "value=" + encodeURIComponent(value);
+    }
+  }
+});
+
 // Delayed observer, like Form.Element.Observer, 
 // but waits for delay after last key input
 // Ideal for live-search fields