nishidayuya-rd2odt 0.0.1.20090403.01 → 0.1.1

data/test/test-helper.rb

@@ -3,6 +3,91 @@
 $top_srcdir = File.join(File.dirname(__FILE__), "..")
 $LOAD_PATH << File.join($top_srcdir, "lib")
 
-$KCODE = "u" if RUBY_VERSION < "1.8.9"
+$KCODE = "u" if RUBY_VERSION < "1.9.0"
 
 require "rd2odt"
+require "tempfile"
+
+module XmlMatchers
+  class BeSameAsThisXml
+    def initialize(expected)
+      @expected = expected
+      if String === expected || Symbol === expected
+        @expected_dom = to_dom(expected.to_s)
+      end
+    end
+
+    def matches?(actual)
+      @actual = actual
+      if String === actual || Symbol === actual
+        @actual_dom = to_dom(actual.to_s)
+      end
+      return expected_dom.to_s == actual_dom.to_s
+    end
+
+    def failure_message
+      return "difference: #{diff}"
+    end
+
+    alias negative_failure_message failure_message
+
+    private
+
+    DOM_PREFIX = <<EOF
+<?xml version='1.0' encoding='UTF-8'?>
+
+<office:document-content xmlns:script='urn:oasis:names:tc:opendocument:xmlns:script:1.0' xmlns:oooc='http://openoffice.org/2004/calc' xmlns:number='urn:oasis:names:tc:opendocument:xmlns:datastyle:1.0' xmlns:dr3d='urn:oasis:names:tc:opendocument:xmlns:dr3d:1.0' xmlns:math='http://www.w3.org/1998/Math/MathML' xmlns:dom='http://www.w3.org/2001/xml-events' xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance' xmlns:text='urn:oasis:names:tc:opendocument:xmlns:text:1.0' xmlns:svg='urn:oasis:names:tc:opendocument:xmlns:svg-compatible:1.0' xmlns:ooo='http://openoffice.org/2004/office' xmlns:xforms='http://www.w3.org/2002/xforms' xmlns:table='urn:oasis:names:tc:opendocument:xmlns:table:1.0' xmlns:meta='urn:oasis:names:tc:opendocument:xmlns:meta:1.0' xmlns:form='urn:oasis:names:tc:opendocument:xmlns:form:1.0' xmlns:field='urn:openoffice:names:experimental:ooxml-odf-interop:xmlns:field:1.0' xmlns:draw='urn:oasis:names:tc:opendocument:xmlns:drawing:1.0' office:version='1.1' xmlns:office='urn:oasis:names:tc:opendocument:xmlns:office:1.0' xmlns:xsd='http://www.w3.org/2001/XMLSchema' xmlns:xlink='http://www.w3.org/1999/xlink' xmlns:fo='urn:oasis:names:tc:opendocument:xmlns:xsl-fo-compatible:1.0' xmlns:dc='http://purl.org/dc/elements/1.1/' xmlns:style='urn:oasis:names:tc:opendocument:xmlns:style:1.0' xmlns:ooow='http://openoffice.org/2004/writer' xmlns:chart='urn:oasis:names:tc:opendocument:xmlns:chart:1.0'>
+
+
+EOF
+
+    DOM_SUFFIX = <<EOF
+
+
+</office:document-content>
+EOF
+
+    def expected_dom
+      return (@expected_dom ||= to_dom(RD2ODT.ah_to_xml(@expected)))
+    end
+
+    def actual_dom
+      return (@actual_dom ||= to_dom(RD2ODT.ah_to_xml(@expected)))
+    end
+
+    def to_dom(s)
+      root = REXML::Document.new(DOM_PREFIX + s + DOM_SUFFIX)
+      result = root[2][1] # `result' is only XML from `s'.
+      return result
+    end
+
+    def diff
+      Tempfile.open("rd2odt-test") do |expected_file|
+        Tempfile.open("rd2odt-test") do |actual_file|
+          expected_file.puts(expected_dom.to_s)
+          expected_file.close
+          actual_file.puts(actual_dom.to_s)
+          actual_file.close
+
+          result = `docdiff --utf8 --char --tty #{expected_file.path} #{actual_file.path}`
+          return result
+        end
+      end
+    end
+  end
+
+  def be_same_as_this_xml(expected)
+    return BeSameAsThisXml.new(expected)
+  end
+end
+
+# for test on Ruby 1.8.6.
+if RUBY_VERSION < "1.8.7"
+  class Hash
+    def each
+      keys.sort.each do |k|
+        yield(k, self[k])
+      end
+    end
+  end
+end

data/test/unit/rd2odt-spec.rb

