rtf 0.3.0 → 0.3.2

data/CHANGES

@@ -1,5 +1,8 @@
 == CHANGES
 
+0.3.2
+  * Added support for utf-8 thanks to clbustos
+
 0.3.0
   * Resolve problems on Ruby 1.9.1 with ImageNode#read_source. Peter uses IO#getc, which returns a String on Ruby 1.9.1, not a Integer, so I replaced with getbyte. [clbustos]
   * Deleted duplicated definition of ImageNode#style= with attr_writer and def. [clbustos]

data/VERSION.yml

@@ -1,5 +1,5 @@
---- 
+---
 :major: 0
 :minor: 3
-:patch: 0
-:build: 
+:patch: 2
+:build:

data/examples/example01.rb

@@ -1,5 +1,9 @@
+# encoding: utf-8
 #!/usr/bin/env ruby
 
+$LOAD_PATH.unshift(File.dirname(__FILE__)+"/../lib/")
+
+
 require 'rubygems'
 require 'rtf'
 
@@ -48,4 +52,4 @@ end
 
 File.open('example01.rtf', 'w') do |file|
    file.write(document.to_rtf)
-end
+end

data/examples/example02.rb

@@ -1,4 +1,5 @@
 #!/usr/bin/env ruby
+$LOAD_PATH.unshift(File.dirname(__FILE__)+"/../lib/")
 
 require 'rubygems'
 require 'rtf'

data/examples/example03.rb

@@ -1,4 +1,5 @@
 #!/usr/bin/env ruby
+$LOAD_PATH.unshift(File.dirname(__FILE__)+"/../lib/")
 
 require 'rubygems'
 require 'rtf'

data/examples/example04.rb

@@ -1,4 +1,5 @@
 #!/usr/bin/env ruby
+$LOAD_PATH.unshift(File.dirname(__FILE__)+"/../lib/")
 
 require 'rubygems'
 require 'rtf'

data/lib/rtf/node.rb

@@ -118,7 +118,22 @@ module RTF
       # This method generates the RTF equivalent for a TextNode object. This
       # method escapes any special sequences that appear in the text.
       def to_rtf
-         @text == nil ? '' : @text.gsub("{", "\\{").gsub("}", "\\}").gsub("\\", "\\\\")
+        rtf=(@text == nil ? '' : @text.gsub("{", "\\{").gsub("}", "\\}").gsub("\\", "\\\\"))
+        # This is from lfarcy / rtf-extensions
+        # I don't see the point of coding different 128<n<256 range
+
+        #f1=lambda { |n| n < 128 ? n.chr : n < 256 ? "\\'#{n.to_s(16)}" : "\\u#{n}\\'3f" }
+        # Encode as Unicode.
+
+        f=lambda { |n| n < 128 ? n.chr : "\\u#{n}\\'3f" }
+        # Ruby 1.9 is safe, cause detect original encoding
+        # and convert text to utf-16 first
+        if RUBY_VERSION>"1.9.0"
+          return rtf.encode("UTF-16LE", :undef=>:replace).each_codepoint.map(&f).join('')
+        else
+          # You SHOULD use UTF-8 as input, ok?
+          return rtf.unpack('U*').map(&f).join('')
+        end
       end
    end # End of the TextNode class.
 
@@ -521,7 +536,7 @@ module RTF
    class TableNode < ContainerNode
       # Cell margin. Default to 100
       attr_accessor :cell_margin
-      
+
       # This is a constructor for the TableNode class.
       #
       # ==== Parameters
@@ -540,7 +555,7 @@ module RTF
             rows.times {entries.push(TableRowNode.new(self, columns, *widths))}
             entries
          end
-        
+
         elsif block
           block.arity<1 ? self.instance_eval(&block) : block.call(self)
         else
@@ -753,7 +768,7 @@ module RTF
       attr_accessor :width
       # Attribute accessor.
       attr_reader :shading_colour, :style
-      
+
       # This is the constructor for the TableCellNode class.
       #
       # ==== Parameters
@@ -1262,7 +1277,7 @@ module RTF
                if size > 0
                   total = 0
                   while @source.eof? == false && total < size
-					  
+
                      @read << @source.getbyte
                      total += 1
                   end
@@ -1660,4 +1675,4 @@ module RTF
          text.string
       end
    end # End of the Document class.
-end # End of the RTF module.
+end # End of the RTF module.

data/test/test_helper.rb

@@ -1,6 +1,7 @@
 require 'rubygems'
 require 'test/unit'
 
+$LOAD_PATH.unshift(File.dirname(__FILE__)+"/../lib/")
 $LOAD_PATH.unshift(File.dirname(__FILE__))
 require 'rtf'
 include RTF

data/test/text_node_test.rb

@@ -1,3 +1,4 @@
+# encoding:UTF-8
 require 'test_helper'
 
 # Information class unit test class.
@@ -5,7 +6,7 @@ class TextNodeTest < Test::Unit::TestCase
    def setup
       @node = Node.new(nil)
    end
-   
+
    def test01
       nodes = []
       nodes.push(TextNode.new(@node))
@@ -13,25 +14,25 @@ class TextNodeTest < Test::Unit::TestCase
       nodes.push(TextNode.new(@node))
       nodes.push(TextNode.new(@node, ''))
 
-      assert(nodes[0].text == nil)      
-      assert(nodes[1].text == 'Node 2')      
-      assert(nodes[2].text == nil)      
+      assert(nodes[0].text == nil)
+      assert(nodes[1].text == 'Node 2')
+      assert(nodes[2].text == nil)
       assert(nodes[3].text == '')
-      
+
       nodes[0].text = 'This is the altered text for node 1.'
       assert(nodes[0].text == 'This is the altered text for node 1.')
-      
+
       nodes[1].append('La la la')
       nodes[2].append('La la la')
       assert(nodes[1].text == 'Node 2La la la')
       assert(nodes[2].text == 'La la la')
-      
+
       nodes[2].text = nil
       nodes[1].insert(' - ', 6)
       nodes[2].insert('TEXT', 2)
       assert(nodes[1].text == 'Node 2 - La la la')
       assert(nodes[2].text == 'TEXT')
-      
+
       nodes[2].text = nil
       nodes[3].text = '{\}'
       assert(nodes[0].to_rtf == 'This is the altered text for node 1.')
@@ -39,7 +40,7 @@ class TextNodeTest < Test::Unit::TestCase
       assert(nodes[2].to_rtf == '')
       assert(nodes[3].to_rtf == '\{\\\}')
    end
-   
+
    def test02
       begin
          TextNode.new(nil)
@@ -47,4 +48,19 @@ class TextNodeTest < Test::Unit::TestCase
       rescue => error
       end
    end
+   def test_utf8
+     nodes = []
+     nodes.push(TextNode.new(@node))
+     nodes.push(TextNode.new(@node))
+
+     nodes[0].text="ASCCI"
+     assert_equal("ASCCI", nodes[0].to_rtf)
+
+
+     utf8="Á"
+     exp="\\u#{utf8.unpack("U")[0]}\\'3f"
+     nodes[0].text=utf8
+     assert_equal(exp, nodes[0].to_rtf)
+
+   end
 end

metadata

@@ -1,29 +1,26 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: rtf
-version: !ruby/object:Gem::Version 
+version: !ruby/object:Gem::Version
+  version: 0.3.2
   prerelease: 
-  version: 0.3.0
 platform: ruby
-authors: 
+authors:
 - Peter Wood
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2011-04-15 00:00:00 +01:00
+date: 2011-09-07 00:00:00.000000000 +01:00
 default_executable: 
 dependencies: []
-
-description: Ruby RTF is a library that can be used to create rich text format (RTF) documents. RTF is a text based standard for laying out document content.
+description: Ruby RTF is a library that can be used to create rich text format (RTF)
+  documents. RTF is a text based standard for laying out document content.
 email: paw220470@yahoo.ie
 executables: []
-
 extensions: []
-
-extra_rdoc_files: 
+extra_rdoc_files:
 - LICENSE
 - README.rdoc
-files: 
+files:
 - CHANGES
 - LICENSE
 - README.rdoc
@@ -74,54 +71,26 @@ files:
 has_rdoc: true
 homepage: http://github.com/thechrisoshow/rtf
 licenses: []
-
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      version: "0"
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: 
-rubygems_version: 1.5.2
+rubygems_version: 1.6.2
 signing_key: 
 specification_version: 3
 summary: Ruby library to create rich text format documents.
-test_files: 
-- examples/example01.rb
-- examples/example02.rb
-- examples/example03.rb
-- examples/example04.rb
-- test/character_style_test.rb
-- test/colour_table_test.rb
-- test/colour_test.rb
-- test/command_node_test.rb
-- test/container_node_test.rb
-- test/document_style_test.rb
-- test/document_test.rb
-- test/font_table_test.rb
-- test/font_test.rb
-- test/footer_node_test.rb
-- test/header_node_test.rb
-- test/image_node_test.rb
-- test/information_test.rb
-- test/node_test.rb
-- test/paragraph_style_test.rb
-- test/style_test.rb
-- test/table_cell_node_test.rb
-- test/table_node_test.rb
-- test/table_row_node_test.rb
-- test/test_helper.rb
-- test/text_node_test.rb
+test_files: []