psych 1.3.1 → 1.3.2

data/CHANGELOG.rdoc

@@ -1,3 +1,9 @@
+Sat Apr  7 02:07:00 2012  Aaron Patterson <aaron@tenderlovemaking.com>
+
+	* ext/psych/parser.c: fall back to any encoding if the external
+	  encoding is wrong.  [ruby-core:44163]
+	* test/psych/test_encoding.rb: fix test
+
 Fri Mar  9 06:29:22 2012  Aaron Patterson <aaron@tenderlovemaking.com>
 
 	* ext/psych/lib/psych.rb (load, parse): stop parsing or loading after

data/ext/psych/parser.c

@@ -146,10 +146,11 @@ static VALUE transcode_io(VALUE src, int * parser_encoding)
 	return src;
     }
 
-    rb_raise(rb_eArgError, "YAML file must be UTF-8, UTF-16LE, or UTF-16BE, not %s",
-	    rb_enc_name(rb_enc_from_index(io_external_enc_index)));
+    /* If the external encoding is something we don't know how to handle,
+     * fall back to YAML_ANY_ENCODING. */
+    *parser_encoding = YAML_ANY_ENCODING;
 
-    return Qnil;
+    return src;
 }
 
 #endif

data/lib/psych.rb

@@ -93,7 +93,7 @@ require 'psych/handlers/document_stream'
 
 module Psych
   # The version is Psych you're using
-  VERSION         = '1.3.1'
+  VERSION         = '1.3.2'
 
   # The version of libyaml Psych is using
   LIBYAML_VERSION = Psych.libyaml_version.join '.'

data/test/psych/test_encoding.rb

@@ -57,7 +57,7 @@ module Psych
       # If the external encoding isn't utf8, utf16le, or utf16be, we cannot
       # process the file.
       File.open(t.path, 'r', :encoding => 'SHIFT_JIS') do |f|
-        assert_raises ArgumentError do
+        assert_raises Psych::SyntaxError do
           Psych.load(f)
         end
       end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: psych
 version: !ruby/object:Gem::Version
-  version: 1.3.1
+  version: 1.3.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-03-27 00:00:00.000000000 Z
+date: 2012-04-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake-compiler
-  requirement: &70103476578220 !ruby/object:Gem::Requirement
+  requirement: &70210793685840 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: 0.4.1
   type: :development
   prerelease: false
-  version_requirements: *70103476578220
+  version_requirements: *70210793685840
 - !ruby/object:Gem::Dependency
   name: rdoc
-  requirement: &70103476577200 !ruby/object:Gem::Requirement
+  requirement: &70210793685400 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -32,10 +32,10 @@ dependencies:
         version: '3.10'
   type: :development
   prerelease: false
-  version_requirements: *70103476577200
+  version_requirements: *70210793685400
 - !ruby/object:Gem::Dependency
   name: hoe
-  requirement: &70103476576580 !ruby/object:Gem::Requirement
+  requirement: &70210793709520 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -43,7 +43,7 @@ dependencies:
         version: '2.13'
   type: :development
   prerelease: false
-  version_requirements: *70103476576580
+  version_requirements: *70210793709520
 description: ! 'Psych is a YAML parser and emitter.  Psych leverages libyaml[http://pyyaml.org/wiki/LibYAML]
 
   for its YAML parsing and emitting capabilities.  In addition to wrapping