narf 0.5.1 → 0.6.1

data/lib/web/parser.rb~

@@ -5,7 +5,7 @@ module Web
   #
   # this hash is has case insensitive keys.  Might be somewhat
   # incomplete
-  class CaseInsensitiveHash < Hash
+  class CaseInsensitiveHash < Hash #:nodoc:
     def [](key)
       super( key.to_s.downcase )
     end
@@ -189,20 +189,32 @@ module Web
         raise EOFError, "no content body"
       end
       
+      # ok... so what the hell does this do?
+      # I promise never to denigrate the accomplishments
+      # of my predecessors again :-)
+      #    ~ pat
       until -1 == content_length
         head = nil
         body = Tempfile.new("Web")
         body.binmode
         
+        # until we have:
+        #   * a header
+        #   * and a buffer that has a boundary
+        # so far, make sense to me.
         until head and /#{boundary}(?:#{EOL}|--)/n.match(buf)
-          
+          # if we have a header....
           if head
+            # !??!??!?!?!
             trim_size = (EOL + boundary + EOL).size
             if trim_size < buf.size
               body.print buf[0 ... (buf.size - trim_size)]
               buf[0 ... (buf.size - trim_size)] = ""
             end
+          
+          # If we have a double space (the smell of a header...)
           elsif /#{EOL}#{EOL}/n.match(buf)
