psych 3.0.0.beta2-java → 3.0.0.beta3-java

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4e51ebd69ee5d66110893f9d5b8ab19107ac922c1beb17f1d90669053ddf895c
-  data.tar.gz: 91304f5dbadb947ceb5327490877c6f5af296f9e27f10945ee913c5b6f8f8e0e
+  metadata.gz: 77219ea7bd26f2394f7a2dcc1e65c6608b11d82fd4c5365849ab29d662fcdfb5
+  data.tar.gz: 0b1f0b790f6d427281329d5dff9839161bf8f40a0834ef44a4106e6dd08c32d1
 SHA512:
-  metadata.gz: 43a594024399e2cc34aaf767b1090d2dbb1805eba63d6825ef7529fc82a059837dc6f7680bb3142c038d75dd7e67c6c3de5501e631c084b2acf8b4e9e0648b8d
-  data.tar.gz: fbccf933d50176dc05a5f20bcdf9a9e5e1a6ee8e01fe995d861420f8d0cdd126dfb4c53a20156e58b18bfd53b18a1732d70b5295f81ff550d846a2a611f8c8ca
+  metadata.gz: 8e99610deb00c1b1cdefd8c04a72d53ec1080cd406b88ae06e3913f09ac2590c759a1add15860dc3e1992ecb6b85d02acd4787a1dc5e8b03ffdc537b543d4fdf
+  data.tar.gz: a5a27877892b3f2feae4a8604c74d8eaa835f68912913fff86ec46a41da23360c311e3c55739fbd215773334f16368dc16d0c282c6306446c003eb0184439a8f

data/.gitignore

@@ -1,5 +1,6 @@
 *.swp
 *.bundle
+*.so
 *.jar
 *.class
 .mvn
@@ -12,3 +13,4 @@
 /pkg/
 /spec/reports/
 /tmp/
+/vendor

data/Rakefile

@@ -1,6 +1,7 @@
-require "bundler/gem_tasks"
-require "rake/testtask"
+require "bundler"
+Bundler::GemHelper.install_tasks
 
+require "rake/testtask"
 Rake::TestTask.new(:test) do |t|
   t.libs << "test"
   t.libs << "lib"
@@ -25,9 +26,21 @@ if RUBY_PLATFORM =~ /java/
   end
 else
   require 'rake/extensiontask'
-  Rake::ExtensionTask.new("psych") do |ext|
+  spec = eval File.read("psych.gemspec")
+  Rake::ExtensionTask.new("psych", spec) do |ext|
     ext.lib_dir = File.join(*['lib', ENV['FAT_DIR']].compact)
+    ext.cross_compile = true
+    ext.cross_platform = %w[x86-mingw32 x64-mingw32]
+    ext.cross_compiling do |s|
+      s.files.concat ["lib/2.2/psych.so", "lib/2.3/psych.so", "lib/2.4/psych.so"]
+    end
   end
 end
 
+desc "Compile binaries for mingw platform using rake-compiler-dock"
+task 'build:mingw' do
+  require 'rake_compiler_dock'
+  RakeCompilerDock.sh "bundle && rake cross native gem RUBY_CC_VERSION=2.2.2:2.3.0:2.4.0"
+end
+
 task :default => [:compile, :test]

data/ext/psych/extconf.rb

@@ -1,5 +1,5 @@
 # -*- coding: us-ascii -*-
-# frozen_string_literal: false
+# frozen_string_literal: true
 require 'mkmf'
 require 'fileutils'
 

data/lib/psych.rb

@@ -1,11 +1,15 @@
-# frozen_string_literal: false
+# frozen_string_literal: true
 require 'psych/versions'
 case RUBY_ENGINE
 when 'jruby'
   require 'psych_jars'
   org.jruby.ext.psych.PsychLibrary.new.load(JRuby.runtime, false)
 else
