psych 2.0.0 → 2.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a515327ad24888eda25dad4eefcc3120c27851c4
-  data.tar.gz: 4397401188b23a9103f30c61cd3b91a2eeddac41
+  metadata.gz: 18ab569c52dd4c717aa67c3752008efba6f68f9d
+  data.tar.gz: 5de13cdc481633c56eb2e1dfb9067f9922d6ad30
 SHA512:
-  metadata.gz: 32f49d5585211df26e9d06a25dae306376c24a30d68d3184e79adf34082773790d785e46302c4ea17bc73f2b11ca049ca9403c0334b55941417989702ee46621
-  data.tar.gz: 3e1c6bb1ab901c77209b400f9f6e8b193de2cb58bb8b7cceee1cbf51b6381565232f25b3f1ff51621479eed3013d7a207e89ffdb6232d698330365664530cfa1
+  metadata.gz: 681a0bef521a162525b1b72e538bac13373857f4e2677cf4909fc6f8e90b740b5fb3abaee0f1a480b8db48d18d7d3793141f248fd48acbe78d64747da0784a0c
+  data.tar.gz: e1281e00a69f1faeaeb15543baf7b588d955b8f2b64915752d4c5ad180d5630da46839c883efd468ba02651d7db882c36f38537ae43d05ae1d2ffa4c864de66e

data/.travis.yml

@@ -1,7 +1,7 @@
 rvm:
   - 1.9.2
   - 1.9.3
-  - ruby-head
+  - 2.0.0
 before_script:
   - gem install isolate
   - gem install hoe

data/CHANGELOG.rdoc

@@ -1,3 +1,25 @@
+Fri Sep  6 02:37:22 2013  Aaron Patterson <aaron@tenderlovemaking.com>
+
+	* ext/psych/lib/psych/visitors/yaml_tree.rb: use double quotes when
+	  strings start with special characters.
+	  [Fixes GH-157] https://github.com/tenderlove/psych/issues/157
+
+	* test/psych/test_string.rb: test for change.
+
+Thu Aug 29 02:40:45 2013  Aaron Patterson <aaron@tenderlovemaking.com>
+
+	* ext/psych/lib/psych/scalar_scanner.rb: invalid floats should be
+	  treated as strings. 
+	  [Fixes GH-156] https://github.com/tenderlove/psych/issues/156
+
+	* test/psych/test_string.rb: test for change
+
+Sat Jul  6 04:49:38 2013  Aaron Patterson <aaron@tenderlovemaking.com>
+
+	* ext/psych/lib/psych/visitors/yaml_tree.rb: register time objects so
+	  they are referenced as ids during output.
+	* test/psych/test_date_time.rb: corresponding test.
+
 Wed May 15 02:22:16 2013  Aaron Patterson <aaron@tenderlovemaking.com>
 
 	* ext/psych/lib/psych.rb: Adding Psych.safe_load for loading a user

data/ext/psych/yaml/yaml.h

