psych 2.1.0-java → 2.1.1-java

data/ext/java/PsychYamlTree.java

@@ -0,0 +1,55 @@
+/***** BEGIN LICENSE BLOCK *****
+ * Version: EPL 1.0/GPL 2.0/LGPL 2.1
+ *
+ * The contents of this file are subject to the Eclipse Public
+ * License Version 1.0 (the "License"); you may not use this file
+ * except in compliance with the License. You may obtain a copy of
+ * the License at http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Software distributed under the License is distributed on an "AS
+ * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
+ * implied. See the License for the specific language governing
+ * rights and limitations under the License.
+ *
+ * Copyright (C) 2010 Charles O Nutter <headius@headius.com>
+ *
+ * Alternatively, the contents of this file may be used under the terms of
+ * either of the GNU General Public License Version 2 or later (the "GPL"),
+ * or the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+ * in which case the provisions of the GPL or the LGPL are applicable instead
+ * of those above. If you wish to allow use of your version of this file only
+ * under the terms of either the GPL or the LGPL, and not to allow others to
+ * use your version of this file under the terms of the EPL, indicate your
+ * decision by deleting the provisions above and replace them with the notice
+ * and other provisions required by the GPL or the LGPL. If you do not delete
+ * the provisions above, a recipient may use your version of this file under
+ * the terms of any one of the EPL, the GPL or the LGPL.
+ ***** END LICENSE BLOCK *****/
+package org.jruby.ext.psych;
+
+import org.jruby.Ruby;
+import org.jruby.RubyClass;
+import org.jruby.RubyModule;
+import org.jruby.RubyObject;
+import org.jruby.anno.JRubyMethod;
+import org.jruby.runtime.ThreadContext;
+import org.jruby.runtime.builtin.IRubyObject;
+import static org.jruby.runtime.Visibility.*;
+
+public class PsychYamlTree {
+    public static void initPsychYamlTree(Ruby runtime, RubyModule psych) {
+        RubyModule visitors = (RubyModule)psych.getConstant("Visitors");
+        RubyClass visitor = (RubyClass)visitors.getConstant("Visitor");
+        RubyClass psychYamlTree = runtime.defineClassUnder("YAMLTree", visitor, RubyObject.OBJECT_ALLOCATOR, visitors);
+
+        psychYamlTree.defineAnnotatedMethods(PsychYamlTree.class);
+    }
+
+    @JRubyMethod(visibility = PRIVATE)
+    public static IRubyObject private_iv_get(ThreadContext context, IRubyObject self, IRubyObject target, IRubyObject prop) {
+        IRubyObject obj = (IRubyObject)target.getInternalVariables().getInternalVariable(prop.asJavaString());
+        if (obj == null) obj = context.nil;
+
+        return obj;
+    }
+}

data/ext/psych/.gitignore

@@ -0,0 +1,11 @@
+/api.c
+/config.h
+/dumper.c
+/emitter.c
+/loader.c
+/parser.c
+/reader.c
+/scanner.c
+/writer.c
+/yaml.h
+/yaml_private.h

data/lib/psych.rb

@@ -224,7 +224,7 @@ require 'psych/class_loader'
 
 module Psych
   # The version is Psych you're using
-  VERSION         = '2.1.0'
+  VERSION         = '2.1.1'
 
   # The version of libyaml Psych is using
   LIBYAML_VERSION = Psych.libyaml_version.join '.'
@@ -469,7 +469,7 @@ module Psych
   ###
   # Load the document contained in +filename+.  Returns the yaml contained in
   # +filename+ as a Ruby object, or if the file is empty, it returns
-  # the specified default return value, which defaults to an empty Hash 
+  # the specified default return value, which defaults to an empty Hash
   def self.load_file filename, fallback = false
     File.open(filename, 'r:bom|utf-8') { |f|
       self.load f, filename, FALLBACK.new(fallback)

data/lib/psych/visitors/to_ruby.rb

@@ -70,11 +70,11 @@ module Psych
             o.value
           end
         when '!ruby/object:BigDecimal'
-          require 'bigdecimal'
+          require 'bigdecimal' unless defined? BigDecimal
           class_loader.big_decimal._load o.value
         when "!ruby/object:DateTime"
           class_loader.date_time
-          require 'date'
+          require 'date' unless defined? DateTime
           @ss.parse_time(o.value).to_datetime
         when '!ruby/encoding'
           ::Encoding.find o.value

data/psych.gemspec

@@ -0,0 +1,39 @@
+# -*- encoding: utf-8 -*-
+
+Gem::Specification.new do |s|
+  s.name = "psych"
+  s.version = "2.1.1"
+  s.authors = ["Aaron Patterson", "SHIBATA Hiroshi"]
+  s.email = ["aaron@tenderlovemaking.com", "hsbt@ruby-lang.org"]
+  s.date = "2016-09-07"
+  s.summary = "Psych is a YAML parser and emitter"
+  s.description = <<-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 libyaml,
+Psych also knows how to serialize and de-serialize most Ruby objects to and from the YAML format.
+DESCRIPTION
+  s.homepage = "http://github.com/tenderlove/psych"
+  s.licenses = ["MIT"]
+  s.require_paths = ["lib"]
+  s.files = `git ls-files -z`.split("\x0").reject { |f| f.match(%r{^(test|spec|features)/}) }
+
+  s.rdoc_options = ["--main", "README.rdoc"]
+  s.extra_rdoc_files = ["CHANGELOG.rdoc", "README.rdoc", "CHANGELOG.rdoc", "README.rdoc"]
+
+  s.required_ruby_version = Gem::Requirement.new(">= 1.9.2")
+  s.rubygems_version = "2.5.1"
+  s.required_rubygems_version = Gem::Requirement.new(">= 0")
+
+  s.add_development_dependency(%q<rake-compiler>, [">= 0.4.1"])
+  s.add_development_dependency(%q<minitest>, ["~> 5.0"])
+
+  if RUBY_PLATFORM =~ /java/
+    require 'psych/versions'
+    s.platform = 'java'
+    s.requirements = "jar org.yaml:snakeyaml, #{Psych::DEFAULT_SNAKEYAML_VERSION}"
+    s.add_dependency 'jar-dependencies', '>= 0.1.7'
+    s.add_development_dependency 'ruby-maven'
+  else
+    s.extensions = ["ext/psych/extconf.rb"]
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: psych
 version: !ruby/object:Gem::Version
-  version: 2.1.0
+  version: 2.1.1
 platform: java
 authors:
 - Aaron Patterson
@@ -9,7 +9,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2016-06-24 00:00:00.000000000 Z
+date: 2016-09-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
@@ -67,11 +67,10 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-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
-  libyaml, Psych also knows how to serialize and de-serialize most Ruby objects
-  to and from the YAML format.
+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 libyaml,
+  Psych also knows how to serialize and de-serialize most Ruby objects to and from the YAML format.
 email:
 - aaron@tenderlovemaking.com
 - hsbt@ruby-lang.org
@@ -81,10 +80,21 @@ extra_rdoc_files:
 - CHANGELOG.rdoc
 - README.rdoc
 files:
+- ".gitignore"
 - ".travis.yml"
 - CHANGELOG.rdoc
+- Gemfile
+- Mavenfile
 - README.rdoc
 - Rakefile
+- bin/console
+- bin/setup
+- ext/java/PsychEmitter.java
+- ext/java/PsychLibrary.java
+- ext/java/PsychParser.java
+- ext/java/PsychToRuby.java
+- ext/java/PsychYamlTree.java
+- ext/psych/.gitignore
 - ext/psych/depend
 - ext/psych/extconf.rb
 - ext/psych/psych.c
@@ -148,51 +158,7 @@ files:
 - 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
-- 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_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
+- psych.gemspec
 homepage: http://github.com/tenderlove/psych
 licenses:
 - MIT
@@ -216,7 +182,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements:
 - jar org.yaml:snakeyaml, 1.14
 rubyforge_project:
-rubygems_version: 2.6.4
+rubygems_version: 2.6.6
 signing_key:
 specification_version: 4
 summary: Psych is a YAML parser and emitter

data/test/psych/handlers/test_recorder.rb

@@ -1,26 +0,0 @@
-# frozen_string_literal: false
-require 'psych/helper'
-require 'psych/handlers/recorder'
-
-module Psych
-  module Handlers
-    class TestRecorder < TestCase
-      def test_replay
-        yaml   = "--- foo\n...\n"
-        output = StringIO.new
-
-        recorder = Psych::Handlers::Recorder.new
-        parser   = Psych::Parser.new recorder
-        parser.parse yaml
-
-        assert_equal 5, recorder.events.length
-
-        emitter = Psych::Emitter.new output
-        recorder.events.each do |m, args|
-          emitter.send m, *args
-        end
-        assert_equal yaml, output.string
-      end
-    end
-  end
-end

data/test/psych/helper.rb

@@ -1,122 +0,0 @@
-# frozen_string_literal: false
-require 'minitest/autorun'
-require 'stringio'
-require 'tempfile'
-require 'date'
-
-require 'psych'
-
-module Psych
-  superclass = if defined?(Minitest::Test)
-                 Minitest::Test
-               else
-                 MiniTest::Unit::TestCase
-               end
-
-  class TestCase < superclass
-    def self.suppress_warning
-      verbose, $VERBOSE = $VERBOSE, nil
-      yield
-    ensure
-      $VERBOSE = verbose
-    end
-
-    def with_default_external(enc)
-      verbose, $VERBOSE = $VERBOSE, nil
-      origenc, Encoding.default_external = Encoding.default_external, enc
-      $VERBOSE = verbose
-      yield
-    ensure
-      verbose, $VERBOSE = $VERBOSE, nil
-      Encoding.default_external = origenc
-      $VERBOSE = verbose
-    end
-
-    def with_default_internal(enc)
-      verbose, $VERBOSE = $VERBOSE, nil
-      origenc, Encoding.default_internal = Encoding.default_internal, enc
-      $VERBOSE = verbose
-      yield
-    ensure
-      verbose, $VERBOSE = $VERBOSE, nil
-      Encoding.default_internal = origenc
-      $VERBOSE = verbose
-    end
-
-    #
-    # Convert between Psych and the object to verify correct parsing and
-    # emitting
-    #
-    def assert_to_yaml( obj, yaml )
-      assert_equal( obj, Psych::load( yaml ) )
-      assert_equal( obj, Psych::parse( yaml ).transform )
-      assert_equal( obj, Psych::load( obj.psych_to_yaml ) )
-      assert_equal( obj, Psych::parse( obj.psych_to_yaml ).transform )
-      assert_equal( obj, Psych::load(
-        obj.psych_to_yaml(
-          :UseVersion => true, :UseHeader => true, :SortKeys => true
-        )
-      ))
-    end
-
-    #
-    # Test parser only
-    #
-    def assert_parse_only( obj, yaml )
-      assert_equal( obj, Psych::load( yaml ) )
-      assert_equal( obj, Psych::parse( yaml ).transform )
-    end
-
-    def assert_cycle( obj )
-      v = Visitors::YAMLTree.create
-      v << obj
-      assert_equal(obj, Psych.load(v.tree.yaml))
-      assert_equal( obj, Psych::load(Psych.dump(obj)))
-      assert_equal( obj, Psych::load( obj.psych_to_yaml ) )
-    end
-
-    #
-    # Make a time with the time zone
-    #
-    def mktime( year, mon, day, hour, min, sec, usec, zone = "Z" )
-      usec = Rational(usec.to_s) * 1000000
-      val = Time::utc( year.to_i, mon.to_i, day.to_i, hour.to_i, min.to_i, sec.to_i, usec )
-      if zone != "Z"
-        hour = zone[0,3].to_i * 3600
-        min = zone[3,2].to_i * 60
-        ofs = (hour + min)
-        val = Time.at( val.tv_sec - ofs, val.tv_nsec / 1000.0 )
-      end
-      return val
-    end
-  end
-end
-
-# backport so that tests will run on 2.0.0
-unless Tempfile.respond_to? :create
-  def Tempfile.create(basename, *rest)
-    tmpfile = nil
-    Dir::Tmpname.create(basename, *rest) do |tmpname, n, opts|
-      mode = File::RDWR|File::CREAT|File::EXCL
-      perm = 0600
-      if opts
-        mode |= opts.delete(:mode) || 0
-        opts[:perm] = perm
-        perm = nil
-      else
-        opts = perm
-      end
-      tmpfile = File.open(tmpname, mode, opts)
-    end
-    if block_given?
-      begin
-        yield tmpfile
-      ensure
-        tmpfile.close if !tmpfile.closed?
-        File.unlink tmpfile
-      end
-    else
-      tmpfile
-    end
-  end
-end

data/test/psych/json/test_stream.rb

@@ -1,110 +0,0 @@
-# frozen_string_literal: false
-require 'psych/helper'
-
-module Psych
-  module JSON
-    class TestStream < TestCase
-      def setup
-        @io     = StringIO.new
-        @stream = Psych::JSON::Stream.new(@io)
-        @stream.start
-      end
-
-      def test_explicit_documents
-        @io     = StringIO.new
-        @stream = Psych::JSON::Stream.new(@io)
-        @stream.start
-
-        @stream.push({ 'foo' => 'bar' })
-
-        assert !@stream.finished?, 'stream not finished'
-        @stream.finish
-        assert @stream.finished?, 'stream finished'
-
-        assert_match(/^---/, @io.string)
-        assert_match(/\.\.\.$/, @io.string)
-      end
-
-      def test_null
-        @stream.push(nil)
-        assert_match(/^--- null/, @io.string)
-      end
-
-      def test_string
-        @stream.push "foo"
-        assert_match(/(["])foo\1/, @io.string)
-      end
-
-      def test_symbol
-        @stream.push :foo
-        assert_match(/(["])foo\1/, @io.string)
-      end
-
-      def test_int
-        @stream.push 10
-        assert_match(/^--- 10/, @io.string)
-      end
-
-      def test_float
-        @stream.push 1.2
-        assert_match(/^--- 1.2/, @io.string)
-      end
-
-      def test_hash
-        hash = { 'one' => 'two' }
-        @stream.push hash
-
-        json = @io.string
-        assert_match(/}$/, json)
-        assert_match(/^--- \{/, json)
-        assert_match(/["]one['"]/, json)
-        assert_match(/["]two['"]/, json)
-      end
-
-      def test_list_to_json
-        list = %w{ one two }
-        @stream.push list
-
-        json = @io.string
-        assert_match(/\]$/, json)
-        assert_match(/^--- \[/, json)
-        assert_match(/["]one["]/, json)
-        assert_match(/["]two["]/, json)
-      end
-
-      class Foo; end
-
-      def test_json_dump_exclude_tag
-        @stream << Foo.new
-        json = @io.string
-        refute_match('Foo', json)
-      end
-
-      class Bar
-        def encode_with coder
-          coder.represent_seq 'omg', %w{ a b c }
-        end
-      end
-
-      def test_json_list_dump_exclude_tag
-        @stream << Bar.new
-        json = @io.string
-        refute_match('omg', json)
-      end
-
-      def test_time
-        time = Time.utc(2010, 10, 10)
-        @stream.push({'a' => time })
-        json = @io.string
-        assert_match "{\"a\": \"2010-10-10 00:00:00.000000000 Z\"}\n", json
-      end
-
-      def test_datetime
-        time = Time.new(2010, 10, 10).to_datetime
-        @stream.push({'a' => time })
-        json = @io.string
-        assert_match "{\"a\": \"#{time.strftime("%Y-%m-%d %H:%M:%S.%9N %:z")}\"}\n", json
-      end
-    end
-  end
-end