psych 1.3.3 → 1.3.4

data/CHANGELOG.rdoc

@@ -1,3 +1,14 @@
+Thu Jul 19 09:33:46 2012  Aaron Patterson <aaron@tenderlovemaking.com>
+
+	* ext/psych/emitter.c (initialize): allow a configuration object to be
+	  passed to the constructor so that mutation isn't required after
+	  instantiation.
+
+	* ext/psych/lib/psych/handler.rb: add configuration object
+
+	* ext/psych/lib/psych/visitors/emitter.rb: use configuration object if
+	  extra configuration is present.
+
 Fri May 18 01:28:21 2012  Aaron Patterson <aaron@tenderlovemaking.com>
 
 	* ext/psych/parser.c (transcode_string): fix encoding index names.

data/ext/psych/emitter.c

@@ -2,6 +2,9 @@
 
 VALUE cPsychEmitter;
 static ID id_write;
+static ID id_line_width;
+static ID id_indentation;
+static ID id_canonical;
 
 static void emit(yaml_emitter_t * emitter, yaml_event_t * event)
 {
@@ -39,15 +42,30 @@ static VALUE allocate(VALUE klass)
     return Data_Wrap_Struct(klass, 0, dealloc, emitter);
 }
 
-/* call-seq: Psych::Emitter.new(io)
+/* call-seq: Psych::Emitter.new(io, options = Psych::Emitter::OPTIONS)
  *
  * Create a new Psych::Emitter that writes to +io+.
  */
-static VALUE initialize(VALUE self, VALUE io)
+static VALUE initialize(int argc, VALUE *argv, VALUE self)
 {
     yaml_emitter_t * emitter;
+    VALUE io, options;
+    VALUE line_width;
+    VALUE indent;
+    VALUE canonical;
+
     Data_Get_Struct(self, yaml_emitter_t, emitter);
 
+    if (rb_scan_args(argc, argv, "11", &io, &options) == 2) {
+	line_width = rb_funcall(options, id_line_width, 0);
+	indent     = rb_funcall(options, id_indentation, 0);
+	canonical  = rb_funcall(options, id_canonical, 0);
+
+	yaml_emitter_set_width(emitter, NUM2INT(line_width));
+	yaml_emitter_set_indent(emitter, NUM2INT(indent));
+	yaml_emitter_set_canonical(emitter, Qtrue == canonical ? 1 : 0);
+    }
+
     yaml_emitter_set_output(emitter, writer, (void *)io);
 
     return self;
@@ -494,7 +512,7 @@ void Init_psych_emitter()
 
     rb_define_alloc_func(cPsychEmitter, allocate);
 
-    rb_define_method(cPsychEmitter, "initialize", initialize, 1);
+    rb_define_method(cPsychEmitter, "initialize", initialize, -1);
     rb_define_method(cPsychEmitter, "start_stream", start_stream, 1);
     rb_define_method(cPsychEmitter, "end_stream", end_stream, 0);
     rb_define_method(cPsychEmitter, "start_document", start_document, 3);
@@ -512,6 +530,9 @@ void Init_psych_emitter()
     rb_define_method(cPsychEmitter, "line_width", line_width, 0);
     rb_define_method(cPsychEmitter, "line_width=", set_line_width, 1);
 
-    id_write = rb_intern("write");
+    id_write       = rb_intern("write");
+    id_line_width  = rb_intern("line_width");
+    id_indentation = rb_intern("indentation");
+    id_canonical   = rb_intern("canonical");
 }
 /* vim: set noet sws=4 sw=4: */

data/ext/psych/extconf.rb

@@ -4,8 +4,8 @@ require 'mkmf'
 
 RbConfig::MAKEFILE_CONFIG['CC'] = ENV['CC'] if ENV['CC']
 
-INCLUDEDIR = Config::CONFIG['includedir']
-LIBDIR     = Config::CONFIG['libdir']
+INCLUDEDIR = RbConfig::CONFIG['includedir']
+LIBDIR     = RbConfig::CONFIG['libdir']
 LIB_DIRS   = ['/opt/local/lib', '/usr/local/lib', LIBDIR, '/usr/lib']
 libyaml    = dir_config 'libyaml', '/opt/local/include', '/opt/local/lib'
 

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.3'
+  VERSION         = '1.3.4'
 
   # The version of libyaml Psych is using
   LIBYAML_VERSION = Psych.libyaml_version.join '.'

data/lib/psych/handler.rb

@@ -10,6 +10,21 @@ module Psych
   #
   # See Psych::Parser for more details
   class Handler
