cgialt 0.0.2 → 1.0.0

data/test/test_cgi_cookie.rb

@@ -1,6 +1,6 @@
 require 'test/unit'
 #require 'cgi'
-require(ENV['CGI'] || 'cgi')
+require(ENV['CGI'] || 'cgialt')
 require 'stringio'
 
 

data/test/test_cgi_core.rb

@@ -1,6 +1,6 @@
 require 'test/unit'
 #require 'cgi'
-require(ENV['CGI'] || 'cgi')
+require(ENV['CGI'] || 'cgialt')
 require 'stringio'
 
 
@@ -18,11 +18,19 @@ class CGICoreTest < Test::Unit::TestCase
 
 
   def teardown
-    @environ.each do |key, val| ENV.delete(key) end
+    @environ and @environ.each do |key, val| ENV.delete(key) end
     $stdout = STDOUT
   end
 
 
+  def test_cgi_core_parse
+    assert_equal({'foo'=>['bar']}, CGI.parse('foo=bar'))
+    assert_equal({'a'=>['10'], 'b'=>['20']}, CGI.parse('a=10&b=20'))
+    assert_equal({'noval'=>['']}, CGI.parse('noval='))
+    assert_equal({'noeq'=>[nil]}, CGI.parse('noeq'))   # same spec as cgi.rb
+  end
+
+
   def test_cgi_core_params_GET
     @environ = {
       'REQUEST_METHOD'  => 'GET',
@@ -174,6 +182,8 @@ class CGICoreTest < Test::Unit::TestCase
                "Content-Language: ja\r\n" +
                "\r\n" +
                euc_str
+    # actual.encoding => US-ASCII, expected.encoding => ASCII-8BIT
+    expected = _convert_encoding(expected, actual)
     assert_equal(expected, actual)
     ## shift_jis
     options = { 'charset'=>'Shift_JIS' }
@@ -186,6 +196,8 @@ class CGICoreTest < Test::Unit::TestCase
                "Content-Language: ja\r\n" +
                "\r\n" +
                sjis_str
+    # actual.encoding => US-ASCII, expected.encoding => ASCII-8BIT
+    expected = _convert_encoding(expected, actual)
     assert_equal(expected, actual)
     ## utf8 (not converted)
     options = { 'charset'=>'utf8' }
@@ -197,6 +209,8 @@ class CGICoreTest < Test::Unit::TestCase
                "Content-Length: 22\r\n" +
                "\r\n" +
                euc_str
+    # actual.encoding => US-ASCII, expected.encoding => ASCII-8BIT
+    expected = _convert_encoding(expected, actual)
     assert_equal(expected, actual)
     ## language is keeped
     options = { 'charset'=>'Shift_JIS', 'language'=>'en' }
@@ -215,6 +229,11 @@ class CGICoreTest < Test::Unit::TestCase
     assert_equal(expected, actual)
   end
 
+  def _convert_encoding(expected, actual)
+    "".respond_to?(:encoding) && actual.encoding != expected.encoding \
+    ? expected.force_encoding(actual.encoding) \
+    : expected
+  end
 
   def test_cgi_core_print
     @environ = {

data/test/test_cgi_header.rb

@@ -1,6 +1,6 @@
 require 'test/unit'
 #require 'cgi'
-require(ENV['CGI'] || 'cgi')
+require(ENV['CGI'] || 'cgialt')
 
 
 class CGIHeaderTest < Test::Unit::TestCase

data/test/test_cgi_modruby.rb

@@ -1,6 +1,6 @@
 require 'test/unit'
 #require 'cgi'
-require(ENV['CGI'] || 'cgi')
+require(ENV['CGI'] || 'cgialt')
 
 
 class CGIModrubyTest < Test::Unit::TestCase

data/test/test_cgi_multipart.rb

@@ -1,6 +1,6 @@
 require 'test/unit'
 #require 'cgi'
-require(ENV['CGI'] || 'cgi')
+require(ENV['CGI'] || 'cgialt')
 require 'tempfile'
 require 'stringio'
 
@@ -36,6 +36,16 @@ class MultiPart
   end
   attr_reader :boundary
 
+  if "".respond_to?(:encoding) && "".respond_to?(:force_encoding)   # Ruby1.9
+    def _convert_encoding(str, str2)
+      str.force_encoding(str2.encoding)
+    end
+  else
+    def _convert_encoding(str, str2)
+      str
+    end
+  end
+
   def append(name, value, filename=nil, content_type=nil)
     content_type = detect_content_type(filename) if filename && content_type.nil?
     s = filename ? "; filename=\"#{filename}\"" : ''
@@ -44,6 +54,7 @@ class MultiPart
     buf << "Content-Disposition: form-data: name=\"#{name}\"#{s}\r\n"
     buf << "Content-Type: #{content_type}\r\n" if content_type
     buf << "\r\n"
+    buf = _convert_encoding(buf, value)
     buf << value
     buf << "\r\n"
     return self
@@ -109,7 +120,7 @@ class CGIMultipartTest < Test::Unit::TestCase
   end
 
   def teardown
-    %[REQUEST_METHOD CONTENT_TYPE CONTENT_LENGTH REQUEST_METHOD].each do |name|
+    %w[REQUEST_METHOD CONTENT_TYPE CONTENT_LENGTH REQUEST_METHOD].each do |name|
       ENV.delete(name)
     end
     $stdin.close() if $stdin.is_a?(Tempfile)
@@ -151,7 +162,11 @@ class CGIMultipartTest < Test::Unit::TestCase
       expected = hash[:value]
       expected_class = @expected_class || (hash[:value].length < threshold ? StringIO : Tempfile)
       assert_kind_of(expected_class, cgi[name])
-      assert_equal(expected, cgi[name].read())
+      actual = cgi[name].read()
+      if "".respond_to?(:encoding)            # Ruby1.9
+        expected = expected.force_encoding(actual.encoding)
+      end
+      assert_equal(expected, actual)
       assert_equal(hash[:filename] || '', cgi[name].original_filename) #if hash[:filename]
       assert_equal(hash[:content_type] || '', cgi[name].content_type)  #if hash[:content_type]
     end
@@ -190,7 +205,11 @@ class CGIMultipartTest < Test::Unit::TestCase
       {:name=>'image1',  :value=>_read('large.png'),
        :filename=>'large.png',  :content_type=>'image/png'},  # large image
     ]
-    @expected_class = Tempfile
+    if "".respond_to?(:encoding)         # Ruby1.9
+      @expected_class = File
+    else
+      @expected_class = Tempfile
+    end
     _test_multipart()
   end
 
@@ -248,6 +267,9 @@ class CGIMultipartTest < Test::Unit::TestCase
        :filename=>'file1.html', :content_type=>'text/html'},
     ]
     _prepare(@data) do |input|
