odt2html 0.1.0 → 0.1.1

data/.gitignore

@@ -1 +1,2 @@
 pkg
+Gemfile.lock

data/CHANGELOG.md

@@ -1,5 +1,8 @@
 # Changelog
 
+## 0.1.1 / 2011-03-03
+- Allow to put output into variable instead of forcing it to write to stdout
+
 ## 0.1.0 / 2011-03-02
 - Forked to Github
 - Added code to handle <text:line_break>

data/README.md

@@ -1,21 +1,20 @@
 # ODT2HTML
 
-This program converts OpenDocument text files to XHTML.
-Copyright (C) 2006 J. David Eisenberg
+## Usage
 
-This library is free software; you can redistribute it and/or
-modify it under the terms of the GNU Lesser General Public
-License as published by the Free Software Foundation; either
-version 2.1 of the License, or (at your option) any later version.
+    $ odt2html [OPTIONS]
 
-This library is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-Lesser General Public License for more details.
+## Available options
 
-You should have received a copy of the GNU Lesser General Public
-License along with this library; if not, write to the Free Software
-Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+Option          | Description
+--------------- | -------------
+--in [PATH]     | Path to input file(required)
+--out [PATH]    | Path to output file(output to STDOUT if not provided)
+--css [PATH]    | Path to css file(css in header if not provided)
+--images [PATH] | Path to images directory
 
-Author: J. David Eisenberg
-Contact: catcode@catcode.com
+## About
+
+Author: Bernard Potocki <<bernard.potocki@imanel.org>>
+
+Oryginal work: J. David Eisenberg <<catcode@catcode.com>>

data/bin/odt2html

@@ -6,4 +6,6 @@ require 'rubygems'
 require 'odt2html'
 
 app = ODT2HTML::Base.new
-app.convert
+output = app.convert
+
+puts output unless output.nil?

data/lib/odt2html.rb

@@ -6,7 +6,7 @@ require 'getoptlong'
 
 module ODT2HTML
 
-  VERSION = "0.1.0"
+  VERSION = "0.1.1"
   ROOT_PATH = File.expand_path(File.dirname(__FILE__))
 
   autoload :Base,             "#{ROOT_PATH}/odt2html/base"

data/lib/odt2html/base.rb

@@ -219,15 +219,23 @@ HDR
       if (@output_filename) then
         output_file = File.open( @output_filename, "w")
       else
-        output_file = $stdout
+        output_file = String.new
       end
 
       @output_doc.write( output_file, 2 )
-      output_file.close
 
-      rescue Exception => e
-        puts "Cannot convert file: #{e}"
-        puts e.backtrace.join("\n")
+      if @output_filename
+        output_file.close
+        return nil
+      else
+        return output_file
+      end
+    rescue ArgumentError => e
+      puts e.message
+      exit
+    rescue Exception => e
+      puts "Cannot convert file: #{e}"
+      puts e.backtrace.join("\n")
     end
 
     def usage

data/spec/integration/files_spec.rb

@@ -5,20 +5,11 @@ describe "files" do
     odt_path = File.join(File.dirname(__FILE__), *%w[.. fixtures example.odt])
     html_path = File.join(File.dirname(__FILE__), *%w[.. fixtures example.html])
     html_file = File.open(html_path)
-    tempfile = Tempfile.new('html')
 
-    begin
-      parser = ODT2HTML::Base.new
-      parser.instance_variable_set('@input_filename', odt_path)
-      parser.instance_variable_set('@output_filename', tempfile.path)
+    parser = ODT2HTML::Base.new
+    parser.instance_variable_set('@input_filename', odt_path)
 
-      parser.convert
-
-      tempfile.rewind
-      html_content = html_file.read.gsub("[TITLE_HERE]", odt_path)
-      tempfile.read.should eql(html_content)
-    ensure
-      tempfile.close!
-    end
+    html_content = html_file.read.gsub("[TITLE_HERE]", odt_path)
+    parser.convert.should eql(html_content)
   end
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: odt2html
 version: !ruby/object:Gem::Version 
-  hash: 27
+  hash: 25
   prerelease: 
   segments: 
   - 0
   - 1
-  - 0
-  version: 0.1.0
+  - 1
+  version: 0.1.1
 platform: ruby
 authors: 
 - Bernard Potocki
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-03-02 00:00:00 +01:00
+date: 2011-03-04 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency