asir 1.1.4 → 1.1.5

data/ChangeLog

@@ -1,3 +1,8 @@
+2012-12-05  Kurt A. Stephens  <ks.github@kurtstephens.com>
+
+	* v1.1.5: New version.
+	* YAML: Support better handling of ASCII-8BIT in Psych.dump.
+
 2012-12-04  Kurt A. Stephens  <ks.github@kurtstephens.com>
 
 	* v1.1.4: New version.

data/lib/asir/coder/yaml.rb

@@ -11,7 +11,7 @@ module ASIR
         when Message, Result
           obj = obj.encode_more!
         end
-        ::YAML::dump(obj)
+        yaml_dump(obj)
       end
 
       def _decode obj
@@ -22,7 +22,35 @@ module ASIR
           obj
         end
       end
+
+      attr_accessor :yaml_options
+      case RUBY_VERSION
+      when /^1\.8/
+        def yaml_dump obj
+          ::YAML::dump obj
+        end
+      else
+        def yaml_dump obj
+          ::YAML::dump(obj, nil, yaml_options || EMPTY_HASH)
+        end
+      end
     end # class
   end # class
 end # module
 
+if defined? ::Psych
+  class Psych::Visitors::YAMLTree
+    alias :binary_without_option? :binary?
+    def binary? string
+      return false if @options[:never_binary]
+      result =
+        string.index("\x00") ||
+        string.count("\x00-\x7F", "^ -~\t\r\n").fdiv(string.length) > 0.3
+      unless @options[:ASCII_8BIT_ok]
+        result ||= string.encoding == Encoding::ASCII_8BIT
+      end
+      result
+    end
+  end
+end
+

data/lib/asir/version.rb

@@ -1,3 +1,3 @@
 module ASIR
-  VERSION = "1.1.4"
+  VERSION = "1.1.5"
 end

data/spec/debug_helper.rb

@@ -13,7 +13,7 @@ else
     # require 'ruby-debug' # BROKEN in 1.9.3-head
   when /^1\.8/
     gem 'ruby-debug'
-    gem 'rcov'
+    gem 'simplecov'
     require 'ruby-debug'
   end
 end

data/spec/yaml_spec.rb

@@ -0,0 +1,107 @@
+require File.expand_path('../spec_helper', __FILE__)
+require 'asir/coder/yaml'
+
+describe "ASIR::Coder::Yaml" do
+  before(:each) do 
+    @enc = ASIR::Coder::Yaml.new
+    @dec = @enc.dup
+  end
+
+  basic_objs = [ ]
+
+  [
+    [ nil, '' ],
+    true,
+    false,
+    123,
+    123.45,
+    'String',
+    [ :Symbol, ':Symbol' ],
+  ].each do | x |
+    x, str = *x
+    str ||= x.to_s
+    str = "--- #{str}\n"
+    str << "...\n" if RUBY_VERSION !~ /^1\.8/
+    basic_objs << [ x, str ]
+    it "should handle #{x.inspect}" do
+      out = @enc.prepare.encode(x)
+      out.should == str
+      @dec.prepare.decode(out).should == x
+    end
+  end
+
+  it 'should handle :never_binary.' do
+    @enc.yaml_options = { :never_binary => true }
+    out = do_message
+    out.should =~ /^  :ascii_8bit: hostname/m
+    case RUBY_VERSION
+    when /^1\.8/
+      out.should =~ /^  :binary: !binary /m
+    else
+      out.should =~ /^  :binary: ! "\\x04/m
+    end
+  end
+
+  it 'should handle :ascii_8bit_ok.' do
+    @enc.yaml_options = { :ASCII_8BIT_ok => true }
+    out = do_message
+    out.should =~ /^  :ascii_8bit: hostname/m
+    out.should =~ /^  :binary: !binary /m
+  end
+
+  def do_message
+    rcvr = "String"
+    sel = :eval
+    args = [ "2 + 2" ]
+    msg = ASIR::Message.new(rcvr, sel, args, nil, nil)
+    str = 'hostname'
+    if str.respond_to?(:force_encoding)
+      str = str.force_encoding("ASCII-8BIT")
+    end
+    msg[:ascii_8bit] = str
+    str = Marshal.dump(@dec)
+    if str.respond_to?(:encoding)
+      str.encoding.inspect.should == "#<Encoding:ASCII-8BIT>"
+    end
+    msg[:binary] = str
+    msg[:source_backtrace] = caller
+    out = @enc.prepare.encode(msg)
+  end
+
+  if ''.methods.include?(:force_encoding)
+    it 'should extend Psych with :never_binary option.' do
+      require 'socket'
+      hostname = Socket.gethostname
+      enc = hostname.encoding
+      enc.inspect.should == "#<Encoding:ASCII-8BIT>"
+
+      str = enc.inspect
+      str.force_encoding(hostname.encoding)
+      str.encoding.inspect.should == "#<Encoding:ASCII-8BIT>"
+
+      yaml = ::YAML.dump(str)
+      yaml.should == "--- !binary |-\n  IzxFbmNvZGluZzpBU0NJSS04QklUPg==\n"
+
+      yaml = ::YAML.dump(str, nil, :never_binary => true)
+      yaml.should == "--- ! '#<Encoding:ASCII-8BIT>'\n"
+    end
+
+    it 'should handle :never_binary options.' do
+      str = '8bitascii'.force_encoding('ASCII-8BIT')
+
+      @enc.yaml_options = @dec.yaml_options = nil
+      out = @enc.prepare.encode(str)
+      out.should == "--- !binary |-\n  OGJpdGFzY2lp\n"
+      @dec.prepare.decode(str).should == str
+
+      @enc.yaml_options = { :never_binary => true }
+      @dec.yaml_options = @enc.yaml_options
+      out = @enc.prepare.encode(str)
+      out.should == "--- 8bitascii\n...\n"
+      inp = @dec.prepare.decode(str)
+      inp.should == str
+      inp.encoding.inspect.should == "#<Encoding:UTF-8>"
+    end
+  end
+end
+

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: asir
 version: !ruby/object:Gem::Version
-  version: 1.1.4
+  version: 1.1.5
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-12-04 00:00:00.000000000 Z
+date: 2012-12-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: uuid
@@ -297,6 +297,7 @@ files:
 - spec/thread_variable_spec.rb
 - spec/transport_spec.rb
 - spec/xml_spec.rb
+- spec/yaml_spec.rb
 - stylesheets/slides.css
 homepage: http://github.com/kstephens/abstracting_services_in_ruby
 licenses: []
@@ -313,7 +314,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -2732914043627439555
+      hash: -3496337274665454137
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -322,7 +323,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -2732914043627439555
+      hash: -3496337274665454137
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.24
@@ -342,3 +343,4 @@ test_files:
 - spec/thread_variable_spec.rb
 - spec/transport_spec.rb
 - spec/xml_spec.rb
+- spec/yaml_spec.rb