libreconv 0.9.0 → 0.9.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 14a16a3e394c4ba9f9d7f69656286f2cdd309a07
-  data.tar.gz: f2768dd2c7905a798f24b62e107270430f37dd57
+  metadata.gz: 522fce89fe66792d062925292ab1104b4c4d4c7e
+  data.tar.gz: 7c2f41f839955d1900417339bdf4be23833debaf
 SHA512:
-  metadata.gz: 07d5b921a16008271f6a4eaf5ed074279e3ab47199fe694ab5b96d9608e8f322f4c4297a1f3119c436bb2701c16a691050a29ce9efbeca4fa24c4991e2a9b676
-  data.tar.gz: 04805b8bf5fd94960161f22c2d9635ddb8361990059e18fdfb2d61758ead3030292c16b261550c28ece1531739e930dbf564bd7da39400c3eb4aa56a7b605c17
+  metadata.gz: 8d9b40454b77418914765b032a54e6c41f1e995a28ac411d61f13f558ea14ce740ee7414a5b2e700bb3d7d8fb7467e30e461698e4add05e45d712fdd11178a3e
+  data.tar.gz: 4913f63b22d7da58a2eec6a3f5f909e10a4f074e1cfe51d32a872b43a8ec7c604d44702ba4101af0c3a7c505706845b4a6ec3598f702c9e23328eb65e2e7a30a

data/.gitignore

@@ -15,6 +15,7 @@ spec/reports
 test/tmp
 test/version_tmp
 tmp
+.idea/
 
 TODO.md
 

data/.travis.yml

@@ -1,12 +1,10 @@
 language: ruby
 rvm:
-  - 1.9.3
-  - 2.0.0
   - 2.1.1
-  - jruby-19mode
-  - jruby-head
+  - 2.2.2
 notifications:
   recipients:
-    - ricny046@gmail.com
+    - ricn@rny.io
 before_install:
+  - sudo apt-get update -qq
   - sudo apt-get install libreoffice

data/README.md

@@ -1,9 +1,10 @@
 # Libreconv
 