-  require 'psych.so'
+  begin
+    require "#{RUBY_VERSION[/\d+\.\d+/]}/psych.so"
+  rescue LoadError
+    require 'psych.so'
+  end
 end
 require 'psych/nodes'
 require 'psych/streaming'

data/lib/psych/class_loader.rb

@@ -1,4 +1,4 @@
-# frozen_string_literal: false
+# frozen_string_literal: true
 require 'psych/omap'
 require 'psych/set'
 

data/lib/psych/coder.rb

@@ -1,4 +1,4 @@
-# frozen_string_literal: false
+# frozen_string_literal: true
 module Psych
   ###
   # If an object defines +encode_with+, then an instance of Psych::Coder will

data/lib/psych/core_ext.rb

@@ -1,4 +1,4 @@
-# frozen_string_literal: false
+# frozen_string_literal: true
 class Object
   def self.yaml_tag url
     Psych.add_tag(url, self)

data/lib/psych/exception.rb

@@ -1,4 +1,4 @@
-# frozen_string_literal: false
+# frozen_string_literal: true
 module Psych
   class Exception < RuntimeError
   end

data/lib/psych/handler.rb

@@ -1,4 +1,4 @@
-# frozen_string_literal: false
+# frozen_string_literal: true
 module Psych
   ###
   # Psych::Handler is an abstract base class that defines the events used

data/lib/psych/handlers/document_stream.rb

@@ -1,4 +1,4 @@
-# frozen_string_literal: false
+# frozen_string_literal: true
 require 'psych/tree_builder'
 
 module Psych

data/lib/psych/handlers/recorder.rb

@@ -1,4 +1,4 @@
-# frozen_string_literal: false
+# frozen_string_literal: true
 require 'psych/handler'
 
 module Psych

data/lib/psych/json/ruby_events.rb

@@ -1,4 +1,4 @@
-# frozen_string_literal: false
+# frozen_string_literal: true
 module Psych
   module JSON
     module RubyEvents # :nodoc:

data/lib/psych/json/stream.rb

@@ -1,4 +1,4 @@
-# frozen_string_literal: false
+# frozen_string_literal: true
 require 'psych/json/ruby_events'
 require 'psych/json/yaml_events'
 

data/lib/psych/json/tree_builder.rb

@@ -1,4 +1,4 @@
-# frozen_string_literal: false
+# frozen_string_literal: true
 require 'psych/json/yaml_events'
 
 module Psych

data/lib/psych/json/yaml_events.rb

@@ -1,4 +1,4 @@
-# frozen_string_literal: false
+# frozen_string_literal: true
 module Psych
   module JSON
     module YAMLEvents # :nodoc:

data/lib/psych/nodes.rb

@@ -1,4 +1,4 @@
-# frozen_string_literal: false
+# frozen_string_literal: true
 require 'psych/nodes/node'
 require 'psych/nodes/stream'
 require 'psych/nodes/document'

data/lib/psych/nodes/alias.rb

@@ -1,4 +1,4 @@
-# frozen_string_literal: false
+# frozen_string_literal: true
 module Psych
   module Nodes
     ###

data/lib/psych/nodes/document.rb

@@ -1,4 +1,4 @@
-# frozen_string_literal: false
+# frozen_string_literal: true
 module Psych
   module Nodes
     ###

data/lib/psych/nodes/mapping.rb

@@ -1,4 +1,4 @@
-# frozen_string_literal: false
+# frozen_string_literal: true
 module Psych
   module Nodes
     ###

data/lib/psych/nodes/node.rb

@@ -1,4 +1,4 @@
-# frozen_string_literal: false
+# frozen_string_literal: true
 require 'stringio'
 require 'psych/class_loader'
 require 'psych/scalar_scanner'

data/lib/psych/nodes/scalar.rb

@@ -1,4 +1,4 @@
-# frozen_string_literal: false
+# frozen_string_literal: true
 module Psych
   module Nodes
     ###

data/lib/psych/nodes/sequence.rb