+    ###
+    # Configuration options for dumping YAML.
+    class DumperOptions
+      attr_accessor :line_width, :indentation, :canonical
+
+      def initialize
+        @line_width  = 0
+        @indentation = 2
+        @canonical   = false
+      end
+    end
+
+    # Default dumping options
+    OPTIONS = DumperOptions.new
+
     ###
     # Called with +encoding+ when the YAML stream starts.  This method is
     # called once per stream.  A stream may contain multiple documents.

data/lib/psych/visitors/emitter.rb

@@ -2,10 +2,17 @@ module Psych
   module Visitors
     class Emitter < Psych::Visitors::Visitor
       def initialize io, options = {}
-        @handler = Psych::Emitter.new io
-        @handler.indentation = options[:indentation] if options[:indentation]
-        @handler.canonical = options[:canonical] if options[:canonical]
-        @handler.line_width = options[:line_width] if options[:line_width]
+        opts = [:indentation, :canonical, :line_width].find_all { |opt|
+          options.key?(opt)
+        }
+
+        if opts.empty?
+          @handler = Psych::Emitter.new io
+        else
+          du = Handler::DumperOptions.new
+          opts.each { |option| du.send :"#{option}=", options[option] }
+          @handler = Psych::Emitter.new io, du
+        end
       end
 
       def visit_Psych_Nodes_Stream o

data/lib/psych/visitors/to_ruby.rb

@@ -148,6 +148,7 @@ module Psych
 
           if klass
             string = klass.allocate.replace string
+            register(o, string)
           end
 
           init_with(string, members.map { |k,v| [k.to_s.sub(/^@/, ''),v] }, o)

data/lib/psych/visitors/yaml_tree.rb

@@ -254,7 +254,7 @@ module Psych
           maptag = '!ruby/string'
           maptag << ":#{o.class}" unless o.class == ::String
 
-          @emitter.start_mapping nil, maptag, false, Nodes::Mapping::BLOCK
+          register o, @emitter.start_mapping(nil, maptag, false, Nodes::Mapping::BLOCK)
           @emitter.scalar 'str', nil, nil, true, false, Nodes::Scalar::ANY
           @emitter.scalar str, nil, tag, plain, quote, style
 

data/test/psych/test_alias_and_anchor.rb

@@ -1,5 +1,13 @@
 require 'psych/helper'
 
+class ObjectWithInstanceVariables
+  attr_accessor :var1, :var2
+end
+
+class SubStringWithInstanceVariables < String
+  attr_accessor :var1
+end
+
 module Psych
  class TestAliasAndAnchor < TestCase
    def test_mri_compatibility
@@ -14,6 +22,40 @@ EOYAML
      result.each {|el| assert_same(result[0], el) }
    end
 
+   def test_mri_compatibility_object_with_ivars
+  yaml = <<EOYAML
+---
+- &id001 !ruby/object:ObjectWithInstanceVariables
+  var1: test1
+  var2: test2
+- *id001
+- *id001
+EOYAML
+
+     result = Psych.load yaml
+     result.each do |el|
+      assert_same(result[0], el)
+      assert_equal('test1', el.var1)
+      assert_equal('test2', el.var2)
+    end
+   end
+
+   def test_mri_compatibility_substring_with_ivars
+    yaml = <<EOYAML
+---
+- &id001 !str:SubStringWithInstanceVariables
+  str: test
+  "@var1": test
+- *id001
+- *id001
+EOYAML
+     result = Psych.load yaml
+     result.each do |el|
+      assert_same(result[0], el)
+      assert_equal('test', el.var1)
+    end
+   end
+
    def test_anchor_alias_round_trip
      o = Object.new
      original = [o,o,o]
@@ -22,5 +64,33 @@ EOYAML
      result = Psych.load yaml
      result.each {|el| assert_same(result[0], el) }
    end
+
+   def test_anchor_alias_round_trip_object_with_ivars
+     o = ObjectWithInstanceVariables.new
+     o.var1 = 'test1'
+     o.var2 = 'test2'
+     original = [o,o,o]
+
+     yaml = Psych.dump original
+     result = Psych.load yaml
+     result.each do |el|
+      assert_same(result[0], el)
+      assert_equal('test1', el.var1)
+      assert_equal('test2', el.var2)
+    end
+   end
+
+   def test_anchor_alias_round_trip_substring_with_ivars
+     o = SubStringWithInstanceVariables.new
+     o.var1 = 'test'
+     original = [o,o,o]
+
+     yaml = Psych.dump original
+     result = Psych.load yaml
+     result.each do |el|
+      assert_same(result[0], el)
+      assert_equal('test', el.var1)
+    end
+   end
  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: psych
 version: !ruby/object:Gem::Version
-  version: 1.3.3
+  version: 1.3.4
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-06-15 00:00:00.000000000 Z
+date: 2012-07-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rdoc