@@ -571,8 +571,10 @@ describe RD2ODT::RD2ODTVisitor, "apply_to_Verbatim" do
 end
 
 describe RD2ODT::RD2ODTVisitor, "apply_to_Include" do
+  include XmlMatchers
+
   before do
-    class Time
+    class ::Time
       class << self
         alias orig_now now
 
@@ -593,7 +595,7 @@ describe RD2ODT::RD2ODTVisitor, "apply_to_Include" do
   end
 
   after do
-    class Time
+    class ::Time
       class << self
         alias now orig_now
       end
@@ -616,10 +618,10 @@ EOF
     result.length.should == 3
     result.class.should == Array
     @visitor.number_of_include_files.should == 1
-    @visitor.additional_styles[0].to_s.should == <<EOF.chomp
+    @visitor.additional_styles[0].to_s.should be_same_as_this_xml(<<EOF.chomp)
 <style:style style:name='#{@name_prefix}Standard' style:class='text' style:family='paragraph'/>
 EOF
-    @visitor.additional_styles[1].to_s.should == <<EOF.chomp
+    @visitor.additional_styles[1].to_s.should be_same_as_this_xml(<<EOF.chomp)
 <style:style style:name='#{@name_prefix}Text_20_body' style:class='text' style:parent-style-name='#{@name_prefix}Standard' style:display-name='#{@name_prefix}Text body' style:family='paragraph'>
    <style:paragraph-properties fo:margin-bottom='0.212cm' fo:margin-top='0cm'/>
   </style:style>
@@ -688,7 +690,7 @@ EOF
     result[0].should == <<EOF.chomp.to_sym
 <text:p text:style-name='#{@name_prefix}Standard'>これは&lt;&lt;&lt;のサンプルです．</text:p>
 EOF
-    result[1].should == <<EOF.chomp.to_sym
+    result[1].should be_same_as_this_xml(<<EOF.chomp.to_sym)
 <table:table table:name='#{@name_prefix}表1' table:style-name='#{@name_prefix}表1'>
     <table:table-column table:number-columns-repeated='3' table:style-name='#{@name_prefix}表1.A'/>
     <table:table-row>
@@ -720,12 +722,12 @@ EOF
 EOF
     result.length.should == 3
     result.class.should == Array
-    @visitor.automatic_styles[0].to_s.should == <<EOF.chomp
+    @visitor.automatic_styles[0].to_s.should be_same_as_this_xml(<<EOF.chomp)
 <style:style style:name='#{@name_prefix}表1' style:family='table'>
    <style:table-properties table:align='margins' style:width='16.999cm'/>
   </style:style>
 EOF
-    @visitor.automatic_styles[1].to_s.should == <<EOF.chomp
+    @visitor.automatic_styles[1].to_s.should be_same_as_this_xml(<<EOF.chomp)
 <style:style style:name='#{@name_prefix}表1.A' style:family='table-column'>
    <style:table-column-properties style:column-width='5.666cm' style:rel-column-width='21845*'/>
   </style:style>
@@ -742,7 +744,7 @@ EOF
     result[0].should == <<EOF.chomp.to_sym
 <text:p text:style-name='#{@name_prefix}Standard'>これは&lt;&lt;&lt;のサンプルです．</text:p>
 EOF
-    result[1].should == <<EOF.chomp.to_sym
+    result[1].should be_same_as_this_xml(<<EOF.chomp.to_sym)
 <text:p text:style-name='#{@name_prefix}Standard'><draw:g text:anchor-type='paragraph' draw:z-index='0' draw:style-name='#{@name_prefix}gr1'><draw:custom-shape svg:x='3.348cm' svg:y='0.088cm' svg:height='3.911cm' draw:style-name='#{@name_prefix}gr2' svg:width='3.887cm'>
       <text:p/>
       <draw:enhanced-geometry draw:glue-points='10800 0 3160 3160 0 10800 3160 18440 10800 21600 18440 18440 21600 10800 18440 3160' draw:type='smiley' draw:enhanced-path='U 10800 10800 10800 10800 0 23592960 Z N U 7305 7515 1165 1165 0 23592960 Z N U 14295 7515 1165 1165 0 23592960 Z N M 4870 ?f1 C 8680 ?f2 12920 ?f2 16730 ?f1 F N' draw:modifiers='17520' draw:text-areas='3200 3200 18400 18400' svg:viewBox='0 0 21600 21600'>
@@ -807,17 +809,17 @@ EOF
 EOF
     result.length.should == 3
     result.class.should == Array
-    @visitor.automatic_styles[0].to_s.should == <<EOF.chomp
+    @visitor.automatic_styles[0].to_s.should be_same_as_this_xml(<<EOF.chomp)
 <style:style style:name='#{@name_prefix}P1' style:family='paragraph'>
    <style:paragraph-properties fo:text-align='center'/>
   </style:style>
 EOF