@@ -1,4 +1,4 @@
-# frozen_string_literal: false
+# frozen_string_literal: true
 module Psych
   module Nodes
     ###

data/lib/psych/nodes/stream.rb

@@ -1,4 +1,4 @@
-# frozen_string_literal: false
+# frozen_string_literal: true
 module Psych
   module Nodes
     ###

data/lib/psych/omap.rb

@@ -1,4 +1,4 @@
-# frozen_string_literal: false
+# frozen_string_literal: true
 module Psych
   class Omap < ::Hash
   end

data/lib/psych/parser.rb

@@ -1,4 +1,4 @@
-# frozen_string_literal: false
+# frozen_string_literal: true
 module Psych
   ###
   # YAML event parser class.  This class parses a YAML document and calls

data/lib/psych/scalar_scanner.rb

@@ -1,4 +1,4 @@
-# frozen_string_literal: false
+# frozen_string_literal: true
 require 'strscan'
 
 module Psych

data/lib/psych/set.rb

@@ -1,4 +1,4 @@
-# frozen_string_literal: false
+# frozen_string_literal: true
 module Psych
   class Set < ::Hash
   end

data/lib/psych/stream.rb

@@ -1,4 +1,4 @@
-# frozen_string_literal: false
+# frozen_string_literal: true
 module Psych
   ###
   # Psych::Stream is a streaming YAML emitter.  It will not buffer your YAML,

data/lib/psych/streaming.rb

@@ -1,4 +1,4 @@
-# frozen_string_literal: false
+# frozen_string_literal: true
 module Psych
   module Streaming
     module ClassMethods

data/lib/psych/syntax_error.rb

@@ -1,4 +1,4 @@
-# frozen_string_literal: false
+# frozen_string_literal: true
 require 'psych/exception'
 
 module Psych

data/lib/psych/tree_builder.rb

@@ -1,4 +1,4 @@
-# frozen_string_literal: false
+# frozen_string_literal: true
 require 'psych/handler'
 
 module Psych

data/lib/psych/versions.rb

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

data/lib/psych/visitors.rb

@@ -1,4 +1,4 @@
-# frozen_string_literal: false
+# frozen_string_literal: true
 require 'psych/visitors/visitor'
 require 'psych/visitors/to_ruby'
 require 'psych/visitors/emitter'

data/lib/psych/visitors/depth_first.rb

@@ -1,4 +1,4 @@
-# frozen_string_literal: false
+# frozen_string_literal: true
 module Psych
   module Visitors
     class DepthFirst < Psych::Visitors::Visitor

data/lib/psych/visitors/emitter.rb

@@ -1,4 +1,4 @@
-# frozen_string_literal: false
+# frozen_string_literal: true
 module Psych
   module Visitors
     class Emitter < Psych::Visitors::Visitor

data/lib/psych/visitors/json_tree.rb

@@ -1,4 +1,4 @@
-# frozen_string_literal: false
+# frozen_string_literal: true
 require 'psych/json/ruby_events'
 
 module Psych

data/lib/psych/visitors/to_ruby.rb

@@ -1,4 +1,4 @@
-# frozen_string_literal: false
+# frozen_string_literal: true
 require 'psych/scalar_scanner'
 require 'psych/class_loader'
 require 'psych/exception'

data/lib/psych/visitors/visitor.rb

@@ -1,4 +1,4 @@
-# frozen_string_literal: false
+# frozen_string_literal: true
 module Psych
   module Visitors
     class Visitor

data/lib/psych/visitors/yaml_tree.rb

@@ -1,4 +1,4 @@
-# frozen_string_literal: false
+# frozen_string_literal: true
 require 'psych/tree_builder'
 require 'psych/scalar_scanner'
 require 'psych/class_loader'
@@ -321,7 +321,7 @@ module Psych
           end
           @emitter.scalar o, nil, tag, plain, quote, style
         else
