word-to-markdown 1.1.0 → 1.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8d0a6d4dbb16a5c53ffc336d781b5ca275acaf61
-  data.tar.gz: 16c255b3f304c01a89d215500cdc9e235149e119
+  metadata.gz: 8826b727f290781e7713325662d056482018d730
+  data.tar.gz: 8692363359366aac70359bf251ccba409f80bba7
 SHA512:
-  metadata.gz: 4b6ecd85ac312939fff436970472dc3d350b6d75d8a42bb82d3633a06f95ac8a970f04765da64f2ac5a2221ef492ed6ba7efd5b06a8e4ea850998826cc85a4b4
-  data.tar.gz: 4612cadf0ba9f7b3409a7d0d378f960084bcca8980e3b6ca1e7436dc67011a33dbbb7817641cb177b769f83e92abb09f29e8758b151e2d4076e3395d00ccd4f7
+  metadata.gz: 8db1e766ad6bfc341de71a4fc82d14f8a3d109005f2bda9d779af2bd7b0f722d160cf873bff98cf56f9fa7929ab9282e945d249fc220fa56beafe46bd962cf9c
+  data.tar.gz: fd84315c249e983a6bdf073a8573d2fbca82886ed05da15b8325ceca4f655b3181cee6ee20cf888c933a4b10794a5c5145ad86a8f9ebf8f9550163de9ce284da

data/lib/nokogiri/xml/element.rb

@@ -2,12 +2,14 @@ module Nokogiri
   module XML
     class Element
 
+      DEFAULT_FONT_SIZE = 12.to_f
+
       # The node's font size
       # Used for guessing heading sizes
       #
       # Returns a float with the font-size
       def font_size
-        styles['font-size'].to_f if styles['font-size']
+        styles['font-size'] ? styles['font-size'].to_f : DEFAULT_FONT_SIZE
       end
 
       def bold?

data/lib/word-to-markdown.rb

@@ -4,6 +4,8 @@ require 'premailer'
 require 'nokogiri'
 require 'nokogiri-styles'
 require 'tmpdir'
+require 'rbconfig'
+require 'open3'
 require_relative 'word-to-markdown/version'
 require_relative 'word-to-markdown/document'
 require_relative 'word-to-markdown/converter'
@@ -29,34 +31,42 @@ class WordToMarkdown
     converter.convert!
   end
 
-  # source: https://github.com/ricn/libreconv/blob/master/lib/libreconv.rb#L48
-  def self.which(cmd)
-    exts = ENV['PATHEXT'] ? ENV['PATHEXT'].split(';') : ['']
-    ENV['PATH'].split(File::PATH_SEPARATOR).each do |path|
-      exts.each do |ext|
-        exe = File.join(path, "#{cmd}#{ext}")
-        return exe if File.executable? exe
-      end
+  # source: https://stackoverflow.com/questions/11784109/detecting-operating-systems-in-ruby
+  def self.os
+    @os ||= (
+    host_os = RbConfig::CONFIG['host_os']
+    case host_os
+    when /mswin|msys|mingw|cygwin|bccwin|wince|emc/
+      :windows
+    when /darwin|mac os/
+      :macosx
+    when /linux/
+      :linux
+    when /solaris|bsd/
+      :unix
+    else
+      raise Error::WebDriverError, "unknown os: #{host_os.inspect}"
     end
-
-    return nil
+    )
   end
 
   def self.soffice_path
-    if RUBY_PLATFORM.include?("darwin")
+    case os
+    when :macosx
       %w[~/Applications /Applications]
-        .map  { |f| File.join(f, "/LibreOffice.app/Contents/MacOS/soffice") }
-        .find { |f| File.file?(f) } || -> { raise RuntimeError.new("Coudln't find LibreOffice on your machine.") }.call
+        .map  { |f| File.expand_path(File.join(f, "/LibreOffice.app/Contents/MacOS/soffice")) }
+        .find { |f| File.file?(f) }
+    when :windows
+      'C:\Program Files (x86)\LibreOffice 4\program\soffice.exe'
     else
-      soffice_path ||= which("soffice")
-      soffice_path ||= which("soffice.bin")
-      soffice_path ||= "soffice"
+      "soffice"
     end
   end
 
-  # Ideally this would be done via open3, but Travis CI can't seen to find soffice when we do
   def self.run_command(*args)
-    `#{soffice_path} #{args.join(' ')}`
+    output, status = Open3.capture2e(soffice_path, *args)
+    raise "Command `#{soffice_path} #{args.join(" ")}` failed: #{output}" if status != 0
+    output
   end
 
   def self.soffice_version

data/lib/word-to-markdown/document.rb

@@ -85,7 +85,7 @@ class WordToMarkdown
 
     def raw_html
       @raw_html ||= begin
-        WordToMarkdown::run_command '--headless', '--convert-to', 'html', "'#{path}'", '--outdir', tmpdir
+        WordToMarkdown::run_command '--headless', '--convert-to', 'html', path, '--outdir', tmpdir
         html = File.read dest_path
         File.delete dest_path
         html

data/lib/word-to-markdown/version.rb

@@ -1,3 +1,3 @@
 class WordToMarkdown
-  VERSION = "1.1.0"
+  VERSION = "1.1.1"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: word-to-markdown
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.1.1
 platform: ruby
 authors:
 - Ben Balter
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-11-16 00:00:00.000000000 Z
+date: 2015-01-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: reverse_markdown
@@ -16,28 +16,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.5'
+        version: '0.6'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.5'
+        version: '0.6'
 - !ruby/object:Gem::Dependency
   name: descriptive_statistics
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.1'
+        version: '2.5'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.1'
+        version: '2.5'
 - !ruby/object:Gem::Dependency
   name: premailer
   requirement: !ruby/object:Gem::Requirement
@@ -72,14 +72,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.3'
+        version: '10.4'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.3'
+        version: '10.4'
 - !ruby/object:Gem::Dependency
   name: shoulda
   requirement: !ruby/object:Gem::Requirement
@@ -94,20 +94,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '3.5'
-- !ruby/object:Gem::Dependency
-  name: rdoc
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '4.1'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '4.1'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -128,28 +114,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.9'
+        version: '0.10'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.9'
+        version: '0.10'
 - !ruby/object:Gem::Dependency
   name: mocha
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '1.1'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '1.1'
 - !ruby/object:Gem::Dependency
   name: minitest
   requirement: !ruby/object:Gem::Requirement