psych 2.0.13 → 2.0.14

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 98ff80d57bc20b6d84ee24df83966f0feebfbe3f
-  data.tar.gz: afa7e8005ce6e5ce2867e4c3d06793d94c2af627
+  metadata.gz: 5ed482aa38a7a9622af286172a58c843a19fee10
+  data.tar.gz: bf517307f66846bfa7d36c048ad7b20d8304c094
 SHA512:
-  metadata.gz: d219a2267fdb9c6471a9e27e18242e572bcbf259207d78b4a8948dd812fc1da23bde5b24850e099961c4d0384a71d2bb2177c02b8131d771d8c726924ec693f0
-  data.tar.gz: 0ae5569645a513442d8f7859b2ab3154a42c8fc728ec9a82f6a40971554eab5907338032352522755cc59666d13f58d42304f71aaacd6f86b5fc9c7c3f4f9dc9
+  metadata.gz: 3c6f8dc7c2c2f6583c5821f6de3c325cf7ec5ddaecdd934dbb7137cd2521e32818cfccae6b46256d8659f27a17ca06caebab2150e8fd63df232bd4b1fbe487bf
+  data.tar.gz: f17fb70ae8e676ad441b68adfa0f79c97a1b55c8e6a844ab041bbab1efc2bc93e4b92a37f72f38a63120323bcb8e6ca06cc728c4b59577791ab9bde8ea56d9ef

data/.travis.yml

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

data/Manifest.txt

@@ -57,6 +57,7 @@ lib/psych/stream.rb
 lib/psych/streaming.rb
 lib/psych/syntax_error.rb
 lib/psych/tree_builder.rb
+lib/psych/versions.rb
 lib/psych/visitors.rb
 lib/psych/visitors/depth_first.rb
 lib/psych/visitors/emitter.rb
@@ -65,6 +66,7 @@ lib/psych/visitors/to_ruby.rb
 lib/psych/visitors/visitor.rb
 lib/psych/visitors/yaml_tree.rb
 lib/psych/y.rb
+lib/psych_jars.rb
 test/psych/handlers/test_recorder.rb
 test/psych/helper.rb
 test/psych/json/test_stream.rb

data/Rakefile

@@ -1,15 +1,22 @@
 # -*- ruby -*-
 
+require 'psych'
 require 'rubygems'
 require 'hoe'
 
+def java?
+  RUBY_PLATFORM =~ /java/
+end
+
 class Hoe
   remove_const :RUBY_FLAGS
-  RUBY_FLAGS = "-I#{%w(lib ext bin test).join(File::PATH_SEPARATOR)}"
+  flags = "-I#{%w(lib ext bin test).join(File::PATH_SEPARATOR)}"
+  flags = "--1.9 " + flags if java?
+  RUBY_FLAGS = flags
 end
 
 gem 'rake-compiler', '>= 0.4.1'
-gem 'minitest', '~> 4.0'
+gem 'minitest', '~> 5.0'
 require "rake/extensiontask"
 
 Hoe.plugin :doofus, :git, :gemspec
@@ -24,15 +31,57 @@ $hoe = Hoe.spec 'psych' do
   self.testlib           = :minitest
 
   extra_dev_deps << ['rake-compiler', '>= 0.4.1']
-  extra_dev_deps << ['minitest', '~> 4.0']
+  extra_dev_deps << ['minitest', '~> 5.0']
 
   self.spec_extras = {
-    :extensions            => ["ext/psych/extconf.rb"],
     :required_ruby_version => '>= 1.9.2'
   }
 
-  Rake::ExtensionTask.new "psych", spec do |ext|
-    ext.lib_dir = File.join(*['lib', ENV['FAT_DIR']].compact)
+  if java?
+    require './lib/psych/versions.rb'
+    extra_deps << ['jar-dependencies', '>= 0.1.7']
+
+    # the jar declaration for jar-dependencies
+    self.spec_extras[ 'requirements' ] = "jar org.yaml:snakeyaml, #{Psych::DEFAULT_SNAKEYAML_VERSION}"
+    self.spec_extras[ 'platform' ] = 'java'
+    # TODO: clean this section up.
+    require "rake/javaextensiontask"
+    Rake::JavaExtensionTask.new("psych", spec) do |ext|
+      require 'maven/ruby/maven'
+      # uses Mavenfile to write classpath into pkg/classpath
+      # and tell maven via system properties the snakeyaml version
+      # this is basically the same as running from the commandline:
+      # rmvn dependency:build-classpath -Dsnakeyaml.version='use version from Psych::DEFAULT_SNAKEYAML_VERSION here'
+      Maven::Ruby::Maven.new.exec( 'dependency:build-classpath', "-Dsnakeyaml.version=#{Psych::DEFAULT_SNAKEYAML_VERSION}", '-Dverbose=true')#, '--quiet' )
+      ext.source_version = '1.7'
+      ext.target_version = '1.7'
+      ext.classpath = File.read('pkg/classpath')
+      ext.ext_dir = 'ext/java'
+    end
+  else
+    self.spec_extras[:extensions] = ["ext/psych/extconf.rb"]
+    Rake::ExtensionTask.new "psych", spec do |ext|
+      ext.lib_dir = File.join(*['lib', ENV['FAT_DIR']].compact)
+    end
+  end
+end
+
+def gem_build_path
+  File.join 'pkg', $hoe.spec.full_name
+end
+
+def add_file_to_gem relative_path
+  target_path = File.join gem_build_path, relative_path
+  target_dir = File.dirname(target_path)
+  mkdir_p target_dir unless File.directory?(target_dir)
+  rm_f target_path
+  safe_ln relative_path, target_path
+  $hoe.spec.files.concat [relative_path]
+end
+
+if java?
+  task gem_build_path => [:compile] do
+    add_file_to_gem 'lib/psych.jar'
   end
 end
 

