mpxj 5.1.4 → 5.1.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: aa50a528b318b58c6f5cb10947b9f09104683365
-  data.tar.gz: 5bb863de2da647861cce6f4aea5152358a36205d
+  metadata.gz: 0c0e87a47f2bc034ae61e4b12a179d886ab91669
+  data.tar.gz: 1c52ba2b1f7ebae4d71012835c74dc99f69fda60
 SHA512:
-  metadata.gz: a18498f76954ef98f1d5e97ecbe11d2c8ea22435dc44304a91324574bd818d3852438eac471d0e8190cb689e6d8dfcb7419b09716207ffc04a00ecf18690e562
-  data.tar.gz: 77a2bbdd0fb8c12cbb2cdfcede80ef3ca4dc82d719903e3661400bfa2eb99a15eaeacc7da858dfbc689b1d774e3624391e41d813e896992e5b09ad172eeb618b
+  metadata.gz: 1859ce007798e9aaa4531795d8390d9f3faf18babceadd4de7b3787da703d6970d09691844867790bebeeed250860a294ddc4ef377036900bb80d31cb4f7d0fe
+  data.tar.gz: bfa39261df30d3856c4d502620b1ca0b3e700d271b5e2bc26d8bbe87e85a1112483df2c1a46903f78e6d4c8e2ccbe8a89d3725a763f6939777d36381b7645850

data/lib/mpxj/container.rb

@@ -62,7 +62,7 @@ module MPXJ
       if attribute_value.nil?
         nil
       else
-        Time.parse(attribute_value)
+        @parent_project.zone.parse(attribute_value)
       end
     end
 

data/lib/mpxj/project.rb

@@ -8,7 +8,9 @@ module MPXJ
     attr_reader :all_tasks
     attr_reader :child_tasks
     attr_reader :all_assignments
-    def initialize(file_name)
+    attr_reader :zone
+    
+    def initialize(file_name, zone)
       @resources_by_unique_id = {}
       @tasks_by_unique_id = {}
 
@@ -20,6 +22,8 @@ module MPXJ
       @all_assignments = []
       @child_tasks = []
 
+      @zone = zone
+
       file = File.read(file_name)
       json_data = JSON.parse(file)
       process_properties(json_data)

data/lib/mpxj/reader.rb

@@ -1,23 +1,29 @@
 require 'tempfile'
+require 'active_support/core_ext/time/calculations'
 
 module MPXJ
   # Used to read a project plan from a file
   class Reader
     # Reads a project plan from a file, and returns a Project instance
-    #   which provides access to the structure and attributes of the project data.
+    # which provides access to the structure and attributes of the project data.
+    # Note that an optional timezone can be supplied to ensue that all date-time
+    # values returned are in the specified timezone.
     #
     # @param file_name [String] the name of the file to read
+    # @param zone [ActiveSupport::TimeZone] an optional timezone
     # @return [Project] new Project instance
-    def self.read(file_name)
+    def self.read(file_name, zone = nil)
       project = nil
       json_file = Tempfile.new([File.basename(file_name, ".*"), '.json'])
+      tz = zone || Time.zone || ActiveSupport::TimeZone["UTC"]
+    
       begin
         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}"
         end
-        project = Project.new(json_file)
+        project = Project.new(json_file, tz)
       ensure
         json_file.close
         json_file.unlink

data/lib/mpxj/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mpxj
 version: !ruby/object:Gem::Version
-  version: 5.1.4
+  version: 5.1.6
 platform: ruby
 authors:
 - Jon Iles
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2015-06-03 00:00:00.000000000 Z
+date: 2015-07-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -80,6 +80,34 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: tzinfo-data
+  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: activesupport
+  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'
 description: 
 email:
 - jon.iles@bcs.org.uk