-          maptag = '!ruby/string'
+          maptag = '!ruby/string'.dup
           maptag << ":#{o.class}" unless o.class == ::String
 
           register o, @emitter.start_mapping(nil, maptag, false, Nodes::Mapping::BLOCK)
@@ -378,14 +378,18 @@ module Psych
 
       def visit_Array o
         if o.class == ::Array
-          register o, @emitter.start_sequence(nil, nil, true, Nodes::Sequence::BLOCK)
-          o.each { |c| accept c }
-          @emitter.end_sequence
+          visit_Enumerator o
         else
           visit_array_subclass o
         end
       end
 
+      def visit_Enumerator o
+        register o, @emitter.start_sequence(nil, nil, true, Nodes::Sequence::BLOCK)
+        o.each { |c| accept c }
+        @emitter.end_sequence
+      end
+
       def visit_NilClass o
         @emitter.scalar('', nil, 'tag:yaml.org,2002:null', true, false, Nodes::Scalar::ANY)
       end
@@ -411,15 +415,9 @@ module Psych
       end
 
       private
-      # FIXME: Remove the index and count checks in Psych 3.0
-      NULL         = "\x00"
-      BINARY_RANGE = "\x00-\x7F"
-      WS_RANGE     = "^ -~\t\r\n"
 
       def binary? string
-        (string.encoding == Encoding::ASCII_8BIT && !string.ascii_only?) ||
-          string.index(NULL) ||
-          string.count(BINARY_RANGE, WS_RANGE).fdiv(string.length) > 0.3
+        string.encoding == Encoding::ASCII_8BIT && !string.ascii_only?
       end
 
       def visit_array_subclass o

data/lib/psych/y.rb

@@ -1,4 +1,4 @@
-# frozen_string_literal: false
+# frozen_string_literal: true
 module Kernel
   ###
   # An alias for Psych.dump_stream meant to be used with IRB.

data/lib/psych_jars.rb

@@ -1,4 +1,4 @@
-# frozen_string_literal: false
+# frozen_string_literal: true
 require 'psych.jar'
 
 require 'jar-dependencies'

data/psych.gemspec

@@ -1,8 +1,9 @@
 # -*- encoding: utf-8 -*-
+# frozen_string_literal: true
 
 Gem::Specification.new do |s|
   s.name = "psych"
-  s.version = "3.0.0.beta2"
+  s.version = "3.0.0.beta3"
   s.authors = ["Aaron Patterson", "SHIBATA Hiroshi", "Charles Oliver Nutter"]
   s.email = ["aaron@tenderlovemaking.com", "hsbt@ruby-lang.org", "headius@headius.com"]
   s.date = "2017-06-16"
@@ -17,7 +18,25 @@ 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/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"]
@@ -31,11 +50,15 @@ DESCRIPTION
 
   if RUBY_ENGINE == 'jruby'
     s.platform = 'java'
-    s.files.concat ["ext/java/PsychEmitter.java", "ext/java/PsychLibrary.java", "ext/java/PsychParser.java", "ext/java/PsychToRuby.java", "ext/java/PsychYamlTree.java", "lib/psych_jars.rb", "lib/psych.jar"]
+    s.files.concat [
+      "ext/java/PsychEmitter.java", "ext/java/PsychLibrary.java", "ext/java/PsychParser.java", "ext/java/PsychToRuby.java",
+      "ext/java/PsychYamlTree.java", "lib/psych_jars.rb", "lib/psych.jar"
+    ]
     s.requirements = "jar org.yaml:snakeyaml, 1.18"
     s.add_dependency 'jar-dependencies', '>= 0.1.7'
     s.add_development_dependency 'ruby-maven'
   else
     s.extensions = ["ext/psych/extconf.rb"]
+    s.add_development_dependency 'rake-compiler-dock', ">= 0.6.1"
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: psych
 version: !ruby/object:Gem::Version
-  version: 3.0.0.beta2
+  version: 3.0.0.beta3
 platform: java
 authors:
 - Aaron Patterson