mpxj 5.3.2 → 5.3.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 220419d39cce3bf112eb4188809ff1c7a0bf395c
-  data.tar.gz: bab3686c96f9b02d5dc23d396286ee779b8deeea
+  metadata.gz: d48d8f223d1fd77574f1f6764b08b67264d29738
+  data.tar.gz: b47853447264f23b57baa1011dbb93705d4ff82b
 SHA512:
-  metadata.gz: 0571376e197b5fe0cd6cbcfbb2eef6fc0fc19a0874b81273cbf9ad5350654098cedcd17258d9f5eac5ef5d4de4768c8c6a0329fc0790681e2c737a8d4e4f4fa3
-  data.tar.gz: 3359508ed02db8132202750d9768f2cc14ea57f1d18d402fac72ea5e22fb34546d0a9ecc9562383f2ace6550af785280e1008364a037e4f655719519a72cb909
+  metadata.gz: 2fd754903bba12dd5e5e808c2fa57bae4ff8516f44aa2c5b463cce4d173c29e9116d817f457345edfa441334012bcd2b08390abe4d15f8f673f4df52e9a17ead
+  data.tar.gz: 24ef1c4b853b34efe8fed6a0dee0f45dec4092fdfe3d268c4a124499d11026893b9bf22835a3f49fe2d35d4d0f2f5a0e071e7dcb317e80bc02686aee9a073bf3

data/lib/mpxj.rb

@@ -8,5 +8,9 @@ require "mpxj/assignment"
 require "mpxj/relation"
 require "mpxj/reader"
 
+require "mpxj/argument_error"
+require "mpxj/runtime_error"
+require "mpxj/unknown_error"
+
 module MPXJ
 end

data/lib/mpxj/argument_error.rb

@@ -0,0 +1,5 @@
+module MPXJ
+  # Custom exception class for MPXJ
+  class ArgumentError < ::RuntimeError
+  end
+end

data/lib/mpxj/reader.rb

@@ -21,7 +21,7 @@ module MPXJ
         classpath = Dir["#{File.dirname(__FILE__)}/*.jar"].join(path_separator)
         java_output = `java -cp \"#{classpath}\" net.sf.mpxj.sample.MpxjConvert \"#{file_name}\" \"#{json_file.path}\"`
         if $?.exitstatus != 0
-          raise "Failed to read file: #{java_output}"
+          report_error(java_output)
         end
         project = Project.new(json_file, tz)
       ensure
@@ -44,5 +44,19 @@ module MPXJ
     def self.windows?
       (/cygwin|mswin|mingw|bccwin|wince|emx/ =~ RUBY_PLATFORM) != nil
     end
+    
+     # @private
+    def self.report_error(java_output)
+      if java_output.include?('Conversion Error: ')
+        message = java_output.split('Conversion Error: ')[1]
+        if message.include?('Cannot read files of type:')
+          raise MPXJ::ArgumentError, message
+        else
+          raise MPXJ::RuntimeError, message
+        end
+      else        
+        raise MPXJ::UnknownError, "Failed to read file: #{java_output}"
+      end
+    end
   end
 end

data/lib/mpxj/runtime_error.rb

@@ -0,0 +1,5 @@
+module MPXJ
+  # Custom exception class for MPXJ
+  class RuntimeError < ::RuntimeError
+  end
+end

data/lib/mpxj/unknown_error.rb

@@ -0,0 +1,5 @@
+module MPXJ
+  # Custom exception class for MPXJ
+  class UnknownError < ::RuntimeError
+  end
+end

data/lib/mpxj/version.rb

@@ -1,5 +1,5 @@
 # MPXJ gem module
 module MPXJ
   # MPXJ gem version number
-  VERSION = "5.3.2"
+  VERSION = "5.3.3"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mpxj
 version: !ruby/object:Gem::Version
-  version: 5.3.2
+  version: 5.3.3
 platform: ruby
 authors:
 - Jon Iles
@@ -116,23 +116,21 @@ files:
 - legal/licence.sqlite-jdbc.txt
 - legal/licence.txt
 - lib/mpxj.rb
+- lib/mpxj/argument_error.rb
 - lib/mpxj/assignment.rb
 - lib/mpxj/container.rb
 - lib/mpxj/mpxj.jar
-- lib/mpxj/poi-3.11-20141221.jar
 - lib/mpxj/poi-3.12-20150511.jar
 - lib/mpxj/project.rb
 - lib/mpxj/properties.rb
 - lib/mpxj/reader.rb
 - lib/mpxj/relation.rb
 - lib/mpxj/resource.rb
-- lib/mpxj/rtfparserkit-1.2.0.jar
-- lib/mpxj/rtfparserkit-1.4.0.jar
-- lib/mpxj/rtfparserkit-1.5.0.jar
-- lib/mpxj/rtfparserkit-1.6.0.jar
 - lib/mpxj/rtfparserkit-1.8.0.jar
+- lib/mpxj/runtime_error.rb
 - lib/mpxj/sqlite-jdbc-3.8.10.1.jar
 - lib/mpxj/task.rb
+- lib/mpxj/unknown_error.rb
 - lib/mpxj/version.rb
 homepage: http://mpxj.sf.net
 licenses: