diff --git a/ext/psych/psych_emitter.c b/ext/psych/psych_emitter.c
index e71bcb62..110eb031 100644
--- a/ext/psych/psych_emitter.c
+++ b/ext/psych/psych_emitter.c
@@ -182,8 +182,8 @@ static VALUE start_document(VALUE self, VALUE version, VALUE tags, VALUE imp)
             Check_Type(tuple, T_ARRAY);
 
             if(RARRAY_LEN(tuple) < 2) {
-        	xfree(head);
-        	rb_raise(rb_eRuntimeError, "tag tuple must be of length 2");
+                xfree(head);
+                rb_raise(rb_eRuntimeError, "tag tuple must be of length 2");
             }
             name  = RARRAY_AREF(tuple, 0);
             value = RARRAY_AREF(tuple, 1);
diff --git a/ext/psych/psych_parser.c b/ext/psych/psych_parser.c
index f08bddfe..26e2d41e 100644
--- a/ext/psych/psych_parser.c
+++ b/ext/psych/psych_parser.c
@@ -91,12 +91,12 @@ static VALUE make_exception(yaml_parser_t * parser, VALUE path)
         ePsychSyntaxError = rb_const_get(mPsych, rb_intern("SyntaxError"));
 
         return rb_funcall(ePsychSyntaxError, rb_intern("new"), 6,
-        	path,
-        	SIZET2NUM(line),
-        	SIZET2NUM(column),
-        	SIZET2NUM(parser->problem_offset),
-        	parser->problem ? rb_usascii_str_new2(parser->problem) : Qnil,
-        	parser->context ? rb_usascii_str_new2(parser->context) : Qnil);
+                path,
+                SIZET2NUM(line),
+                SIZET2NUM(column),
+                SIZET2NUM(parser->problem_offset),
+                parser->problem ? rb_usascii_str_new2(parser->problem) : Qnil,
+                parser->context ? rb_usascii_str_new2(parser->context) : Qnil);
     }
 }
 
@@ -269,10 +269,10 @@ static VALUE parse(VALUE self, VALUE handler, VALUE yaml, VALUE path)
         yaml = transcode_string(yaml, &parser_encoding);
         yaml_parser_set_encoding(parser, parser_encoding);
         yaml_parser_set_input_string(
-        	parser,
-        	(const unsigned char *)RSTRING_PTR(yaml),
-        	(size_t)RSTRING_LEN(yaml)
-        	);
+                parser,
+                (const unsigned char *)RSTRING_PTR(yaml),
+                (size_t)RSTRING_LEN(yaml)
+                );
     }
 
     while(!done) {
@@ -304,147 +304,147 @@ static VALUE parse(VALUE self, VALUE handler, VALUE yaml, VALUE path)
         switch(event.type) {
             case YAML_STREAM_START_EVENT:
               {
-        	  VALUE args[2];
+                  VALUE args[2];
 
-        	  args[0] = handler;
-        	  args[1] = INT2NUM(event.data.stream_start.encoding);
-        	  rb_protect(protected_start_stream, (VALUE)args, &state);
+                  args[0] = handler;
+                  args[1] = INT2NUM(event.data.stream_start.encoding);
+                  rb_protect(protected_start_stream, (VALUE)args, &state);
               }
               break;
           case YAML_DOCUMENT_START_EVENT:
             {
-        	VALUE args[4];
-        	/* Get a list of tag directives (if any) */
-        	VALUE tag_directives = rb_ary_new();
-        	/* Grab the document version */
-        	VALUE version = event.data.document_start.version_directive ?
-        	    rb_ary_new3(
-        		(long)2,
-        		INT2NUM(event.data.document_start.version_directive->major),
-        		INT2NUM(event.data.document_start.version_directive->minor)
-        		) : rb_ary_new();
-
-        	if(event.data.document_start.tag_directives.start) {
-        	    yaml_tag_directive_t *start =
-        		event.data.document_start.tag_directives.start;
-        	    yaml_tag_directive_t *end =
-        		event.data.document_start.tag_directives.end;
-        	    for(; start != end; start++) {
-        		VALUE handle = Qnil;
-        		VALUE prefix = Qnil;
-        		if(start->handle) {
-        		    handle = rb_str_new2((const char *)start->handle);
-        		    PSYCH_TRANSCODE(handle, encoding, internal_enc);
-        		}
-
-        		if(start->prefix) {
-        		    prefix = rb_str_new2((const char *)start->prefix);
-        		    PSYCH_TRANSCODE(prefix, encoding, internal_enc);
-        		}
-
-        		rb_ary_push(tag_directives, rb_ary_new3((long)2, handle, prefix));
-        	    }
-        	}
-        	args[0] = handler;
-        	args[1] = version;
-        	args[2] = tag_directives;
-        	args[3] = event.data.document_start.implicit == 1 ? Qtrue : Qfalse;
-        	rb_protect(protected_start_document, (VALUE)args, &state);
+                VALUE args[4];
+                /* Get a list of tag directives (if any) */
+                VALUE tag_directives = rb_ary_new();
+                /* Grab the document version */
+                VALUE version = event.data.document_start.version_directive ?
+                    rb_ary_new3(
+                        (long)2,
+                        INT2NUM(event.data.document_start.version_directive->major),
+                        INT2NUM(event.data.document_start.version_directive->minor)
+                        ) : rb_ary_new();
+
+                if(event.data.document_start.tag_directives.start) {
+                    yaml_tag_directive_t *start =
+                        event.data.document_start.tag_directives.start;
+                    yaml_tag_directive_t *end =
+                        event.data.document_start.tag_directives.end;
+                    for(; start != end; start++) {
+                        VALUE handle = Qnil;
+                        VALUE prefix = Qnil;
+                        if(start->handle) {
+                            handle = rb_str_new2((const char *)start->handle);
+                            PSYCH_TRANSCODE(handle, encoding, internal_enc);
+                        }
+
+                        if(start->prefix) {
+                            prefix = rb_str_new2((const char *)start->prefix);
+                            PSYCH_TRANSCODE(prefix, encoding, internal_enc);
+                        }
+
+                        rb_ary_push(tag_directives, rb_ary_new3((long)2, handle, prefix));
+                    }
+                }
+                args[0] = handler;
+                args[1] = version;
+                args[2] = tag_directives;
+                args[3] = event.data.document_start.implicit == 1 ? Qtrue : Qfalse;
+                rb_protect(protected_start_document, (VALUE)args, &state);
             }
             break;
           case YAML_DOCUMENT_END_EVENT:
             {
-        	VALUE args[2];
+                VALUE args[2];
 
-        	args[0] = handler;
-        	args[1] = event.data.document_end.implicit == 1 ? Qtrue : Qfalse;
-        	rb_protect(protected_end_document, (VALUE)args, &state);
+                args[0] = handler;
+                args[1] = event.data.document_end.implicit == 1 ? Qtrue : Qfalse;
+                rb_protect(protected_end_document, (VALUE)args, &state);
             }
             break;
           case YAML_ALIAS_EVENT:
             {
-        	VALUE args[2];
-        	VALUE alias = Qnil;
-        	if(event.data.alias.anchor) {
-        	    alias = rb_str_new2((const char *)event.data.alias.anchor);
-        	    PSYCH_TRANSCODE(alias, encoding, internal_enc);
-        	}
-
-        	args[0] = handler;
-        	args[1] = alias;
-        	rb_protect(protected_alias, (VALUE)args, &state);
+                VALUE args[2];
+                VALUE alias = Qnil;
+                if(event.data.alias.anchor) {
+                    alias = rb_str_new2((const char *)event.data.alias.anchor);
+                    PSYCH_TRANSCODE(alias, encoding, internal_enc);
+                }
+
+                args[0] = handler;
+                args[1] = alias;
+                rb_protect(protected_alias, (VALUE)args, &state);
             }
             break;
           case YAML_SCALAR_EVENT:
             {
-        	VALUE args[7];
-        	VALUE anchor = Qnil;
-        	VALUE tag = Qnil;
-        	VALUE plain_implicit, quoted_implicit, style;
-        	VALUE val = rb_str_new(
-        	    (const char *)event.data.scalar.value,
-        	    (long)event.data.scalar.length
-        	    );
-
-        	PSYCH_TRANSCODE(val, encoding, internal_enc);
-
-        	if(event.data.scalar.anchor) {
-        	    anchor = rb_str_new2((const char *)event.data.scalar.anchor);
-        	    PSYCH_TRANSCODE(anchor, encoding, internal_enc);
-        	}
-
-        	if(event.data.scalar.tag) {
-        	    tag = rb_str_new2((const char *)event.data.scalar.tag);
-        	    PSYCH_TRANSCODE(tag, encoding, internal_enc);
-        	}
-
-        	plain_implicit =
-        	    event.data.scalar.plain_implicit == 0 ? Qfalse : Qtrue;
-
-        	quoted_implicit =
-        	    event.data.scalar.quoted_implicit == 0 ? Qfalse : Qtrue;
-
-        	style = INT2NUM(event.data.scalar.style);
-
-        	args[0] = handler;
-        	args[1] = val;
-        	args[2] = anchor;
-        	args[3] = tag;
-        	args[4] = plain_implicit;
-        	args[5] = quoted_implicit;
-        	args[6] = style;
-        	rb_protect(protected_scalar, (VALUE)args, &state);
+                VALUE args[7];
+                VALUE anchor = Qnil;
+                VALUE tag = Qnil;
+                VALUE plain_implicit, quoted_implicit, style;
+                VALUE val = rb_str_new(
+                    (const char *)event.data.scalar.value,
+                    (long)event.data.scalar.length
+                    );
+
+                PSYCH_TRANSCODE(val, encoding, internal_enc);
+
+                if(event.data.scalar.anchor) {
+                    anchor = rb_str_new2((const char *)event.data.scalar.anchor);
+                    PSYCH_TRANSCODE(anchor, encoding, internal_enc);
+                }
+
+                if(event.data.scalar.tag) {
+                    tag = rb_str_new2((const char *)event.data.scalar.tag);
+                    PSYCH_TRANSCODE(tag, encoding, internal_enc);
+                }
+
+                plain_implicit =
+                    event.data.scalar.plain_implicit == 0 ? Qfalse : Qtrue;
+
+                quoted_implicit =
+                    event.data.scalar.quoted_implicit == 0 ? Qfalse : Qtrue;
+
+                style = INT2NUM(event.data.scalar.style);
+
+                args[0] = handler;
+                args[1] = val;
+                args[2] = anchor;
+                args[3] = tag;
+                args[4] = plain_implicit;
+                args[5] = quoted_implicit;
+                args[6] = style;
+                rb_protect(protected_scalar, (VALUE)args, &state);
             }
             break;
           case YAML_SEQUENCE_START_EVENT:
             {
-        	VALUE args[5];
-        	VALUE anchor = Qnil;
-        	VALUE tag = Qnil;
-        	VALUE implicit, style;
-        	if(event.data.sequence_start.anchor) {
-        	    anchor = rb_str_new2((const char *)event.data.sequence_start.anchor);
-        	    PSYCH_TRANSCODE(anchor, encoding, internal_enc);
-        	}
-
-        	tag = Qnil;
-        	if(event.data.sequence_start.tag) {
-        	    tag = rb_str_new2((const char *)event.data.sequence_start.tag);
-        	    PSYCH_TRANSCODE(tag, encoding, internal_enc);
-        	}
-
-        	implicit =
-        	    event.data.sequence_start.implicit == 0 ? Qfalse : Qtrue;
-
-        	style = INT2NUM(event.data.sequence_start.style);
-
-        	args[0] = handler;
-        	args[1] = anchor;
-        	args[2] = tag;
-        	args[3] = implicit;
-        	args[4] = style;
-
-        	rb_protect(protected_start_sequence, (VALUE)args, &state);
+                VALUE args[5];
+                VALUE anchor = Qnil;
+                VALUE tag = Qnil;
+                VALUE implicit, style;
+                if(event.data.sequence_start.anchor) {
+                    anchor = rb_str_new2((const char *)event.data.sequence_start.anchor);
+                    PSYCH_TRANSCODE(anchor, encoding, internal_enc);
+                }
+
+                tag = Qnil;
+                if(event.data.sequence_start.tag) {
+                    tag = rb_str_new2((const char *)event.data.sequence_start.tag);
+                    PSYCH_TRANSCODE(tag, encoding, internal_enc);
+                }
+
+                implicit =
+                    event.data.sequence_start.implicit == 0 ? Qfalse : Qtrue;
+
+                style = INT2NUM(event.data.sequence_start.style);
+
+                args[0] = handler;
+                args[1] = anchor;
+                args[2] = tag;
+                args[3] = implicit;
+                args[4] = style;
+
+                rb_protect(protected_start_sequence, (VALUE)args, &state);
             }
             break;
           case YAML_SEQUENCE_END_EVENT:
@@ -452,32 +452,32 @@ static VALUE parse(VALUE self, VALUE handler, VALUE yaml, VALUE path)
             break;
           case YAML_MAPPING_START_EVENT:
             {
-        	VALUE args[5];
-        	VALUE anchor = Qnil;
-        	VALUE tag = Qnil;
-        	VALUE implicit, style;
-        	if(event.data.mapping_start.anchor) {
-        	    anchor = rb_str_new2((const char *)event.data.mapping_start.anchor);
-        	    PSYCH_TRANSCODE(anchor, encoding, internal_enc);
-        	}
-
-        	if(event.data.mapping_start.tag) {
-        	    tag = rb_str_new2((const char *)event.data.mapping_start.tag);
-        	    PSYCH_TRANSCODE(tag, encoding, internal_enc);
-        	}
-
-        	implicit =
-        	    event.data.mapping_start.implicit == 0 ? Qfalse : Qtrue;
-
-        	style = INT2NUM(event.data.mapping_start.style);
-
-        	args[0] = handler;
-        	args[1] = anchor;
-        	args[2] = tag;
-        	args[3] = implicit;
-        	args[4] = style;
-
-        	rb_protect(protected_start_mapping, (VALUE)args, &state);
+                VALUE args[5];
+                VALUE anchor = Qnil;
+                VALUE tag = Qnil;
+                VALUE implicit, style;
+                if(event.data.mapping_start.anchor) {
+                    anchor = rb_str_new2((const char *)event.data.mapping_start.anchor);
+                    PSYCH_TRANSCODE(anchor, encoding, internal_enc);
+                }
+
+                if(event.data.mapping_start.tag) {
+                    tag = rb_str_new2((const char *)event.data.mapping_start.tag);
+                    PSYCH_TRANSCODE(tag, encoding, internal_enc);
+                }
+
+                implicit =
+                    event.data.mapping_start.implicit == 0 ? Qfalse : Qtrue;
+
+                style = INT2NUM(event.data.mapping_start.style);
+
+                args[0] = handler;
+                args[1] = anchor;
+                args[2] = tag;
+                args[3] = implicit;
+                args[4] = style;
+
+                rb_protect(protected_start_mapping, (VALUE)args, &state);
             }
             break;
           case YAML_MAPPING_END_EVENT:
diff --git a/test/psych/test_yaml.rb b/test/psych/test_yaml.rb
index cedec46c..812a15df 100644
--- a/test/psych/test_yaml.rb
+++ b/test/psych/test_yaml.rb
@@ -1,8 +1,6 @@
 # -*- coding: us-ascii; mode: ruby; ruby-indent-level: 4; tab-width: 4 -*-
 # frozen_string_literal: true
-#												vim:sw=4:ts=4
-# $Id$
-#
+
 require_relative 'helper'
 require 'ostruct'
 
@@ -36,30 +34,30 @@ def test_multiline_regexp
     def test_regexp_with_n
         assert_cycle(Regexp.new('',Regexp::NOENCODING))
     end
-	#
-	# Tests modified from 00basic.t in Psych.pm
-	#
-	def test_basic_map
-		# Simple map
-		assert_parse_only(
-			{ 'one' => 'foo', 'three' => 'baz', 'two' => 'bar' }, <<EOY
+    #
+    # Tests modified from 00basic.t in Psych.pm
+    #
+    def test_basic_map
+        # Simple map
+        assert_parse_only(
+            { 'one' => 'foo', 'three' => 'baz', 'two' => 'bar' }, <<EOY
 one: foo
 two: bar
 three: baz
 EOY
-		)
-	end
-
-	def test_basic_strings
-		# Common string types
-		assert_cycle("x")
-		assert_cycle(":x")
-		assert_cycle(":")
-		assert_parse_only(
-			{ 1 => 'simple string', 2 => 42, 3 => '1 Single Quoted String',
-			  4 => 'Psych\'s Double "Quoted" String', 5 => "A block\n  with several\n    lines.\n",
-			  6 => "A \"chomped\" block", 7 => "A folded\n string\n", 8 => ": started string" },
-			  <<EOY
+        )
+    end
+
+    def test_basic_strings
+        # Common string types
+        assert_cycle("x")
+        assert_cycle(":x")
+        assert_cycle(":")
+        assert_parse_only(
+            { 1 => 'simple string', 2 => 42, 3 => '1 Single Quoted String',
+              4 => 'Psych\'s Double "Quoted" String', 5 => "A block\n  with several\n    lines.\n",
+              6 => "A \"chomped\" block", 7 => "A folded\n string\n", 8 => ": started string" },
+              <<EOY
 1: simple string
 2: 42
 3: '1 Single Quoted String'
@@ -76,44 +74,44 @@ def test_basic_strings
    string
 8: ": started string"
 EOY
-		)
-	end
-
-	#
-	# Test the specification examples
-	# - Many examples have been changes because of whitespace problems that
-	#   caused the two to be inequivalent, or keys to be sorted wrong
-	#
-
-	def test_spec_simple_implicit_sequence
-	  	# Simple implicit sequence
-		assert_to_yaml(
-			[ 'Mark McGwire', 'Sammy Sosa', 'Ken Griffey' ], <<EOY
+        )
+    end
+
+    #
+    # Test the specification examples
+    # - Many examples have been changes because of whitespace problems that
+    #   caused the two to be inequivalent, or keys to be sorted wrong
+    #
+
+    def test_spec_simple_implicit_sequence
+          # Simple implicit sequence
+        assert_to_yaml(
+            [ 'Mark McGwire', 'Sammy Sosa', 'Ken Griffey' ], <<EOY
 - Mark McGwire
 - Sammy Sosa
 - Ken Griffey
 EOY
-		)
-	end
+        )
+    end
 
-	def test_spec_simple_implicit_map
-		# Simple implicit map
-		assert_to_yaml(
-			{ 'hr' => 65, 'avg' => 0.278, 'rbi' => 147 }, <<EOY
+    def test_spec_simple_implicit_map
+        # Simple implicit map
+        assert_to_yaml(
+            { 'hr' => 65, 'avg' => 0.278, 'rbi' => 147 }, <<EOY
 avg: 0.278
 hr: 65
 rbi: 147
 EOY
-		)
-	end
-
-	def test_spec_simple_map_with_nested_sequences
-		# Simple mapping with nested sequences
-		assert_to_yaml(
-			{ 'american' =>
-			  [ 'Boston Red Sox', 'Detroit Tigers', 'New York Yankees' ],
-			  'national' =>
-			  [ 'New York Mets', 'Chicago Cubs', 'Atlanta Braves' ] }, <<EOY
+        )
+    end
+
+    def test_spec_simple_map_with_nested_sequences
+        # Simple mapping with nested sequences
+        assert_to_yaml(
+            { 'american' =>
+              [ 'Boston Red Sox', 'Detroit Tigers', 'New York Yankees' ],
+              'national' =>
+              [ 'New York Mets', 'Chicago Cubs', 'Atlanta Braves' ] }, <<EOY
 american:
   - Boston Red Sox
   - Detroit Tigers
@@ -123,16 +121,16 @@ def test_spec_simple_map_with_nested_sequences
   - Chicago Cubs
   - Atlanta Braves
 EOY
-		)
-	end
-
-	def test_spec_simple_sequence_with_nested_map
-		# Simple sequence with nested map
-		assert_to_yaml(
-		  [
-		    {'name' => 'Mark McGwire', 'hr' => 65, 'avg' => 0.278},
-			{'name' => 'Sammy Sosa', 'hr' => 63, 'avg' => 0.288}
-		  ], <<EOY
+        )
+    end
+
+    def test_spec_simple_sequence_with_nested_map
+        # Simple sequence with nested map
+        assert_to_yaml(
+          [
+            {'name' => 'Mark McGwire', 'hr' => 65, 'avg' => 0.278},
+            {'name' => 'Sammy Sosa', 'hr' => 63, 'avg' => 0.288}
+          ], <<EOY
 -
   avg: 0.278
   hr: 65
@@ -142,38 +140,38 @@ def test_spec_simple_sequence_with_nested_map
   hr: 63
   name: Sammy Sosa
 EOY
-		)
-	end
-
-	def test_spec_sequence_of_sequences
-		# Simple sequence with inline sequences
-		assert_parse_only(
-		  [
-		  	[ 'name', 'hr', 'avg' ],
-			[ 'Mark McGwire', 65, 0.278 ],
-			[ 'Sammy Sosa', 63, 0.288 ]
-		  ], <<EOY
+        )
+    end
+
+    def test_spec_sequence_of_sequences
+        # Simple sequence with inline sequences
+        assert_parse_only(
+          [
+              [ 'name', 'hr', 'avg' ],
+            [ 'Mark McGwire', 65, 0.278 ],
+            [ 'Sammy Sosa', 63, 0.288 ]
+          ], <<EOY
 - [ name         , hr , avg   ]
 - [ Mark McGwire , 65 , 0.278 ]
 - [ Sammy Sosa   , 63 , 0.288 ]
 EOY
-		)
-	end
-
-	def test_spec_mapping_of_mappings
-		# Simple map with inline maps
-		assert_parse_only(
-		  { 'Mark McGwire' =>
-		    { 'hr' => 65, 'avg' => 0.278 },
-			'Sammy Sosa' =>
-		    { 'hr' => 63, 'avg' => 0.288 }
-		  }, <<EOY
+        )
+    end
+
+    def test_spec_mapping_of_mappings
+        # Simple map with inline maps
+        assert_parse_only(
+          { 'Mark McGwire' =>
+            { 'hr' => 65, 'avg' => 0.278 },
+            'Sammy Sosa' =>
+            { 'hr' => 63, 'avg' => 0.288 }
+          }, <<EOY
 Mark McGwire: {hr: 65, avg: 0.278}
 Sammy Sosa:   {hr: 63,
                avg: 0.288}
 EOY
-		)
-	end
+        )
+    end
 
     def test_ambiguous_comments
         # [ruby-talk:88012]
@@ -182,11 +180,11 @@ def test_ambiguous_comments
 EOY
     end
 
-	def test_spec_nested_comments
-		# Map and sequences with comments
-		assert_parse_only(
-		  { 'hr' => [ 'Mark McGwire', 'Sammy Sosa' ],
-		    'rbi' => [ 'Sammy Sosa', 'Ken Griffey' ] }, <<EOY
+    def test_spec_nested_comments
+        # Map and sequences with comments
+        assert_parse_only(
+          { 'hr' => [ 'Mark McGwire', 'Sammy Sosa' ],
+            'rbi' => [ 'Sammy Sosa', 'Ken Griffey' ] }, <<EOY
 hr: # 1998 hr ranking
   - Mark McGwire
   - Sammy Sosa
@@ -195,16 +193,16 @@ def test_spec_nested_comments
   - Sammy Sosa
   - Ken Griffey
 EOY
-		)
-	end
-
-	def test_spec_anchors_and_aliases
-		# Anchors and aliases
-		assert_parse_only(
-			{ 'hr' =>
-			  [ 'Mark McGwire', 'Sammy Sosa' ],
-			  'rbi' =>
-			  [ 'Sammy Sosa', 'Ken Griffey' ] }, <<EOY
+        )
+    end
+
+    def test_spec_anchors_and_aliases
+        # Anchors and aliases
+        assert_parse_only(
+            { 'hr' =>
+              [ 'Mark McGwire', 'Sammy Sosa' ],
+              'rbi' =>
+              [ 'Sammy Sosa', 'Ken Griffey' ] }, <<EOY
 hr:
    - Mark McGwire
    # Name "Sammy Sosa" scalar SS
@@ -214,7 +212,7 @@ def test_spec_anchors_and_aliases
    - *SS
    - Ken Griffey
 EOY
-	 	)
+         )
 
         assert_to_yaml(
             [{"arrival"=>"EDI", "departure"=>"LAX", "fareref"=>"DOGMA", "currency"=>"GBP"}, {"arrival"=>"MEL", "departure"=>"SYD", "fareref"=>"MADF", "currency"=>"AUD"}, {"arrival"=>"MCO", "departure"=>"JFK", "fareref"=>"DFSF", "currency"=>"USD"}], <<EOY
@@ -251,13 +249,13 @@ def test_spec_anchors_and_aliases
 EOY
         )
 
-	end
+    end
 
-	def test_spec_mapping_between_sequences
-		# Complex key #1
-		assert_parse_only(
-			{ [ 'Detroit Tigers', 'Chicago Cubs' ] => [ Date.new( 2001, 7, 23 ) ],
-			  [ 'New York Yankees', 'Atlanta Braves' ] => [ Date.new( 2001, 7, 2 ), Date.new( 2001, 8, 12 ), Date.new( 2001, 8, 14 ) ] }, <<EOY
+    def test_spec_mapping_between_sequences
+        # Complex key #1
+        assert_parse_only(
+            { [ 'Detroit Tigers', 'Chicago Cubs' ] => [ Date.new( 2001, 7, 23 ) ],
+              [ 'New York Yankees', 'Atlanta Braves' ] => [ Date.new( 2001, 7, 2 ), Date.new( 2001, 8, 12 ), Date.new( 2001, 8, 14 ) ] }, <<EOY
 ? # PLAY SCHEDULE
   - Detroit Tigers
   - Chicago Cubs
@@ -269,16 +267,16 @@ def test_spec_mapping_between_sequences
 : [ 2001-07-02, 2001-08-12,
     2001-08-14 ]
 EOY
-		)
-
-		# Complex key #2
-		assert_parse_only(
-		  { [ 'New York Yankees', 'Atlanta Braves' ] =>
-		    [ Date.new( 2001, 7, 2 ), Date.new( 2001, 8, 12 ),
-			  Date.new( 2001, 8, 14 ) ],
-			[ 'Detroit Tigers', 'Chicago Cubs' ] =>
-			[ Date.new( 2001, 7, 23 ) ]
-		  }, <<EOY
+        )
+
+        # Complex key #2
+        assert_parse_only(
+          { [ 'New York Yankees', 'Atlanta Braves' ] =>
+            [ Date.new( 2001, 7, 2 ), Date.new( 2001, 8, 12 ),
+              Date.new( 2001, 8, 14 ) ],
+            [ 'Detroit Tigers', 'Chicago Cubs' ] =>
+            [ Date.new( 2001, 7, 23 ) ]
+          }, <<EOY
 ?
     - New York Yankees
     - Atlanta Braves
@@ -292,17 +290,17 @@ def test_spec_mapping_between_sequences
 :
   - 2001-07-23
 EOY
-		)
-	end
-
-	def test_spec_sequence_key_shortcut
-		# Shortcut sequence map
-		assert_parse_only(
-		  { 'invoice' => 34843, 'date' => Date.new( 2001, 1, 23 ),
-		    'bill-to' => 'Chris Dumars', 'product' =>
-			[ { 'item' => 'Super Hoop', 'quantity' => 1 },
-			  { 'item' => 'Basketball', 'quantity' => 4 },
-			  { 'item' => 'Big Shoes', 'quantity' => 1 } ] }, <<EOY
+        )
+    end
+
+    def test_spec_sequence_key_shortcut
+        # Shortcut sequence map
+        assert_parse_only(
+          { 'invoice' => 34843, 'date' => Date.new( 2001, 1, 23 ),
+            'bill-to' => 'Chris Dumars', 'product' =>
+            [ { 'item' => 'Super Hoop', 'quantity' => 1 },
+              { 'item' => 'Basketball', 'quantity' => 4 },
+              { 'item' => 'Big Shoes', 'quantity' => 1 } ] }, <<EOY
 invoice: 34843
 date   : 2001-01-23
 bill-to: Chris Dumars
@@ -314,8 +312,8 @@ def test_spec_sequence_key_shortcut
   - item    : Big Shoes
     quantity: 1
 EOY
-		)
-	end
+        )
+    end
 
     def test_spec_sequence_in_sequence_shortcut
         # Seq-in-seq
@@ -351,31 +349,31 @@ def test_spec_sequence_shortcuts
 EOY
     end
 
-	def test_spec_single_literal
-		# Literal scalar block
-		assert_parse_only( [ "\\/|\\/|\n/ |  |_\n" ], <<EOY )
+    def test_spec_single_literal
+        # Literal scalar block
+        assert_parse_only( [ "\\/|\\/|\n/ |  |_\n" ], <<EOY )
 - |
     \\/|\\/|
     / |  |_
 EOY
-	end
+    end
 
-	def test_spec_single_folded
-		# Folded scalar block
-		assert_parse_only(
-			[ "Mark McGwire's year was crippled by a knee injury.\n" ], <<EOY
+    def test_spec_single_folded
+        # Folded scalar block
+        assert_parse_only(
+            [ "Mark McGwire's year was crippled by a knee injury.\n" ], <<EOY
 - >
     Mark McGwire\'s
     year was crippled
     by a knee injury.
 EOY
-		)
-	end
+        )
+    end
 
-	def test_spec_preserve_indent
-		# Preserve indented spaces
-		assert_parse_only(
-			"Sammy Sosa completed another fine season with great stats.\n\n  63 Home Runs\n  0.288 Batting Average\n\nWhat a year!\n", <<EOY
+    def test_spec_preserve_indent
+        # Preserve indented spaces
+        assert_parse_only(
+            "Sammy Sosa completed another fine season with great stats.\n\n  63 Home Runs\n  0.288 Batting Average\n\nWhat a year!\n", <<EOY
 --- >
  Sammy Sosa completed another
  fine season with great stats.
@@ -385,13 +383,13 @@ def test_spec_preserve_indent
 
  What a year!
 EOY
-		)
-	end
+        )
+    end
 
-	def test_spec_indentation_determines_scope
-		assert_parse_only(
-			{ 'name' => 'Mark McGwire', 'accomplishment' => "Mark set a major league home run record in 1998.\n",
-			  'stats' => "65 Home Runs\n0.278 Batting Average\n" }, <<EOY
+    def test_spec_indentation_determines_scope
+        assert_parse_only(
+            { 'name' => 'Mark McGwire', 'accomplishment' => "Mark set a major league home run record in 1998.\n",
+              'stats' => "65 Home Runs\n0.278 Batting Average\n" }, <<EOY
 name: Mark McGwire
 accomplishment: >
    Mark set a major league
@@ -400,14 +398,14 @@ def test_spec_indentation_determines_scope
    65 Home Runs
    0.278 Batting Average
 EOY
-		)
-	end
-
-	def test_spec_multiline_scalars
-		# Multiline flow scalars
-	 	assert_parse_only(
-	 		{ 'plain' => 'This unquoted scalar spans many lines.',
-	 		  'quoted' => "So does this quoted scalar.\n" }, <<EOY
+        )
+    end
+
+    def test_spec_multiline_scalars
+        # Multiline flow scalars
+         assert_parse_only(
+             { 'plain' => 'This unquoted scalar spans many lines.',
+               'quoted' => "So does this quoted scalar.\n" }, <<EOY
 plain: This unquoted
        scalar spans
        many lines.
@@ -415,19 +413,19 @@ def test_spec_multiline_scalars
   So does this quoted
   scalar.\\n"
 EOY
-		)
-	end
+        )
+    end
 
-	def test_spec_type_int
-		assert_parse_only(
-			{ 'canonical' => 12345, 'decimal' => 12345, 'octal' => '014'.oct, 'hexadecimal' => '0xC'.hex }, <<EOY
+    def test_spec_type_int
+        assert_parse_only(
+            { 'canonical' => 12345, 'decimal' => 12345, 'octal' => '014'.oct, 'hexadecimal' => '0xC'.hex }, <<EOY
 canonical: 12345
 decimal: +12,345
 octal: 014
 hexadecimal: 0xC
 EOY
-		)
-		assert_parse_only(
+        )
+        assert_parse_only(
             { 'canonical' => 685230, 'decimal' => 685230, 'octal' => 02472256, 'hexadecimal' => 0x0A74AE, 'sexagesimal' => 685230 }, <<EOY)
 canonical: 685230
 decimal: +685,230
@@ -435,48 +433,48 @@ def test_spec_type_int
 hexadecimal: 0x0A,74,AE
 sexagesimal: 190:20:30
 EOY
-	end
+    end
 
-	def test_spec_type_float
-		assert_parse_only(
-			{ 'canonical' => 1230.15, 'exponential' => 1230.15, 'fixed' => 1230.15,
-			  'negative infinity' => -1.0/0.0 }, <<EOY)
+    def test_spec_type_float
+        assert_parse_only(
+            { 'canonical' => 1230.15, 'exponential' => 1230.15, 'fixed' => 1230.15,
+              'negative infinity' => -1.0/0.0 }, <<EOY)
 canonical: 1.23015e+3
 exponential: 12.3015e+02
 fixed: 1,230.15
 negative infinity: -.inf
 EOY
-		nan = Psych::load( <<EOY )
+        nan = Psych::load( <<EOY )
 not a number: .NaN
 EOY
-		assert( nan['not a number'].nan? )
-	end
+        assert( nan['not a number'].nan? )
+    end
 
-	def test_spec_type_misc
-		assert_parse_only(
-			{ nil => nil, true => true, false => false, 'string' => '12345' }, <<EOY
+    def test_spec_type_misc
+        assert_parse_only(
+            { nil => nil, true => true, false => false, 'string' => '12345' }, <<EOY
 null: ~
 true: yes
 false: no
 string: '12345'
 EOY
-		)
-	end
-
-	def test_spec_complex_invoice
-		# Complex invoice type
-		id001 = { 'given' => 'Chris', 'family' => 'Dumars', 'address' =>
-			{ 'lines' => "458 Walkman Dr.\nSuite #292\n", 'city' => 'Royal Oak',
-			  'state' => 'MI', 'postal' => 48046 } }
-		assert_parse_only(
-			{ 'invoice' => 34843, 'date' => Date.new( 2001, 1, 23 ),
-			  'bill-to' => id001, 'ship-to' => id001, 'product' =>
-			  [ { 'sku' => 'BL394D', 'quantity' => 4,
-			      'description' => 'Basketball', 'price' => 450.00 },
-				{ 'sku' => 'BL4438H', 'quantity' => 1,
-				  'description' => 'Super Hoop', 'price' => 2392.00 } ],
-			  'tax' => 251.42, 'total' => 4443.52,
-			  'comments' => "Late afternoon is best. Backup contact is Nancy Billsmer @ 338-4338.\n" }, <<EOY
+        )
+    end
+
+    def test_spec_complex_invoice
+        # Complex invoice type
+        id001 = { 'given' => 'Chris', 'family' => 'Dumars', 'address' =>
+            { 'lines' => "458 Walkman Dr.\nSuite #292\n", 'city' => 'Royal Oak',
+              'state' => 'MI', 'postal' => 48046 } }
+        assert_parse_only(
+            { 'invoice' => 34843, 'date' => Date.new( 2001, 1, 23 ),
+              'bill-to' => id001, 'ship-to' => id001, 'product' =>
+              [ { 'sku' => 'BL394D', 'quantity' => 4,
+                  'description' => 'Basketball', 'price' => 450.00 },
+                { 'sku' => 'BL4438H', 'quantity' => 1,
+                  'description' => 'Super Hoop', 'price' => 2392.00 } ],
+              'tax' => 251.42, 'total' => 4443.52,
+              'comments' => "Late afternoon is best. Backup contact is Nancy Billsmer @ 338-4338.\n" }, <<EOY
 invoice: 34843
 date   : 2001-01-23
 bill-to: &id001
@@ -507,12 +505,12 @@ def test_spec_complex_invoice
     Backup contact is Nancy
     Billsmer @ 338-4338.
 EOY
-		)
-	end
+        )
+    end
 
-	def test_spec_log_file
-		doc_ct = 0
-		Psych::load_stream( <<EOY
+    def test_spec_log_file
+        doc_ct = 0
+        Psych::load_stream( <<EOY
 ---
 Time: 2001-11-23 15:01:42 -05:00
 User: ed
@@ -540,52 +538,52 @@ def test_spec_log_file
     code: |-
       foo = bar
 EOY
-		) { |doc|
-			case doc_ct
-				when 0
-					assert_equal( doc, { 'Time' => mktime( 2001, 11, 23, 15, 01, 42, 00, "-05:00" ),
-						'User' => 'ed', 'Warning' => "This is an error message for the log file\n" } )
-				when 1
-					assert_equal( doc, { 'Time' => mktime( 2001, 11, 23, 15, 02, 31, 00, "-05:00" ),
-						'User' => 'ed', 'Warning' => "A slightly different error message.\n" } )
-				when 2
-					assert_equal( doc, { 'Date' => mktime( 2001, 11, 23, 15, 03, 17, 00, "-05:00" ),
-						'User' => 'ed', 'Fatal' => "Unknown variable \"bar\"\n",
-						'Stack' => [
-							{ 'file' => 'TopClass.py', 'line' => 23, 'code' => "x = MoreObject(\"345\\n\")\n" },
-							{ 'file' => 'MoreClass.py', 'line' => 58, 'code' => "foo = bar" } ] } )
-			end
-			doc_ct += 1
-		}
-		assert_equal( doc_ct, 3 )
-	end
-
-	def test_spec_root_fold
-		y = Psych::load( <<EOY
+        ) { |doc|
+            case doc_ct
+                when 0
+                    assert_equal( doc, { 'Time' => mktime( 2001, 11, 23, 15, 01, 42, 00, "-05:00" ),
+                        'User' => 'ed', 'Warning' => "This is an error message for the log file\n" } )
+                when 1
+                    assert_equal( doc, { 'Time' => mktime( 2001, 11, 23, 15, 02, 31, 00, "-05:00" ),
+                        'User' => 'ed', 'Warning' => "A slightly different error message.\n" } )
+                when 2
+                    assert_equal( doc, { 'Date' => mktime( 2001, 11, 23, 15, 03, 17, 00, "-05:00" ),
+                        'User' => 'ed', 'Fatal' => "Unknown variable \"bar\"\n",
+                        'Stack' => [
+                            { 'file' => 'TopClass.py', 'line' => 23, 'code' => "x = MoreObject(\"345\\n\")\n" },
+                            { 'file' => 'MoreClass.py', 'line' => 58, 'code' => "foo = bar" } ] } )
+            end
+            doc_ct += 1
+        }
+        assert_equal( doc_ct, 3 )
+    end
+
+    def test_spec_root_fold
+        y = Psych::load( <<EOY
 ---
 This Psych stream contains a single text value.
 The next stream is a log file - a sequence of
 log entries. Adding an entry to the log is a
 simple matter of appending it at the end.
 EOY
-		)
-		assert_equal( y, "This Psych stream contains a single text value. The next stream is a log file - a sequence of log entries. Adding an entry to the log is a simple matter of appending it at the end." )
-	end
+        )
+        assert_equal( y, "This Psych stream contains a single text value. The next stream is a log file - a sequence of log entries. Adding an entry to the log is a simple matter of appending it at the end." )
+    end
 
-	def test_spec_root_mapping
-		y = Psych::unsafe_load( <<EOY
+    def test_spec_root_mapping
+        y = Psych::unsafe_load( <<EOY
 # This stream is an example of a top-level mapping.
 invoice : 34843
 date    : 2001-01-23
 total   : 4443.52
 EOY
-		)
-		assert_equal( y, { 'invoice' => 34843, 'date' => Date.new( 2001, 1, 23 ), 'total' => 4443.52 } )
-	end
+        )
+        assert_equal( y, { 'invoice' => 34843, 'date' => Date.new( 2001, 1, 23 ), 'total' => 4443.52 } )
+    end
 
-	def test_spec_oneline_docs
-		doc_ct = 0
-		Psych::load_stream( <<EOY
+    def test_spec_oneline_docs
+        doc_ct = 0
+        Psych::load_stream( <<EOY
 # The following is a sequence of three documents.
 # The first contains an empty mapping, the second
 # an empty sequence, and the last an empty string.
@@ -593,21 +591,21 @@ def test_spec_oneline_docs
 --- [ ]
 --- ''
 EOY
-		) { |doc|
-			case doc_ct
-				when 0
-					assert_equal( doc, {} )
-				when 1
-					assert_equal( doc, [] )
-				when 2
-					assert_equal( doc, '' )
-			end
-			doc_ct += 1
-		}
-		assert_equal( doc_ct, 3 )
-	end
-
-	def test_spec_domain_prefix
+        ) { |doc|
+            case doc_ct
+                when 0
+                    assert_equal( doc, {} )
+                when 1
+                    assert_equal( doc, [] )
+                when 2
+                    assert_equal( doc, '' )
+            end
+            doc_ct += 1
+        }
+        assert_equal( doc_ct, 3 )
+    end
+
+    def test_spec_domain_prefix
         customer_proc = proc { |type, val|
             if Hash === val
                 _, _, type = type.split( ':', 3 )
@@ -619,7 +617,7 @@ def test_spec_domain_prefix
         }
         Psych.add_domain_type( "domain.tld/2002", 'invoice', &customer_proc )
         Psych.add_domain_type( "domain.tld/2002", 'customer', &customer_proc )
-		assert_parse_only( { "invoice"=> { "customers"=> [ { "given"=>"Chris", "type"=>"domain customer", "family"=>"Dumars" } ], "type"=>"domain invoice" } }, <<EOY
+        assert_parse_only( { "invoice"=> { "customers"=> [ { "given"=>"Chris", "type"=>"domain customer", "family"=>"Dumars" } ], "type"=>"domain invoice" } }, <<EOY
 # 'http://domain.tld,2002/invoice' is some type family.
 invoice: !domain.tld/2002:invoice
   # 'seq' is shorthand for 'http://yaml.org/seq'.
@@ -632,12 +630,12 @@ def test_spec_domain_prefix
       given : Chris
       family : Dumars
 EOY
-		)
-	end
+        )
+    end
 
-	def test_spec_throwaway
-		assert_parse_only(
-			{"this"=>"contains three lines of text.\nThe third one starts with a\n# character. This isn't a comment.\n"}, <<EOY
+    def test_spec_throwaway
+        assert_parse_only(
+            {"this"=>"contains three lines of text.\nThe third one starts with a\n# character. This isn't a comment.\n"}, <<EOY
 ### These are four throwaway comment  ###
 
 ### lines (the second line is empty). ###
@@ -649,19 +647,19 @@ def test_spec_throwaway
 # These are three throwaway comment
 # lines (the first line is empty).
 EOY
-		)
-	end
+        )
+    end
 
-	def test_spec_force_implicit
-		# Force implicit
-		assert_parse_only(
-			{ 'integer' => 12, 'also int' => 12, 'string' => '12' }, <<EOY
+    def test_spec_force_implicit
+        # Force implicit
+        assert_parse_only(
+            { 'integer' => 12, 'also int' => 12, 'string' => '12' }, <<EOY
 integer: 12
 also int: ! "12"
 string: !str 12
 EOY
-		)
-	end
+        )
+    end
 
     ###
     # Commenting out this test.  This line:
@@ -672,44 +670,44 @@ def test_spec_force_implicit
     #
     #   http://yaml.org/spec/1.1/#id896876
     #
-#	def test_spec_url_escaping
-#		Psych.add_domain_type( "domain.tld,2002", "type0" ) { |type, val|
-#			"ONE: #{val}"
-#		}
-#		Psych.add_domain_type( "domain.tld,2002", "type%30" ) { |type, val|
-#			"TWO: #{val}"
-#		}
-#		assert_parse_only(
-#			{ 'same' => [ 'ONE: value', 'ONE: value' ], 'different' => [ 'TWO: value' ] }, <<EOY
+#    def test_spec_url_escaping
+#        Psych.add_domain_type( "domain.tld,2002", "type0" ) { |type, val|
+#            "ONE: #{val}"
+#        }
+#        Psych.add_domain_type( "domain.tld,2002", "type%30" ) { |type, val|
+#            "TWO: #{val}"
+#        }
+#        assert_parse_only(
+#            { 'same' => [ 'ONE: value', 'ONE: value' ], 'different' => [ 'TWO: value' ] }, <<EOY
 #same:
 #  - !domain.tld,2002/type\\x30 value
 #  - !domain.tld,2002/type0 value
 #different: # As far as the Psych parser is concerned
 #  - !domain.tld,2002/type%30 value
 #EOY
-#		)
-#	end
-
-	def test_spec_override_anchor
-		# Override anchor
-		a001 = "The alias node below is a repeated use of this value.\n"
-		assert_parse_only(
-			{ 'anchor' => 'This scalar has an anchor.', 'override' => a001, 'alias' => a001 }, <<EOY
+#        )
+#    end
+
+    def test_spec_override_anchor
+        # Override anchor
+        a001 = "The alias node below is a repeated use of this value.\n"
+        assert_parse_only(
+            { 'anchor' => 'This scalar has an anchor.', 'override' => a001, 'alias' => a001 }, <<EOY
 anchor : &A001 This scalar has an anchor.
 override : &A001 >
  The alias node below is a
  repeated use of this value.
 alias : *A001
 EOY
-		)
-	end
+        )
+    end
 
-	def test_spec_explicit_families
+    def test_spec_explicit_families
         Psych.add_domain_type( "somewhere.com/2002", 'type' ) { |type, val|
             "SOMEWHERE: #{val}"
         }
-		assert_parse_only(
-			{ 'not-date' => '2002-04-28', 'picture' => "GIF89a\f\000\f\000\204\000\000\377\377\367\365\365\356\351\351\345fff\000\000\000\347\347\347^^^\363\363\355\216\216\216\340\340\340\237\237\237\223\223\223\247\247\247\236\236\236i^\020' \202\n\001\000;", 'hmm' => "SOMEWHERE: family above is short for\nhttp://somewhere.com/type\n" }, <<EOY
+        assert_parse_only(
+            { 'not-date' => '2002-04-28', 'picture' => "GIF89a\f\000\f\000\204\000\000\377\377\367\365\365\356\351\351\345fff\000\000\000\347\347\347^^^\363\363\355\216\216\216\340\340\340\237\237\237\223\223\223\247\247\247\236\236\236i^\020' \202\n\001\000;", 'hmm' => "SOMEWHERE: family above is short for\nhttp://somewhere.com/type\n" }, <<EOY
 not-date: !str 2002-04-28
 picture: !binary |
  R0lGODlhDAAMAIQAAP//9/X
@@ -721,34 +719,34 @@ def test_spec_explicit_families
  family above is short for
  http://somewhere.com/type
 EOY
-		)
-	end
-
-	def test_spec_application_family
-		# Testing the clarkevans.com graphs
-		Psych.add_domain_type( "clarkevans.com/2002", 'graph/shape' ) { |type, val|
-			if Array === val
-				val << "Shape Container"
-				val
-			else
-				raise ArgumentError, "Invalid graph of type #{val.class}: " + val.inspect
-			end
-		}
-		one_shape_proc = Proc.new { |type, val|
-			if Hash === val
+        )
+    end
+
+    def test_spec_application_family
+        # Testing the clarkevans.com graphs
+        Psych.add_domain_type( "clarkevans.com/2002", 'graph/shape' ) { |type, val|
+            if Array === val
+                val << "Shape Container"
+                val
+            else
+                raise ArgumentError, "Invalid graph of type #{val.class}: " + val.inspect
+            end
+        }
+        one_shape_proc = Proc.new { |type, val|
+            if Hash === val
                 type = type.split( /:/ )
-				val['TYPE'] = "Shape: #{type[2]}"
-				val
-			else
-				raise ArgumentError, "Invalid graph of type #{val.class}: " + val.inspect
-			end
-		}
-		Psych.add_domain_type( "clarkevans.com/2002", 'graph/circle', &one_shape_proc )
-		Psych.add_domain_type( "clarkevans.com/2002", 'graph/line', &one_shape_proc )
-		Psych.add_domain_type( "clarkevans.com/2002", 'graph/text', &one_shape_proc )
+                val['TYPE'] = "Shape: #{type[2]}"
+                val
+            else
+                raise ArgumentError, "Invalid graph of type #{val.class}: " + val.inspect
+            end
+        }
+        Psych.add_domain_type( "clarkevans.com/2002", 'graph/circle', &one_shape_proc )
+        Psych.add_domain_type( "clarkevans.com/2002", 'graph/line', &one_shape_proc )
+        Psych.add_domain_type( "clarkevans.com/2002", 'graph/text', &one_shape_proc )
         # MODIFIED to remove invalid Psych
-		assert_parse_only(
-			[[{"radius"=>7, "center"=>{"x"=>73, "y"=>129}, "TYPE"=>"Shape: graph/circle"}, {"finish"=>{"x"=>89, "y"=>102}, "TYPE"=>"Shape: graph/line", "start"=>{"x"=>73, "y"=>129}}, {"TYPE"=>"Shape: graph/text", "value"=>"Pretty vector drawing.", "start"=>{"x"=>73, "y"=>129}, "color"=>16772795}, "Shape Container"]], <<EOY
+        assert_parse_only(
+            [[{"radius"=>7, "center"=>{"x"=>73, "y"=>129}, "TYPE"=>"Shape: graph/circle"}, {"finish"=>{"x"=>89, "y"=>102}, "TYPE"=>"Shape: graph/line", "start"=>{"x"=>73, "y"=>129}}, {"TYPE"=>"Shape: graph/text", "value"=>"Pretty vector drawing.", "start"=>{"x"=>73, "y"=>129}, "color"=>16772795}, "Shape Container"]], <<EOY
 - !clarkevans.com/2002:graph/shape
   - !/graph/circle
     center: &ORIGIN {x: 73, y: 129}
@@ -761,12 +759,12 @@ def test_spec_application_family
     color: 0xFFEEBB
     value: Pretty vector drawing.
 EOY
-		)
-	end
+        )
+    end
 
-	def test_spec_float_explicit
-		assert_parse_only(
-			[ 10.0, 10.0, 10.0, 10.0 ], <<EOY
+    def test_spec_float_explicit
+        assert_parse_only(
+            [ 10.0, 10.0, 10.0, 10.0 ], <<EOY
 # All entries in the sequence
 # have the same type and value.
 - 10.0
@@ -776,15 +774,15 @@ def test_spec_float_explicit
   1\\
   0"
 EOY
-		)
-	end
-
-	def test_spec_builtin_seq
-		# Assortment of sequences
-		assert_parse_only(
-			{ 'empty' => [], 'in-line' => [ 'one', 'two', 'three', 'four', 'five' ],
-			  'nested' => [ 'First item in top sequence', [ 'Subordinate sequence entry' ],
-			  	"A multi-line sequence entry\n", 'Sixth item in top sequence' ] }, <<EOY
+        )
+    end
+
+    def test_spec_builtin_seq
+        # Assortment of sequences
+        assert_parse_only(
+            { 'empty' => [], 'in-line' => [ 'one', 'two', 'three', 'four', 'five' ],
+              'nested' => [ 'First item in top sequence', [ 'Subordinate sequence entry' ],
+                  "A multi-line sequence entry\n", 'Sixth item in top sequence' ] }, <<EOY
 empty: []
 in-line: [ one, two, three # May span lines,
          , four,           # indentation is
@@ -798,24 +796,24 @@ def test_spec_builtin_seq
    sequence entry
  - Sixth item in top sequence
 EOY
-		)
-	end
-
-	def test_spec_builtin_map
-		# Assortment of mappings
-		assert_parse_only(
-			{ 'empty' => {}, 'in-line' => { 'one' => 1, 'two' => 2 },
-			  'spanning' => { 'one' => 1, 'two' => 2 },
-			  'nested' => { 'first' => 'First entry', 'second' =>
-			  	{ 'key' => 'Subordinate mapping' }, 'third' =>
-				  [ 'Subordinate sequence', {}, 'Previous mapping is empty.',
-					{ 'A key' => 'value pair in a sequence.', 'A second' => 'key:value pair.' },
-					'The previous entry is equal to the following one.',
-					{ 'A key' => 'value pair in a sequence.', 'A second' => 'key:value pair.' } ],
-				  12.0 => 'This key is a float.', "?\n" => 'This key had to be protected.',
-				  "\a" => 'This key had to be escaped.',
-				  "This is a multi-line folded key\n" => "Whose value is also multi-line.\n",
-				  [ 'This key', 'is a sequence' ] => [ 'With a sequence value.' ] } }, <<EOY
+        )
+    end
+
+    def test_spec_builtin_map
+        # Assortment of mappings
+        assert_parse_only(
+            { 'empty' => {}, 'in-line' => { 'one' => 1, 'two' => 2 },
+              'spanning' => { 'one' => 1, 'two' => 2 },
+              'nested' => { 'first' => 'First entry', 'second' =>
+                  { 'key' => 'Subordinate mapping' }, 'third' =>
+                  [ 'Subordinate sequence', {}, 'Previous mapping is empty.',
+                    { 'A key' => 'value pair in a sequence.', 'A second' => 'key:value pair.' },
+                    'The previous entry is equal to the following one.',
+                    { 'A key' => 'value pair in a sequence.', 'A second' => 'key:value pair.' } ],
+                  12.0 => 'This key is a float.', "?\n" => 'This key had to be protected.',
+                  "\a" => 'This key had to be escaped.',
+                  "This is a multi-line folded key\n" => "Whose value is also multi-line.\n",
+                  [ 'This key', 'is a sequence' ] => [ 'With a sequence value.' ] } }, <<EOY
 
 empty: {}
 in-line: { one: 1, two: 2 }
@@ -860,13 +858,13 @@ def test_spec_builtin_map
 # :
 #  with a: mapping value.
 EOY
-		)
-	end
+        )
+    end
 
-	def test_spec_builtin_literal_blocks
-		# Assortment of literal scalar blocks
-		assert_parse_only(
-			{"both are equal to"=>"  This has no newline.", "is equal to"=>"The \\ ' \" characters may be\nfreely used. Leading white\n   space is significant.\n\nLine breaks are significant.\nThus this value contains one\nempty line and ends with a\nsingle line break, but does\nnot start with one.\n", "also written as"=>"  This has no newline.", "indented and chomped"=>"  This has no newline.", "empty"=>"", "literal"=>"The \\ ' \" characters may be\nfreely used. Leading white\n   space is significant.\n\nLine breaks are significant.\nThus this value contains one\nempty line and ends with a\nsingle line break, but does\nnot start with one.\n"}, <<EOY
+    def test_spec_builtin_literal_blocks
+        # Assortment of literal scalar blocks
+        assert_parse_only(
+            {"both are equal to"=>"  This has no newline.", "is equal to"=>"The \\ ' \" characters may be\nfreely used. Leading white\n   space is significant.\n\nLine breaks are significant.\nThus this value contains one\nempty line and ends with a\nsingle line break, but does\nnot start with one.\n", "also written as"=>"  This has no newline.", "indented and chomped"=>"  This has no newline.", "empty"=>"", "literal"=>"The \\ ' \" characters may be\nfreely used. Leading white\n   space is significant.\n\nLine breaks are significant.\nThus this value contains one\nempty line and ends with a\nsingle line break, but does\nnot start with one.\n"}, <<EOY
 empty: |
 
 literal: |
@@ -900,15 +898,15 @@ def test_spec_builtin_literal_blocks
 
 both are equal to: "  This has no newline."
 EOY
-		)
-
-		str1 = "This has one newline.\n"
-		str2 = "This has no newline."
-		str3 = "This has two newlines.\n\n"
-		assert_parse_only(
-			{ 'clipped' => str1, 'same as "clipped" above' => str1,
-			  'stripped' => str2, 'same as "stripped" above' => str2,
-			  'kept' => str3, 'same as "kept" above' => str3 }, <<EOY
+        )
+
+        str1 = "This has one newline.\n"
+        str2 = "This has no newline."
+        str3 = "This has two newlines.\n\n"
+        assert_parse_only(
+            { 'clipped' => str1, 'same as "clipped" above' => str1,
+              'stripped' => str2, 'same as "stripped" above' => str2,
+              'kept' => str3, 'same as "kept" above' => str3 }, <<EOY
 clipped: |
     This has one newline.
 
@@ -925,11 +923,11 @@ def test_spec_builtin_literal_blocks
 same as "kept" above: "This has two newlines.\\n\\n"
 
 EOY
-		)
-	end
+        )
+    end
 
-	def test_spec_span_single_quote
-		assert_parse_only( {"third"=>"a single quote ' must be escaped.", "second"=>"! : \\ etc. can be used freely.", "is same as"=>"this contains six spaces\nand one line break", "empty"=>"", "span"=>"this contains six spaces\nand one line break"}, <<EOY
+    def test_spec_span_single_quote
+        assert_parse_only( {"third"=>"a single quote ' must be escaped.", "second"=>"! : \\ etc. can be used freely.", "is same as"=>"this contains six spaces\nand one line break", "empty"=>"", "span"=>"this contains six spaces\nand one line break"}, <<EOY
 empty: ''
 second: '! : \\ etc. can be used freely.'
 third: 'a single quote '' must be escaped.'
@@ -940,11 +938,11 @@ def test_spec_span_single_quote
       line break'
 is same as: "this contains six spaces\\nand one line break"
 EOY
-		)
-	end
+        )
+    end
 
-	def test_spec_span_double_quote
-		assert_parse_only( {"is equal to"=>"this contains four  spaces", "third"=>"a \" or a \\ must be escaped.", "second"=>"! : etc. can be used freely.", "empty"=>"", "fourth"=>"this value ends with an LF.\n", "span"=>"this contains four  spaces"}, <<EOY
+    def test_spec_span_double_quote
+        assert_parse_only( {"is equal to"=>"this contains four  spaces", "third"=>"a \" or a \\ must be escaped.", "second"=>"! : etc. can be used freely.", "empty"=>"", "fourth"=>"this value ends with an LF.\n", "span"=>"this contains four  spaces"}, <<EOY
 empty: ""
 second: "! : etc. can be used freely."
 third: "a \\\" or a \\\\ must be escaped."
@@ -954,29 +952,29 @@ def test_spec_span_double_quote
       spaces"
 is equal to: "this contains four  spaces"
 EOY
-		)
-	end
-
-	def test_spec_builtin_time
-		# Time
-		assert_parse_only(
-			{ "space separated" => mktime( 2001, 12, 14, 21, 59, 43, ".10", "-05:00" ),
-			  "canonical" => mktime( 2001, 12, 15, 2, 59, 43, ".10" ),
-			  "date (noon UTC)" => Date.new( 2002, 12, 14),
-			  "valid iso8601" => mktime( 2001, 12, 14, 21, 59, 43, ".10", "-05:00" ) }, <<EOY
+        )
+    end
+
+    def test_spec_builtin_time
+        # Time
+        assert_parse_only(
+            { "space separated" => mktime( 2001, 12, 14, 21, 59, 43, ".10", "-05:00" ),
+              "canonical" => mktime( 2001, 12, 15, 2, 59, 43, ".10" ),
+              "date (noon UTC)" => Date.new( 2002, 12, 14),
+              "valid iso8601" => mktime( 2001, 12, 14, 21, 59, 43, ".10", "-05:00" ) }, <<EOY
 canonical: 2001-12-15T02:59:43.1Z
 valid iso8601: 2001-12-14t21:59:43.10-05:00
 space separated: 2001-12-14 21:59:43.10 -05:00
 date (noon UTC): 2002-12-14
 EOY
-		)
-	end
-
-	def test_spec_builtin_binary
-		arrow_gif = "GIF89a\f\000\f\000\204\000\000\377\377\367\365\365\356\351\351\345fff\000\000\000\347\347\347^^^\363\363\355\216\216\216\340\340\340\237\237\237\223\223\223\247\247\247\236\236\236iiiccc\243\243\243\204\204\204\377\376\371\377\376\371\377\376\371\377\376\371\377\376\371\377\376\371\377\376\371\377\376\371\377\376\371\377\376\371\377\376\371\377\376\371\377\376\371\377\376\371!\376\016Made with GIMP\000,\000\000\000\000\f\000\f\000\000\005,  \216\2010\236\343@\024\350i\020\304\321\212\010\034\317\200M$z\357\3770\205p\270\2601f\r\e\316\001\303\001\036\020' \202\n\001\000;"
-		assert_parse_only(
-			{ 'canonical' => arrow_gif, 'base64' => arrow_gif,
-			  'description' => "The binary value above is a tiny arrow encoded as a gif image.\n" }, <<EOY
+        )
+    end
+
+    def test_spec_builtin_binary
+        arrow_gif = "GIF89a\f\000\f\000\204\000\000\377\377\367\365\365\356\351\351\345fff\000\000\000\347\347\347^^^\363\363\355\216\216\216\340\340\340\237\237\237\223\223\223\247\247\247\236\236\236iiiccc\243\243\243\204\204\204\377\376\371\377\376\371\377\376\371\377\376\371\377\376\371\377\376\371\377\376\371\377\376\371\377\376\371\377\376\371\377\376\371\377\376\371\377\376\371\377\376\371!\376\016Made with GIMP\000,\000\000\000\000\f\000\f\000\000\005,  \216\2010\236\343@\024\350i\020\304\321\212\010\034\317\200M$z\357\3770\205p\270\2601f\r\e\316\001\303\001\036\020' \202\n\001\000;"
+        assert_parse_only(
+            { 'canonical' => arrow_gif, 'base64' => arrow_gif,
+              'description' => "The binary value above is a tiny arrow encoded as a gif image.\n" }, <<EOY
 canonical: !binary "\\
  R0lGODlhDAAMAIQAAP//9/X17unp5WZmZgAAAOf\\
  n515eXvPz7Y6OjuDg4J+fn5OTk6enp56enmlpaW\\
@@ -997,19 +995,19 @@ def test_spec_builtin_binary
  The binary value above is a tiny arrow
  encoded as a gif image.
 EOY
-		)
-	end
-	def test_ruby_regexp
-		# Test Ruby regular expressions
-		assert_to_yaml(
-			{ 'simple' => /a.b/, 'complex' => %r'\A"((?:[^"]|\")+)"',
-			  'case-insensitive' => /George McFly/i }, <<EOY
+        )
+    end
+    def test_ruby_regexp
+        # Test Ruby regular expressions
+        assert_to_yaml(
+            { 'simple' => /a.b/, 'complex' => %r'\A"((?:[^"]|\")+)"',
+              'case-insensitive' => /George McFly/i }, <<EOY
 case-insensitive: !ruby/regexp "/George McFly/i"
 complex: !ruby/regexp "/\\\\A\\"((?:[^\\"]|\\\\\\")+)\\"/"
 simple: !ruby/regexp "/a.b/"
 EOY
-		)
-	end
+        )
+    end
 
     #
     # Test of Ranges
@@ -1033,15 +1031,15 @@ def test_ranges
 
     end
 
-	def test_ruby_struct
-		Struct.send(:remove_const, :MyBookStruct) if Struct.const_defined?(:MyBookStruct)
-		# Ruby structures
-		book_struct = Struct::new( "MyBookStruct", :author, :title, :year, :isbn )
-		assert_to_yaml(
-			[ book_struct.new( "Yukihiro Matsumoto", "Ruby in a Nutshell", 2002, "0-596-00214-9" ),
-			  book_struct.new( [ 'Dave Thomas', 'Andy Hunt' ], "The Pickaxe", 2002,
-				book_struct.new( "This should be the ISBN", "but I have another struct here", 2002, "None" )
-			  ) ], <<EOY
+    def test_ruby_struct
+        Struct.send(:remove_const, :MyBookStruct) if Struct.const_defined?(:MyBookStruct)
+        # Ruby structures
+        book_struct = Struct::new( "MyBookStruct", :author, :title, :year, :isbn )
+        assert_to_yaml(
+            [ book_struct.new( "Yukihiro Matsumoto", "Ruby in a Nutshell", 2002, "0-596-00214-9" ),
+              book_struct.new( [ 'Dave Thomas', 'Andy Hunt' ], "The Pickaxe", 2002,
+                book_struct.new( "This should be the ISBN", "but I have another struct here", 2002, "None" )
+              ) ], <<EOY
 - !ruby/struct:MyBookStruct
   author: Yukihiro Matsumoto
   title: Ruby in a Nutshell
@@ -1059,64 +1057,64 @@ def test_ruby_struct
     year: 2002
     isbn: None
 EOY
-		)
+        )
 
         assert_to_yaml( Psych_Tests::StructTest.new( 123 ), <<EOY )
 --- !ruby/struct:Psych_Tests::StructTest
 c: 123
 EOY
 
-	end
+    end
 
-	def test_ruby_rational
-		assert_to_yaml( Rational(1, 2), <<EOY )
+    def test_ruby_rational
+        assert_to_yaml( Rational(1, 2), <<EOY )
 --- !ruby/object:Rational
 numerator: 1
 denominator: 2
 EOY
 
-		# Read Psych dumped by the ruby 1.8.3.
-		assert_to_yaml( Rational(1, 2), "!ruby/object:Rational 1/2\n" )
-		assert_raise( ArgumentError ) { Psych.unsafe_load("!ruby/object:Rational INVALID/RATIONAL\n") }
-	end
+        # Read Psych dumped by the ruby 1.8.3.
+        assert_to_yaml( Rational(1, 2), "!ruby/object:Rational 1/2\n" )
+        assert_raise( ArgumentError ) { Psych.unsafe_load("!ruby/object:Rational INVALID/RATIONAL\n") }
+    end
 
-	def test_ruby_complex
-		assert_to_yaml( Complex(3, 4), <<EOY )
+    def test_ruby_complex
+        assert_to_yaml( Complex(3, 4), <<EOY )
 --- !ruby/object:Complex
 image: 4
 real: 3
 EOY
 
-		# Read Psych dumped by the ruby 1.8.3.
-		assert_to_yaml( Complex(3, 4), "!ruby/object:Complex 3+4i\n" )
-		assert_raise( ArgumentError ) { Psych.unsafe_load("!ruby/object:Complex INVALID+COMPLEXi\n") }
-	end
+        # Read Psych dumped by the ruby 1.8.3.
+        assert_to_yaml( Complex(3, 4), "!ruby/object:Complex 3+4i\n" )
+        assert_raise( ArgumentError ) { Psych.unsafe_load("!ruby/object:Complex INVALID+COMPLEXi\n") }
+    end
 
-	def test_emitting_indicators
-		assert_to_yaml( "Hi, from Object 1. You passed: please, pretty please", <<EOY
+    def test_emitting_indicators
+        assert_to_yaml( "Hi, from Object 1. You passed: please, pretty please", <<EOY
 --- "Hi, from Object 1. You passed: please, pretty please"
 EOY
-		)
-	end
-
-	##
-	## Test the Psych::Stream class -- INACTIVE at the moment
-	##
-	#def test_document
-	#	y = Psych::Stream.new( :Indent => 2, :UseVersion => 0 )
-	#	y.add(
-	#		{ 'hi' => 'hello', 'map' =>
-	#			{ 'good' => 'two' },
-	#		  'time' => Time.now,
-	#		  'try' => /^po(.*)$/,
-	#		  'bye' => 'goodbye'
-	#		}
-	#	)
-	#	y.add( { 'po' => 'nil', 'oper' => 90 } )
-	#	y.add( { 'hi' => 'wow!', 'bye' => 'wow!' } )
-	#	y.add( { [ 'Red Socks', 'Boston' ] => [ 'One', 'Two', 'Three' ] } )
-	#	y.add( [ true, false, false ] )
-	#end
+        )
+    end
+
+    ##
+    ## Test the Psych::Stream class -- INACTIVE at the moment
+    ##
+    #def test_document
+    #    y = Psych::Stream.new( :Indent => 2, :UseVersion => 0 )
+    #    y.add(
+    #        { 'hi' => 'hello', 'map' =>
+    #            { 'good' => 'two' },
+    #          'time' => Time.now,
+    #          'try' => /^po(.*)$/,
+    #          'bye' => 'goodbye'
+    #        }
+    #    )
+    #    y.add( { 'po' => 'nil', 'oper' => 90 } )
+    #    y.add( { 'hi' => 'wow!', 'bye' => 'wow!' } )
+    #    y.add( { [ 'Red Socks', 'Boston' ] => [ 'One', 'Two', 'Three' ] } )
+    #    y.add( [ true, false, false ] )
+    #end
 
     #
     # Test YPath choices parsing