serenity-odt 0.2.0 → 0.2.1

data/Rakefile

@@ -8,7 +8,7 @@ Spec::Rake::SpecTask.new("spec")
 
 spec = Gem::Specification.new do |s|
   s.name = %q{serenity-odt}
-  s.version = "0.2.0"
+  s.version = "0.2.1"
 
   s.authors = ["Tomas Kramar"]
   s.description = <<-EOF

data/lib/serenity/escape_xml.rb

@@ -3,6 +3,11 @@ class String
     mgsub!([[/&/, '&amp;'], [/</, '&lt;'], [/>/, '&gt;']])
   end
 
+  def convert_newlines
+    gsub!("\n", '<text:line-break/>')
+    self
+  end
+
   def mgsub!(key_value_pairs=[].freeze)
     regexp_fragments = key_value_pairs.collect { |k,v| k }
     gsub!(Regexp.union(*regexp_fragments)) do |match|

data/lib/serenity/line.rb

@@ -44,13 +44,17 @@ module Serenity
     end
 
     def escape_code code
-      code.mgsub! [[/&apos;/, "'"], [/&gt;/, '>'], [/&lt/, '<'], [/&quot;/, '"']]
+      code.mgsub! [[/&apos;/, "'"], [/&gt;/, '>'], [/&lt/, '<'], [/&quot;/, '"'], [/&amp;/, '&']]
     end
   end
 
   class StringLine < CodeLine
     def to_buf
-      " _buf << (" << escape_code(@text) << ").to_s.escape_xml;"
+      " _buf << (" << escape_code(@text) << ").to_s.escape_xml.convert_newlines;"
+    end
+
+    def convert_newlines text
+      text.gsub("First line", '<text:line-break>')
     end
   end
 

data/lib/serenity/odteruby.rb

@@ -51,7 +51,7 @@ module Serenity
     end
 
     def process_instruction text
-      text = text.strip
+      #text = text.strip
       pos = 0
       src = []
 

data/lib/serenity/xml_reader.rb

@@ -10,9 +10,9 @@ module Serenity
 
       @src.scan(/<.*?>/) do |node|
         m = Regexp.last_match
-        if m.begin(0) > last_match_pos + 1
+        if m.begin(0) > last_match_pos
           text = @src[last_match_pos...m.begin(0)]
-          yield text.strip, node_type(text) if text.gsub(/\s+/, '') != ''
+          yield text, node_type(text) if text.gsub(/\s+/, '') != ''
         end
 
         last_match_pos = m.end(0)

data/spec/odteruby_spec.rb

@@ -89,5 +89,14 @@ module Serenity
 
       run_spec template, expected
     end
+
+    it 'should replace \n with soft newlines' do
+      text_with_newline = "First line\nSecond line"
+
+      template = '<text:p text:style-name="P2">{%= text_with_newline %}</text:p>'
+      expected = '<text:p text:style-name="P2">First line <text:line-break/>Second line</text:p>'
+
+      run_spec template, expected, binding
+    end
   end
 end

data/spec/template_spec.rb

@@ -14,35 +14,50 @@ module Serenity
       @title = 'captain'
 
       template = Template.new(fixture('variables.odt'), 'output_variables.odt')
-      lambda {template.process binding}.should_not raise_error
+      template.process binding
+
+      'output_variables.odt'.should contain_in('content.xml', 'Malcolm Reynolds')
+      'output_variables.odt'.should contain_in('content.xml', 'captain')
     end
 
     it "should unroll a simple for loop" do
       @crew = %w{'River', 'Jayne', 'Wash'}
 
       template = Template.new(fixture('loop.odt'), 'output_loop.odt')
-      lambda {template.process binding}.should_not raise_error
+      template.process binding
     end
 
     it "should unroll an advanced loop with tables" do
       @ships = [Ship.new('Firefly', 'transport'), Ship.new('Colonial', 'battle')]
 
       template = Template.new(fixture('loop_table.odt'), 'output_loop_table.odt')
-      lambda {template.process binding}.should_not raise_error
+      template.process binding
+
+      ['Firefly', 'transport', 'Colonial', 'battle'].each do |text|
+        'output_loop_table.odt'.should contain_in('content.xml', text)
+      end
     end
 
     it "should process an advanced document" do
       @persons = [Person.new('Malcolm', 'captain'), Person.new('River', 'psychic'), Person.new('Jay', 'gunslinger')]
 
       template = Template.new(fixture('advanced.odt'), 'output_advanced.odt')
-      lambda {template.process binding}.should_not raise_error
+      template.process binding
+
+      ['Malcolm', 'captain', 'River', 'psychic', 'Jay', 'gunslinger'].each do |text|
+        'output_advanced.odt'.should contain_in('content.xml', text)
+      end
     end
 
     it "should loop and generate table rows" do
       @ships = [Ship.new('Firefly', 'transport'), Ship.new('Colonial', 'battle')]
 
       template = Template.new(fixture('table_rows.odt'), 'output_table_rows.odt')
-      lambda {template.process binding}.should_not raise_error
+      template.process binding
+
+      ['Firefly', 'transport', 'Colonial', 'battle'].each do |text|
+        'output_table_rows.odt'.should contain_in('content.xml', text)
+      end
     end
 
     it "should parse the header" do
@@ -52,5 +67,13 @@ module Serenity
       template.process(binding)
       'output_header.odt'.should contain_in('styles.xml', 'captain')
     end
+
+    it 'should parse the footer' do
+      @title = 'captain'
+
+      template = Template.new(fixture('footer.odt'), 'output_footer.odt')
+      template.process(binding)
+      'output_footer.odt'.should contain_in('styles.xml', 'captain')
+    end
   end
 end

data/spec/xml_reader_spec.rb

@@ -31,7 +31,7 @@ module Serenity
 
       idx = 0
       reader.each_node do |node, type|
-        expected[idx].text.should == node
+        expected[idx].text.should == node.strip
         expected[idx].type.should == type
         idx += 1
       end

metadata

@@ -1,13 +1,12 @@
 --- !ruby/object:Gem::Specification 
 name: serenity-odt
 version: !ruby/object:Gem::Version 
-  hash: 23
   prerelease: false
   segments: 
   - 0
   - 2
-  - 0
-  version: 0.2.0
+  - 1
+  version: 0.2.1
 platform: ruby
 authors: 
 - Tomas Kramar
@@ -15,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-09-23 00:00:00 +02:00
+date: 2010-11-03 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -26,7 +25,6 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 57
         segments: 
         - 0
         - 9
@@ -42,7 +40,6 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 13
         segments: 
         - 1
         - 2
@@ -80,6 +77,7 @@ files:
 - spec/template_spec.rb
 - spec/xml_reader_spec.rb
 - fixtures/advanced.odt
+- fixtures/footer.odt
 - fixtures/header.odt
 - fixtures/loop.odt
 - fixtures/loop_table.odt
@@ -99,7 +97,6 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 3
       segments: 
       - 0
       version: "0"
@@ -108,7 +105,6 @@ required_rubygems_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 3
       segments: 
       - 0
       version: "0"
@@ -129,6 +125,7 @@ test_files:
 - spec/template_spec.rb
 - spec/xml_reader_spec.rb
 - fixtures/advanced.odt
+- fixtures/footer.odt
 - fixtures/header.odt
 - fixtures/loop.odt
 - fixtures/loop_table.odt