psych-shopifork 2.0.5 → 2.0.13

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9e2f3338b6772bcae59dd47d00176c3dfa5c6f31
-  data.tar.gz: 82e508c6a44a897d3859f4e9119f996ba65c300a
+  metadata.gz: 5f174e67e13c4e70df1d785ebaa88cd16ae4aecf
+  data.tar.gz: c7f88164d3a4b196277eee0baeccdaff9cae8664
 SHA512:
-  metadata.gz: e4d6c099340d0d0a38e29c7fdfffeb088fa35f342785b98f89814ad5fe781ecb51db37cd934f11eb9cab548c5af97989cbc60237988b0e3a6b4cd52415634a08
-  data.tar.gz: 70690a0824b6bba21d3e65dbd4cbeb97ef7d27c72d1fc617faf279d87d8556bc205532b7da132a0186f0444821a60dd1ad6fdfbdef88c5425bf7e4850fa4f11c
+  metadata.gz: f860d1ced6e42df06baadc181c48fb1821548fb37e685616628cd5e14d6d58128540cbe6374fcedae41a93af7dfc062ea2dcb166360387e14c4080638cac1928
+  data.tar.gz: 014b4621ae3cca4ce82995995071c357916debb410205035aee75f5546e284776ca25a461e61d85b3be594a9770a63db3ec5a8984723670d49d37b91b794b2ce

data/.travis.yml

@@ -3,8 +3,14 @@ rvm:
   - 1.9.3
   - 2.0.0
   - 2.1.0
+  - 2.2.0
+  - ruby-head
+  - rbx-2
 before_script:
-  - gem install isolate
   - gem install hoe
   - gem install rake-compiler
-script: rake isolate test
+  - gem install minitest -v '~> 5.0'
+script: rake test
+matrix:
+  allow_failures:
+    - rvm: rbx-2

data/CHANGELOG.rdoc

@@ -1,3 +1,90 @@
+Fri Feb  6 17:47:05 2015  Aaron Patterson <aaron@tenderlovemaking.com>
+
+	* ext/psych/lib/psych/visitors/yaml_tree.rb: register nodes when
+	  dumping objects with custom coders. [ruby-core:66215] [Bug #10496]
+
+	* test/psych/test_coder.rb: test for fix
+
+Fri Feb  6 16:58:31 2015  Aaron Patterson <aaron@tenderlovemaking.com>
+
+	* ext/psych/lib/psych/visitors/to_ruby.rb: fix support for regular
+	  expressions with newlines. tenderlove/psych#222
+
+	* test/psych/test_yaml.rb: test for change.
+
+Thu Jan 29 02:34:27 2015  Aaron Patterson <aaron@tenderlovemaking.com>
+
+	* ext/psych/lib/psych/visitors/to_ruby.rb: fix parsing hashes with
+	  instance variables when it is referenced multiple times.
+	* ext/psych/lib/psych.rb: bump version
+	* ext/psych/psych.gemspec: bump version
+	* test/psych/test_hash.rb: test for fix
+
+Fri Jan  9 07:13:55 2015  Aaron Patterson <aaron@tenderlovemaking.com>
+
+	* ext/psych/lib/psych/visitors/to_ruby.rb: call `allocate` on hash
+	subclasses.  Fixes github.com/tenderlove/psych/issues/196
+
+	* test/psych/test_hash.rb: test for change
+
+Fri Jan  9 06:58:43 2015  Aaron Patterson <aaron@tenderlovemaking.com>
+
+	* ext/psych/lib/psych/visitors/to_ruby.rb: revive hashes with ivars
+
+	* ext/psych/lib/psych/visitors/yaml_tree.rb: dump hashes with ivars.
+	  Fixes github.com/psych/issues/43
+
+	* test/psych/test_hash.rb: test for change
+
+Sun Nov 23 13:11:24 2014  Sean Griffin  <sean@thoughtbot.com>
+
+        * lib/psych/visitors/to_ruby.rb: Allow loading any BasicObject that
+          defines #marshal_load, fixes #100
+        * lib/psych/visitors/yaml_tree.rb: Allow dumping any BasicObject that
+          defines #marshal_dump
+
+Sat Aug 30 06:39:48 2014  Aaron Patterson <aaron@tenderlovemaking.com>
+
+	* ext/psych/lib/psych/visitors/yaml_tree.rb: fix NameError dumping and
+	  loading. Fixes GH #85. Thanks @brentdax for the patch!
+	* test/psych/test_exception.rb: test for fix
+
+Sat Aug 30 06:23:40 2014  Aaron Patterson <aaron@tenderlovemaking.com>
+
+	* ext/psych/lib/psych/scalar_scanner.rb: fix loading strings that
+	  look like integers but have a newline. Fixes GH #189
+	* test/psych/test_string.rb: test for fix
+
+Sat Aug 30 06:10:39 2014  Aaron Patterson <aaron@tenderlovemaking.com>
+
+	* ext/psych/lib/psych/visitors/to_ruby.rb: merge keys with a hash
+	  should merge the hash in to the parent.
+	* test/psych/test_merge_keys.rb: test for change. Fixes GH #202
+
+Sat Aug 30 06:00:26 2014  Aaron Patterson <aaron@tenderlovemaking.com>
+
+	* ext/psych/lib/psych/visitors/to_ruby.rb: quoted "<<" strings
+	  should not be treated as merge keys.
+	* ext/psych/lib/psych/visitors/yaml_tree.rb: hashes with keys
+	  containing "<<" should roundtrip.
+	* test/psych/test_merge_keys.rb: test for change. Fixes GH #203
+
+Wed Aug  6 03:41:21 2014  Aaron Patterson <aaron@tenderlovemaking.com>
+
+	* ext/psych/lib/psych/visitors/to_ruby.rb: backwards compatibility for
+	  hashes emitted by Syck. Github #198
+	* test/psych/test_hash.rb: test for change.
+
+Fri Jun  6 07:41:41 2014  Aaron Patterson <aaron@tenderlovemaking.com>
+
+	* ext/psych/lib/psych/visitors/yaml_tree.rb: dump empty symbols with a
+	  tag so that they can be parsed on input. [Bug #9873] [ruby-core:62825]
+	* test/psych/test_symbol.rb: test for change
+
+Sun May 25 11:35:41 2014  Zachary Scott  <e@zzak.io>
+
+	* test/psych/*: YAML::ENGINE was removed in [Bug #8344]
+
 2014-03-27  SHIBATA Hiroshi  <shibata.hiroshi@gmail.com>
 
 	* ext/psych/yaml/scanner.c: merge libyaml 0.1.6

data/Manifest.txt

@@ -79,7 +79,6 @@ test/psych/test_deprecated.rb
 test/psych/test_document.rb
 test/psych/test_emitter.rb
 test/psych/test_encoding.rb
-test/psych/test_engine_manager.rb
 test/psych/test_exception.rb
 test/psych/test_hash.rb
 test/psych/test_json_tree.rb

data/Rakefile

@@ -9,9 +9,10 @@ class Hoe
 end
 
 gem 'rake-compiler', '>= 0.4.1'
+gem 'minitest', '~> 5.0'
 require "rake/extensiontask"
 
-Hoe.plugin :doofus, :git, :gemspec, :isolate
+Hoe.plugin :doofus, :git, :gemspec
 
 $hoe = Hoe.spec 'psych-shopifork' do
   license   'MIT'
@@ -23,6 +24,7 @@ $hoe = Hoe.spec 'psych-shopifork' do
   self.testlib           = :minitest
 
   extra_dev_deps << ['rake-compiler', '>= 0.4.1']
+  extra_dev_deps << ['minitest', '~> 5.0']
 
   self.spec_extras = {
     :extensions            => ["ext/psych/extconf.rb"],

data/ext/psych/psych.c

@@ -20,7 +20,7 @@ static VALUE libyaml_version(VALUE module)
 
 VALUE mPsych;
 
-void Init_psych()
+void Init_psych(void)
 {
     mPsych = rb_define_module("Psych");
 

data/ext/psych/psych_emitter.c

@@ -29,17 +29,34 @@ static void dealloc(void * ptr)
     xfree(emitter);
 }
 
+#if 0
+static size_t memsize(const void *ptr)
+{
+    const yaml_emitter_t *emitter = ptr;
+    /* TODO: calculate emitter's size */
+    return 0;
+}
+#endif
+
+static const rb_data_type_t psych_emitter_type = {
+    "Psych/emitter",
+    {0, dealloc, 0,},
+    0, 0,
+#ifdef RUBY_TYPED_FREE_IMMEDIATELY
+    RUBY_TYPED_FREE_IMMEDIATELY,
+#endif
+};
+
 static VALUE allocate(VALUE klass)
 {
     yaml_emitter_t * emitter;
-
-    emitter = xmalloc(sizeof(yaml_emitter_t));
+    VALUE obj = TypedData_Make_Struct(klass, yaml_emitter_t, &psych_emitter_type, emitter);
 
     yaml_emitter_initialize(emitter);
     yaml_emitter_set_unicode(emitter, 1);
     yaml_emitter_set_indent(emitter, 2);
 
-    return Data_Wrap_Struct(klass, 0, dealloc, emitter);
+    return obj;
 }
 
 /* call-seq: Psych::Emitter.new(io, options = Psych::Emitter::OPTIONS)
@@ -54,7 +71,7 @@ static VALUE initialize(int argc, VALUE *argv, VALUE self)
     VALUE indent;
     VALUE canonical;
 
-    Data_Get_Struct(self, yaml_emitter_t, emitter);
+    TypedData_Get_Struct(self, yaml_emitter_t, &psych_emitter_type, emitter);
 
     if (rb_scan_args(argc, argv, "11", &io, &options) == 2) {
 	line_width = rb_funcall(options, id_line_width, 0);
@@ -81,7 +98,7 @@ static VALUE start_stream(VALUE self, VALUE encoding)
 {
     yaml_emitter_t * emitter;
     yaml_event_t event;
-    Data_Get_Struct(self, yaml_emitter_t, emitter);
+    TypedData_Get_Struct(self, yaml_emitter_t, &psych_emitter_type, emitter);
     Check_Type(encoding, T_FIXNUM);
 
     yaml_stream_start_event_initialize(&event, (yaml_encoding_t)NUM2INT(encoding));
@@ -101,7 +118,7 @@ static VALUE end_stream(VALUE self)
 {
     yaml_emitter_t * emitter;
     yaml_event_t event;
-    Data_Get_Struct(self, yaml_emitter_t, emitter);
+    TypedData_Get_Struct(self, yaml_emitter_t, &psych_emitter_type, emitter);
 
     yaml_stream_end_event_initialize(&event);
 
@@ -124,7 +141,7 @@ static VALUE start_document(VALUE self, VALUE version, VALUE tags, VALUE imp)
     yaml_tag_directive_t * tail = NULL;
     yaml_event_t event;
     yaml_version_directive_t version_directive;
-    Data_Get_Struct(self, yaml_emitter_t, emitter);
+    TypedData_Get_Struct(self, yaml_emitter_t, &psych_emitter_type, emitter);
 
 
     Check_Type(version, T_ARRAY);
@@ -198,7 +215,7 @@ static VALUE end_document(VALUE self, VALUE imp)
 {
     yaml_emitter_t * emitter;
     yaml_event_t event;
-    Data_Get_Struct(self, yaml_emitter_t, emitter);
+    TypedData_Get_Struct(self, yaml_emitter_t, &psych_emitter_type, emitter);
 
     yaml_document_end_event_initialize(&event, imp ? 1 : 0);
 
@@ -228,7 +245,7 @@ static VALUE scalar(
 #ifdef HAVE_RUBY_ENCODING_H
     rb_encoding *encoding;
 #endif
-    Data_Get_Struct(self, yaml_emitter_t, emitter);
+    TypedData_Get_Struct(self, yaml_emitter_t, &psych_emitter_type, emitter);
 
     Check_Type(value, T_STRING);
 
@@ -295,7 +312,7 @@ static VALUE start_sequence(
     }
 #endif
 
-    Data_Get_Struct(self, yaml_emitter_t, emitter);
+    TypedData_Get_Struct(self, yaml_emitter_t, &psych_emitter_type, emitter);
 
     yaml_sequence_start_event_initialize(
 	    &event,
@@ -320,7 +337,7 @@ static VALUE end_sequence(VALUE self)
 {
     yaml_emitter_t * emitter;
     yaml_event_t event;
-    Data_Get_Struct(self, yaml_emitter_t, emitter);
+    TypedData_Get_Struct(self, yaml_emitter_t, &psych_emitter_type, emitter);
 
     yaml_sequence_end_event_initialize(&event);
 
@@ -348,7 +365,7 @@ static VALUE start_mapping(
 #ifdef HAVE_RUBY_ENCODING_H
     rb_encoding *encoding;
 #endif
-    Data_Get_Struct(self, yaml_emitter_t, emitter);
+    TypedData_Get_Struct(self, yaml_emitter_t, &psych_emitter_type, emitter);
 
 #ifdef HAVE_RUBY_ENCODING_H
     encoding = rb_utf8_encoding();
@@ -387,7 +404,7 @@ static VALUE end_mapping(VALUE self)
 {
     yaml_emitter_t * emitter;
     yaml_event_t event;
-    Data_Get_Struct(self, yaml_emitter_t, emitter);
+    TypedData_Get_Struct(self, yaml_emitter_t, &psych_emitter_type, emitter);
 
     yaml_mapping_end_event_initialize(&event);
 
@@ -406,7 +423,7 @@ static VALUE alias(VALUE self, VALUE anchor)
 {
     yaml_emitter_t * emitter;
     yaml_event_t event;
-    Data_Get_Struct(self, yaml_emitter_t, emitter);
+    TypedData_Get_Struct(self, yaml_emitter_t, &psych_emitter_type, emitter);
 
 #ifdef HAVE_RUBY_ENCODING_H
     if(!NIL_P(anchor)) {
@@ -432,7 +449,7 @@ static VALUE alias(VALUE self, VALUE anchor)
 static VALUE set_canonical(VALUE self, VALUE style)
 {
     yaml_emitter_t * emitter;
-    Data_Get_Struct(self, yaml_emitter_t, emitter);
+    TypedData_Get_Struct(self, yaml_emitter_t, &psych_emitter_type, emitter);
 
     yaml_emitter_set_canonical(emitter, Qtrue == style ? 1 : 0);
 
@@ -446,7 +463,7 @@ static VALUE set_canonical(VALUE self, VALUE style)
 static VALUE canonical(VALUE self)
 {
     yaml_emitter_t * emitter;
-    Data_Get_Struct(self, yaml_emitter_t, emitter);
+    TypedData_Get_Struct(self, yaml_emitter_t, &psych_emitter_type, emitter);
 
     return (emitter->canonical == 0) ? Qfalse : Qtrue;
 }
@@ -459,7 +476,7 @@ static VALUE canonical(VALUE self)
 static VALUE set_indentation(VALUE self, VALUE level)
 {
     yaml_emitter_t * emitter;
-    Data_Get_Struct(self, yaml_emitter_t, emitter);
+    TypedData_Get_Struct(self, yaml_emitter_t, &psych_emitter_type, emitter);
 
     yaml_emitter_set_indent(emitter, NUM2INT(level));
 
@@ -473,7 +490,7 @@ static VALUE set_indentation(VALUE self, VALUE level)
 static VALUE indentation(VALUE self)
 {
     yaml_emitter_t * emitter;
-    Data_Get_Struct(self, yaml_emitter_t, emitter);
+    TypedData_Get_Struct(self, yaml_emitter_t, &psych_emitter_type, emitter);
 
     return INT2NUM(emitter->best_indent);
 }
@@ -485,7 +502,7 @@ static VALUE indentation(VALUE self)
 static VALUE line_width(VALUE self)
 {
     yaml_emitter_t * emitter;
-    Data_Get_Struct(self, yaml_emitter_t, emitter);
+    TypedData_Get_Struct(self, yaml_emitter_t, &psych_emitter_type, emitter);
 
     return INT2NUM(emitter->best_width);
 }
@@ -497,14 +514,14 @@ static VALUE line_width(VALUE self)
 static VALUE set_line_width(VALUE self, VALUE width)
 {
     yaml_emitter_t * emitter;
-    Data_Get_Struct(self, yaml_emitter_t, emitter);
+    TypedData_Get_Struct(self, yaml_emitter_t, &psych_emitter_type, emitter);
 
     yaml_emitter_set_width(emitter, NUM2INT(width));
 
     return width;
 }
 
-void Init_psych_emitter()
+void Init_psych_emitter(void)
 {
     VALUE psych     = rb_define_module("Psych");
     VALUE handler   = rb_define_class_under(psych, "Handler", rb_cObject);

data/ext/psych/psych_emitter.h

@@ -3,6 +3,6 @@
 
 #include <psych.h>
 
-void Init_psych_emitter();
+void Init_psych_emitter(void);
 
 #endif

data/ext/psych/psych_parser.c

@@ -49,14 +49,32 @@ static void dealloc(void * ptr)
     xfree(parser);
 }
 
+#if 0
+static size_t memsize(const void *ptr)
+{
+    const yaml_parser_t *parser = ptr;
+    /* TODO: calculate parser's size */
+    return 0;
+}
+#endif
+
+static const rb_data_type_t psych_parser_type = {
+    "Psych/parser",
+    {0, dealloc, 0,},
+    0, 0,
+#ifdef RUBY_TYPED_FREE_IMMEDIATELY
+    RUBY_TYPED_FREE_IMMEDIATELY,
+#endif
+};
+
 static VALUE allocate(VALUE klass)
 {
     yaml_parser_t * parser;
+    VALUE obj = TypedData_Make_Struct(klass, yaml_parser_t, &psych_parser_type, parser);
 
-    parser = xmalloc(sizeof(yaml_parser_t));
     yaml_parser_initialize(parser);
 
-    return Data_Wrap_Struct(klass, 0, dealloc, parser);
+    return obj;
 }
 
 static VALUE make_exception(yaml_parser_t * parser, VALUE path)
@@ -248,7 +266,7 @@ static VALUE parse(int argc, VALUE *argv, VALUE self)
 	    path = rb_str_new2("<unknown>");
     }
 
-    Data_Get_Struct(self, yaml_parser_t, parser);
+    TypedData_Get_Struct(self, yaml_parser_t, &psych_parser_type, parser);
 
     yaml_parser_delete(parser);
     yaml_parser_initialize(parser);
@@ -526,7 +544,7 @@ static VALUE mark(VALUE self)
     VALUE args[3];
     yaml_parser_t * parser;
 
-    Data_Get_Struct(self, yaml_parser_t, parser);
+    TypedData_Get_Struct(self, yaml_parser_t, &psych_parser_type, parser);
     mark_klass = rb_const_get_at(cPsychParser, rb_intern("Mark"));
     args[0] = INT2NUM(parser->mark.index);
     args[1] = INT2NUM(parser->mark.line);
@@ -535,7 +553,7 @@ static VALUE mark(VALUE self)
     return rb_class_new_instance(3, args, mark_klass);
 }
 
-void Init_psych_parser()
+void Init_psych_parser(void)
 {
 #if 0
     mPsych = rb_define_module("Psych");

data/ext/psych/psych_parser.h

@@ -1,6 +1,6 @@
 #ifndef PSYCH_PARSER_H
 #define PSYCH_PARSER_H
 
-void Init_psych_parser();
+void Init_psych_parser(void);
 
 #endif

data/ext/psych/yaml/scanner.c

@@ -1105,13 +1105,6 @@ yaml_parser_save_simple_key(yaml_parser_t *parser)
     int required = (!parser->flow_level
             && parser->indent == (ptrdiff_t)parser->mark.column);
 
-    /*
-     * A simple key is required only when it is the first token in the current
-     * line.  Therefore it is always allowed.  But we add a check anyway.
-     */
-
-    assert(parser->simple_key_allowed || !required);    /* Impossible. */
-
     /*
      * If the current position may start a simple key, save it.
      */

data/lib/psych.rb

@@ -21,7 +21,7 @@ require 'psych/class_loader'
 #
 # Psych is a YAML parser and emitter.
 # Psych leverages libyaml [Home page: http://pyyaml.org/wiki/LibYAML]
-# or [Git repo: https://github.com/zerotao/libyaml] for its YAML parsing
+# or [HG repo: https://bitbucket.org/xi/libyaml] for its YAML parsing
 # and emitting capabilities. In addition to wrapping libyaml, Psych also
 # knows how to serialize and de-serialize most Ruby objects to and from
 # the YAML format.
@@ -217,7 +217,7 @@ require 'psych/class_loader'
 
 module Psych
   # The version is Psych you're using
-  VERSION         = '2.0.5'
+  VERSION         = '2.0.13'
 
   # The version of libyaml Psych is using
   LIBYAML_VERSION = Psych.libyaml_version.join '.'