psych 2.1.0 → 2.1.1

data/ext/java/PsychToRuby.java

@@ -0,0 +1,79 @@
+/***** 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.RubyException;
+import org.jruby.anno.JRubyMethod;
+import org.jruby.exceptions.RaiseException;
+import org.jruby.runtime.ThreadContext;
+import org.jruby.runtime.builtin.IRubyObject;
+import static org.jruby.runtime.Visibility.*;
+
+public class PsychToRuby {
+    public static void initPsychToRuby(Ruby runtime, RubyModule psych) {
+        RubyClass classLoader = runtime.defineClassUnder("ClassLoader", runtime.getObject(), RubyObject.OBJECT_ALLOCATOR, psych);
+
+        RubyModule visitors = runtime.defineModuleUnder("Visitors", psych);
+        RubyClass visitor = runtime.defineClassUnder("Visitor", runtime.getObject(), runtime.getObject().getAllocator(), visitors);
+        RubyClass psychToRuby = runtime.defineClassUnder("ToRuby", visitor, RubyObject.OBJECT_ALLOCATOR, visitors);
+
+        psychToRuby.defineAnnotatedMethods(ToRuby.class);
+        classLoader.defineAnnotatedMethods(ClassLoader.class);
+    }
+
+    public static class ToRuby {
+        @JRubyMethod(visibility = PRIVATE)
+        public static IRubyObject build_exception(ThreadContext context, IRubyObject self, IRubyObject klass, IRubyObject message) {
+            if (klass instanceof RubyClass) {
+                IRubyObject exception = ((RubyClass)klass).allocate();
+                ((RubyException)exception).message = message;
+                return exception;
+            } else {
+                throw context.runtime.newTypeError(klass, context.runtime.getClassClass());
+            }
+        }
+    }
+
+    public static class ClassLoader {
+        @JRubyMethod(visibility = PRIVATE)
+        public static IRubyObject path2class(ThreadContext context, IRubyObject self, IRubyObject path) {
+            try {
+                return context.runtime.getClassFromPath(path.asJavaString());
+            } catch (RaiseException re) {
+                if (re.getException().getMetaClass() == context.runtime.getNameError()) {
+                    throw context.runtime.newArgumentError("undefined class/module " + path);
+                }
+                throw re;
+            }
+        }
+    }
+}

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/scalar_scanner.rb

@@ -100,7 +100,7 @@ module Psych
           @string_cache[string] = true
           string
         else
-          Float(string.gsub(/[,_]|\.$/, ''))
+          Float(string.gsub(/[,_]|\.([Ee]|$)/, '\1'))
         end
       else
         int = parse_int string.gsub(/[,_]/, '')

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,29 +1,16 @@
 --- !ruby/object:Gem::Specification
 name: psych
 version: !ruby/object:Gem::Version
-  version: 2.1.0
+  version: 2.1.1
 platform: ruby
 authors:
 - Aaron Patterson
+- SHIBATA Hiroshi
 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
-  name: rdoc
-  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: rake-compiler
   requirement: !ruby/object:Gem::Requirement
@@ -52,41 +39,35 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '5.0'
-- !ruby/object:Gem::Dependency
-  name: hoe
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '3.15'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '3.15'
-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
 executables: []
 extensions:
 - ext/psych/extconf.rb
 extra_rdoc_files:
 - CHANGELOG.rdoc
-- Manifest.txt
 - README.rdoc
 files:
-- ".autotest"
+- ".gitignore"
 - ".travis.yml"
 - CHANGELOG.rdoc
-- Manifest.txt
+- 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
@@ -150,51 +131,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
@@ -217,7 +154,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 2.6.6
 signing_key: 
 specification_version: 4
 summary: Psych is a YAML parser and emitter

data/.autotest

@@ -1,18 +0,0 @@
-require "autotest/restart"
-require 'rbconfig'
-
-Autotest.add_hook :initialize do |at|
-  at.find_directories = ARGV unless ARGV.empty?
-  at.testlib = "minitest/autorun"
-end
-
-Autotest.add_hook :run_command do |at|
-  at.unit_diff = 'cat'
-  system "ruby -S rake compile"
-end
-
-Autotest.add_hook :ran_command do |at|
-  File.open('/tmp/autotest.txt', 'wb') { |f|
-    f.write(at.results.join)
-  }
-end

data/Manifest.txt

@@ -1,114 +0,0 @@
-.autotest
-.travis.yml
-CHANGELOG.rdoc
-Manifest.txt
-README.rdoc
-Rakefile
-ext/psych/depend
-ext/psych/extconf.rb
-ext/psych/psych.c
-ext/psych/psych.h
-ext/psych/psych_emitter.c
-ext/psych/psych_emitter.h
-ext/psych/psych_parser.c
-ext/psych/psych_parser.h
-ext/psych/psych_to_ruby.c
-ext/psych/psych_to_ruby.h
-ext/psych/psych_yaml_tree.c
-ext/psych/psych_yaml_tree.h
-ext/psych/yaml/LICENSE
-ext/psych/yaml/api.c
-ext/psych/yaml/config.h
-ext/psych/yaml/dumper.c
-ext/psych/yaml/emitter.c
-ext/psych/yaml/loader.c
-ext/psych/yaml/parser.c
-ext/psych/yaml/reader.c
-ext/psych/yaml/scanner.c
-ext/psych/yaml/writer.c
-ext/psych/yaml/yaml.h
-ext/psych/yaml/yaml_private.h
-lib/psych.rb
-lib/psych/class_loader.rb
-lib/psych/coder.rb
-lib/psych/core_ext.rb
-lib/psych/deprecated.rb
-lib/psych/exception.rb
-lib/psych/handler.rb
-lib/psych/handlers/document_stream.rb
-lib/psych/handlers/recorder.rb
-lib/psych/json/ruby_events.rb
-lib/psych/json/stream.rb
-lib/psych/json/tree_builder.rb
-lib/psych/json/yaml_events.rb
-lib/psych/nodes.rb
-lib/psych/nodes/alias.rb
-lib/psych/nodes/document.rb
-lib/psych/nodes/mapping.rb
-lib/psych/nodes/node.rb
-lib/psych/nodes/scalar.rb
-lib/psych/nodes/sequence.rb
-lib/psych/nodes/stream.rb
-lib/psych/omap.rb
-lib/psych/parser.rb
-lib/psych/scalar_scanner.rb
-lib/psych/set.rb
-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
-lib/psych/visitors/json_tree.rb
-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
-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