psych 3.0.0.beta4-java → 3.0.2-java

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA256:
-  metadata.gz: 49d7dc264c542f0e3d6c93309aed732a0e739c7bf8e7e72675b7a89cee027790
-  data.tar.gz: f13013584936eebb4285fb77878dc1bf7550015a6d65b599a6ff418202c0efa4
+SHA1:
+  metadata.gz: 0cd551e6f43bcd6884c1efd454765a9544649e5a
+  data.tar.gz: f660bc87fca4221c306f93f9b0de800e4aa11b06
 SHA512:
-  metadata.gz: 91bac4a0ff87e06f9a0f4bdce8b78d7aab69af9ec8f61ccd74771c192556cbf7c26469a1264b36c0af87b2c39d87ba9cfcb702bae95fcea55161e3233c80d6e4
-  data.tar.gz: 723f317e90bd3ea4617860ded12f98c368db71fbbad8e76952b93c4754224f8c82f6ff6a6117f425a1c4fde92fa1261ab3a181b7dd877778f7058334f98831f6
+  metadata.gz: c17282aa46f06bdbfb34e5be66b1037ca6c4e0b6175e543a804a623e2a0e16e6d88ef0c7203e7d903f83c587f584f36e76234495a8dc8399061f4e26d35e652b
+  data.tar.gz: 75022ffc21735051df9de9d674a5867b69472ed136486eb09daa342ade8163c87da03b29cede5a4365dcbf7a4e161789eb87038f952405ad0df601d609dd626e

data/.travis.yml

@@ -3,11 +3,11 @@ rvm:
   - 2.3.5
   - 2.4.2
   - ruby-head
-  - jruby-9.1.13.0
+  - jruby-9.1.14.0
 
 matrix:
   allow_failures:
-  - rvm: jruby-9.1.13.0
+    - rvm: jruby-9.1.14.0
 
 before_script:
   - unset JRUBY_OPTS

data/ext/psych/psych_parser.c

@@ -292,6 +292,9 @@ static VALUE parse(int argc, VALUE *argv, VALUE self)
     }
 
     while(!done) {
+	VALUE event_args[5];
+	VALUE start_line, start_column, end_line, end_column;
+
 	if(!yaml_parser_parse(parser, &event)) {
 	    VALUE exception;
 
@@ -302,9 +305,6 @@ static VALUE parse(int argc, VALUE *argv, VALUE self)
 	    rb_exc_raise(exception);
 	}
 
-	VALUE event_args[5];
-	VALUE start_line, start_column, end_line, end_column;
-
 	start_line = INT2NUM((long)event.start_mark.line);
 	start_column = INT2NUM((long)event.start_mark.column);
 	end_line = INT2NUM((long)event.end_mark.line);

data/lib/psych.rb

@@ -252,8 +252,15 @@ module Psych
   #     ex.file    # => 'file.txt'
   #     ex.message # => "(file.txt): found character that cannot start any token"
   #   end
-  def self.load yaml, filename = nil, fallback = false, symbolize_names: false
-    result = parse(yaml, filename, fallback)
+  #
+  # When the optional +symbolize_names+ keyword argument is set to a
+  # true value, returns symbols for keys in Hash objects (default: strings).
+  #
+  #   Psych.load("---\n foo: bar")                         # => {"foo"=>"bar"}
+  #   Psych.load("---\n foo: bar", symbolize_names: true)  # => {:foo=>"bar"}
+  #
+  def self.load yaml, filename = nil, fallback: false, symbolize_names: false
+    result = parse(yaml, filename, fallback: fallback)
     result = result.to_ruby if result
     symbolize_names!(result) if symbolize_names
     result
@@ -293,7 +300,17 @@ module Psych
   #
   # A Psych::BadAlias exception will be raised if the yaml contains aliases
   # but the +aliases+ parameter is set to false.
-  def self.safe_load yaml, whitelist_classes = [], whitelist_symbols = [], aliases = false, filename = nil
+  #
+  # +filename+ will be used in the exception message if any exception is raised
+  # while parsing.
+  #
+  # When the optional +symbolize_names+ keyword argument is set to a
+  # true value, returns symbols for keys in Hash objects (default: strings).
+  #
+  #   Psych.safe_load("---\n foo: bar")                         # => {"foo"=>"bar"}
+  #   Psych.safe_load("---\n foo: bar", symbolize_names: true)  # => {:foo=>"bar"}
+  #
+  def self.safe_load yaml, whitelist_classes = [], whitelist_symbols = [], aliases = false, filename = nil, symbolize_names: false
     result = parse(yaml, filename)
     return unless result
 
@@ -305,7 +322,9 @@ module Psych
     else
       visitor = Visitors::NoAliasRuby.new scanner, class_loader
     end
-    visitor.accept result
+    result = visitor.accept result
+    symbolize_names!(result) if symbolize_names
+    result
   end
 
   ###
@@ -327,7 +346,7 @@ module Psych
   #   end
   #
   # See Psych::Nodes for more information about YAML AST.
-  def self.parse yaml, filename = nil, fallback = false
+  def self.parse yaml, filename = nil, fallback: false
     parse_stream(yaml, filename) do |node|
       return node
     end
@@ -474,9 +493,9 @@ 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
-  def self.load_file filename, fallback = false
+  def self.load_file filename, fallback: false
     File.open(filename, 'r:bom|utf-8') { |f|
-      self.load f, filename, FALLBACK.new(fallback)
+      self.load f, filename, fallback: FALLBACK.new(fallback)
     }
   end
 

data/lib/psych/versions.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 module Psych
   # The version is Psych you're using
-  VERSION = '3.0.0.beta4'
+  VERSION = '3.0.2'
 
   if RUBY_ENGINE == 'jruby'
     DEFAULT_SNAKEYAML_VERSION = '1.18'.freeze

data/lib/psych/visitors/yaml_tree.rb

@@ -304,7 +304,7 @@ module Psych
           quote = false
         elsif @line_width && o.length > @line_width
           style = Nodes::Scalar::FOLDED
-        elsif o =~ /^[^[:word:]][^"]*$/ or o =~ /^([^"]*'+[^"]*)+$/
+        elsif o =~ /^[^[:word:]][^"]*$/
           style = Nodes::Scalar::DOUBLE_QUOTED
         elsif not String === @ss.tokenize(o) or /\A0[0-7]*[89]/ =~ o
           style = Nodes::Scalar::SINGLE_QUOTED

data/psych.gemspec

@@ -3,10 +3,10 @@
 
 Gem::Specification.new do |s|
   s.name = "psych"
-  s.version = "3.0.0.beta4"
+  s.version = "3.0.2"
   s.authors = ["Aaron Patterson", "SHIBATA Hiroshi", "Charles Oliver Nutter"]
   s.email = ["aaron@tenderlovemaking.com", "hsbt@ruby-lang.org", "headius@headius.com"]
-  s.date = "2017-11-27"
+  s.date = "2017-12-04"
   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]
@@ -41,7 +41,7 @@ DESCRIPTION
   s.rdoc_options = ["--main", "README.md"]
   s.extra_rdoc_files = ["CHANGELOG.rdoc", "README.md"]
 
-  s.required_ruby_version = Gem::Requirement.new(">= 1.9.2")
+  s.required_ruby_version = Gem::Requirement.new(">= 2.2.2")
   s.rubygems_version = "2.5.1"
   s.required_rubygems_version = Gem::Requirement.new(">= 0")
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: psych
 version: !ruby/object:Gem::Version
-  version: 3.0.0.beta4
+  version: 3.0.2
 platform: java
 authors:
 - Aaron Patterson
@@ -10,7 +10,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2017-11-27 00:00:00.000000000 Z
+date: 2017-12-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
@@ -175,7 +175,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 1.9.2
+      version: 2.2.2
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
@@ -184,7 +184,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements:
 - jar org.yaml:snakeyaml, 1.18
 rubyforge_project:
-rubygems_version: 2.6.13
+rubygems_version: 2.6.14
 signing_key:
 specification_version: 4
 summary: Psych is a YAML parser and emitter