+            # extract the header, and erase it from the buffer
             buf = buf.sub(/\A((?:.|\n)*?#{EOL})#{EOL}/n) do
               head = $1.dup
               ""
@@ -210,18 +222,18 @@ module Web
             next
           end
           
+          # read a chunk from the input
           c = if bufsize < content_length
                 input.read(bufsize) or ''
               else
                 input.read(content_length) or ''
               end
+          # add it to the input, reduce our countdown
           buf.concat c
           content_length -= c.size
-          
         end
         
-        
-        /Content-Disposition:.* filename="?([^\";]*)"?/ni.match(head)
+       /Content-Disposition:.* filename="?([^\";]*)"?/ni.match(head)
         filename = ($1 or "").dup
         if /Mac/ni.match(env['http_user_agent']) and
             /Mozilla/ni.match(env['http_user_agent']) and
@@ -232,7 +244,9 @@ module Web
         /Content-Type: (.*)/ni.match(head)
         content_type = ($1 or "").strip
         
-        buf = buf.sub(/\A((?:.|\n)*?)(?:#{EOL})?#{boundary}(#{EOL}|--)/n) do
+        # is this the part that is eating too much?
+        #buf = buf.sub(/\A(.*?)(?:#{EOL})?#{boundary}(#{EOL}|--)/mn) do
+        buf = buf.sub(/\A((?:.|\n)*?)(?:[\r\n]{1,2})?#{boundary}([\r\n]{1,2}|--)/n) do
           body.print $1
           if "--" == $2
             content_length = -1
@@ -241,7 +255,8 @@ module Web
         end
         
         body.rewind
-        
+
+     
         if (content_type.empty?)
           upload = body.read
         else
@@ -250,7 +265,14 @@ module Web
 
         /Content-Disposition:.* name="?([^\";]*)"?/ni.match(head)
         name = $1.dup
-        
+
+
+        File.open( "/Users/patsplat/Desktop/test.#{name}", "w" ) {|f|
+          f.write body.read
+        }
+
+        body.rewind
+
         if params.has_key?(name)
           params[name].push(upload)
         else

data/lib/web/template.rb

@@ -154,14 +154,16 @@ module Web
   # the template merged with values:
   #
   #     --- script.rb:
-  #     Web.print_template "mytemplate.html",
-  #     		   "field1" => "val1",
-  #     		   "field2" => "val2",
-  #     		   "field3" => "val3",
+  #     Web::process do
+  #       Web.print_template "mytemplate.html",
+  #       		   "field1" => "val1",
+  #       		   "field2" => "val2",
+  #     	  	   "field3" => "val3",
   #     		   "field4" => "3",
   #     		   "values" => [{ "name" => "one", "value" => "1"},
   #     		                { "name" => "two", "value" => "2"},
   #     				{ "name' => "three", "value" => "3"}]
+  #     end
   #
   #     --- mytemplate.html:
   #     <narf:input type="text" name="field1">

data/lib/web/wiki.rb

@@ -4,6 +4,7 @@ require 'web/wiki/page'
 require 'yaml'
 require 'ftools'
 require 'strscan'
+require 'ipaddr'
 
 module Web
   # == Purpose
@@ -107,9 +108,7 @@ module Web
       @@wiki ||= Wiki.new
     end
     
-    # This is a deadly method, only use on a test wiki.
     def Wiki.wipe #:nodoc:
-      wiki.wipe
       @@wiki = nil
     end
     
@@ -242,8 +241,9 @@ module Web
         }
       end
       
+
       def store_basedir
-        if ( vandals.include?(ENV["REMOTE_ADDR"]) )
+        if ( vandal? )
           Wiki.pref( "tarpit_dir" )
         else
           Wiki.pref( "store_dir" )
@@ -268,17 +268,28 @@ module Web
           store_basedir
         end
       end
+
+      def vandal?
+        vandal = false
+        vandals.each do |pattern|
+          if pattern =~ ENV["REMOTE_ADDR"]
+            vandal = true
+            break
+          end
+        end
+        vandal
+      end
       
       def vandals
-        if File.exists?( Wiki.pref("vandals") || "" )
-          File.open( Wiki.pref("vandals") ) { |f|
-            f.to_a
-          }.collect{ |line|
-            line.chomp
-          }
-        else
-          [ ]
-        end
+        @vandals ||= if File.exists?( Wiki.pref("vandals") || "" )
+                       File.open( Wiki.pref("vandals") ) { |f|
+                         f.to_a
+                      }.collect{ |line|
+                         /^#{line.chomp.strip.gsub(/"/, '')}/
+                      }
+                     else
+                       [ ]
+                     end
       end
       
       def exit_handler

data/lib/web/wiki.rb~

@@ -317,7 +317,7 @@ module Web
       def initialize( wiki )
         @handled = false
         @wiki = wiki
-        @template = if (File.basename(Web.get_cgi.script_name) == "admin.rb")
+        @template = if (File.basename(Web.script_name) == "admin.rb")
                       "admin.html"
                     else
                       "template.html"

data/narf.gemspec

@@ -3,7 +3,7 @@ require 'rubygems'
 spec = Gem::Specification.new do |s|
   #### Basic information.
   s.name = 'narf'
-  s.version = "0.5.1"
+  s.version = "0.6.1"
   s.summary = <<-EOF
 NARF is a replacement for and derivative of the Ruby CGI library. It exists to trivialize web development .
 EOF

data/narf.gemspec~

@@ -1,52 +1,40 @@
 require 'rubygems'
 
 spec = Gem::Specification.new do |s|
-
   #### Basic information.
-
-  s.name = 'rmagic'
-  s.version = "0.3.2"
+  s.name = 'narf'
+  s.version = "0.5.1"
   s.summary = <<-EOF
-      RMagic demonstrates some of the magical things that Ruby can do.  It includes
-      a library and a demonstration application (rmagic-app).
-    EOF
+NARF is a replacement for and derivative of the Ruby CGI library. It exists to trivialize web development .
+EOF
   s.description = <<-EOF
-      RMagic tries to demonstrate all aspects of a gem specification.  In practice,
-      you will only need some of them.  Few gems contain applications, and even fewer
-      contain native (C code) extensions.
-    EOF
+These are the basic goals of narf:
 
-  #### Dependencies and requirements.
+* To provide a clean API for basic Web application functionality. 
+* To make it easy, really easy to write testable Web applications.
+* To run everywhere
 
-  s.add_dependency('log4r', '> 1.0.4')
-  s.requirements << "A decent graphics card and monitor."
+EOF
 
   #### Which files are to be included in this gem?  Everything!  (Except CVS directories.)
-
-  s.files = Dir.glob("**/*").delete_if { |item| item.include?("CVS") }
-
-  #### C code extensions.
-
-  s.extensions << "ext/rmagic/extconf.rb"
+  s.files = Dir.glob("**/*").delete_if { |item|
+    item.include?("CVS") || item.include?("svn")
+  }
 
   #### Load-time details: library and application (you will need one or both).
 
   s.require_path = 'lib'                         # Use these for libraries.
-  s.autorequire = 'rmagic'
-
-  s.bindir = "bin"                               # Use these for applications.
-  s.executables = ["rmagic-app"]
-  s.default_executable = "rmagic-app"
+  s.autorequire = 'web'
 
   #### Documentation and testing.
 
   s.has_rdoc = true
-  s.test_suite_file = "test/rmagic-tests.rb"
+  #s.test_suite_file = "build.rb test"
 
   #### Author and project details.
 
-  s.author = "Ruby J. User"
-  s.email = "rubyuser@yahoo.com"
-  s.homepage = "http://rmagic.rubyforge.org"
-  s.rubyforge_project = "rmagic"
+  s.author = "Patrick May"
+  s.email = "narf@hexane.org"
+  s.homepage = "http://www.narf-lib.org"
+  s.rubyforge_project = "narf"
 end 

data/test/test.request.rb

@@ -256,28 +256,41 @@ class TestRequest < Test::Unit::TestCase
       
     end
 
-#-------------------------------------------------------
-#    I've been unable to get this test to work right.
-#    For some reason, the code inside Request.parse
-#    can't see the MOD_RUBY constant I'm trying to set.
-#
-#    Tracing statements have shown that the
-#    if(defined?MOD_RUBY) in Request.parse returns false
-#    but if(defined?MOD_RUBY) returns true within the
-#    test's scope.
-#-------------------------------------------------------
-#    def test_parse_get_with_mod_ruby
-#	Object.const_set( :MOD_RUBY, true )
-#	assert_equal( {"key" => ["some value"], "anotherKey" => ["someother value"]},
-#		      Web::Request.parse )
-#    end
+    def options
+      {}
+    end
 
-    # this test added so I can test the effect of above apart from the cause
-    #def test_mod_ruby_query_string
-#	assert_equal( "key=some%20value&anotherKey=someother%20value",
-#		      Web::CGD.mod_ruby_query_string )
-#    end
+    def test_mac_ie_multipart_bug
+      require 'yaml'
+      test_env = nil
+      File.open("test/testfiles/mac_ie_env.yaml", "r") { |f|
+        test_env = YAML.load(f)
+      }
 
+      backup_env = {}
+      test_env.each{ |k,v|
+        backup_env[k.downcase] = ENV[k.downcase]
+        ENV[k.downcase] = v
+      }
+      
+      begin
+        File.open("test/testfiles/mac_ie_stdin.bin", "r") { |f|
+          $stdin = f
+          
+          parse_request
+          
+          assert_equal "test",      @multiple_params["text"].first
+          assert_equal Web::Upload, @multiple_params["small"].first.class
+          assert_equal 15,          @multiple_params["button.x"].first.to_i
+          assert_equal 11,          @multiple_params["button.y"].first.to_i
+        }
+      ensure
+        backup_env.each{ |k,v|
+          ENV[k] = v
+        }
+      end
+
+    end
 end
 
 class TestUpload < Test::Unit::TestCase

data/test/test.request.rb~

@@ -246,6 +246,16 @@ class TestRequest < Test::Unit::TestCase
 
     end
 
+    def test_downcase_env
+      ENV["KEY"] = "value"
+      env = downcase_env( ENV )
+      ["key", "kEy", "kEY", "KEY", "KEy", "Key", "keY"].each{ |k|
+        assert( env.has_key?(k) )
+        assert_equal( "value", env[k] )
+      }
+      
+    end
+
 #-------------------------------------------------------
 #    I've been unable to get this test to work right.
 #    For some reason, the code inside Request.parse

data/test/testfiles/mac_ie_env.yaml

@@ -0,0 +1,32 @@
+--- 
+SERVER_NAME: 127.0.0.1
+HTTP_UA_OS: MacOS
+HTTP_USER_AGENT: Mozilla/4.0 (compatible; MSIE 5.22; Mac_PowerPC)
+HTTP_EXTENSION: Security/Remote-Passphrase
+CONTENT_LENGTH: "2134"
+"__CF_USER_TEXT_ENCODING": 0x46:0:0
+SCRIPT_NAME: "/~patsplat/fhwang.rb"
+SERVER_PROTOCOL: HTTP/1.1
+SERVER_ADDR: 192.168.1.101
+HTTP_HOST: localhost
+HTTP_ACCEPT_LANGUAGE: en
+SERVER_SOFTWARE: Apache/1.3.29 (Darwin)
+REMOTE_ADDR: 192.168.1.101
+HTTP_REFERER: http://localhost/~patsplat/form.html
+CONTENT_TYPE: multipart/form-data; boundary=---------------------------047485629054451
+HTTP_UA_CPU: PPC
+HTTP_COOKIE: "_session_id=57c6e5950b4fceab"
+REQUEST_URI: "/~patsplat/fhwang.rb"
+SERVER_SIGNATURE: "<ADDRESS>Apache/1.3.29 Server at 127.0.0.1 Port 80</ADDRESS>\n"
+DOCUMENT_ROOT: "/Library/WebServer/Documents"
+SERVER_PORT: "80"
+QUERY_STRING: ''
+GATEWAY_INTERFACE: CGI/1.1
+SERVER_ADMIN: "[no address given]"
+REMOTE_PORT: "49176"
+HTTP_PRAGMA: no-cache
+SCRIPT_FILENAME: "/Users/patsplat/Sites/fhwang.rb"
+PATH: "/bin:/sbin:/usr/bin:/usr/sbin:/usr/libexec:/System/Library/CoreServices"
+HTTP_ACCEPT: "*/*"
+REQUEST_METHOD: POST
+HTTP_CONNECTION: Keep-Alive

data/test/wiki/test.tarpit.rb

@@ -11,6 +11,7 @@ class TestTarpit < Test::Unit::TestCase
   def teardown
     teardown_wiki
     ENV["REMOTE_ADDR"] = @old_remote_addr
+    File.delete("vandals.test.txt") if File.exists? "vandals.test.txt"
   end
 
   def do_edit( name, content )
@@ -37,4 +38,19 @@ class TestTarpit < Test::Unit::TestCase
                    Web::Wiki.store_dir )
   end
 
+  def test_ip_range
+    File.open( "vandals.test.txt", "w" ) { |f|
+       f.puts( "123.51", "23.17.49", "88.34.23.9")
+    }
+
+    assert_equal( make_temp("test.pages/"),
+                  Web::Wiki::store_dir )
+
+    ["123.51.27.13", "23.17.49.2", "88.34.23.9"].each{ |ip|
+      ENV["REMOTE_ADDR"] = ip
+      assert_equal( make_temp("tarpit/"),
+                    Web::Wiki.store_dir )
+    }
+  end
+  
 end

data/test/wiki/test.tarpit.rb~

@@ -0,0 +1,40 @@
+require 'web/wiki'
+
+class TestTarpit < Test::Unit::TestCase
+  include Web::Testing
+
+  def setup
+    @old_remote_addr = ENV["REMOTE_ADDR"]
+    setup_wiki
+  end
+
+  def teardown
+    teardown_wiki
+    ENV["REMOTE_ADDR"] = @old_remote_addr
+  end
+
+  def do_edit( name, content )
+    do_request "wiki.rb", "action" => "edit", "page.name" => name
+    do_submit "edit_page", "page.content" => content, "action" => "Save"
+  end
+
+  def test_page_revisions_store_remote_addr
+    page = Web::Wiki.wiki.load_page( "HomePage" )
+    assert_equal( "auto-create", page.remote_addr )
+
+    ENV["REMOTE_ADDR"] = "127.0.0.1"
+    do_edit( "HomePage", "this is a test" )
+    page = Web::Wiki.wiki.load_page( "HomePage" )
+    assert_equal( "127.0.0.1", page.remote_addr )
+  end
+
+  def test_tarpit
+     File.open( "vandals.test.txt", "w" ) { |f|
+       f.puts( "123.51.23.192", "127.0.0.1", "52.213.123.65" )
+     }
+     ENV["REMOTE_ADDR"] = "127.0.0.1"
+     assert_equal( make_temp("tarpit/"),
+                   Web::Wiki.store_dir )
+  end
+
+end