finalized multiline-support

it's now possible to contain newlines in a parameter if it's enclosed by "

lib/inifile.rb

@@ -49,9 +49,9 @@ def initialize( filename, opts = {} )
     @rgxp_section = %r/\A\s*\[([^\]]+)\]/o
     @rgxp_param   = %r/\A([^#{@param}]+)#{@param}(.*)\z/
 
-    @rgxp_multiline_start = %r/\A(?<param>[^#{@param}]+)#{@param}\s*"(?<value>.*)\z/
-    @rgxp_multiline_value = %r/\A(?<value>[^"]*)\z/
-    @rgxp_multiline_end   = %r/\A(?<value>[^"]*)"\z/
+    @rgxp_multiline_start = %r/\A(?<param>[^#{@param}]+)#{@param}\s*?"+(?<value>.*)\z/
+    @rgxp_multiline_value = %r/\A(?<value>.*[^"])\z/
+    @rgxp_multiline_end   = %r/\A(?<value>.*)"\z/
 
     parse
   end
@@ -297,14 +297,14 @@ def parse
           tmp_param = $~[:param].strip
           tmp_value = $~[:value] + "\n"
 
-       elsif line =~ @rgxp_multiline_value && tmp_param != ""  then
-
-          tmp_value += $~[:value] + "\n"
-
         elsif line =~ @rgxp_multiline_end && tmp_param != "" then
 
           section[tmp_param] = tmp_value + $~[:value]
-          tmp_value, tmp_param = ""
+          tmp_value, tmp_param = "", ""
+
+        elsif line =~ @rgxp_multiline_value && tmp_param != ""  then
+
+          tmp_value += $~[:value] + "\n"
 
         # ignore blank lines and comment lines
         elsif line =~ @rgxp_comment then
@@ -319,7 +319,7 @@ def parse
         # otherwise we have a parameter
         elsif line =~ @rgxp_param then
 
-         begin
+          begin
             section[$1.strip] = $2.strip
           rescue NoMethodError
             raise Error, "parameter encountered before first section"
@@ -330,6 +330,7 @@ def parse
         end
       end  # while
     end  # File.open
+
   end
 
 end  # class IniFile

test/data/multiline.ini

@@ -0,0 +1,17 @@
+[section_one]
+one = 1
+two = 2
+
+[section_two]
+three =         3
+
+; comments should be ignored
+[section_three]
+three   = "hello
+multiline"
+other = stuff
+
+[section_four]
+four   = "hello
+multiple
+multilines"

test/test_inifile.rb

@@ -6,7 +6,7 @@
   require 'inifile'
 rescue LoadError
   require 'rubygems'
-  require '/home/melkon/rb/inifile/lib/inifile'
+  require 'inifile'
 end
 
 require 'fileutils'
@@ -335,12 +335,12 @@ def test_multiline_parsing
 
     ini_file = IniFile.load('test/data/multiline.ini')
 
-    multiline = ini_file['section_two']
-    expected = {"four" => "hello\nmultiline"}
+    multiline = ini_file['section_three']
+    expected = {"three" => "hello\nmultiline", "other" => "stuff"}
     assert_equal expected, multiline
 
-    multiple = ini_file['section_three']
-    expected = {"three" => "hello\nmultiple\nmultilines"}
+    multiple = ini_file['section_four']
+    expected = {"four" => "hello\nmultiple\nmultilines"}
     assert_equal expected, multiple
 
   end