-    @visitor.automatic_styles[1].to_s.should == <<EOF.chomp
+    @visitor.automatic_styles[1].to_s.should be_same_as_this_xml(<<EOF.chomp)
 <style:style style:name='#{@name_prefix}gr1' style:family='graphic'>
    <style:graphic-properties style:flow-with-text='false' style:horizontal-pos='from-left' style:wrap='none' style:vertical-rel='paragraph' draw:wrap-influence-on-position='once-concurrent' style:horizontal-rel='paragraph' style:run-through='foreground' style:vertical-pos='from-top'/>
   </style:style>
 EOF
-    @visitor.automatic_styles[2].to_s.should == <<EOF.chomp
+    @visitor.automatic_styles[2].to_s.should be_same_as_this_xml(<<EOF.chomp)
 <style:style style:name='#{@name_prefix}gr2' style:family='graphic'>
    <style:graphic-properties draw:textarea-vertical-align='middle' draw:auto-grow-height='false' style:run-through='foreground' draw:textarea-horizontal-align='justify'/>
   </style:style>

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: nishidayuya-rd2odt
 version: !ruby/object:Gem::Version 
-  version: 0.0.1.20090403.01
+  version: 0.1.1
 platform: ruby
 authors: 
 - Yuya.Nishida.
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-04-01 00:00:00 -07:00
+date: 2009-05-16 00:00:00 -07:00
 default_executable: 
 dependencies: []
 
@@ -24,9 +24,43 @@ extra_rdoc_files: []
 files: 
 - bin/rd2odt
 - lib/rd2odt.rb
+- lib/rd2odt/compat/ruby-1.8.6.rb
+- lib/rd2odt/rdtool/NOTICE.rd2odt
+- lib/rd2odt/rdtool/README.rd
+- lib/rd2odt/rdtool/README.rd.ja
+- lib/rd2odt/rdtool/rd/block-element.rb
+- lib/rd2odt/rdtool/rd/complex-list-item.rb
+- lib/rd2odt/rdtool/rd/desclist.rb
+- lib/rd2odt/rdtool/rd/document-struct.rb
+- lib/rd2odt/rdtool/rd/element.rb
+- lib/rd2odt/rdtool/rd/filter.rb
+- lib/rd2odt/rdtool/rd/inline-element.rb
+- lib/rd2odt/rdtool/rd/labeled-element.rb
+- lib/rd2odt/rdtool/rd/list.rb
+- lib/rd2odt/rdtool/rd/loose-struct.rb
+- lib/rd2odt/rdtool/rd/methodlist.rb
+- lib/rd2odt/rdtool/rd/output-format-visitor.rb
+- lib/rd2odt/rdtool/rd/package.rb
+- lib/rd2odt/rdtool/rd/parser-util.rb
+- lib/rd2odt/rdtool/rd/rbl-file.rb
+- lib/rd2odt/rdtool/rd/rbl-suite.rb
+- lib/rd2odt/rdtool/rd/rd-struct.rb
+- lib/rd2odt/rdtool/rd/rd2html-lib.rb
+- lib/rd2odt/rdtool/rd/rd2html-opt.rb
+- lib/rd2odt/rdtool/rd/rd2man-lib.rb
+- lib/rd2odt/rdtool/rd/rd2rdo-lib.rb
+- lib/rd2odt/rdtool/rd/rd2rmi-lib.rb
+- lib/rd2odt/rdtool/rd/rdblockparser.tab.rb
+- lib/rd2odt/rdtool/rd/rdfmt.rb
+- lib/rd2odt/rdtool/rd/rdinlineparser.tab.rb
+- lib/rd2odt/rdtool/rd/rdvisitor.rb
+- lib/rd2odt/rdtool/rd/reference-resolver.rb
+- lib/rd2odt/rdtool/rd/search-file.rb
+- lib/rd2odt/rdtool/rd/tree.rb
+- lib/rd2odt/rdtool/rd/version.rb
+- lib/rd2odt/rdtool/rd/visitor.rb
 - doc/sample.rd.ja
 - doc/sample.rd.ja.ott
-- doc/sample.rd.ja.pdf
 - doc/sample/body-text.rd
 - doc/sample/enum-list-over-headline-multi-level.rd
 - doc/sample/enum-list-over-headline.rd
@@ -64,11 +98,12 @@ rdoc_options: []
 
 require_paths: 
 - lib
+- lib/rd2odt/rdtool
 required_ruby_version: !ruby/object:Gem::Requirement 
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      version: 1.8.7
+      version: 1.8.6
   version: 
 required_rubygems_version: !ruby/object:Gem::Requirement 
   requirements: