narf 0.6.3 → 0.7.1

data/lib/web/action.rb

@@ -1,82 +1,83 @@
 module Web
-    class Action #:nodoc:
-	attr_reader :patterns
-	def initialize patterns={}, &function
-	    @patterns = patterns
-	    @function = function || lambda{}
-	    @@all_actions.push self
-	end
-
-	def run cgi=Web::CGI.create
-	    @function.call( cgi )
-	end
-
-	def old_applies? cgi
-	    matches = false
-	    patterns.each{ |key, pattern|
-		cgi.multiple_params[key].each{ |value|
-		    if pattern.kind_of? Regexp
-			matches = true if value =~ pattern
-		    else
-			matches = true if value == pattern
-		    end
-		}
-	    }
-	    matches
-	end
-
-	def applies? cgi
-	    relevance = 0;
-	    unmatched_terms = patterns.size;
-	    patterns.each{ |key, pattern|
-		if pattern.kind_of? Regexp
-		    if cgi.multiple_params[key].find{ |value| value =~ pattern }
-			unmatched_terms = unmatched_terms - 1
-			relevance += 1
-		    end
-		else
-		    if cgi.multiple_params[key].find{ |value| value == pattern }
-			unmatched_terms = unmatched_terms - 1
-			relevance += 10
-		    end
-		end
-	    }
-	    if unmatched_terms == 0
-		relevance
-	    else
-		false
-	    end
-	end
-
-	@@all_actions = []
-	def Action.pick( cgi )
-	    @@all_actions.find_all{ |action|
-		action.applies? cgi
-	    }.sort{|a, b|
-		a.applies?(cgi) <=> b.applies?(cgi)
-	    }.last ||
-		@@all_actions.find{ |action| action.patterns == {} } ||
-		blank_action
+  class Action #:nodoc:
+    attr_reader :patterns
+    def initialize patterns={}, &function
+      @patterns = patterns
+      @function = function || lambda{}
+      Thread.current[:actions] ||= [ ]
+      Thread.current[:actions].push self
+    end
 
-#	    (raise Web::Exception.new( "Could not locate action for #{ cgi.multiple_params.inspect }" ))
-	end
+    def run cgi=Web::CGI.create
+      @function.call( cgi )
+    end
+    
+    def old_applies? cgi
+      matches = false
+      patterns.each{ |key, pattern|
+        cgi.multiple_params[key].each{ |value|
+          if pattern.kind_of? Regexp
+            matches = true if value =~ pattern
+          else
+            matches = true if value == pattern
+          end
+        }
+      }
+      matches
+    end
 
-	def Action.blank_action
-	    blank = Action.new
-	    @@all_actions.delete blank
-	    blank
-	end
+    def applies? cgi
+      relevance = 0;
+      unmatched_terms = patterns.size;
+      patterns.each{ |key, pattern|
+        if pattern.kind_of? Regexp
+          if cgi.multiple_params[key].find{ |value| value =~ pattern }
+            unmatched_terms = unmatched_terms - 1
+            relevance += 1
+          end
+        else
+          if cgi.multiple_params[key].find{ |value| value == pattern }
+            unmatched_terms = unmatched_terms - 1
+            relevance += 10
+          end
+        end
+      }
+      if unmatched_terms == 0
+        relevance
+      else
+        false
+      end
+    end
+    
+    def Action.pick( cgi )
+      Thread.current[:actions] ||= [ ]
+      Thread.current[:actions].find_all do |action|
+        action.applies? cgi
+      end.sort do |a, b|
+        a.applies?(cgi) <=> b.applies?(cgi)
+      end.last || Thread.current[:actions].find do |action|
+        action.patterns == {}
+      end || blank_action
+      
+      #	    (raise Web::Exception.new( "Could not locate action for #{ cgi.multiple_params.inspect }" ))
+    end
+    
+    def Action.blank_action
+      blank = Action.new
+      Thread::current[:actions].delete blank
+      blank
+    end
 
-	def Action.run options={}
-            if options.kind_of? Hash
-                Web.process(options){ |cgi|
-                    pick(cgi).run(cgi)
-                }
-            elsif options.kind_of? Web::CGI
-                pick(options).run(options)
-                options.close
-                options
-            end
-	end
+    def Action.run options={}
+      if options.kind_of? Hash
+        Web.process(options) do |cgi|
+          pick(cgi).run(cgi)
+        end
+      elsif options.kind_of? Web::CGI
+        pick(options).run(options)
+        options.close
+        options
+      end
     end
+  end
 end

data/lib/web/action.rb~

