clbustos-rtf 0.2.2 → 0.3.0

data/CHANGES

@@ -0,0 +1,5 @@
+== CHANGES
+
+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/README

@@ -1,4 +1,4 @@
-== Ruby Rich Text Format (RTF) Library 0.2.0
+== Ruby Rich Text Format (RTF) Library
 The RTF library provides a pure Ruby set of functionality that can be used to
 programmatically create RTF documents. The main aim in developing this library
 is to ease the complexity involved in assembling RTF documents although some
@@ -18,13 +18,6 @@ In creating this library I set out to make it reasonably easy to create RTF
 documents in code. Having said that I'm certain that it is possible to generate
 invalid RTF documents with this library.
 
-=== This version
-
-A bug fix fork of thechrisoshow/rtf[http://github.com/thechrisoshow/rtf] , which is a gitified version of original ruby-rft[http://rubyforge.org/projects/ruby-rtf/] 
-
-* 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.
-* Deleted duplicated definition of ImageNode#style= with attr_writer and def.
-
 === Known Issues
 I've tried to assemble a reasonably extensive (although I won't claim
 exhaustive) unit test for the library. Despite that, this is an early release of
@@ -183,7 +176,11 @@ is installed with the library gem (if you're reading this you may already be
 looking at this documentation). Another source of information is the examples
 directory, so check that out too.
 
+CONTRIBUTORS
+Claudio Bustos
+Chris O'Sullivan
+
 COPYRIGHT
 =========
 
-Copyright (c) 2009 Peter Wood. See LICENSE for details.
+Copyright (c) 2009-2010 Peter Wood. See LICENSE for details.

data/Rakefile

@@ -11,10 +11,11 @@ begin
     s.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.'
-    s.authors = ["Peter Wood", "Claudio Bustos"]
+    s.authors = ["Peter Wood"]
+    s.files = FileList["[A-Z]*", "{examples,lib,test}/**/*"]
   end
 rescue LoadError
-  puts "Jeweler not available. Install it with: sudo gem install technicalpickles-jeweler -s http://gems.github.com"
+  puts "Jeweler not available. Install it with: sudo gem install jeweler"
 end
 
 require 'rake/rdoctask'
@@ -22,7 +23,7 @@ Rake::RDocTask.new do |rdoc|
   rdoc.rdoc_dir = 'rdoc'
   rdoc.title = 'ruby-rtf'
   rdoc.options << '--line-numbers' << '--inline-source'
-  rdoc.rdoc_files.include('README*')
+  rdoc.rdoc_files.include('[A-Z]*')
   rdoc.rdoc_files.include('lib/**/*.rb')
 end
 

data/VERSION.yml

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

data/lib/rtf/information.rb

@@ -1,8 +1,7 @@
 #!/usr/bin/env ruby
 
 require 'stringio'
-require 'parsedate'
-
+require 'date'
 module RTF
    # This class represents an information group for a RTF document.
    class Information
@@ -56,7 +55,7 @@ module RTF
          if setting.instance_of?(Time)
             @created = setting
          else
-            datetime = ParseDate::parsedate(setting.to_s)
+           datetime = Date._parse(setting.to_s).values_at(:year, :mon, :mday, :hour, :min, :sec, :zone, :wday)
             if datetime == nil
                RTFError.fire("Invalid document creation date/time information "\
                              "specified.")

data/lib/rtf/node.rb

@@ -63,11 +63,8 @@ module RTF
    # This class represents a specialisation of the Node class to refer to a Node
    # that simply contains text.
    class TextNode < Node
-      # Attribute accessor.
-      attr_reader :text
-
-      # Attribute mutator.
-      attr_writer :text
+     # Actual text
+      attr_accessor :text
 
       # This is the constructor for the TextNode class.
       #
@@ -131,11 +128,8 @@ module RTF
    class ContainerNode < Node
       include Enumerable
 
-      # Attribute accessor.
-      attr_reader :children
-
-      # Attribute mutator.
-      attr_writer :children
+      # Children elements of the node
+      attr_accessor :children
 
       # This is the constructor for the ContainerNode class.
       #
@@ -208,11 +202,14 @@ module RTF
    # is concrete enough to be used on its own but will also be used as the
    # base class for some specific command node types.
    class CommandNode < ContainerNode
-      # Attribute accessor.
-      attr_reader :prefix, :suffix, :split
-
-      # Attribute mutator.
-      attr_writer :prefix, :suffix, :split
+      # String containing the prefix text for the command
+      attr_accessor :prefix
+      # String containing the suffix text for the command
+      attr_accessor :suffix
+      # A boolean to indicate whether the prefix and suffix should
+      # be written to separate lines whether the node is converted
+      # to RTF. Defaults to true
+      attr_accessor :split
 
       # This is the constructor for the CommandNode class.
       #
@@ -522,12 +519,9 @@ module RTF
    # specialised container nodes that contain only TableRowNodes and have their
    # size specified when they are created an cannot be resized after that.
    class TableNode < ContainerNode
-      # Attribute accessor.
-      attr_reader :cell_margin
-
-      # Attribute mutator.
-      attr_writer :cell_margin
-
+      # Cell margin. Default to 100
+      attr_accessor :cell_margin
+      
       # This is a constructor for the TableNode class.
       #
       # ==== Parameters
@@ -536,12 +530,22 @@ module RTF
       # columns::  The number of columns in the table.
       # *widths::  One or more integers specifying the widths of the table
       #            columns.
-      def initialize(parent, rows, columns, *widths)
+      def initialize(parent, *args, &block)
+        if args.size>=2
+         rows=args.shift
+         columns=args.shift
+         widths=args
          super(parent) do
             entries = []
             rows.times {entries.push(TableRowNode.new(self, columns, *widths))}
             entries
          end
+        
+        elsif block
+          block.arity<1 ? self.instance_eval(&block) : block.call(self)
+        else
+          raise "You should use 0 or >2 args"
+        end
          @cell_margin = 100
       end
 
@@ -669,7 +673,7 @@ module RTF
          end
       end
 
-      # Attrobute accessors
+      # Attribute accessors
       def length
          entries.size
       end
@@ -745,13 +749,11 @@ module RTF
    class TableCellNode < CommandNode
       # A definition for the default width for the cell.
       DEFAULT_WIDTH                              = 300
-
+      # Width of cell
+      attr_accessor :width
       # Attribute accessor.
-      attr_reader :width, :shading_colour, :style
-
-      # Attribute mutator.
-      attr_writer :width
-
+      attr_reader :shading_colour, :style
+      
       # This is the constructor for the TableCellNode class.
       #
       # ==== Parameters

metadata

@@ -1,16 +1,20 @@
 --- !ruby/object:Gem::Specification 
 name: clbustos-rtf
 version: !ruby/object:Gem::Version 
-  version: 0.2.2
+  prerelease: false
+  segments: 
+  - 0
+  - 3
+  - 0
+  version: 0.3.0
 platform: ruby
 authors: 
 - Peter Wood
-- Claudio Bustos
 autorequire: 
 bindir: bin
 cert_chain: []
 
-date: 2010-03-25 00:00:00 -03:00
+date: 2010-05-03 00:00:00 -04:00
 default_executable: 
 dependencies: []
 
@@ -24,7 +28,7 @@ extra_rdoc_files:
 - LICENSE
 - README
 files: 
-- .gitignore
+- CHANGES
 - LICENSE
 - README
 - Rakefile
@@ -44,7 +48,6 @@ files:
 - lib/rtf/node.rb
 - lib/rtf/paper.rb
 - lib/rtf/style.rb
-- ruby-rtf.gemspec
 - test/character_style_test.rb
 - test/colour_table_test.rb
 - test/colour_test.rb
@@ -85,44 +88,46 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      segments: 
+      - 0
       version: "0"
-  version: 
 required_rubygems_version: !ruby/object:Gem::Requirement 
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      segments: 
+      - 0
       version: "0"
-  version: 
 requirements: []
 
 rubyforge_project: ruby-statsample
-rubygems_version: 1.3.5
+rubygems_version: 1.3.6
 signing_key: 
 specification_version: 3
 summary: Ruby library to create rich text format documents.
 test_files: 
-- test/node_test.rb
-- test/information_test.rb
-- test/container_node_test.rb
-- test/table_cell_node_test.rb
-- test/character_style_test.rb
+- test/table_row_node_test.rb
+- test/font_table_test.rb
 - test/paragraph_style_test.rb
+- test/document_style_test.rb
 - test/font_test.rb
+- test/header_node_test.rb
+- test/node_test.rb
+- test/colour_table_test.rb
+- test/test_helper.rb
 - test/document_test.rb
+- test/footer_node_test.rb
+- test/command_node_test.rb
 - test/style_test.rb
-- test/font_table_test.rb
+- test/character_style_test.rb
 - test/text_node_test.rb
-- test/table_node_test.rb
-- test/colour_table_test.rb
 - test/image_node_test.rb
-- test/document_style_test.rb
-- test/test_helper.rb
-- test/footer_node_test.rb
-- test/table_row_node_test.rb
 - test/colour_test.rb
-- test/header_node_test.rb
-- test/command_node_test.rb
-- examples/example01.rb
+- test/container_node_test.rb
+- test/information_test.rb
+- test/table_node_test.rb
+- test/table_cell_node_test.rb
 - examples/example02.rb
+- examples/example01.rb
 - examples/example03.rb
 - examples/example04.rb

data/.gitignore

@@ -1,3 +0,0 @@
-*.sw?
-.DS_Store
-coverage

data/ruby-rtf.gemspec

@@ -1,29 +0,0 @@
-# -*- encoding: utf-8 -*-
-
-Gem::Specification.new do |s|
-  s.name = %q{ruby-rtf}
-  s.version = "0.2.0"
-
-  s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
-  s.authors = ["Peter Wood"]
-  s.date = %q{2009-02-23}
-  s.description = %q{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.}
-  s.email = %q{paw220470@yahoo.ie}
-  s.files = ["VERSION.yml", "lib/rtf", "lib/rtf/colour.rb", "lib/rtf/font.rb", "lib/rtf/information.rb", "lib/rtf/node.rb", "lib/rtf/paper.rb", "lib/rtf/style.rb", "lib/rtf.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/fixtures", "test/fixtures/bitmap1.bmp", "test/fixtures/bitmap2.bmp", "test/fixtures/jpeg1.jpg", "test/fixtures/jpeg2.jpg", "test/fixtures/png1.png", "test/fixtures/png2.png", "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"]
-  s.has_rdoc = true
-  s.homepage = %q{http://github.com/thechrisoshow/ruby-rtf}
-  s.rdoc_options = ["--inline-source", "--charset=UTF-8"]
-  s.require_paths = ["lib"]
-  s.rubygems_version = %q{1.3.1}
-  s.summary = %q{Ruby library to create rich text format documents.}
-
-  if s.respond_to? :specification_version then
-    current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
-    s.specification_version = 2
-
-    if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
-    else
-    end
-  else
-  end
-end