From ccfce40446b0f7ca38483a1e9bbc6b07fb3faa8d Mon Sep 17 00:00:00 2001
From: David Haslem <therabidbanana@gmail.com>
Date: Mon, 21 May 2012 12:01:08 -0400
Subject: [PATCH] Fix for unordered hashes in ruby 1.8

---
 spec/addressable/template_spec.rb | 297 ++++++++++++++++++++++++++----
 1 file changed, 263 insertions(+), 34 deletions(-)

diff --git a/spec/addressable/template_spec.rb b/spec/addressable/template_spec.rb
index 2a5195fb..4a3589ea 100644
--- a/spec/addressable/template_spec.rb
+++ b/spec/addressable/template_spec.rb
@@ -2,9 +2,14 @@
 
 shared_examples_for 'expands' do |tests|
   tests.each do |template, expansion|
-    it "#{template} to #{expansion}" do
+    exp = expansion.is_a?(Array) ? expansion.first : expansion
+    it "#{template} to #{exp}" do
       tmpl = Addressable::Template.new(template).expand(subject)
-      tmpl.to_str.should == expansion
+      if expansion.is_a?(Array)
+        expansion.any?{|i| i == tmpl.to_str}.should be_true
+      else
+        tmpl.to_str.should == expansion
+      end
     end
   end
 end
@@ -120,8 +125,22 @@
       '{var:30}' => 'value',
       '{list}' => 'red,green,blue',
       '{list*}' => 'red,green,blue',
-      '{keys}' => 'semi,%3B,dot,.,comma,%2C',
-      '{keys*}' => 'semi=%3B,dot=.,comma=%2C',
+      '{keys}' => [
+        'semi,%3B,dot,.,comma,%2C',
+        'dot,.,semi,%3B,comma,%2C',
+        'comma,%2C,semi,%3B,dot,.',
+        'semi,%3B,comma,%2C,dot,.',
+        'dot,.,comma,%2C,semi,%3B',
+        'comma,%2C,dot,.,semi,%3B'
+      ],
+      '{keys*}' => [
+        'semi=%3B,dot=.,comma=%2C',
+        'dot=.,semi=%3B,comma=%2C',
+        'comma=%2C,semi=%3B,dot=.',
+        'semi=%3B,comma=%2C,dot=.',
+        'dot=.,comma=%2C,semi=%3B',
+        'comma=%2C,dot=.,semi=%3B'
+      ],
     }
   end
   context "Operator + with value modifiers" do
@@ -129,8 +148,22 @@
       '{+path:6}/here' => '/foo/b/here',
       '{+list}' => 'red,green,blue',
       '{+list*}' => 'red,green,blue',
-      '{+keys}' => 'semi,;,dot,.,comma,,',
-      '{+keys*}' => 'semi=;,dot=.,comma=,',
+      '{+keys}' => [
+        'semi,;,dot,.,comma,,',
+        'dot,.,semi,;,comma,,',
+        'comma,,,semi,;,dot,.',
+        'semi,;,comma,,,dot,.',
+        'dot,.,comma,,,semi,;',
+        'comma,,,dot,.,semi,;'
+      ],
+      '{+keys*}' => [
+        'semi=;,dot=.,comma=,',
+        'dot=.,semi=;,comma=,',
+        'comma=,,semi=;,dot=.',
+        'semi=;,comma=,,dot=.',
+        'dot=.,comma=,,semi=;',
+        'comma=,,dot=.,semi=;'
+      ],
     }
   end
   context "Operator # with value modifiers" do
@@ -138,8 +171,22 @@
       '{#path:6}/here' => '#/foo/b/here',
       '{#list}' => '#red,green,blue',
       '{#list*}' => '#red,green,blue',
-      '{#keys}' => '#semi,;,dot,.,comma,,',
-      '{#keys*}' => '#semi=;,dot=.,comma=,',
+      '{#keys}' => [
+        '#semi,;,dot,.,comma,,',
+        '#dot,.,semi,;,comma,,',
+        '#comma,,,semi,;,dot,.',
+        '#semi,;,comma,,,dot,.',
+        '#dot,.,comma,,,semi,;',
+        '#comma,,,dot,.,semi,;'
+      ],
+      '{#keys*}' => [
+        '#semi=;,dot=.,comma=,',
+        '#dot=.,semi=;,comma=,',
+        '#comma=,,semi=;,dot=.',
+        '#semi=;,comma=,,dot=.',
+        '#dot=.,comma=,,semi=;',
+        '#comma=,,dot=.,semi=;'
+      ],
     }
   end
   context "Operator . with value modifiers" do
@@ -147,8 +194,22 @@
       'X{.var:3}' => 'X.val',
       'X{.list}' => 'X.red,green,blue',
       'X{.list*}' => 'X.red.green.blue',
-      'X{.keys}' => 'X.semi,%3B,dot,.,comma,%2C',
-      'X{.keys*}' => 'X.semi=%3B.dot=..comma=%2C',
+      'X{.keys}' => [
+        'X.semi,%3B,dot,.,comma,%2C',
+        'X.dot,.,semi,%3B,comma,%2C',
+        'X.comma,%2C,semi,%3B,dot,.',
+        'X.semi,%3B,comma,%2C,dot,.',
+        'X.dot,.,comma,%2C,semi,%3B',
+        'X.comma,%2C,dot,.,semi,%3B'
+      ],
+      'X{.keys*}' => [
+        'X.semi=%3B.dot=..comma=%2C',
+        'X.dot=..semi=%3B.comma=%2C',
+        'X.comma=%2C.semi=%3B.dot=.',
+        'X.semi=%3B.comma=%2C.dot=.',
+        'X.dot=..comma=%2C.semi=%3B',
+        'X.comma=%2C.dot=..semi=%3B'
+      ],
     }
   end
   context "Operator / with value modifiers" do
@@ -157,8 +218,22 @@
       '{/list}' => '/red,green,blue',
       '{/list*}' => '/red/green/blue',
       '{/list*,path:4}' => '/red/green/blue/%2Ffoo',
-      '{/keys}' => '/semi,%3B,dot,.,comma,%2C',
-      '{/keys*}' => '/semi=%3B/dot=./comma=%2C',
+      '{/keys}' => [
+        '/semi,%3B,dot,.,comma,%2C',
+        '/dot,.,semi,%3B,comma,%2C',
+        '/comma,%2C,semi,%3B,dot,.',
+        '/semi,%3B,comma,%2C,dot,.',
+        '/dot,.,comma,%2C,semi,%3B',
+        '/comma,%2C,dot,.,semi,%3B'
+      ],
+      '{/keys*}' => [
+        '/semi=%3B/dot=./comma=%2C',
+        '/dot=./semi=%3B/comma=%2C',
+        '/comma=%2C/semi=%3B/dot=.',
+        '/semi=%3B/comma=%2C/dot=.',
+        '/dot=./comma=%2C/semi=%3B',
+        '/comma=%2C/dot=./semi=%3B'
+      ],
     }
   end
   context "Operator ; with value modifiers" do
@@ -166,8 +241,22 @@
       '{;hello:5}' => ';hello=Hello',
       '{;list}' => ';list=red,green,blue',
       '{;list*}' => ';list=red;list=green;list=blue',
-      '{;keys}' => ';keys=semi,%3B,dot,.,comma,%2C',
-      '{;keys*}' => ';semi=%3B;dot=.;comma=%2C',
+      '{;keys}' => [
+        ';keys=semi,%3B,dot,.,comma,%2C',
+        ';keys=dot,.,semi,%3B,comma,%2C',
+        ';keys=comma,%2C,semi,%3B,dot,.',
+        ';keys=semi,%3B,comma,%2C,dot,.',
+        ';keys=dot,.,comma,%2C,semi,%3B',
+        ';keys=comma,%2C,dot,.,semi,%3B'
+      ],
+      '{;keys*}' => [
+        ';semi=%3B;dot=.;comma=%2C',
+        ';dot=.;semi=%3B;comma=%2C',
+        ';comma=%2C;semi=%3B;dot=.',
+        ';semi=%3B;comma=%2C;dot=.',
+        ';dot=.;comma=%2C;semi=%3B',
+        ';comma=%2C;dot=.;semi=%3B'
+      ],
     }
   end
   context "Operator ? with value modifiers" do
