Add support for single nested hashes.

lib/scrolls/parser.rb

@@ -14,39 +14,37 @@ def unparse(data)
           "#{k}=nil"
         elsif v.is_a?(Time)
           "#{k}=#{v.strftime("%FT%H:%M:%S%z")}"
+        elsif v.is_a?(Hash)
+          v.map { |(nk,nv)| "#{k}.#{nk.to_s}=#{handle_quotes(nv)}" }
         else
-          v = v.to_s
-          has_single_quote = v.index("'")
-          has_double_quote = v.index('"')
-          if v =~ / /
-            if has_single_quote && has_double_quote
-              v = '"' + v.gsub(/\\|"/) { |c| "\\#{c}" } + '"'
-            elsif has_double_quote
-              v = "'" + v.gsub('\\', '\\\\\\') + "'"
-            else
-              v = '"' + v.gsub('\\', '\\\\\\') + '"'
-            end
-          elsif v =~ /=/
-            v = '"' + v + '"'
-          end
+          v = handle_quotes(v)
           "#{k}=#{v}"
         end
       end.compact.join(" ")
     end
 
     def parse(data)
       vals = {}
+      nvals = {}
       str = data.dup if data.is_a?(String)
 
       patterns = [
         /([^= ]+)="((?:\\.|[^"\\])*)"/, # key="\"literal\" escaped val"
         /([^= ]+)='((?:\\.|[^'\\])*)'/, # key='\'literal\' escaped val'
+        /([^= ]+)\.([^= ]+)=([^ =]+)/,  # key.group=value
         /([^= ]+)=([^ =]+)/             # key=value
       ]
 
       patterns.each do |pattern|
         str.scan(pattern) do |match|
-          v = match[1]
+          k = match[0]         # Our key will always be our first match
+          if match.length == 3 # If we are parsing a nested value (ie: k.n=v)
+            n = match[1]       # Then our nested key will be our second match
+            v = match[2]       # And our nested value will be our third match
+          else
+            v = match[1]       # Default
+          end
+
           v.gsub!(/\\"/, '"')                # unescape \"
           v.gsub!(/\\\\/, "\\")              # unescape \\
 
@@ -60,7 +58,12 @@ def parse(data)
             v = true
           end
 
-          vals[match[0]] = v
+          if n
+            nvals[n.to_sym] = v
+            vals[k] = nvals
+          else
+            vals[k] = v
+          end
         end
         # sub value, leaving keys in order
         str.gsub!(pattern, "\\1")
@@ -72,5 +75,25 @@ def parse(data)
         h
       end
     end
+
+    private
+
+    def handle_quotes(v)
+      v = v.to_s
+      has_single_quote = v.index("'")
+      has_double_quote = v.index('"')
+      if v =~ / /
+        if has_single_quote && has_double_quote
+          v = '"' + v.gsub(/\\|"/) { |c| "\\#{c}" } + '"'
+        elsif has_double_quote
+          v = "'" + v.gsub('\\', '\\\\\\') + "'"
+        else
+          v = '"' + v.gsub('\\', '\\\\\\') + '"'
+        end
+      elsif v =~ /=/
+        v = '"' + v + '"'
+      end
+      v
+    end
   end
 end

test/test_parser.rb

@@ -68,4 +68,10 @@ def test_parse_nil
     data = { n: nil }
     assert_equal "n=nil", unparse(data)
   end
+
+  def test_nested_hashes
+    data = { t: { n: "v", o: "w" } }
+    assert_equal 't.n=v t.o=w', unparse(data)
+    assert_equal data.inspect, parse(unparse(data)).inspect
+  end
 end