-Convert office documents to PDF using LibreOffice / OpenOffice.
+Convert office documents using LibreOffice / OpenOffice to one of their supported formats.
 
 [![Code Climate](https://codeclimate.com/github/ricn/libreconv.png)](https://codeclimate.com/github/ricn/libreconv)
 [![Build Status](https://travis-ci.org/ricn/libreconv.png?branch=master)](https://travis-ci.org/ricn/libreconv)
+[![Gem Version](https://badge.fury.io/rb/libreconv.svg)](http://badge.fury.io/rb/libreconv)
 
 ## Installation
 
@@ -41,6 +42,12 @@ Libreconv.convert('http://myserver.com/123/document.docx', '/Users/ricn/pdf_docu
 # If you for some reason can't have soffice in your PATH you can specifiy the file path to the soffice binary
 Libreconv.convert('document.docx', '/Users/ricn/pdf_documents', '/Applications/LibreOffice.app/Contents/MacOS/soffice')
 
+# Converts document.docx to my_document_as.html
+Libreconv.convert('document.docx', '/Users/ricn/pdf_documents/my_document_as.html', nil, 'html')
+
+# Converts document.docx to my_document_as.pdf using writer_pdf_Export filter
+Libreconv.convert('document.docx', '/Users/ricn/pdf_documents/my_document_as.pdf', nil, 'pdf:writer_pdf_Export')
+
 ```
 
 ## Credits

data/lib/libreconv.rb

@@ -6,18 +6,19 @@ require "spoon"
 
 module Libreconv
 
-  def self.convert(source, target, soffice_command = nil)
-    Converter.new(source, target, soffice_command).convert
+  def self.convert(source, target, soffice_command = nil, convert_to = nil)
+    Converter.new(source, target, soffice_command, convert_to).convert
   end
 
   class Converter
     attr_accessor :soffice_command
 
-    def initialize(source, target, soffice_command = nil)
+    def initialize(source, target, soffice_command = nil, convert_to = nil)
       @source = source
       @target = target
       @target_path = Dir.tmpdir
       @soffice_command = soffice_command
+      @convert_to = convert_to || "pdf"
       determine_soffice_command
       check_source_type
 
@@ -29,10 +30,10 @@ module Libreconv
     def convert
       orig_stdout = $stdout.clone
       $stdout.reopen File.new('/dev/null', 'w')
-      pid = Spoon.spawnp(@soffice_command, "--headless", "--convert-to", "pdf", @source, "--outdir", @target_path)
+      pid = Spoon.spawnp(@soffice_command, "--headless", "--convert-to", @convert_to, @source, "--outdir", @target_path)
       Process.waitpid(pid)
       $stdout.reopen orig_stdout
-      target_tmp_file = "#{@target_path}/#{File.basename(@source, ".*")}.pdf"
+      target_tmp_file = "#{@target_path}/#{File.basename(@source, ".*")}.#{File.basename(@convert_to, ":*")}"
       FileUtils.cp target_tmp_file, @target
     end
 
@@ -58,10 +59,10 @@ module Libreconv
     end
 
     def check_source_type
-      is_file = File.exists?(@source) && !File.directory?(@source)
-      is_http = URI(@source).scheme == "http" && Net::HTTP.get_response(URI(@source)).is_a?(Net::HTTPSuccess)
-      is_https = URI(@source).scheme == "https" && Net::HTTP.get_response(URI(@source)).is_a?(Net::HTTPSuccess)
-      raise IOError, "Source (#{@source}) is neither a file nor an URL." unless is_file || is_http || is_https
+      return if File.exists?(@source) && !File.directory?(@source) #file
+      return if URI(@source).scheme == "http" && Net::HTTP.get_response(URI(@source)).is_a?(Net::HTTPSuccess) #http
+      return if URI(@source).scheme == "https" && Net::HTTP.get_response(URI(@source)).is_a?(Net::HTTPSuccess) #https
+      raise IOError, "Source (#{@source}) is neither a file nor an URL."
     end
   end
-end
+end

data/lib/libreconv/version.rb

@@ -1,3 +1,3 @@
 module Libreconv
-  VERSION = "0.9.0"
+  VERSION = "0.9.1"
 end

data/libreconv.gemspec

@@ -18,7 +18,7 @@ Gem::Specification.new do |spec|
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ["lib"]
   spec.add_dependency "spoon"
-  spec.add_development_dependency "bundler", "~> 1.6.0.rc2"
+  spec.add_development_dependency "bundler", ">= 0"
   spec.add_development_dependency "rake"
-  spec.add_development_dependency "rspec", "~> 3.0.0.rc1"
+  spec.add_development_dependency "rspec", "~> 3.2.0"
 end

metadata

@@ -1,81 +1,81 @@
 --- !ruby/object:Gem::Specification
 name: libreconv
 version: !ruby/object:Gem::Version
-  version: 0.9.0
+  version: 0.9.1
 platform: ruby
 authors:
 - Richard Nyström
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-05-31 00:00:00.000000000 Z
+date: 2015-07-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: spoon
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - '>='
       - !ruby/object:Gem::Version
-        version: 1.6.0.rc2
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - '>='
       - !ruby/object:Gem::Version
-        version: 1.6.0.rc2
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
-        version: 3.0.0.rc1
+        version: 3.2.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
-        version: 3.0.0.rc1
-description: " Convert office documents to PDF using LibreOffice. "
+        version: 3.2.0
+description: ' Convert office documents to PDF using LibreOffice. '
 email:
 - ricny046@gmail.com
 executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- ".gitignore"
-- ".rspec"
-- ".travis.yml"
+- .gitignore
+- .rspec
+- .travis.yml
 - Gemfile
 - LICENSE.txt
 - README.md
@@ -100,17 +100,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.0.14
 signing_key: 
 specification_version: 4
 summary: Convert office documents to PDF.