data/ext/psych/psych_emitter.c

@@ -50,14 +50,13 @@ static const rb_data_type_t psych_emitter_type = {
 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 TypedData_Wrap_Struct(klass, &psych_emitter_type, emitter);
+    return obj;
 }
 
 /* call-seq: Psych::Emitter.new(io, options = Psych::Emitter::OPTIONS)

data/ext/psych/psych_parser.c

@@ -70,11 +70,11 @@ static const rb_data_type_t psych_parser_type = {
 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 TypedData_Wrap_Struct(klass, &psych_parser_type, parser);
+    return obj;
 }
 
 static VALUE make_exception(yaml_parser_t * parser, VALUE path)

data/lib/psych.rb

@@ -1,4 +1,10 @@
-require 'psych.so'
+case RUBY_ENGINE
+when 'jruby'
+  require 'psych_jars'
+  org.jruby.ext.psych.PsychLibrary.new.load(JRuby.runtime, false)
+else
+  require 'psych.so'
+end
 require 'psych/nodes'
 require 'psych/streaming'
 require 'psych/visitors'
@@ -217,7 +223,7 @@ require 'psych/class_loader'
 
 module Psych
   # The version is Psych you're using
-  VERSION         = '2.0.13'
+  VERSION         = '2.0.14'
 
   # The version of libyaml Psych is using
   LIBYAML_VERSION = Psych.libyaml_version.join '.'

data/lib/psych/versions.rb

@@ -0,0 +1,3 @@
+module Psych
+  DEFAULT_SNAKEYAML_VERSION = '1.14'.freeze
+end

data/lib/psych/visitors/to_ruby.rb

@@ -61,7 +61,7 @@ module Psych
         case o.tag
         when '!binary', 'tag:yaml.org,2002:binary'
           o.value.unpack('m').first
-        when /^!(?:str|ruby\/string)(?::(.*))?/, 'tag:yaml.org,2002:str'
+        when /^!(?:str|ruby\/string)(?::(.*))?$/, 'tag:yaml.org,2002:str'
           klass = resolve_class($1)
           if klass
             klass.allocate.replace o.value
@@ -208,7 +208,7 @@ module Psych
             obj
           end
 
-        when /^!(?:str|ruby\/string)(?::(.*))?/, 'tag:yaml.org,2002:str'
+        when /^!(?:str|ruby\/string)(?::(.*))?$/, 'tag:yaml.org,2002:str'
           klass   = resolve_class($1)
           members = {}
           string  = nil

data/lib/psych_jars.rb

@@ -0,0 +1,5 @@
+require 'psych/versions'
+require 'psych.jar'
+
+require 'jar-dependencies'
+require_jar('org.yaml', 'snakeyaml', Psych::DEFAULT_SNAKEYAML_VERSION)

data/test/psych/helper.rb

@@ -2,6 +2,7 @@ require 'minitest/autorun'
 require 'stringio'
 require 'tempfile'
 require 'date'
+
 require 'psych'
 
 module Psych

data/test/psych/visitors/test_to_ruby.rb

@@ -321,6 +321,13 @@ description:
         assert_equal %w{ foo foo }, list
         assert_equal list[0].object_id, list[1].object_id
       end
+
+      def test_mapping_with_str_tag
+        mapping = Nodes::Mapping.new(nil, '!strawberry')
+        mapping.children << Nodes::Scalar.new('foo')
+        mapping.children << Nodes::Scalar.new('bar')
+        assert_equal({'foo' => 'bar'}, mapping.to_ruby)
+      end
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: psych
 version: !ruby/object:Gem::Version
-  version: 2.0.13
+  version: 2.0.14
 platform: ruby
 authors:
 - Aaron Patterson
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-02-17 00:00:00.000000000 Z
+date: 2015-08-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rdoc
@@ -44,14 +44,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '4.0'
+        version: '5.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '4.0'
+        version: '5.0'
 - !ruby/object:Gem::Dependency
   name: hoe
   requirement: !ruby/object:Gem::Requirement
@@ -141,6 +141,7 @@ files:
 - lib/psych/streaming.rb
 - lib/psych/syntax_error.rb
 - lib/psych/tree_builder.rb
+- lib/psych/versions.rb
 - lib/psych/visitors.rb
 - lib/psych/visitors/depth_first.rb
 - lib/psych/visitors/emitter.rb
@@ -149,6 +150,7 @@ files:
 - lib/psych/visitors/visitor.rb
 - lib/psych/visitors/yaml_tree.rb
 - lib/psych/y.rb
+- lib/psych_jars.rb
 - test/psych/handlers/test_recorder.rb
 - test/psych/helper.rb
 - test/psych/json/test_stream.rb
@@ -166,7 +168,6 @@ files:
 - test/psych/test_exception.rb
 - test/psych/test_hash.rb
 - test/psych/test_json_tree.rb
-- test/psych/test_marshalable.rb
 - test/psych/test_merge_keys.rb
 - test/psych/test_nil.rb
 - test/psych/test_null.rb
@@ -217,53 +218,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5
+rubygems_version: 2.5.0
 signing_key: 
 specification_version: 4
 summary: Psych is a YAML parser and emitter
-test_files:
-- test/psych/handlers/test_recorder.rb
-- test/psych/json/test_stream.rb
-- test/psych/nodes/test_enumerable.rb
-- test/psych/test_alias_and_anchor.rb
-- test/psych/test_array.rb
-- test/psych/test_boolean.rb
-- test/psych/test_class.rb
-- test/psych/test_coder.rb
-- test/psych/test_date_time.rb
-- test/psych/test_deprecated.rb
-- test/psych/test_document.rb
-- test/psych/test_emitter.rb
-- test/psych/test_encoding.rb
-- test/psych/test_exception.rb
-- test/psych/test_hash.rb
-- test/psych/test_json_tree.rb
-- test/psych/test_marshalable.rb
-- test/psych/test_merge_keys.rb
-- test/psych/test_nil.rb
-- test/psych/test_null.rb
-- test/psych/test_numeric.rb
-- test/psych/test_object.rb
-- test/psych/test_object_references.rb
-- test/psych/test_omap.rb
-- test/psych/test_parser.rb
-- test/psych/test_psych.rb
-- test/psych/test_safe_load.rb
-- test/psych/test_scalar.rb
-- test/psych/test_scalar_scanner.rb
-- test/psych/test_serialize_subclasses.rb
-- test/psych/test_set.rb
-- test/psych/test_stream.rb
-- test/psych/test_string.rb
-- test/psych/test_struct.rb
-- test/psych/test_symbol.rb
-- test/psych/test_tainted.rb
-- test/psych/test_to_yaml_properties.rb
-- test/psych/test_tree_builder.rb
-- test/psych/test_yaml.rb
-- test/psych/test_yamldbm.rb
-- test/psych/test_yamlstore.rb
-- test/psych/visitors/test_depth_first.rb
-- test/psych/visitors/test_emitter.rb
-- test/psych/visitors/test_to_ruby.rb
-- test/psych/visitors/test_yaml_tree.rb
+test_files: []

data/test/psych/test_marshalable.rb

@@ -1,54 +0,0 @@
-require_relative 'helper'
-require 'delegate'
-
-module Psych
-  class TestMarshalable < TestCase
-    def test_objects_defining_marshal_dump_and_marshal_load_can_be_dumped
-      sd = SimpleDelegator.new(1)
-      loaded = Psych.load(Psych.dump(sd))
-
-      assert_instance_of(SimpleDelegator, loaded)
-      assert_equal(sd, loaded)
-    end
-
-    class PsychCustomMarshalable < BasicObject
-      attr_reader :foo
-
-      def initialize(foo)
-        @foo = foo
-      end
-
-      def marshal_dump
-        [foo]
-      end
-
-      def mashal_load(data)
-        @foo = data[0]
-      end
-
-      def init_with(coder)
-        @foo = coder['foo']
-      end
-
-      def encode_with(coder)
-        coder['foo'] = 2
-      end
-
-      def respond_to?(method)
-        [:marshal_dump, :marshal_load, :init_with, :encode_with].include?(method)
-      end
-
-      def class
-        PsychCustomMarshalable
-      end
-    end
-
-    def test_init_with_takes_priority_over_marshal_methods
-      obj = PsychCustomMarshalable.new(1)
-      loaded = Psych.load(Psych.dump(obj))
-
-      assert(PsychCustomMarshalable === loaded)
-      assert_equal(2, loaded.foo)
-    end
-  end
-end