psych 2.2.4-java → 3.0.0.beta2-java

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 462fdd22e9e9b7049177e6fc24a1ba8f6dd40bfb
-  data.tar.gz: aac6857311058164a21001bc67e3feacb854fe71
+SHA256:
+  metadata.gz: 4e51ebd69ee5d66110893f9d5b8ab19107ac922c1beb17f1d90669053ddf895c
+  data.tar.gz: 91304f5dbadb947ceb5327490877c6f5af296f9e27f10945ee913c5b6f8f8e0e
 SHA512:
-  metadata.gz: 6845cff97c809faf85eb0948bcebc3bea23db688fdd4f8de53116dbe89af250be1c624562c7b3c5013bc18bba309b9577310e06adf8f73fe283ba4e93a028bd4
-  data.tar.gz: 51db7cdcd70731288d13f775fd9bb504e87e86b43e6d578cc7af5b454ce0883872782be399969e1ae61e0aee1c11153a3b7bb9c0a01b175c72cc589a09222783
+  metadata.gz: 43a594024399e2cc34aaf767b1090d2dbb1805eba63d6825ef7529fc82a059837dc6f7680bb3142c038d75dd7e67c6c3de5501e631c084b2acf8b4e9e0648b8d
+  data.tar.gz: fbccf933d50176dc05a5f20bcdf9a9e5e1a6ee8e01fe995d861420f8d0cdd126dfb4c53a20156e58b18bfd53b18a1732d70b5295f81ff550d846a2a611f8c8ca

data/.travis.yml

@@ -1,15 +1,16 @@
 rvm:
-  - 2.1
-  - 2.2
-  - 2.3.0
+  - 2.2.7
+  - 2.3.4
+  - 2.4.1
   - ruby-head
-  - jruby-9.1.6.0
+  - jruby-9.1.8.0
 
 matrix:
   allow_failures:
-  - rvm: jruby-9.1.6.0
+  - rvm: jruby-9.1.8.0
 
-before_install: gem install bundler --no-document
+before_script:
+  - unset JRUBY_OPTS
 
 script: rake
 

data/ext/java/PsychParser.java

