diff options
| author | naruse <naruse@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2010-12-07 11:47:39 +0000 |
|---|---|---|
| committer | naruse <naruse@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2010-12-07 11:47:39 +0000 |
| commit | 85eb93d062934ef711074ec6bd1eaab33fed64aa (patch) | |
| tree | db5402a679348364b1c6409587eccfa460dd85b4 | |
| parent | 1f70a6ba67f90b20e4eb3e32786d82cd1985c89d (diff) | |
| download | ruby-85eb93d062934ef711074ec6bd1eaab33fed64aa.tar.gz | |
* ext/nkf/lib/kconv.rb (String#kconv): fix typo and update rdoc.
patched by Kouhei Yanagita [ruby-dev:42696]
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@30112 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | ext/nkf/lib/kconv.rb | 10 | ||||
| -rw-r--r-- | test/nkf/test_kconv.rb | 7 |
3 files changed, 17 insertions, 5 deletions
@@ -1,3 +1,8 @@ +Tue Dec 7 18:56:52 2010 NARUSE, Yui <naruse@ruby-lang.org> + + * ext/nkf/lib/kconv.rb (String#kconv): fix typo and update rdoc. + patched by Kouhei Yanagita [ruby-dev:42696] + Tue Dec 7 20:32:11 2010 Kouhei Sutou <kou@cozmixng.org> * test/rexml/test_doctype.rb: add Accessor to test case name. diff --git a/ext/nkf/lib/kconv.rb b/ext/nkf/lib/kconv.rb index 6230996876..f8c1ae8f59 100644 --- a/ext/nkf/lib/kconv.rb +++ b/ext/nkf/lib/kconv.rb @@ -51,8 +51,8 @@ module Kconv # call-seq: # Kconv.kconv(str, to_enc, from_enc=nil) # - # Convert <code>str</code> to out_code. - # <code>out_code</code> and <code>in_code</code> are given as constants of Kconv. + # Convert <code>str</code> to <code>to_enc</code>. + # <code>to_enc</code> and <code>from_enc</code> are given as constants of Kconv or Encoding objects. def kconv(str, to_enc, from_enc=nil) opt = '' opt += ' --ic=' + from_enc.to_s if from_enc @@ -199,10 +199,10 @@ class String # call-seq: # String#kconv(to_enc, from_enc) # - # Convert <code>self</code> to out_code. - # <code>out_code</code> and <code>in_code</code> are given as constants of Kconv. + # Convert <code>self</code> to <code>to_enc</code>. + # <code>to_enc</code> and <code>from_enc</code> are given as constants of Kconv or Encoding objects. def kconv(to_enc, from_enc=nil) - form_enc = self.encoding if !from_enc && self.encoding != Encoding.list[0] + from_enc = self.encoding if !from_enc && self.encoding != Encoding.list[0] Kconv::kconv(self, to_enc, from_enc) end diff --git a/test/nkf/test_kconv.rb b/test/nkf/test_kconv.rb index 8581f10e4e..09c0ce803a 100644 --- a/test/nkf/test_kconv.rb +++ b/test/nkf/test_kconv.rb @@ -71,4 +71,11 @@ class TestKconv < Test::Unit::TestCase assert_equal(@jis_str, @utf8_str.kconv(::NKF::JIS)) assert_equal(@jis_str, @jis_str.kconv(::NKF::JIS)) end + def test_kconv + str = "\xc2\xa1" + %w/UTF-8 EUC-JP/.each do |enc| + s = str.dup.force_encoding(enc) + assert_equal(s, s.kconv(enc)) + end + end end |