@@ -0,0 +1,83 @@
+module Web
+    class Action #:nodoc:
+	attr_reader :patterns
+	def initialize patterns={}, &function
+	  @patterns = patterns
+	  @function = function || lambda{}
+          Thread.current[:actions] ||= [ ]
+	  Thread.current[:actions].push self
+	end
+
+	def run cgi=Web::CGI.create
+	    @function.call( cgi )
+	end
+
+	def old_applies? cgi
+	    matches = false
+	    patterns.each{ |key, pattern|
+		cgi.multiple_params[key].each{ |value|
+		    if pattern.kind_of? Regexp
+			matches = true if value =~ pattern
+		    else
+			matches = true if value == pattern
+		    end
+		}
+	    }
+	    matches
+	end
+
+	def applies? cgi
+	    relevance = 0;
+	    unmatched_terms = patterns.size;
+	    patterns.each{ |key, pattern|
+		if pattern.kind_of? Regexp
+		    if cgi.multiple_params[key].find{ |value| value =~ pattern }
+			unmatched_terms = unmatched_terms - 1
+			relevance += 1
+		    end
+		else
+		    if cgi.multiple_params[key].find{ |value| value == pattern }
+			unmatched_terms = unmatched_terms - 1
+			relevance += 10
+		    end
+		end
+	    }
+	    if unmatched_terms == 0
+		relevance
+	    else
+		false
+	    end
+	end
+
+	def Action.pick( cgi )
+          Thread.current[:actions] ||= [ ]
+          Thread.current[:actions].find_all do |action|
+            action.applies? cgi
+          end.sort do |a, b|
+            a.applies?(cgi) <=> b.applies?(cgi)
+          end.last || Thread.current[:actions].find do |action|
+            action.patterns == {}
+          end || blank_action
+
+#	    (raise Web::Exception.new( "Could not locate action for #{ cgi.multiple_params.inspect }" ))
+	end
+
+	def Action.blank_action
+	    blank = Action.new
+	    Thread::current[:actions].delete blank
+	    blank
+	end
+
+	def Action.run options={}
+            if options.kind_of? Hash
+                Web.process(options){ |cgi|
+                    pick(cgi).run(cgi)
+                }
+            elsif options.kind_of? Web::CGI
+                pick(options).run(options)
+                options.close
+                options
+            end
+	end
+    end
+end

data/lib/web/cgi.rb

@@ -8,34 +8,24 @@ module Web
   # 
   class CGI
 
-    @@__web__cgi = nil
-    
     # set the singleton cgi object for Web
     def CGI.set_cgi cgi
-      @@__web__cgi = cgi
+      Thread.current[:cgi] = cgi
     end
 	
     # get the singleton cgi object for Web
     def CGI.get_cgi( options={} )
-      unless @@__web__cgi
-        @@__web__cgi = Web::CGI.new(options)
-        
-        at_exit {
-          @@__web__cgi.close if @@__web__cgi
-        }
+      unless Thread.current[:cgi]
+        CGI.set_cgi( Web::CGI.new(options) )
       end
 
-      @@__web__cgi
-
+      Thread.current[:cgi]
     end
-    
-    def CGI.process( options={} ) 	#:nodoc:
-      cgi = Web::CGI.get_cgi( options )
-      yield cgi
-      cgi.close
-      cgi
+
+    def CGI::create(options = {})
+      CGI::new(options)
     end
-    
+
     include Test::Unit::Assertions
 
     attr_reader :session, :options
@@ -56,12 +46,6 @@ module Web
       @cgd
     end
 
-    @@cgi_instances = {}
-    def CGI::create(options={}) 
-      
-      options[:out] ||= $stdout
-      @@cgi_instances[ options[:out].id ] ||= CGI.new(options)
-    end
     
     # Construct cgi with the given options.  Defaults are in parenthesis.
     # These options are alpha and due for change as narf supports
@@ -91,7 +75,8 @@ module Web
         @output = @cgd.output
       else
         @output = StringIO.new
-      end
+      end
+      @cgd.output.binmode if @cgd.output.respond_to? :binmode
       
       @session = if (options.has_key? :session)
                    options[:session]
@@ -113,16 +98,21 @@ module Web
 
 
     # returns params as a hash of arrays
-    def multiple_params
+    def params
       @cgd.multiple_params
     end
-    
+
+   
     # set multiple params, in case you want to change the state of your app
     # without a round trip to the client.
-    def multiple_params= other
+    def params= other
       @cgd.multiple_params = other
     end
 
+    alias :multiple_params :params
+    alias :multiple_params= :params=
+
+
     MULTIPLE_KEY = /\[\]\z/
     
     # access parameters.  If the key is array-style,