@@ -158,10 +158,15 @@ public class PsychParser extends RubyObject {
 
         // fall back on IOInputStream, using default charset
         if (yaml.respondsTo("read")) {
-            Encoding enc = (yaml instanceof RubyIO)
-                ? ((RubyIO)yaml).getReadEncoding()
-                : UTF8Encoding.INSTANCE;
-            Charset charset = enc.getCharset();
+            Charset charset = null;
+            if (yaml instanceof RubyIO) {
+                Encoding enc = ((RubyIO) yaml).getReadEncoding();
+                charset = enc.getCharset();
+            }
+            if (charset == null) {
+                // If we can't get it from the IO or it doesn't have a charset, fall back on UTF-8
+                charset = UTF8Encoding.INSTANCE.getCharset();
+            }
             return new StreamReader(new InputStreamReader(new IOInputStream(yaml), charset));
         } else {
             throw runtime.newTypeError(yaml, runtime.getIO());

data/ext/psych/yaml/scanner.c

@@ -3504,12 +3504,12 @@ yaml_parser_scan_plain_scalar(yaml_parser_t *parser, yaml_token_t *token)
         {
             if (IS_BLANK(parser->buffer))
             {
-                /* Check for tab character that abuse indentation. */
+                /* Check for tab characters that abuse indentation. */
 
                 if (leading_blanks && (int)parser->mark.column < indent
                         && IS_TAB(parser->buffer)) {
                     yaml_parser_set_scanner_error(parser, "while scanning a plain scalar",
-                            start_mark, "found a tab character that violate indentation");
+                            start_mark, "found a tab character that violates indentation");
                     goto error;
                 }
 

data/lib/psych.rb

@@ -17,7 +17,6 @@ require 'psych/omap'
 require 'psych/set'
 require 'psych/coder'
 require 'psych/core_ext'
-require 'psych/deprecated'
 require 'psych/stream'
 require 'psych/json/tree_builder'
 require 'psych/json/stream'

data/lib/psych/core_ext.rb

@@ -4,31 +4,14 @@ class Object
     Psych.add_tag(url, self)
   end
 
-  # FIXME: rename this to "to_yaml" when syck is removed
-
   ###
   # call-seq: to_yaml(options = {})
   #
   # Convert an object to YAML.  See Psych.dump for more information on the
   # available +options+.
-  def psych_to_yaml options = {}
+  def to_yaml options = {}
     Psych.dump self, options
   end
-  remove_method :to_yaml rescue nil
-  alias :to_yaml :psych_to_yaml
-end
-
-class Module
-  def psych_yaml_as url
-    return if caller[0].end_with?('rubytypes.rb')
-    if $VERBOSE
-      warn "#{caller[0]}: yaml_as is deprecated, please use yaml_tag"
-    end
-    Psych.add_tag(url, self)
-  end
-
-  remove_method :yaml_as rescue nil
-  alias :yaml_as :psych_yaml_as
 end
 
 if defined?(::IRB)

data/lib/psych/scalar_scanner.rb

@@ -10,7 +10,6 @@ module Psych
 
     # Taken from http://yaml.org/type/float.html
     FLOAT = /^(?:[-+]?([0-9][0-9_,]*)?\.[0-9]*([eE][-+][0-9]+)?(?# base 10)
-              |[-+]?[0-9][0-9_,]*(:[0-5]?[0-9])+\.[0-9_]*(?# base 60)
               |[-+]?\.(inf|Inf|INF)(?# infinity)
               |\.(nan|NaN|NAN)(?# not a number))$/x
 
@@ -83,13 +82,13 @@ module Psych
         else
           @symbol_cache[string] = class_loader.symbolize(string.sub(/^:/, ''))
         end
-      when /^[-+]?[0-9][0-9_]*(:[0-5]?[0-9])+$/
+      when /^[-+]?[0-9][0-9_]*(:[0-5]?[0-9]){1,2}$/
         i = 0
         string.split(':').each_with_index do |n,e|
           i += (n.to_i * 60 ** (e - 2).abs)
         end
         i
-      when /^[-+]?[0-9][0-9_]*(:[0-5]?[0-9])+\.[0-9_]*$/
+      when /^[-+]?[0-9][0-9_]*(:[0-5]?[0-9]){1,2}\.[0-9_]*$/
         i = 0
         string.split(':').each_with_index do |n,e|
           i += (n.to_f * 60 ** (e - 2).abs)
@@ -144,7 +143,7 @@ module Psych
         offset += ((tz[1] || 0) * 60)
       end
 
-      klass.at((time - offset).to_i, us)
+      klass.new(yy, m, dd, hh, mm, ss+us/(1_000_000r), offset)
     end
   end
 end

data/lib/psych/versions.rb

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

data/lib/psych/visitors/to_ruby.rb

@@ -380,11 +380,6 @@ module Psych
 
         if o.respond_to?(:init_with)
           o.init_with c
-        elsif o.respond_to?(:yaml_initialize)
-          if $VERBOSE
-            warn "Implementing #{o.class}#yaml_initialize is deprecated, please implement \"init_with(coder)\""
-          end
-          o.yaml_initialize c.tag, c.map
         else
           h.each { |k,v| o.instance_variable_set(:"@#{k}", v) }
         end

data/lib/psych/visitors/yaml_tree.rb

@@ -53,15 +53,6 @@ module Psych
         new(emitter, ss, options)
       end
 
-      def self.new emitter = nil, ss = nil, options = nil
-        return super if emitter && ss && options
-
-        if $VERBOSE
-          warn "This API is deprecated, please pass an emitter, scalar scanner, and options or call #{self}.create() (#{caller.first})"
-        end
-        create emitter, ss
-      end
-
       def initialize emitter, ss, options
         super()
         @started    = false
@@ -139,24 +130,6 @@ module Psych
           return @emitter.alias anchor
         end
 
-        if target.respond_to?(:to_yaml)
-          begin
-            loc = target.method(:to_yaml).source_location.first
-            if loc !~ /(syck\/rubytypes.rb|psych\/core_ext.rb)/
-              unless target.respond_to?(:encode_with)
-                if $VERBOSE
-                  warn "implementing to_yaml is deprecated, please implement \"encode_with\""
-                end
-
-                target.to_yaml(:nodump => true)
-              end
-            end
-          rescue
-            # public_method or source_location might be overridden,
-            # and it's OK to skip it since it's only to emit a warning
-          end
-        end
-
         if target.respond_to?(:encode_with)
           dump_coder target
         else
@@ -191,6 +164,8 @@ module Psych
         @emitter.end_mapping
       end
 
+      alias :visit_Delegator :visit_Object
+
       def visit_Struct o
         tag = ['!ruby/struct', o.class.name].compact.join(':')
 
@@ -336,7 +311,7 @@ module Psych
         end
 
         is_primitive = o.class == ::String
-        ivars = find_ivars o, is_primitive
+        ivars = is_primitive ? [] : o.instance_variables
 
         if ivars.empty?
           unless is_primitive
@@ -527,24 +502,6 @@ module Psych
         end
       end
 
-      # FIXME: remove this method once "to_yaml_properties" is removed
-      def find_ivars target, is_primitive=false
-        begin
-          loc = target.method(:to_yaml_properties).source_location.first
-          unless loc.start_with?(Psych::DEPRECATED) || loc.end_with?('rubytypes.rb')
-            if $VERBOSE
-              warn "#{loc}: to_yaml_properties is deprecated, please implement \"encode_with(coder)\""
-            end
-            return target.to_yaml_properties
-          end
-        rescue
-          # public_method or source_location might be overridden,
-          # and it's OK to skip it since it's only to emit a warning.
-        end
-
-        is_primitive ? [] : target.instance_variables
-      end
-
       def register target, yaml_obj
         @st.register target, yaml_obj
         yaml_obj
@@ -586,9 +543,7 @@ module Psych
       end
 
       def dump_ivars target
-        ivars = find_ivars target
-
-        ivars.each do |iv|
+        target.instance_variables.each do |iv|
           @emitter.scalar("#{iv.to_s.sub(/^@/, '')}", nil, nil, true, false, Nodes::Scalar::ANY)
           accept target.instance_variable_get(iv)
         end

data/psych.gemspec

@@ -2,10 +2,10 @@
 
 Gem::Specification.new do |s|
   s.name = "psych"
-  s.version = "2.2.4"
+  s.version = "3.0.0.beta2"
   s.authors = ["Aaron Patterson", "SHIBATA Hiroshi", "Charles Oliver Nutter"]
   s.email = ["aaron@tenderlovemaking.com", "hsbt@ruby-lang.org", "headius@headius.com"]
-  s.date = "2016-11-14"
+  s.date = "2017-06-16"
   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]
@@ -17,7 +17,7 @@ DESCRIPTION
   s.require_paths = ["lib"]
 
   # for ruby core repository. It was generated by `git ls-files -z`.split("\x0").reject { |f| f.match(%r{^(test|spec|features)/}) }
-  s.files = [".gitignore", ".travis.yml", "CHANGELOG.rdoc", "Gemfile", "Mavenfile", "README.md", "Rakefile", "bin/console", "bin/setup", "ext/psych/.gitignore", "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", "psych.gemspec"]
+  s.files = [".gitignore", ".travis.yml", "CHANGELOG.rdoc", "Gemfile", "Mavenfile", "README.md", "Rakefile", "bin/console", "bin/setup", "ext/psych/.gitignore", "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/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", "psych.gemspec"]
 
   s.rdoc_options = ["--main", "README.md"]
   s.extra_rdoc_files = ["CHANGELOG.rdoc", "README.md"]

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: psych
 version: !ruby/object:Gem::Version
-  version: 2.2.4
+  version: 3.0.0.beta2
 platform: java
 authors:
 - Aaron Patterson
@@ -10,7 +10,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2016-11-14 00:00:00.000000000 Z
+date: 2017-06-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
@@ -126,7 +126,6 @@ files:
 - 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
@@ -185,9 +184,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements:
 - jar org.yaml:snakeyaml, 1.18
 rubyforge_project:
-rubygems_version: 2.6.8
+rubygems_version: 2.6.11
 signing_key:
 specification_version: 4
 summary: Psych is a YAML parser and emitter
 test_files: []
-has_rdoc:

data/lib/psych/deprecated.rb

@@ -1,86 +0,0 @@
-# frozen_string_literal: false
-require 'date'
-
-module Psych
-  DEPRECATED = __FILE__ # :nodoc:
-
-  module DeprecatedMethods # :nodoc:
-    attr_accessor :taguri
-    attr_accessor :to_yaml_style
-  end
-
-  def self.quick_emit thing, opts = {}, &block # :nodoc:
-    warn "#{caller[0]}: YAML.quick_emit is deprecated" if $VERBOSE && !caller[0].start_with?(File.dirname(__FILE__))
-    target = eval 'self', block.binding
-    target.extend DeprecatedMethods
-    metaclass = class << target; self; end
-    metaclass.send(:define_method, :encode_with) do |coder|
-      target.taguri        = coder.tag
-      target.to_yaml_style = coder.style
-      block.call coder
-    end
-    target.psych_to_yaml unless opts[:nodump]
-  end
-
-  # This method is deprecated, use Psych.load_stream instead.
-  def self.load_documents yaml, &block
-    if $VERBOSE
-      warn "#{caller[0]}: load_documents is deprecated, use load_stream"
-    end
-    list = load_stream yaml
-    return list unless block_given?
-    list.each(&block)
-  end
-
-  def self.detect_implicit thing
-    warn "#{caller[0]}: detect_implicit is deprecated" if $VERBOSE
-    return '' unless String === thing
-    return 'null' if '' == thing
-    ss = ScalarScanner.new(ClassLoader.new)
-    ss.tokenize(thing).class.name.downcase
-  end
-
-  def self.add_ruby_type type_tag, &block
-    warn "#{caller[0]}: add_ruby_type is deprecated, use add_domain_type" if $VERBOSE
-    domain = 'ruby.yaml.org,2002'
-    key = ['tag', domain, type_tag].join ':'
-    @domain_types[key] = [key, block]
-  end
-
-  def self.add_private_type type_tag, &block
-    warn "#{caller[0]}: add_private_type is deprecated, use add_domain_type" if $VERBOSE
-    domain = 'x-private'
-    key = [domain, type_tag].join ':'
-    @domain_types[key] = [key, block]
-  end
-
-  def self.tagurize thing
-    warn "#{caller[0]}: add_private_type is deprecated, use add_domain_type" if $VERBOSE
-    return thing unless String === thing
-    "tag:yaml.org,2002:#{thing}"
-  end
-
-  def self.read_type_class type, reference
-    warn "#{caller[0]}: read_type_class is deprecated" if $VERBOSE
-    _, _, type, name = type.split ':', 4
-
-    reference = name.split('::').inject(reference) do |k,n|
-      k.const_get(n.to_sym)
-    end if name
-    [type, reference]
-  end
-
-  def self.object_maker klass, hash
-    warn "#{caller[0]}: object_maker is deprecated" if $VERBOSE
-    klass.allocate.tap do |obj|
-      hash.each { |k,v| obj.instance_variable_set(:"@#{k}", v) }
-    end
-  end
-end
-
-class Object
-  undef :to_yaml_properties rescue nil
-  def to_yaml_properties # :nodoc:
-    instance_variables
-  end
-end