+      if input.respond_to?(:encoding)    # Ruby1.9
+        input = input.force_encoding('ASCII-8BIT')
+      end
       input2 = input.sub(/--(\r\n)?\z/, "\r\n")
       assert input2 != input
       #p input2
@@ -259,6 +281,9 @@ class CGIMultipartTest < Test::Unit::TestCase
     assert_equal("bad boundary end of body part", ex.message)
     #
     _prepare(@data) do |input|
+      if input.respond_to?(:encoding)    # Ruby1.9
+        input = input.force_encoding('ASCII-8BIT')
+      end
       input2 = input.sub(/--(\r\n)?\z/, "")
       assert input2 != input
       #p input2

data/test/test_cgi_util.rb

@@ -0,0 +1,240 @@
+require 'test/unit'
+#require 'cgi'
+require(ENV['CGI'] || 'cgialt')
+
+
+if defined?(CGIExt)
+  def if_cgiext;  yield if block_given?; true;  end
+  def if_cgialt;  false;  end
+else
+  def if_cgiext;  false;  end
+  def if_cgialt;  yield if block_given?; true;  end
+end
+
+
+class CGIUtilTest < Test::Unit::TestCase
+
+  def test_escape_html
+    ## escape html characters
+    input = '<>&"\''
+    expected = '&lt;&gt;&amp;&quot;\''
+    actual = nil
+    if_cgiext { actual = CGIExt.escape_html(input) }
+    if_cgialt { actual = CGI.escapeHTML(input) }
+    assert_equal(expected, actual)
+    if_cgiext { assert_equal(CGI.escapeHTML(input), actual) }
+    ## if no html characters found, return the passed argument as is
+    input = 'foobar'
+    expected = input
+    if_cgiext { actual = CGIExt.escape_html(input) }
+    if_cgialt { actual = CGI.escapeHTML(input) }
+    assert_equal(expected, actual)
+    #assert_same(expected, actual)
+    ## when non-string is passed, error raised
+    input = nil
+    if_cgiext { assert_raise(TypeError) { CGIExt.escape_html(input) } }
+    if_cgialt { assert_raise(NoMethodError) { CGI.escapeHTML(input) } }
+    input = 123
+    if_cgiext { assert_raise(TypeError) { CGIExt.escape_html(input) } }
+    if_cgialt { assert_raise(NoMethodError) { CGI.escapeHTML(input) } }
+  end
+
+
+if_cgiext {
+  def test_escape_html!
+    ## escape html characters
+    input = '<>&"\''
+    expected = '&lt;&gt;&amp;&quot;\''
+    actual = CGIExt.escape_html!(input)
+    assert_equal(expected, actual)
+    assert_equal(CGI.escapeHTML(input), actual)
+    ## if no html characters found, return the string as is
+    input = 'foobar'
+    expected = input
+    actual = CGIExt.escape_html!(input)
+    assert_equal(expected, actual)
+    assert_same(expected, actual)
+    ## non-string value are converted into string
+    input = nil
+    expected = ''
+    actual = CGIExt.escape_html!(input)
+    assert_equal(expected, actual)
+    input = 123
+    expected = '123'
+    actual = CGIExt.escape_html!(input)
+    assert_equal(expected, actual)
+  end
+}
+
+
+  def test_unescape_html
+    ## unescape html characters
+    tdata = [
+      ## html entities ('<>&"')
+      ['&lt;&gt;&amp;&quot;', '<>&"'],
+      ## otehr html entities (ex. '&copy;')
+      ['&copy;&heart;', '&copy;&heart;'],
+      ## '&#99' format
+      ['&#34;&#38;&#39;&#60;&#62;', '"&\'<>'],
+      ## '&#x9999' format
+      ['&#x0022;&#x0026;&#x0027;&#x003c;&#x003E;', '"&\'<>'],
+      ## invalid format
+      ['&&lt;&amp&gt;&quot&abcdefghijklmn', '&<&amp>&quot&abcdefghijklmn'],
+    ]
+    actual = nil
+    tdata.each do |input, expected|
+      if_cgiext { actual = CGIExt.unescape_html(input) }
+      if_cgialt { actual = CGI.unescapeHTML(input) }
+      assert_equal(expected, actual)
+      if_cgiext { assert_equal(CGI.unescapeHTML(input), actual) }
+    end
+    ## return as-is when no html entity found
+    input = "foobar"
+    expected = input
+    if_cgiext { actual = CGIExt.unescape_html(input) }
+    if_cgialt { actual = CGI.unescapeHTML(input) }
+    assert_equal(expected, actual)
+    if_cgiext { assert_same(expected, actual) }
+    ## when non-string is passed, error raised
+    input = nil
+    if_cgiext { assert_raise(TypeError) { CGIExt.unescape_html(input) } }
+    if_cgialt { assert_raise(NoMethodError) { CGI.unescapeHTML(input) } }
+    input = 123
+    if_cgiext { assert_raise(TypeError) { CGIExt.unescape_html(input) } }
+    if_cgialt { assert_raise(NoMethodError) { CGI.unescapeHTML(input) } }
+  end
+
+
+  TESTDATA_FOR_ESCAPE_URL = [
+      ## example data
+      ["'Stop!' said Fred._-+", '%27Stop%21%27+said+Fred._-%2B'],
+      ## characters not to be escaped
+      ["abcdefgxyzABCDEFGXYZ0123456789_.-",    "abcdefgxyzABCDEFGXYZ0123456789_.-"],
+      ## characters to be escaped
+      [' !"#$%&\'()*+,/:;<=>?@[\\]^`{|}~', "+%21%22%23%24%25%26%27%28%29%2A%2B%2C%2F%3A%3B%3C%3D%3E%3F%40%5B%5C%5D%5E%60%7B%7C%7D%7E"],
+      ## '%' format
+      ["k[]", 'k%5B%5D'],
+      ## unicode characters
+      ["\244\242\244\244\244\246\244\250\244\252", "%A4%A2%A4%A4%A4%A6%A4%A8%A4%AA"],
+  ]
+
+
+  def test_escape_url
+    ## encode url string
+    testdata = TESTDATA_FOR_ESCAPE_URL + [
+                 ## containing '%' character
+                 ["%XX%5%%%", "%25XX%255%25%25%25"],
+               ]
+    actual = nil
+    testdata.each do |input, expected|
+      if_cgiext { actual = CGIExt.escape_url(input) }
+      if_cgialt { actual = CGI.escape(input) }
+      assert_equal(expected, actual)
+      if_cgiext { assert_equal(CGI.escape(input), actual) }
+      #assert_equal(expected, CGI.escape(input))
+    end
+    ## error when non-string
+    if_cgiext { assert_raise(TypeError) { CGIExt.escape_url(nil) } }
+    if_cgialt { assert_raise(NoMethodError) { CGI.escape(nil) } }
+    if_cgiext { assert_raise(TypeError) { CGIExt.escape_url(123) } }
+    if_cgialt { assert_raise(NoMethodError) { CGI.escape(123) } }
+  end
+
+
+  def test_unescape_url
+    ## decode url string
+    testdata = TESTDATA_FOR_ESCAPE_URL + [
+                 ## invalid '%' format
+                 ["%XX%5%%%", "%XX%5%%%"],
+                 ## combination of lower case and upper case
+                 ["\244\252", "%a4%Aa"],
+               ]
+    actual = nil
+    testdata.each do |expected, input|
+      if_cgiext { actual = CGIExt.unescape_url(input) }
+      if_cgialt { actual = CGI.unescape(input) }
+      assert_equal(expected, actual)
+      if_cgiext { assert_equal(CGI.unescape(input), actual) }
+      #assert_equal(expected, CGI.unescape(input))
+    end
+    ## error when non-string
+    if_cgiext { assert_raise(TypeError) { CGIExt.unescape_url(nil) } }
+    if_cgialt { assert_raise(NoMethodError) { CGI.unescape(nil) } }
+    if_cgiext { assert_raise(TypeError) { CGIExt.unescape_url(123) } }
+    if_cgialt { assert_raise(NoMethodError) { CGI.unescape(123) } }
+  end
+
+
+  def test_rfc1123_date
+    sec = 1196524602
+    t = Time.at(sec)
+    expected = 'Sat, 01 Dec 2007 15:56:42 GMT'
+    actual = nil
+    if_cgiext { actual = CGIExt.rfc1123_date(t) }
+    if_cgialt { actual = CGI.rfc1123_date(t) }
+    assert_equal(expected, actual)
+    if_cgiext { assert_equal(CGI.rfc1123_date(t), actual) }
+    ## error when not Time object
+    if_cgiext { assert_raise(TypeError) { CGIExt.rfc1123_date(nil) } }
+    if_cgialt { assert_raise(TypeError) { CGI.rfc1123_date(nil) } }
+    if_cgiext { assert_raise(TypeError) { CGIExt.rfc1123_date(123) } }
+    if_cgialt { assert_raise(TypeError) { CGI.rfc1123_date(123) } }
+  end
+
+
+  def test_parse_query_string
+    ## equal with CGI.parse()
+    tuples = [
+      ## '&' separator
+      ['a=10&b=20&key1=val1',  {'a'=>['10'], 'b'=>['20'], 'key1'=>['val1']} ],
+      ## ';' separator
+      ['a=10;b=20;key1=val1',  {'a'=>['10'], 'b'=>['20'], 'key1'=>['val1']} ],
+      ## same keys
+      ['a=1&a=2&a=3',          {'a'=>['1', '2', '3']} ],
+      ## no value
+      ['key=&key=', {'key'=>['', '']} ],
+      ## unescape ascii string
+      ['k%5B%5D=%5B%5D%26%3B', {'k[]'=>['[]&;']} ],
+      ## unescape unicode string
+      ["%A4%A2%a4%a4=%A4%a6%A4%A8%A4%Aa", {"\244\242\244\244"=>["\244\246\244\250\244\252"]} ],
+      ## invalid '%' format
+      ['k%XX%5=%%%', {'k%XX%5'=>['%%%']} ],
+    ]
+    actual = nil
+    tuples.each do |input, expected|
+      if_cgiext { actual = CGIExt.parse_query_string(input) }
+      if_cgialt { actual = CGI.parse(input) }
+      assert_equal(expected, actual)
+      if_cgiext { assert_equal(CGI.parse(input), actual) }
+    end
+    ## different with CGI.parse()
+    tdata = {}
+    ## without '=' (CGI: {"a"=>[nil], "b"=>[nil]})
+    if_cgiext { tdata['a&b'] =  {'a'=>[''], 'b'=>['']}     }
+    if_cgialt { tdata['a&b'] =  {"a"=>[nil], "b"=>[nil]}   }
+    ## no key  (CGI: {""=>["a", "b"], nil=>[nil]})
+    if_cgiext { tdata['&=a&=b'] = {''=>['', 'a', 'b']}     }
+    if_cgialt { tdata['&=a&=b'] = {""=>["a", "b"], nil=>[nil]}  }
+    ## invalid format  (CGI: {"a"=>[""], "b"=>[nil]})
+    if_cgiext { tdata['a=&b&&'] = {'a'=>[''], 'b'=>[''], ''=>['', '']}  }
+    if_cgialt { tdata['a=&b&&'] = {"a"=>[""], "b"=>[nil]}  }
+    tdata.each do |input, expected|
+      if_cgiext { actual = CGIExt.parse_query_string(input) }
+      if_cgialt { actual = CGI.parse(input) }
+      assert_equal(expected, actual)
+      if_cgiext { assert_equal(CGI.parse(input), actual) }
+    end
+    ## default value is frozen empty array
+    assert_equal(actual['unknownkey'], [])
+    ex = nil
+    if "".respond_to?(:encoding)      # Ruby1.9
+      errclass = RuntimeError
+    else
+      errclass = TypeError
+    end
+    ex = assert_raise(errclass) { actual['unknownkey'] << 'foo' }
+    assert_equal("can't modify frozen array", ex.message)
+  end
+
+
+end