@@ -178,17 +168,6 @@ module Web
     # Response methods
     #----------------------------------
     
-    # these are documentation stubs for rdoc
-
-    # Append output to client
-    def << (*args) end
-    # Append output to client with line endings
-    def puts(*args) end
-    # Append output to client
-    def write(*args) end
-    # Append output to client
-    def print(*args) end
-
     # Append output to client
     [ :<<, :puts, :write, :print ].each{ |symbol|
       define_method(symbol) { |*args|
@@ -204,9 +183,29 @@ module Web
         raise( Exception.new( "Can't call Web::clear()" ) )
       else
         @output = StringIO.new
+        @content = StringIO.new
       end
     end
 
+    # This method will replace the contents
+    # of the output buffer by reading from
+    # the given filename.  If the content-type
+    # has not already been set, it will try
+    # and guess an appropriate mime-type
+    # from the extension of the file.
+    #
+    # Note: this doesn't flush the output,
+    # you can still keep writing after
+    # this method.
+    def send_file( filename )
+      clear()
+      write( File.open( filename, 'rb' ) { |f| f.read } )
+      if self.content_type == "text/html"
+        self.content_type = Web::Mime::get_mimetype(filename)
+      end
+      Web::close()
+    end
+
     def unbuffered?
       @options[:unbuffered]
     end
@@ -574,18 +573,53 @@ module Web
     
   end
 
-  class CGI
-    def report_error( err )
-      self.puts "<h3>ruby error:</h3>"
-      self.puts Dir.pwd
-      self.puts err.to_s.gsub(/\n/,"<br><br>")
-      self.puts "<blockquote>"
-      self.puts( if (err.backtrace.size > 3)
-                   err.backtrace[0...-2]
-                 else
-                   err.backtrace
-                 end).collect{ |string| string + "<br>" }
-      self.puts "</blockquote>"
+  class CGI
+    TRACE_PATTERN = /^((\w:){0,1}.*?):(\d+)(:?(.*))$/
+    def report_error( err )
+      # write to error log
+      $stderr.binmode
+      $stderr.puts err.class.to_s + ": " + err.to_s
+      err.backtrace.each do |line|
+        $stderr.puts "  " + line.chomp
+      end
+      # end write to error log
+     
+      # write to browser
+      title = err.class.to_s
+      
+      msg = "<b style='font-size:20px'>" + err.to_s.gsub(/\n/,"<br>") + "</b><br>"
+      msg += Time::now().to_s
+
+      msg += <<-STYLE
+<style type="text/css">
+.columnHead {
+  background-color:CCCDDD;
+  text-align:center;
+  font-weight:bold;
+}
+.info {
+  text-align:center;
+}
+.info_row:hover{
+  background-color:F8FF80;
+}
+</style>
+STYLE
+      msg += "<p><table onMouseover=\"changeto(event, '#F8FF80')\" onMouseout=\"changeback(event, '#eeeeff')\">\n"
+      msg += "<tr><td class='columnHead'>File</td><td class='columnHead'>&nbsp;Line&nbsp;</td><td class='columnHead'>Method</td></tr>\n"
+           
+      err.backtrace.each do |level|
+        level =~ TRACE_PATTERN
+        level = [ $1, $3, $5 ]
+        msg += "<tr class='info_row'>\n"
+        level.each{ |column| msg += "<td class='info'>" + (column || '') + "</td>\n" }
+        msg += "</tr>\n\n"
+      end
+      
+      msg += "</table>"
+      
+      Web::print_message( title, msg )
+      # end write to browser
     end
     
     # returns one of these values:
@@ -602,15 +636,33 @@ module Web
         :cgi
       end
     end
-    
-    @@in_process = false
+
     def CGI::basic_process( options={}) #:nodoc:
-      unless @@in_process
-        @@in_process = true
+      unless Thread::current[:in_process]
+        Thread::current[:in_process] = true
         Web.set_cgi( CGI.new( options ) )
-        yield Web.get_cgi
+        
+        begin
+          case Web["narf_resource"]
+          when "narf-logo.gif"
+            Web::send_lib_file('resources/narf-logo.gif')
+          when "narf-styles.css"
+            Web::send_lib_file('resources/narf-styles.css')
+          when "highlight_table.js"
+            Web::send_lib_file('resources/highlight_table.js')
+          else
+            yield Web.get_cgi
+          end
+        rescue Exception => error
+          if (options[:testing])
+            raise error
+          else
+            Web::report_error( error )
+          end
+        end
+
         Web.get_cgi.close
-        @@in_process = false
+        Thread::current[:in_process] = false
         Web.get_cgi
       else
         yield Web.get_cgi