nitro 0.23.0 → 0.24.0

data/lib/nitro/scaffold.rb

@@ -6,7 +6,6 @@ require 'nitro/mixin/form'
 module Nitro
 
 # The scaffolder adds default actions to a Controller.
-#
 #--
 # FIXME: handle controller base in generated routes.
 # FIXME: better handle templates (check if action exists).
@@ -108,7 +107,13 @@ module Scaffolding
         template.gsub!(/%list_name%/, "#{list_name}")
       end
 =end
-      unless compiler.template_for_action(list_name, self.template_root)
+      unless compiler.template_for_action(list_name, self.template_root) or
+      #--
+      # FIXME: this is a hack fix. to better fix, implemente deferred scaffolding.
+      #++
+          compiler.template_for_action(list_name, 'public') or 
+          compiler.template_for_action(list_name, 'src/template') or
+          compiler.template_for_action(list_name, 'src/view')
         source = File.read(File.join(Nitro.proto_path, 'public', 'scaffold', 'list.xhtml'))
         template = Compiler.new.transform_template(source)
         
@@ -129,9 +134,10 @@ module Scaffolding
         
         def save#{suffix}
           if oid = request['#{oid}']
-            obj = request.fill(#{klass}[oid])
+            oid = oid.to_s # in case oid is a StringIO (multipart).
+            obj = request.fill(#{klass}[oid], :assign_relations => true, :force_boolean => true)
           else
-            obj = request.fill(#{klass}.new)
+            obj = request.fill(#{klass}.new, :assign_relations => true)
           end
           unless obj.valid?
             session[:ERRORS] = obj.errors
@@ -153,8 +159,6 @@ module Scaffolding
         }
       end
 
-#      puts '--', klass, '..', code
-    
       class_eval(code)
     end
 
@@ -163,3 +167,5 @@ module Scaffolding
 end
 
 end
+
+# * George Moschovitis <gm@navel.gr>

data/lib/nitro/server.rb

@@ -6,11 +6,8 @@ module Nitro
 class Server
 
   # The server listening address. 
-  #--
-  # 0.0.0.0 may be a better default?
-  #++
 
-  setting :address, :default => '127.0.0.1', :doc => 'The server listening address'
+  setting :address, :default => '0.0.0.0', :doc => 'The server listening address'
 
   # The server listening port.
 
@@ -18,7 +15,7 @@ class Server
 
   # The map.
   
-  setting :map, :default => { '/' => SimpleController }, :doc => 'The server map'
+  setting :map, :default => { '/' => Controller }, :doc => 'The server map'
 
   # The public files root directory.
   
@@ -89,7 +86,8 @@ class Server
   
   def start(options = {})    
     @map['/'] = options[:controller] if options[:controller]
-    @dispatcher = options[:dispatche] || Dispatcher.new(@map)
+    @dispatcher = options[:dispatcher] || Dispatcher.new(@map)
+    return self
   end
 
   def root=(controller)

data/lib/nitro/server/runner.rb

@@ -239,7 +239,7 @@ class Runner
       
     elsif 'cgi_proc' == ENV['NITRO_INVOKE']
       require 'nitro/adapter/cgi'
-      Cgi.start(server)
+      CgiAdapter.start(server)
       
     elsif 'irb' == ENV['NITRO_INVOKE']
       $server = server
@@ -283,7 +283,7 @@ class Runner
 
         when :lhttpd
           require 'nitro/adapter/fastcgi'
-          `lighttpd -f conf/lhttpd.conf`
+          `lighttpd -f conf/lhttpd_fcgi.conf`
 
         when :lhttpd_scgi
           require 'nitro/adapter/scgi'

data/lib/nitro/session.rb

@@ -7,7 +7,7 @@ require 'mega/time_in_english'
 require 'glue/attribute'
 require 'glue/configuration'
 
-require 'nitro/cookie'
+require 'nitro/cgi/cookie'
 
 module Nitro
   
@@ -92,6 +92,13 @@ class Session < Hash
       Session.store.delete_if { |key, s| s.invalid? }
     end
     alias_method :gc!, :garbage_collection!
+    
+    # Helper method that returns all sessions.
+    
+    def all
+      Session.store.values
+    end
+    
   end
   
   # The unique id of this session.

data/lib/nitro/session/file.rb

@@ -0,0 +1,40 @@
+#!/usr/bin/env ruby
+
+require 'nitro/session'
+
+module Nitro
+  class FileSessionStore
+    # The session keepalive time. The session is eligable for
+    # garbage collection after this time passes.
+  
+    setting :path, :default => "/tmp/nitro_session", :doc => 'The directory to store file session'
+
+    def initialize
+      @path = FileSessionStore.path
+      Dir.mkdir(@path) unless File.exists?(@path)
+    end
+
+    def []=(k,v)
+      File.open(File.join(@path, k), "w") { |f| f.write(Marshal.dump(v)) }
+    end
+
+    def [](k)
+      fn = File.join(@path, k)
+      return nil unless File.exists?(fn)
+      Marshal.load( File.read(fn) )
+    end
+
+#    def values
+#      []
+#    end
+#
+#    def each
+#      #yield
+#    end
+
+  end
+
+  Session.store = FileSessionStore.new
+end
+
+# * Guillaume Pierronnet <guillaume.pierronnet@gmail.com>

data/lib/part/admin.rb

@@ -1,3 +1,5 @@
+require 'nano/time/stamp'
+
 require 'nitro/server'
 
 require 'part/admin/controller'

data/lib/part/admin/controller.rb

@@ -1,9 +1,13 @@
 require 'nitro/controller'
+require 'nitro/mixin/form'
 
 class AdminController < Nitro::Controller
-
-  @template_root = File.join(File.dirname(__FILE__), 'template')
+  include Nitro::FormMixin
   
+  def self.template_root
+    File.join(File.dirname(__FILE__), 'template')  
+  end
+
   def index
     @classes = self.class.managed_classes
   end
@@ -15,7 +19,7 @@ class AdminController < Nitro::Controller
   
     # Called when this controller is mounted.
        
-    def mounted
+    def mounted(path)
       @managed_classes = Og.manager.manageable_classes
       @managed_classes.each { |c| scaffold(c) }
     end

data/lib/part/admin/skin.rb

@@ -8,13 +8,20 @@ class SystemPage < Nitro::Element
         <title>#@name</title>
         <base href="\#{context.host_url}/" />    
         <link rel="stylesheet" href="/system.css" type="text/css" media="screen" />    
+        <script src="/js/behaviour.js" type="text/javascript"> </script>
+        <script src="/js/prototype.js" type="text/javascript"> </script>
+        <script src="/js/effects.js" type="text/javascript"> </script>
+        <script src="/js/dragdrop.js" type="text/javascript"> </script>
+        <script src="/js/controls.js" type="text/javascript"> </script>
+        <script src="/js/scaffold.js" type="text/javascript"> </script>
       </head>
       <body>
-        <h1>#@name</h1>
+        <h1><a href="/">Home</a> / #@name</h1>
         #{content}
         <br />
         Powered by <a href="http://www.nitrohq.com">Nitro</a> version #{Nitro::Version}
       </body>
+      <script type="text/javascript" src="js/scaffold.js" />
     </html>
     ~
   end

data/lib/part/admin/template/index.xhtml

@@ -1,9 +1,47 @@
 <SystemPage name="System">
+
+  <style>
+    th {
+      border: 1px solid #ccc;
+      background: #eee;
+      text-align: left;
+    }
+  </style>
+  
+  <h2>Og managed classes</h2>
+  
   <table>
+    <tr>
+      <th>Class</th>
+      <th>Count</th>
+      <th>Properties</th>
+    </tr>
   <?r for c in @classes ?>
     <tr>
-      <td><a href="#@base/#{c.name.plural.underscore}">#{c.name}</a> (#{c.count})</td>
+      <td><a href="#@base/#{c.name.plural.underscore}">#{c.name}</a></td>
+      <td>#{c.count}</td>
+      <td width="100%">#{c.properties.values.join(', ')}</td>
+    </tr>
+  <?r end ?>
+  </table>
+  
+  <h2>System configuration</h2>
+  
+  <table width="100%">
+    <tr>
+      <th>Name</th>
+      <th>Value</th>
+      <th>Type</th>
+      <th>Description</th>
+    </tr>
+  <?r  for s in Configuration.settings ?>
+    <tr>
+      <td>#{s.owner}.<strong>#{s.name}</strong></td>
+      <td>#{s.value.inspect}</td>
+      <td>#{s.type}</td>
+      <td>#{s.options[:doc]}</td>
     </tr>
   <?r end ?>
   </table>
+  
 </SystemPage>

data/proto/public/error.xhtml

@@ -31,11 +31,13 @@
   <body>
     <h1>Error</h1>
 
-<?r if Run.mode == :debug ?>
-
+<?r 
+    if Run.mode == :debug 
+    require 'cgi'
+?>
     <?r  for error, path in @context.rendering_errors ?>
       <div class="path"><strong>Path:</strong> #{path}</div>
-      <div class="error"><strong>#{error.to_s}</strong></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) ?>

data/proto/public/js/behaviour.js

@@ -1,254 +1,254 @@
-/*
-   Behaviour v1.0 by Ben Nolan, June 2005. Based largely on the work
-   of Simon Willison (see comments by Simon below).
-
-   Description:
-     
-     Uses css selectors to apply javascript behaviours to enable
-     unobtrusive javascript in html documents.
-     
-   Usage:   
-   
-  var myrules = {
-    'b.someclass' : function(element){
-      element.onclick = function(){
-        alert(this.innerHTML);
-      }
-    },
-    '#someid u' : function(element){
-      element.onmouseover = function(){
-        this.innerHTML = "BLAH!";
-      }
-    }
-  );
-  
-  Behaviour.register(myrules);
-  
-  // Call Behaviour.apply() to re-apply the rules (if you
-  // update the dom, etc).
-
-   License:
-   
-     My stuff is BSD licensed. Not sure about Simon's.
-     
-   More information:
-     
-     http://ripcord.co.nz/behaviour/
-   
-*/   
-
-var Behaviour = {
-  list : new Array,
-  
-  register : function(sheet){
-    Behaviour.list.push(sheet);
-  },
-  
-  start : function(){
-    Behaviour.addLoadEvent(function(){
-      Behaviour.apply();
-    });
-  },
-  
-  apply : function(){
-    for (h=0;sheet=Behaviour.list[h];h++){
-      for (selector in sheet){
-        list = document.getElementsBySelector(selector);
-        
-        if (!list){
-          continue;
-        }
-
-        for (i=0;element=list[i];i++){
-          sheet[selector](element);
-        }
-      }
-    }
-  },
-  
-  addLoadEvent : function(func){
-    var oldonload = window.onload;
-    
-    if (typeof window.onload != 'function') {
-      window.onload = func;
-    } else {
-      window.onload = function() {
-        oldonload();
-        func();
-      }
-    }
-  }
-}
-
-Behaviour.start();
-
-/*
-   The following code is Copyright (C) Simon Willison 2004.
-
-   document.getElementsBySelector(selector)
-   - returns an array of element objects from the current document
-     matching the CSS selector. Selectors can contain element names, 
-     class names and ids and can be nested. For example:
-     
-       elements = document.getElementsBySelect('div#main p a.external')
-     
-     Will return an array of all 'a' elements with 'external' in their 
-     class attribute that are contained inside 'p' elements that are 
-     contained inside the 'div' element which has id="main"
-
-   New in version 0.4: Support for CSS2 and CSS3 attribute selectors:
-   See http://www.w3.org/TR/css3-selectors/#attribute-selectors
-
-   Version 0.4 - Simon Willison, March 25th 2003
-   -- Works in Phoenix 0.5, Mozilla 1.3, Opera 7, Internet Explorer 6, Internet Explorer 5 on Windows
-   -- Opera 7 fails 
-*/
-
-function getAllChildren(e) {
-  // Returns all children of element. Workaround required for IE5/Windows. Ugh.
-  return e.all ? e.all : e.getElementsByTagName('*');
-}
-
-document.getElementsBySelector = function(selector) {
-  // Attempt to fail gracefully in lesser browsers
-  if (!document.getElementsByTagName) {
-    return new Array();
-  }
-  // Split selector in to tokens
-  var tokens = selector.split(' ');
-  var currentContext = new Array(document);
-  for (var i = 0; i < tokens.length; i++) {
-    token = tokens[i].replace(/^\s+/,'').replace(/\s+$/,'');;
-    if (token.indexOf('#') > -1) {
-      // Token is an ID selector
-      var bits = token.split('#');
-      var tagName = bits[0];
-      var id = bits[1];
-      var element = document.getElementById(id);
-      if (tagName && element.nodeName.toLowerCase() != tagName) {
-        // tag with that ID not found, return false
-        return new Array();
-      }
-      // Set currentContext to contain just this element
-      currentContext = new Array(element);
-      continue; // Skip to next token
-    }
-    if (token.indexOf('.') > -1) {
-      // Token contains a class selector
-      var bits = token.split('.');
-      var tagName = bits[0];
-      var className = bits[1];
-      if (!tagName) {
-        tagName = '*';
-      }
-      // Get elements matching tag, filter them for class selector
-      var found = new Array;
-      var foundCount = 0;
-      for (var h = 0; h < currentContext.length; h++) {
-        var elements;
-        if (tagName == '*') {
-            elements = getAllChildren(currentContext[h]);
-        } else {
-            elements = currentContext[h].getElementsByTagName(tagName);
-        }
-        for (var j = 0; j < elements.length; j++) {
-          found[foundCount++] = elements[j];
-        }
-      }
-      currentContext = new Array;
-      var currentContextIndex = 0;
-      for (var k = 0; k < found.length; k++) {
-        if (found[k].className && found[k].className.match(new RegExp('\\b'+className+'\\b'))) {
-          currentContext[currentContextIndex++] = found[k];
-        }
-      }
-      continue; // Skip to next token
-    }
-    // Code to deal with attribute selectors
-    if (token.match(/^(\w*)\[(\w+)([=~\|\^\$\*]?)=?"?([^\]"]*)"?\]$/)) {
-      var tagName = RegExp.$1;
-      var attrName = RegExp.$2;
-      var attrOperator = RegExp.$3;
-      var attrValue = RegExp.$4;
-      if (!tagName) {
-        tagName = '*';
-      }
-      // Grab all of the tagName elements within current context
-      var found = new Array;
-      var foundCount = 0;
-      for (var h = 0; h < currentContext.length; h++) {
-        var elements;
-        if (tagName == '*') {
-            elements = getAllChildren(currentContext[h]);
-        } else {
-            elements = currentContext[h].getElementsByTagName(tagName);
-        }
-        for (var j = 0; j < elements.length; j++) {
-          found[foundCount++] = elements[j];
-        }
-      }
-      currentContext = new Array;
-      var currentContextIndex = 0;
-      var checkFunction; // This function will be used to filter the elements
-      switch (attrOperator) {
-        case '=': // Equality
-          checkFunction = function(e) { return (e.getAttribute(attrName) == attrValue); };
-          break;
-        case '~': // Match one of space seperated words 
-          checkFunction = function(e) { return (e.getAttribute(attrName).match(new RegExp('\\b'+attrValue+'\\b'))); };
-          break;
-        case '|': // Match start with value followed by optional hyphen
-          checkFunction = function(e) { return (e.getAttribute(attrName).match(new RegExp('^'+attrValue+'-?'))); };
-          break;
-        case '^': // Match starts with value
-          checkFunction = function(e) { return (e.getAttribute(attrName).indexOf(attrValue) == 0); };
-          break;
-        case '$': // Match ends with value - fails with "Warning" in Opera 7
-          checkFunction = function(e) { return (e.getAttribute(attrName).lastIndexOf(attrValue) == e.getAttribute(attrName).length - attrValue.length); };
-          break;
-        case '*': // Match ends with value
-          checkFunction = function(e) { return (e.getAttribute(attrName).indexOf(attrValue) > -1); };
-          break;
-        default :
-          // Just test for existence of attribute
-          checkFunction = function(e) { return e.getAttribute(attrName); };
-      }
-      currentContext = new Array;
-      var currentContextIndex = 0;
-      for (var k = 0; k < found.length; k++) {
-        if (checkFunction(found[k])) {
-          currentContext[currentContextIndex++] = found[k];
-        }
-      }
-      // alert('Attribute Selector: '+tagName+' '+attrName+' '+attrOperator+' '+attrValue);
-      continue; // Skip to next token
-    }
-    
-    if (!currentContext[0]){
-      return;
-    }
-    
-    // If we get here, token is JUST an element (not a class or ID selector)
-    tagName = token;
-    var found = new Array;
-    var foundCount = 0;
-    for (var h = 0; h < currentContext.length; h++) {
-      var elements = currentContext[h].getElementsByTagName(tagName);
-      for (var j = 0; j < elements.length; j++) {
-        found[foundCount++] = elements[j];
-      }
-    }
-    currentContext = found;
-  }
-  return currentContext;
-}
-
-/* That revolting regular expression explained 
-/^(\w+)\[(\w+)([=~\|\^\$\*]?)=?"?([^\]"]*)"?\]$/
-  \---/  \---/\-------------/    \-------/
-    |      |         |               |
-    |      |         |           The value
-    |      |    ~,|,^,$,* or =
-    |   Attribute 
-   Tag
-*/
+/*
+   Behaviour v1.0 by Ben Nolan, June 2005. Based largely on the work
+   of Simon Willison (see comments by Simon below).
+
+   Description:
+     
+     Uses css selectors to apply javascript behaviours to enable
+     unobtrusive javascript in html documents.
+     
+   Usage:   
+   
+  var myrules = {
+    'b.someclass' : function(element){
+      element.onclick = function(){
+        alert(this.innerHTML);
+      }
+    },
+    '#someid u' : function(element){
+      element.onmouseover = function(){
+        this.innerHTML = "BLAH!";
+      }
+    }
+  );
+  
+  Behaviour.register(myrules);
+  
+  // Call Behaviour.apply() to re-apply the rules (if you
+  // update the dom, etc).
+
+   License:
+   
+     My stuff is BSD licensed. Not sure about Simon's.
+     
+   More information:
+     
+     http://ripcord.co.nz/behaviour/
+   
+*/   
+
+var Behaviour = {
+  list : new Array,
+  
+  register : function(sheet){
+    Behaviour.list.push(sheet);
+  },
+  
+  start : function(){
+    Behaviour.addLoadEvent(function(){
+      Behaviour.apply();
+    });
+  },
+  
+  apply : function(){
+    for (h=0;sheet=Behaviour.list[h];h++){
+      for (selector in sheet){
+        list = document.getElementsBySelector(selector);
+        
+        if (!list){
+          continue;
+        }
+
+        for (i=0;element=list[i];i++){
+          sheet[selector](element);
+        }
+      }
+    }
+  },
+  
+  addLoadEvent : function(func){
+    var oldonload = window.onload;
+    
+    if (typeof window.onload != 'function') {
+      window.onload = func;
+    } else {
+      window.onload = function() {
+        oldonload();
+        func();
+      }
+    }
+  }
+}
+
+Behaviour.start();
+
+/*
+   The following code is Copyright (C) Simon Willison 2004.
+
+   document.getElementsBySelector(selector)
+   - returns an array of element objects from the current document
+     matching the CSS selector. Selectors can contain element names, 
+     class names and ids and can be nested. For example:
+     
+       elements = document.getElementsBySelect('div#main p a.external')
+     
+     Will return an array of all 'a' elements with 'external' in their 
+     class attribute that are contained inside 'p' elements that are 
+     contained inside the 'div' element which has id="main"
+
+   New in version 0.4: Support for CSS2 and CSS3 attribute selectors:
+   See http://www.w3.org/TR/css3-selectors/#attribute-selectors
+
+   Version 0.4 - Simon Willison, March 25th 2003
+   -- Works in Phoenix 0.5, Mozilla 1.3, Opera 7, Internet Explorer 6, Internet Explorer 5 on Windows
+   -- Opera 7 fails 
+*/
+
+function getAllChildren(e) {
+  // Returns all children of element. Workaround required for IE5/Windows. Ugh.
+  return e.all ? e.all : e.getElementsByTagName('*');
+}
+
+document.getElementsBySelector = function(selector) {
+  // Attempt to fail gracefully in lesser browsers
+  if (!document.getElementsByTagName) {
+    return new Array();
+  }
+  // Split selector in to tokens
+  var tokens = selector.split(' ');
+  var currentContext = new Array(document);
+  for (var i = 0; i < tokens.length; i++) {
+    token = tokens[i].replace(/^\s+/,'').replace(/\s+$/,'');;
+    if (token.indexOf('#') > -1) {
+      // Token is an ID selector
+      var bits = token.split('#');
+      var tagName = bits[0];
+      var id = bits[1];
+      var element = document.getElementById(id);
+      if (tagName && element.nodeName.toLowerCase() != tagName) {
+        // tag with that ID not found, return false
+        return new Array();
+      }
+      // Set currentContext to contain just this element
+      currentContext = new Array(element);
+      continue; // Skip to next token
+    }
+    if (token.indexOf('.') > -1) {
+      // Token contains a class selector
+      var bits = token.split('.');
+      var tagName = bits[0];
+      var className = bits[1];
+      if (!tagName) {
+        tagName = '*';
+      }
+      // Get elements matching tag, filter them for class selector
+      var found = new Array;
+      var foundCount = 0;
+      for (var h = 0; h < currentContext.length; h++) {
+        var elements;
+        if (tagName == '*') {
+            elements = getAllChildren(currentContext[h]);
+        } else {
+            elements = currentContext[h].getElementsByTagName(tagName);
+        }
+        for (var j = 0; j < elements.length; j++) {
+          found[foundCount++] = elements[j];
+        }
+      }
+      currentContext = new Array;
+      var currentContextIndex = 0;
+      for (var k = 0; k < found.length; k++) {
+        if (found[k].className && found[k].className.match(new RegExp('\\b'+className+'\\b'))) {
+          currentContext[currentContextIndex++] = found[k];
+        }
+      }
+      continue; // Skip to next token
+    }
+    // Code to deal with attribute selectors
+    if (token.match(/^(\w*)\[(\w+)([=~\|\^\$\*]?)=?"?([^\]"]*)"?\]$/)) {
+      var tagName = RegExp.$1;
+      var attrName = RegExp.$2;
+      var attrOperator = RegExp.$3;
+      var attrValue = RegExp.$4;
+      if (!tagName) {
+        tagName = '*';
+      }
+      // Grab all of the tagName elements within current context
+      var found = new Array;
+      var foundCount = 0;
+      for (var h = 0; h < currentContext.length; h++) {
+        var elements;
+        if (tagName == '*') {
+            elements = getAllChildren(currentContext[h]);
+        } else {
+            elements = currentContext[h].getElementsByTagName(tagName);
+        }
+        for (var j = 0; j < elements.length; j++) {
+          found[foundCount++] = elements[j];
+        }
+      }
+      currentContext = new Array;
+      var currentContextIndex = 0;
+      var checkFunction; // This function will be used to filter the elements
+      switch (attrOperator) {
+        case '=': // Equality
+          checkFunction = function(e) { return (e.getAttribute(attrName) == attrValue); };
+          break;
+        case '~': // Match one of space seperated words 
+          checkFunction = function(e) { return (e.getAttribute(attrName).match(new RegExp('\\b'+attrValue+'\\b'))); };
+          break;
+        case '|': // Match start with value followed by optional hyphen
+          checkFunction = function(e) { return (e.getAttribute(attrName).match(new RegExp('^'+attrValue+'-?'))); };
+          break;
+        case '^': // Match starts with value
+          checkFunction = function(e) { return (e.getAttribute(attrName).indexOf(attrValue) == 0); };
+          break;
+        case '$': // Match ends with value - fails with "Warning" in Opera 7
+          checkFunction = function(e) { return (e.getAttribute(attrName).lastIndexOf(attrValue) == e.getAttribute(attrName).length - attrValue.length); };
+          break;
+        case '*': // Match ends with value
+          checkFunction = function(e) { return (e.getAttribute(attrName).indexOf(attrValue) > -1); };
+          break;
+        default :
+          // Just test for existence of attribute
+          checkFunction = function(e) { return e.getAttribute(attrName); };
+      }
+      currentContext = new Array;
+      var currentContextIndex = 0;
+      for (var k = 0; k < found.length; k++) {
+        if (checkFunction(found[k])) {
+          currentContext[currentContextIndex++] = found[k];
+        }
+      }
+      // alert('Attribute Selector: '+tagName+' '+attrName+' '+attrOperator+' '+attrValue);
+      continue; // Skip to next token
+    }
+    
+    if (!currentContext[0]){
+      return;
+    }
+    
+    // If we get here, token is JUST an element (not a class or ID selector)
+    tagName = token;
+    var found = new Array;
+    var foundCount = 0;
+    for (var h = 0; h < currentContext.length; h++) {
+      var elements = currentContext[h].getElementsByTagName(tagName);
+      for (var j = 0; j < elements.length; j++) {
+        found[foundCount++] = elements[j];
+      }
+    }
+    currentContext = found;
+  }
+  return currentContext;
+}
+
+/* That revolting regular expression explained 
+/^(\w+)\[(\w+)([=~\|\^\$\*]?)=?"?([^\]"]*)"?\]$/
+  \---/  \---/\-------------/    \-------/
+    |      |         |               |
+    |      |         |           The value
+    |      |    ~,|,^,$,* or =
+    |   Attribute 
+   Tag
+*/