metadata

@@ -1,33 +1,26 @@
 --- !ruby/object:Gem::Specification 
-rubygems_version: 0.9.2
-specification_version: 1
 name: cgialt
 version: !ruby/object:Gem::Version 
-  version: 0.0.2
-date: 2007-12-11 00:00:00 +09:00
-summary: an alternative of 'cgi.rb' in pure Ruby
-require_paths: 
-- lib
-email: 
-homepage: http://cgialt.rubyforge.org/
-rubyforge_project: 
-description: CGIAlt is an alternative library of 'cgi.rb'. It is compatible with and faster than 'cgi.rb'. It is able to install with CGIExt (which is re-implementation of cgi.rb in C extension).
-autorequire: 
-default_executable: 
-bindir: bin
-has_rdoc: false
-required_ruby_version: !ruby/object:Gem::Version::Requirement 
-  requirements: 
-  - - ">"
-    - !ruby/object:Gem::Version 
-      version: 0.0.0
-  version: 
+  version: 1.0.0
 platform: ruby
-signing_key: 
-cert_chain: 
-post_install_message: 
 authors: 
 - makoto kuwata
+autorequire: 
+bindir: bin
+cert_chain: []
+
+date: 2008-11-09 00:00:00 +09:00
+default_executable: 
+dependencies: []
+
+description: CGIAlt is an alternative library of 'cgi.rb'. It is compatible with and faster than 'cgi.rb'. It is able to install with CGIExt (which is re-implementation of cgi.rb in C extension).
+email: 
+executables: []
+
+extensions: []
+
+extra_rdoc_files: []
+
 files: 
 - lib/cgialt
 - lib/cgialt/cookie.rb
@@ -44,6 +37,7 @@ files:
 - test/test_cgi_header.rb
 - test/test_cgi_modruby.rb
 - test/test_cgi_multipart.rb
+- test/test_cgi_util.rb
 - test/testdata
 - test/testdata/file1.html
 - test/testdata/large.png
@@ -52,17 +46,31 @@ files:
 - bench.rb
 - setup.rb
 - CHANGES.txt
-test_files: []
-
+has_rdoc: false
+homepage: http://cgialt.rubyforge.org/
+post_install_message: 
 rdoc_options: []
 
-extra_rdoc_files: []
-
-executables: []
-
-extensions: []
-
+require_paths: 
+- lib
+required_ruby_version: !ruby/object:Gem::Requirement 
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      version: "0"
+  version: 
+required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      version: "0"
+  version: 
 requirements: []
 
-dependencies: []
+rubyforge_project: 
+rubygems_version: 1.2.0
+signing_key: 
+specification_version: 2
+summary: an alternative of 'cgi.rb' in pure Ruby
+test_files: []