psych 1.2.1 → 1.2.2.rc1

data/CHANGELOG.rdoc

@@ -1,3 +1,9 @@
+Fri Sep  2 04:05:25 2011  Aaron Patterson <aaron@tenderlovemaking.com>
+
+	* ext/psych/lib/psych/visitors/yaml_tree.rb: emit strings tagged as
+	  ascii-8bit as binary in YAML.
+	* test/psych/test_string.rb: corresponding test.
+
 Thu Aug 25 06:11:35 2011  Aaron Patterson <aaron@tenderlovemaking.com>
 
 	* ext/psych/lib/psych/nodes/node.rb: default `to_yaml` encoding to be

data/Rakefile

@@ -13,7 +13,7 @@ require "rake/extensiontask"
 
 Hoe.plugin :debugging, :doofus, :git, :gemspec
 
-Hoe.spec 'psych' do
+$hoe = Hoe.spec 'psych' do
   developer 'Aaron Patterson', 'aaron@tenderlovemaking.com'
 
   self.extra_rdoc_files  = Dir['*.rdoc']
@@ -37,6 +37,11 @@ Hoe.add_include_dirs('.:lib/psych')
 
 task :test => :compile
 
+task :hack_spec do
+  $hoe.spec.extra_rdoc_files.clear
+end
+task 'core:spec' => [:hack_spec, 'gem:spec']
+
 desc "merge psych in to ruby trunk"
 namespace :merge do
   basedir = File.expand_path File.dirname __FILE__

data/lib/psych.rb

@@ -90,7 +90,7 @@ require 'psych/json'
 
 module Psych
   # The version is Psych you're using
-  VERSION         = '1.2.1'
+  VERSION         = '1.2.2.rc1'
 
   # The version of libyaml Psych is using
   LIBYAML_VERSION = Psych.libyaml_version.join '.'

data/lib/psych/visitors/to_ruby.rb

@@ -1,5 +1,9 @@
 require 'psych/scalar_scanner'
 
+unless defined?(Regexp::NOENCODING)
+  Regexp::NOENCODING = 32
+end
+
 module Psych
   module Visitors
     ###

data/lib/psych/visitors/yaml_tree.rb

@@ -214,12 +214,19 @@ module Psych
         end
       end
 
+      def binary? string
+        string.encoding == Encoding::ASCII_8BIT ||
+          string.index("\x00") ||
+          string.count("\x00-\x7F", "^ -~\t\r\n").fdiv(string.length) > 0.3
+      end
+      private :binary?
+
       def visit_String o
         plain = false
         quote = false
         style = Nodes::Scalar::ANY
 
-        if o.index("\x00") || o.count("\x00-\x7F", "^ -~\t\r\n").fdiv(o.length) > 0.3
+        if binary?(o)
           str   = [o].pack('m').chomp
           tag   = '!binary' # FIXME: change to below when syck is removed
           #tag   = 'tag:yaml.org,2002:binary'
@@ -304,11 +311,27 @@ module Psych
       end
 
       private
-      def format_time time
-        if time.utc?
-          time.strftime("%Y-%m-%d %H:%M:%S.%9N Z")
-        else
-          time.strftime("%Y-%m-%d %H:%M:%S.%9N %:z")
+      # '%:z' was no defined until 1.9.3
+      if RUBY_VERSION < '1.9.3'
+        def format_time time
+          formatted = time.strftime("%Y-%m-%d %H:%M:%S.%9N")
+
+          if time.utc?
+            formatted += " Z"
+          else
+            zone = time.strftime('%z')
+            formatted += " #{zone[0,3]}:#{zone[3,5]}"
+          end
+
+          formatted
+        end
+      else
+        def format_time time
+          if time.utc?
+            time.strftime("%Y-%m-%d %H:%M:%S.%9N Z")
+          else
+            time.strftime("%Y-%m-%d %H:%M:%S.%9N %:z")
+          end
         end
       end
 

data/test/psych/test_deprecated.rb

@@ -145,7 +145,7 @@ module Psych
     end
 
     class YamlAs
-      yaml_as 'helloworld'
+      psych_yaml_as 'helloworld' # this should be yaml_as but to avoid syck
     end
 
     def test_yaml_as

data/test/psych/test_string.rb

@@ -2,6 +2,14 @@ require 'psych/helper'
 
 module Psych
   class TestString < TestCase
+    def test_tagged_binary_should_be_dumped_as_binary
+      string = "hello world!"
+      string.force_encoding 'ascii-8bit'
+      yml = Psych.dump string
+      assert_match(/binary/, yml)
+      assert_equal string, Psych.load(yml)
+    end
+
     def test_binary_string_null
       string = "\x00"
       yml = Psych.dump string

metadata

@@ -1,13 +1,15 @@
 --- !ruby/object:Gem::Specification 
 name: psych
 version: !ruby/object:Gem::Version 
-  hash: 29
-  prerelease: 
+  hash: 15424007
+  prerelease: 6
   segments: 
   - 1
   - 2
+  - 2
+  - rc
   - 1
-  version: 1.2.1
+  version: 1.2.2.rc1
 platform: ruby
 authors: 
 - Aaron Patterson
@@ -15,7 +17,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-08-24 00:00:00 Z
+date: 2011-10-03 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: rake-compiler
@@ -176,16 +178,18 @@ required_ruby_version: !ruby/object:Gem::Requirement
 required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
   requirements: 
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version 
-      hash: 3
+      hash: 25
       segments: 
-      - 0
-      version: "0"
+      - 1
+      - 3
+      - 1
+      version: 1.3.1
 requirements: []
 
 rubyforge_project: psych
-rubygems_version: 1.8.8
+rubygems_version: 1.8.10
 signing_key: 
 specification_version: 3
 summary: Psych is a YAML parser and emitter