[前][次][番号順一覧][スレッド一覧]

ruby-changes:9721

From: shyouhei <ko1@a...>
Date: Fri, 2 Jan 2009 03:18:25 +0900 (JST)
Subject: [ruby-changes:9721] Ruby:r21262 (ruby_1_8_7): merge revision(s) 18246:

shyouhei	2009-01-02 03:17:59 +0900 (Fri, 02 Jan 2009)

  New Revision: 21262

  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=rev&revision=21262

  Log:
    merge revision(s) 18246:
    * test/rss/: use PNG instead of zlib as binary data. [ruby-dev:35666]

  Added files:
    branches/ruby_1_8_7/test/rss/dot.png
  Modified files:
    branches/ruby_1_8_7/ChangeLog
    branches/ruby_1_8_7/test/rss/rss-assertions.rb
    branches/ruby_1_8_7/test/rss/test_atom.rb
    branches/ruby_1_8_7/version.h

Index: ruby_1_8_7/ChangeLog
===================================================================
--- ruby_1_8_7/ChangeLog	(revision 21261)
+++ ruby_1_8_7/ChangeLog	(revision 21262)
@@ -1,3 +1,7 @@
+Fri Jan  2 03:08:47 2009  Kouhei Sutou  <kou@c...>
+
+	* test/rss/: use PNG instead of zlib as binary data. [ruby-dev:35666]
+
 Tue Nov 11 01:07:32 2008  Kazuhiro NISHIYAMA  <zn@m...>
 
 	* configure.in: fix SEGV on Mac OS X 10.5.3 with --enable-pthread.
Index: ruby_1_8_7/version.h
===================================================================
--- ruby_1_8_7/version.h	(revision 21261)
+++ ruby_1_8_7/version.h	(revision 21262)
@@ -1,15 +1,15 @@
 #define RUBY_VERSION "1.8.7"
-#define RUBY_RELEASE_DATE "2008-11-11"
+#define RUBY_RELEASE_DATE "2009-01-02"
 #define RUBY_VERSION_CODE 187
-#define RUBY_RELEASE_CODE 20081111
-#define RUBY_PATCHLEVEL 73
+#define RUBY_RELEASE_CODE 20090102
+#define RUBY_PATCHLEVEL 74
 
 #define RUBY_VERSION_MAJOR 1
 #define RUBY_VERSION_MINOR 8
 #define RUBY_VERSION_TEENY 7
-#define RUBY_RELEASE_YEAR 2008
-#define RUBY_RELEASE_MONTH 11
-#define RUBY_RELEASE_DAY 11
+#define RUBY_RELEASE_YEAR 2009
+#define RUBY_RELEASE_MONTH 1
+#define RUBY_RELEASE_DAY 2
 
 #ifdef RUBY_EXTERN
 RUBY_EXTERN const char ruby_version[];
@@ -29,3 +29,5 @@
 #define RUBY_RELEASE_NUM RUBY_PATCHLEVEL
 
 
+
+
Index: ruby_1_8_7/test/rss/rss-assertions.rb
===================================================================
--- ruby_1_8_7/test/rss/rss-assertions.rb	(revision 21261)
+++ ruby_1_8_7/test/rss/rss-assertions.rb	(revision 21262)
@@ -557,20 +557,14 @@
 
     def assert_atom_content_inline_other_text(generator)
       _wrap_assertion do
-        require "zlib"
-
-        type = "application/zip"
+        type = "image/png"
         assert_parse(generator.call(<<-EOA), :nothing_raised)
   <content type="#{type}"/>
 EOA
 
-        text = ""
-        char = "a"
-        100.times do |i|
-          text << char
-          char.succ!
-        end
-        base64_content = Base64.encode64(Zlib::Deflate.deflate(text))
+        png_file = File.join(File.dirname(__FILE__), "dot.png")
+        png = File.open(png_file, "rb") {|file| file.read}
+        base64_content = [png].pack("m").delete("\n")
 
         [false, true].each do |with_space|
           xml_content = base64_content
@@ -591,7 +585,7 @@
           assert(content.inline_other_base64?)
           assert(!content.out_of_line?)
           assert(!content.have_xml_content?)
-          assert_equal(text, Zlib::Inflate.inflate(content.content))
+          assert_equal(png, content.content)
 
           xml = REXML::Document.new(content.to_s).root
           assert_rexml_element([], {"type" => type}, base64_content, xml)
Index: ruby_1_8_7/test/rss/dot.png
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = image/png

Property changes on: ruby_1_8_7/test/rss/dot.png
___________________________________________________________________
Name: svn:mime-type
   + image/png

Index: ruby_1_8_7/test/rss/test_atom.rb
===================================================================
--- ruby_1_8_7/test/rss/test_atom.rb	(revision 21261)
+++ ruby_1_8_7/test/rss/test_atom.rb	(revision 21262)
@@ -641,24 +641,17 @@
 
     def assert_atom_content_inline_other_base64_to_s(target_class)
       _wrap_assertion do
-        require "zlib"
+        type = "image/png"
+        png_file = File.join(File.dirname(__FILE__), "dot.png")
+        original_content = File.open(png_file, "rb") {|file| file.read}
 
-        text = ""
-        char = "a"
-        100.times do |i|
-          text << char
-          char.succ!
-        end
-
-        type = "application/zip"
-        original_content = Zlib::Deflate.deflate(text)
-
         content = target_class.new
         content.type = type
         content.content = original_content
         xml = REXML::Document.new(content.to_s).root
         assert_rexml_element([], {"type" => type},
-                             Base64.encode64(original_content), xml)
+                             [original_content].pack("m").delete("\n"),
+                             xml)
       end
     end
 

--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml/

[前][次][番号順一覧][スレッド一覧]