@@ -175,8 +264,22 @@
       '{?var:3}' => '?var=val',
       '{?list}' => '?list=red,green,blue',
       '{?list*}' => '?list=red&list=green&list=blue',
-      '{?keys}' => '?keys=semi,%3B,dot,.,comma,%2C',
-      '{?keys*}' => '?semi=%3B&dot=.&comma=%2C',
+      '{?keys}' => [
+        '?keys=semi,%3B,dot,.,comma,%2C',
+        '?keys=dot,.,semi,%3B,comma,%2C',
+        '?keys=comma,%2C,semi,%3B,dot,.',
+        '?keys=semi,%3B,comma,%2C,dot,.',
+        '?keys=dot,.,comma,%2C,semi,%3B',
+        '?keys=comma,%2C,dot,.,semi,%3B'
+      ],
+      '{?keys*}' => [
+        '?semi=%3B&dot=.&comma=%2C',
+        '?dot=.&semi=%3B&comma=%2C',
+        '?comma=%2C&semi=%3B&dot=.',
+        '?semi=%3B&comma=%2C&dot=.',
+        '?dot=.&comma=%2C&semi=%3B',
+        '?comma=%2C&dot=.&semi=%3B'
+      ],
     }
   end
   context "Operator & with value modifiers" do
@@ -184,8 +287,22 @@
       '{&var:3}' => '&var=val',
       '{&list}' => '&list=red,green,blue',
       '{&list*}' => '&list=red&list=green&list=blue',
-      '{&keys}' => '&keys=semi,%3B,dot,.,comma,%2C',
-      '{&keys*}' => '&semi=%3B&dot=.&comma=%2C',
+      '{&keys}' => [
+        '&keys=semi,%3B,dot,.,comma,%2C',
+        '&keys=dot,.,semi,%3B,comma,%2C',
+        '&keys=comma,%2C,semi,%3B,dot,.',
+        '&keys=semi,%3B,comma,%2C,dot,.',
+        '&keys=dot,.,comma,%2C,semi,%3B',
+        '&keys=comma,%2C,dot,.,semi,%3B'
+      ],
+      '{&keys*}' => [
+        '&semi=%3B&dot=.&comma=%2C',
+        '&dot=.&semi=%3B&comma=%2C',
+        '&comma=%2C&semi=%3B&dot=.',
+        '&semi=%3B&comma=%2C&dot=.',
+        '&dot=.&comma=%2C&semi=%3B',
+        '&comma=%2C&dot=.&semi=%3B'
+      ],
     }
   end
 end
@@ -265,8 +382,22 @@
       '{var:30}' => 'value',
       '{list}' => 'red,green,blue',
       '{list*}' => 'red,green,blue',
-      '{keys}' => 'semi,%3B,dot,.,comma,%2C',
-      '{keys*}' => 'semi=%3B,dot=.,comma=%2C',
+      '{keys}' => [
+        'semi,%3B,dot,.,comma,%2C',
+        'dot,.,semi,%3B,comma,%2C',
+        'comma,%2C,semi,%3B,dot,.',
+        'semi,%3B,comma,%2C,dot,.',
+        'dot,.,comma,%2C,semi,%3B',
+        'comma,%2C,dot,.,semi,%3B'
+      ],
+      '{keys*}' => [
+        'semi=%3B,dot=.,comma=%2C',
+        'dot=.,semi=%3B,comma=%2C',
+        'comma=%2C,semi=%3B,dot=.',
+        'semi=%3B,comma=%2C,dot=.',
+        'dot=.,comma=%2C,semi=%3B',
+        'comma=%2C,dot=.,semi=%3B'
+      ],
     }
   end
   context "reserved expansion (+)" do
@@ -286,8 +417,22 @@
       '{+path:6}/here' => '/foo/b/here',
       '{+list}' => 'red,green,blue',
       '{+list*}' => 'red,green,blue',
-      '{+keys}' => 'semi,;,dot,.,comma,,',
-      '{+keys*}' => 'semi=;,dot=.,comma=,',
+      '{+keys}' => [
+        'semi,;,dot,.,comma,,',
+        'dot,.,semi,;,comma,,',
+        'comma,,,semi,;,dot,.',
+        'semi,;,comma,,,dot,.',
+        'dot,.,comma,,,semi,;',
+        'comma,,,dot,.,semi,;'
+      ],
+      '{+keys*}' => [
+        'semi=;,dot=.,comma=,',
+        'dot=.,semi=;,comma=,',
+        'comma=,,semi=;,dot=.',
+        'semi=;,comma=,,dot=.',
+        'dot=.,comma=,,semi=;',
+        'comma=,,dot=.,semi=;'
+      ],
     }
   end
   context "fragment expansion (#)" do
@@ -302,8 +447,22 @@
       '{#path:6}/here' => '#/foo/b/here',
       '{#list}' => '#red,green,blue',
       '{#list*}' => '#red,green,blue',
-      '{#keys}' => '#semi,;,dot,.,comma,,',
-      '{#keys*}' => '#semi=;,dot=.,comma=,',
+      '{#keys}' => [
+        '#semi,;,dot,.,comma,,',
+        '#dot,.,semi,;,comma,,',
+        '#comma,,,semi,;,dot,.',
+        '#semi,;,comma,,,dot,.',
+        '#dot,.,comma,,,semi,;',
+        '#comma,,,dot,.,semi,;'
+      ],
+      '{#keys*}' => [
+        '#semi=;,dot=.,comma=,',
+        '#dot=.,semi=;,comma=,',
+        '#comma=,,semi=;,dot=.',
+        '#semi=;,comma=,,dot=.',
+        '#dot=.,comma=,,semi=;',
+        '#comma=,,dot=.,semi=;'
+      ],
     }
   end
   context "label expansion (.)" do
@@ -318,8 +477,22 @@
       'X{.var:3}' => 'X.val',
       'X{.list}' => 'X.red,green,blue',
       'X{.list*}' => 'X.red.green.blue',
-      'X{.keys}' => 'X.semi,%3B,dot,.,comma,%2C',
-      'X{.keys*}' => 'X.semi=%3B.dot=..comma=%2C',
+      'X{.keys}' => [
+        'X.semi,%3B,dot,.,comma,%2C',
+        'X.dot,.,semi,%3B,comma,%2C',
+        'X.comma,%2C,semi,%3B,dot,.',
+        'X.semi,%3B,comma,%2C,dot,.',
+        'X.dot,.,comma,%2C,semi,%3B',
+        'X.comma,%2C,dot,.,semi,%3B'
+      ],
+      'X{.keys*}' => [
+        'X.semi=%3B.dot=..comma=%2C',
+        'X.dot=..semi=%3B.comma=%2C',
+        'X.comma=%2C.semi=%3B.dot=.',
+        'X.semi=%3B.comma=%2C.dot=.',
+        'X.dot=..comma=%2C.semi=%3B',
+        'X.comma=%2C.dot=..semi=%3B'
+      ],
       'X{.empty_keys}' => 'X',
       'X{.empty_keys*}' => 'X',
     }
@@ -338,8 +511,22 @@
       '{/list}' => '/red,green,blue',
       '{/list*}' => '/red/green/blue',
       '{/list*,path:4}' => '/red/green/blue/%2Ffoo',
-      '{/keys}' => '/semi,%3B,dot,.,comma,%2C',
-      '{/keys*}' => '/semi=%3B/dot=./comma=%2C',
+      '{/keys}' => [
+        '/semi,%3B,dot,.,comma,%2C',
+        '/dot,.,semi,%3B,comma,%2C',
+        '/comma,%2C,semi,%3B,dot,.',
+        '/semi,%3B,comma,%2C,dot,.',
+        '/dot,.,comma,%2C,semi,%3B',
+        '/comma,%2C,dot,.,semi,%3B'
+      ],
+      '{/keys*}' => [
+        '/semi=%3B/dot=./comma=%2C',
+        '/dot=./semi=%3B/comma=%2C',
+        '/comma=%2C/semi=%3B/dot=.',
+        '/semi=%3B/comma=%2C/dot=.',
+        '/dot=./comma=%2C/semi=%3B',
+        '/comma=%2C/dot=./semi=%3B'
+      ],
     }
   end
   context "path-style expansion (;)" do
@@ -355,8 +542,22 @@
       '{;hello:5}' => ';hello=Hello',
       '{;list}' => ';list=red,green,blue',
       '{;list*}' => ';list=red;list=green;list=blue',
-      '{;keys}' => ';keys=semi,%3B,dot,.,comma,%2C',
-      '{;keys*}' => ';semi=%3B;dot=.;comma=%2C',
+      '{;keys}' => [
+        ';keys=semi,%3B,dot,.,comma,%2C',
+        ';keys=dot,.,semi,%3B,comma,%2C',
+        ';keys=comma,%2C,semi,%3B,dot,.',
+        ';keys=semi,%3B,comma,%2C,dot,.',
+        ';keys=dot,.,comma,%2C,semi,%3B',
+        ';keys=comma,%2C,dot,.,semi,%3B'
+      ],
+      '{;keys*}' => [
+        ';semi=%3B;dot=.;comma=%2C',
+        ';dot=.;semi=%3B;comma=%2C',
+        ';comma=%2C;semi=%3B;dot=.',
+        ';semi=%3B;comma=%2C;dot=.',
+        ';dot=.;comma=%2C;semi=%3B',
+        ';comma=%2C;dot=.;semi=%3B'
+      ],
     }
   end
   context "form query expansion (?)" do
@@ -369,8 +570,22 @@
       '{?var:3}' => '?var=val',
       '{?list}' => '?list=red,green,blue',
       '{?list*}' => '?list=red&list=green&list=blue',
-      '{?keys}' => '?keys=semi,%3B,dot,.,comma,%2C',
-      '{?keys*}' => '?semi=%3B&dot=.&comma=%2C',
+      '{?keys}' => [
+        '?keys=semi,%3B,dot,.,comma,%2C',
+        '?keys=dot,.,semi,%3B,comma,%2C',
+        '?keys=comma,%2C,semi,%3B,dot,.',
+        '?keys=semi,%3B,comma,%2C,dot,.',
+        '?keys=dot,.,comma,%2C,semi,%3B',
+        '?keys=comma,%2C,dot,.,semi,%3B'
+      ],
+      '{?keys*}' => [
+        '?semi=%3B&dot=.&comma=%2C',
+        '?dot=.&semi=%3B&comma=%2C',
+        '?comma=%2C&semi=%3B&dot=.',
+        '?semi=%3B&comma=%2C&dot=.',
+        '?dot=.&comma=%2C&semi=%3B',
+        '?comma=%2C&dot=.&semi=%3B'
+      ],
     }
   end
   context "form query expansion (&)" do
@@ -383,8 +598,22 @@
       '{&var:3}' => '&var=val',
       '{&list}' => '&list=red,green,blue',
       '{&list*}' => '&list=red&list=green&list=blue',
-      '{&keys}' => '&keys=semi,%3B,dot,.,comma,%2C',
-      '{&keys*}' => '&semi=%3B&dot=.&comma=%2C',
+      '{&keys}' => [
+        '&keys=semi,%3B,dot,.,comma,%2C',
+        '&keys=dot,.,semi,%3B,comma,%2C',
+        '&keys=comma,%2C,semi,%3B,dot,.',
+        '&keys=semi,%3B,comma,%2C,dot,.',
+        '&keys=dot,.,comma,%2C,semi,%3B',
+        '&keys=comma,%2C,dot,.,semi,%3B'
+      ],
+      '{&keys*}' => [
+        '&semi=%3B&dot=.&comma=%2C',
+        '&dot=.&semi=%3B&comma=%2C',
+        '&comma=%2C&semi=%3B&dot=.',
+        '&semi=%3B&comma=%2C&dot=.',
+        '&dot=.&comma=%2C&semi=%3B',
+        '&comma=%2C&dot=.&semi=%3B'
+      ],
     }
   end
 end