@@ -1089,7 +1089,7 @@ typedef struct yaml_parser_s {
     yaml_error_type_t error;
     /** Error description. */
     const char *problem;
-    /** The byte about which the problem occured. */
+    /** The byte about which the problem occurred. */
     size_t problem_offset;
     /** The problematic value (@c -1 is none). */
     int problem_value;

data/lib/psych.rb

@@ -41,7 +41,7 @@ require 'psych/handlers/document_stream'
 # Psych provides a range of interfaces for parsing a YAML document ranging from
 # low level to high level, depending on your parsing needs.  At the lowest
 # level, is an event based parser.  Mid level is access to the raw YAML AST,
-# and at the highest level is the ability to unmarshal YAML to ruby objects.
+# and at the highest level is the ability to unmarshal YAML to Ruby objects.
 #
 # == YAML Emitting
 #
@@ -172,7 +172,7 @@ require 'psych/handlers/document_stream'
 #
 # The lowest level parser should be used when the YAML input is already known,
 # and the developer does not want to pay the price of building an AST or
-# automatic detection and conversion to ruby objects.  See Psych::Parser for
+# automatic detection and conversion to Ruby objects.  See Psych::Parser for
 # more information on using the event based parser.
 #
 # ==== Reading to Psych::Nodes::Stream structure
@@ -200,7 +200,7 @@ require 'psych/handlers/document_stream'
 # document.  This interface should be used when document format is known in
 # advance or speed is a concern.  See Psych::Emitter for more information.
 #
-# ==== Writing to a ruby structure
+# ==== Writing to a Ruby structure
 #
 #   Psych.parser.parse("--- a")       # => #<Psych::Parser>
 #
@@ -216,7 +216,7 @@ require 'psych/handlers/document_stream'
 
 module Psych
   # The version is Psych you're using
-  VERSION         = '2.0.0'
+  VERSION         = '2.0.1'
 
   # The version of libyaml Psych is using
   LIBYAML_VERSION = Psych.libyaml_version.join '.'
@@ -433,7 +433,7 @@ module Psych
 
   ###
   # Load multiple documents given in +yaml+.  Returns the parsed documents
-  # as a list.  If a block is given, each document will be converted to ruby
+  # as a list.  If a block is given, each document will be converted to Ruby
   # and passed to the block during parsing
   #
   # Example:
@@ -458,7 +458,7 @@ module Psych
 
   ###
   # Load the document contained in +filename+.  Returns the yaml contained in
-  # +filename+ as a ruby object
+  # +filename+ as a Ruby object
   def self.load_file filename
     File.open(filename, 'r:bom|utf-8') { |f| self.load f, filename }
   end

data/lib/psych/scalar_scanner.rb

@@ -28,7 +28,7 @@ module Psych
       @class_loader = class_loader
     end
 
-    # Tokenize +string+ returning the ruby object
+    # Tokenize +string+ returning the Ruby object
     def tokenize string
       return nil if string.empty?
       return string if @string_cache.key?(string)
@@ -95,7 +95,7 @@ module Psych
         end
         i
       when FLOAT
-        if string == '.'
+        if string =~ /\A[-+]?\.\Z/
           @string_cache[string] = true
           string
         else

data/lib/psych/visitors/to_ruby.rb

@@ -9,7 +9,7 @@ end
 module Psych
   module Visitors
     ###
-    # This class walks a YAML AST, converting each node to ruby
+    # This class walks a YAML AST, converting each node to Ruby
     class ToRuby < Psych::Visitors::Visitor
       def self.create
         class_loader = ClassLoader.new

data/lib/psych/visitors/yaml_tree.rb

@@ -5,7 +5,7 @@ require 'psych/class_loader'
 module Psych
   module Visitors
     ###
-    # YAMLTree builds a YAML ast given a ruby object.  For example:
+    # YAMLTree builds a YAML ast given a Ruby object.  For example:
     #
     #   builder = Psych::Visitors::YAMLTree.new
     #   builder << { :foo => 'bar' }
@@ -47,6 +47,15 @@ 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
@@ -207,7 +216,7 @@ module Psych
 
       def visit_Time o
         formatted = format_time o
-        @emitter.scalar formatted, nil, nil, true, false, Nodes::Scalar::ANY
+        register o, @emitter.scalar(formatted, nil, nil, true, false, Nodes::Scalar::ANY)
       end
 
       def visit_Rational o
@@ -279,6 +288,8 @@ module Psych
           quote = false
         elsif o =~ /\n/
           style = Nodes::Scalar::LITERAL
+        elsif o =~ /^\W/
+          style = Nodes::Scalar::DOUBLE_QUOTED
         else
           unless String === @ss.tokenize(o)
             style = Nodes::Scalar::SINGLE_QUOTED

data/test/psych/helper.rb

@@ -83,3 +83,32 @@ module Psych
     end
   end
 end
+
+# backport so that tests will run on 1.9 and 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/test_date_time.rb

@@ -13,5 +13,13 @@ module Psych
       dt = DateTime.now
       assert_cycle dt
     end
+
+    def test_alias_with_time
+      t    = Time.now
+      h    = {:a => t, :b => t}
+      yaml = Psych.dump h
+      assert_match('&', yaml)
+      assert_match('*', yaml)
+    end
   end
 end

data/test/psych/test_string.rb

@@ -15,6 +15,16 @@ module Psych
       end
     end
 
+    def test_doublequotes_when_there_is_a_single
+      yaml = Psych.dump "@123'abc"
+      assert_match(/---\s*"/, yaml)
+    end
+
+    def test_dash_dot
+      assert_cycle '-.'
+      assert_cycle '+.'
+    end
+
     def test_string_subclass_with_anchor
       y = Psych.load <<-eoyml
 ---

metadata

@@ -1,55 +1,55 @@
 --- !ruby/object:Gem::Specification
 name: psych
 version: !ruby/object:Gem::Version
-  version: 2.0.0
+  version: 2.0.1
 platform: ruby
 authors:
 - Aaron Patterson
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-06-27 00:00:00.000000000 Z
+date: 2013-09-18 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
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 0.4.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 0.4.1
 - !ruby/object:Gem::Dependency
   name: hoe
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '3.6'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '3.6'
 description: |-
@@ -67,8 +67,8 @@ extra_rdoc_files:
 - Manifest.txt
 - README.rdoc
 files:
-- .autotest
-- .travis.yml
+- ".autotest"
+- ".travis.yml"
 - CHANGELOG.rdoc
 - Manifest.txt
 - README.rdoc
@@ -180,24 +180,24 @@ files:
 - test/psych/visitors/test_emitter.rb
 - test/psych/visitors/test_to_ruby.rb
 - test/psych/visitors/test_yaml_tree.rb
-- .gemtest
+- ".gemtest"
 homepage: http://github.com/tenderlove/psych
 licenses: []
 metadata: {}
 post_install_message: 
 rdoc_options:
-- --main
+- "--main"
 - README.rdoc
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: 1.9.2
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []