psych 2.0.8 → 2.0.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9f4c0db7eb15a38300a2e0b67f1a7ed0684f1f04
-  data.tar.gz: f93f68a1a66f579da0f09def436544d5becdad70
+  metadata.gz: ff8cb5130ddeec957e2ea9cb3743aff24dba4dc9
+  data.tar.gz: 71ee9f61849d041bea7f7e7ffb90f380d315eaab
 SHA512:
-  metadata.gz: a1fc55b8c18c01b5cebec82f87e9e767ae2aaf9332d72c876f8b848f489001f307c4020c7730d32afd38c63f0a444da4371c11d3bfd8e3836a78482e1e531c0c
-  data.tar.gz: 3e1e6663119da44e991eeba5391945d0443feaeaf9c72a43053d6cda0887bbf735cd3a040eb8da48634d9b41a01ab917b09aa29156c59ccb01f3ef8b026e0f1b
+  metadata.gz: 9641a5d5820bee5cb15db5c768e094ec5158b3c7f7d2ec4f1e91933f046cb129b6c316339e8293cac73eb34100ca901a90c029341ca5053d47a1d531753d1efc
+  data.tar.gz: 7e270db26bdd10fef4c1c809f780f23699a2196a16cb3f394d1ee9a7c48f8ef57184fe805c125f30dc89d428eb833c50fbb2935b95dad308cfc990d09b7025d5

data/.travis.yml

@@ -3,8 +3,9 @@ rvm:
   - 1.9.3
   - 2.0.0
   - 2.1.0
+  - ruby-head
 before_script:
-  - gem install isolate
   - gem install hoe
   - gem install rake-compiler
-script: rake isolate test
+  - gem install minitest -v '~> 4.0'
+script: rake test

data/CHANGELOG.rdoc

@@ -1,3 +1,19 @@
+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

data/Rakefile

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

data/lib/psych.rb

@@ -217,7 +217,7 @@ require 'psych/class_loader'
 
 module Psych
   # The version is Psych you're using
-  VERSION         = '2.0.8'
+  VERSION         = '2.0.9'
 
   # The version of libyaml Psych is using
   LIBYAML_VERSION = Psych.libyaml_version.join '.'

data/lib/psych/visitors/to_ruby.rb

@@ -261,8 +261,22 @@ module Psych
           end
           set
 
+        when /^!ruby\/hash-with-ivars(?::(.*))?$/
+          hash = $1 ? resolve_class($1).allocate : {}
+          o.children.each_slice(2) do |key, value|
+            case key.value
+            when 'elements'
+              revive_hash hash, value
+            when 'ivars'
+              value.children.each_slice(2) do |k,v|
+                hash.instance_variable_set accept(k), accept(v)
+              end
+            end
+          end
+          hash
+
         when /^!map:(.*)$/, /^!ruby\/hash:(.*)$/
-          revive_hash register(o, resolve_class($1).new), o
+          revive_hash register(o, resolve_class($1).allocate), o
 
         when '!omap', 'tag:yaml.org,2002:omap'
           map = register(o, class_loader.psych_omap.new)

data/lib/psych/visitors/yaml_tree.rb

@@ -317,7 +317,7 @@ module Psych
           tag   = 'tag:yaml.org,2002:str'
           plain = false
           quote = false
-        elsif o =~ /^\W[^"]*$/
+        elsif o =~ /^[^[:word:]][^"]*$/
           style = Nodes::Scalar::DOUBLE_QUOTED
         else
           unless String === @ss.tokenize(o)
@@ -367,17 +367,46 @@ module Psych
       end
 
       def visit_Hash o
-        tag      = o.class == ::Hash ? nil : "!ruby/hash:#{o.class}"
-        implicit = !tag
+        ivars    = o.instance_variables
 
-        register(o, @emitter.start_mapping(nil, tag, implicit, Psych::Nodes::Mapping::BLOCK))
+        if ivars.any?
+          tag = "!ruby/hash-with-ivars"
+          tag << ":#{o.class}" unless o.class == ::Hash
 
-        o.each do |k,v|
-          accept k
-          accept v
-        end
+          register(o, @emitter.start_mapping(nil, tag, false, Psych::Nodes::Mapping::BLOCK))
 
-        @emitter.end_mapping
+          @emitter.scalar 'elements', nil, nil, true, false, Nodes::Scalar::ANY
+
+          @emitter.start_mapping nil, nil, true, Nodes::Mapping::BLOCK
+          o.each do |k,v|
+            accept k
+            accept v
+          end
+          @emitter.end_mapping
+
+          @emitter.scalar 'ivars', nil, nil, true, false, Nodes::Scalar::ANY
+
+          @emitter.start_mapping nil, nil, true, Nodes::Mapping::BLOCK
+          o.instance_variables.each do |ivar|
+            accept ivar
+            accept o.instance_variable_get ivar
+          end
+          @emitter.end_mapping
+
+          @emitter.end_mapping
+        else
+          tag      = o.class == ::Hash ? nil : "!ruby/hash:#{o.class}"
+          implicit = !tag
+
+          register(o, @emitter.start_mapping(nil, tag, implicit, Psych::Nodes::Mapping::BLOCK))
+
+          o.each do |k,v|
+            accept k
+            accept v
+          end
+
+          @emitter.end_mapping
+        end
       end
 
       def visit_Psych_Set o

data/test/psych/test_hash.rb

@@ -5,11 +5,55 @@ module Psych
     class X < Hash
     end
 
+    class HashWithCustomInit < Hash
+      attr_reader :obj
+      def initialize(obj)
+        @obj = obj
+      end
+    end
+
+    class HashWithCustomInitNoIvar < Hash
+      def initialize(obj)
+        # *shrug*
+      end
+    end
+
     def setup
       super
       @hash = { :a => 'b' }
     end
 
+    def test_custom_initialized
+      a = [1,2,3,4,5]
+      t1 = HashWithCustomInit.new(a)
+      t2 = Psych.load(Psych.dump(t1))
+      assert_equal t1, t2
+      assert_cycle t1
+    end
+
+    def test_custom_initialize_no_ivar
+      t1 = HashWithCustomInitNoIvar.new(nil)
+      t2 = Psych.load(Psych.dump(t1))
+      assert_equal t1, t2
+      assert_cycle t1
+    end
+
+    def test_hash_with_ivars
+      @hash.instance_variable_set :@foo, 'bar'
+      dup = Psych.load Psych.dump @hash
+      assert_equal 'bar', dup.instance_variable_get(:@foo)
+    end
+
+    def test_hash_subclass_with_ivars
+      x = X.new
+      x[:a] = 'b'
+      x.instance_variable_set :@foo, 'bar'
+      dup = Psych.load Psych.dump x
+      assert_cycle x
+      assert_equal 'bar', dup.instance_variable_get(:@foo)
+      assert_equal X, dup.class
+    end
+
     def test_load_with_class_syck_compatibility
       hash = Psych.load "--- !ruby/object:Hash\n:user_id: 7\n:username: Lucas\n"
       assert_equal({ user_id: 7, username: 'Lucas'}, hash)

data/test/psych/test_string.rb

@@ -1,3 +1,4 @@
+# encoding: UTF-8
 require_relative 'helper'
 
 module Psych
@@ -23,6 +24,11 @@ module Psych
       assert_equal 2, Psych.dump(%Q{<%= ENV["PATH"] %>}).count('"')
     end
 
+    def test_no_quotes_when_start_with_non_ascii_character
+      yaml = Psych.dump 'Český non-ASCII'.encode(Encoding::UTF_8)
+      assert_match(/---\s*[^"'!]+$/, yaml)
+    end
+
     def test_doublequotes_when_there_is_a_single
       yaml = Psych.dump "@123'abc"
       assert_match(/---\s*"/, yaml)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: psych
 version: !ruby/object:Gem::Version
-  version: 2.0.8
+  version: 2.0.9
 platform: ruby
 authors:
 - Aaron Patterson
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-12-05 00:00:00.000000000 Z
+date: 2015-01-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rdoc
@@ -38,6 +38,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 0.4.1
+- !ruby/object:Gem::Dependency
+  name: minitest
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '4.0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '4.0'
 - !ruby/object:Gem::Dependency
   name: hoe
   requirement: !ruby/object:Gem::Requirement