aemo 0.3.5 → 0.3.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2e036164503970b8109a8a7a8c26ebdb3dfffb05954cb3f1226aa547d2f48978
-  data.tar.gz: 18d839838bf0da9a9e0d117b902e027405e8d1af750742ba51cb6dcaef60b321
+  metadata.gz: 23bf34dda3b788053ddf01fcd40497dc7f06a8cff209d03dac214d45391d753e
+  data.tar.gz: 1128cc1092cfe865449d4781da7f730fb2b528898bf8e7030f38dca21ce0ce87
 SHA512:
-  metadata.gz: 2eefd5cbddfdc6fb6eb2e65f401a17ba9b66508d704c44c7a2dabfe8dc9a7760522f9c77affff4a1a2ec9aec5904ca805fc1523b6ddb3bc1b8cbf2482c1d583f
-  data.tar.gz: b9c1267af166577899810bb0e7eac204f0aa47aaf36767a7440a48e40e15a5df860b34741a9a8be2f787be4a2f60b1810137d6f5c4d91e834843712b7546e3f2
+  metadata.gz: 7ba042960c1b4ce73347433c3814c20b8a36c6eba00c1c1ae8d250b8d9bf128cf360a5ec4f62fa61fdfa97836d6117f8ca24f524e27be131737e2ff07d6b4965
+  data.tar.gz: ab12814656e7a026ff59a945ee08308474fe91407a7516f863ff3ae765be37de100ebcc99a1a22c4fe3351fa91e8289e1bfed549c15afbf2d111ea7f569682ea

data/lib/aemo/nem12.rb

@@ -274,6 +274,8 @@ module AEMO
     attr_accessor :file_contents, :header, :nmi_data_details, :nmi
 
     # Initialize a NEM12 file
+    # @param [string] nmi
+    # @param [Hash] options
     def initialize(nmi, options = {})
       @nmi              = AEMO::NMI.new(nmi) unless nmi.empty?
       @data_details     = []
@@ -291,6 +293,7 @@ module AEMO
 
     # Parses the header record
     # @param [String] line A single line in string format
+    # @param [Hash] options
     # @return [Hash] the line parsed into a hash of information
     def self.parse_nem12_100(line, options = {})
       csv = line.parse_csv
@@ -312,6 +315,7 @@ module AEMO
 
     # Parses the NMI Data Details
     # @param [String] line A single line in string format
+    # @param [Hash] options
     # @return [Hash] the line parsed into a hash of information
     def parse_nem12_200(line, options = {})
       csv = line.parse_csv
@@ -346,6 +350,7 @@ module AEMO
     end
 
     # @param [String] line A single line in string format
+    # @param [Hash] options
     # @return [Array of hashes] the line parsed into a hash of information
     def parse_nem12_300(line, options = {})
       csv = line.parse_csv
@@ -380,7 +385,7 @@ module AEMO
         if csv[intervals_offset + 3].match(/\d{14}/).nil? || csv[intervals_offset + 3] != Time.parse(csv[intervals_offset + 3].to_s).strftime('%Y%m%d%H%M%S')
           raise ArgumentError, 'UpdateDateTime is not valid'
         end
-        if !csv[intervals_offset + 4].nil? && csv[intervals_offset + 4].match(/\d{14}/).nil? || csv[intervals_offset + 4] != Time.parse(csv[intervals_offset + 4].to_s).strftime('%Y%m%d%H%M%S')
+        if !csv[intervals_offset + 4].blank? && csv[intervals_offset + 4].match(/\d{14}/).nil? || !csv[intervals_offset + 4].blank? && csv[intervals_offset + 4] != Time.parse(csv[intervals_offset + 4].to_s).strftime('%Y%m%d%H%M%S')
           raise ArgumentError, 'MSATSLoadDateTime is not valid'
         end
       end
@@ -397,7 +402,23 @@ module AEMO
         flag[:reason_code] = csv[intervals_offset + 1].to_i unless csv[intervals_offset + 1].nil?
       end
 
-      base_interval = { data_details: @data_details.last, datetime: Time.parse("#{csv[1]}000000+1000"), value: nil, flag: flag }
+      # Deal with updated_at & msats_load_at
+      updated_at = nil
+      msats_load_at = nil
+
+      if options[:strict]
+        updated_at = Time.parse(csv[intervals_offset + 3]) unless csv[intervals_offset + 3].blank?
+        msats_load_at = Time.parse(csv[intervals_offset + 4]) unless csv[intervals_offset + 4].blank?
+      end
+
+      base_interval = {
+        data_details: @data_details.last,
+        datetime: Time.parse("#{csv[1]}000000+1000"),
+        value: nil,
+        flag: flag,
+        updated_at: updated_at,
+        msats_load_at: msats_load_at
+      }
 
       intervals = []
       (2..(number_of_intervals + 1)).each do |i|
@@ -411,8 +432,9 @@ module AEMO
     end
 
     # @param [String] line A single line in string format
+    # @param [Hash] options
     # @return [Hash] the line parsed into a hash of information
-    def parse_nem12_400(line)
+    def parse_nem12_400(line, options = {})
       csv = line.parse_csv
       raise ArgumentError, 'RecordIndicator is not 400'     if csv[0] != '400'
       raise ArgumentError, 'StartInterval is not valid'     if csv[1].nil? || csv[1].match(/^\d+$/).nil?
@@ -451,11 +473,17 @@ module AEMO
       interval_events
     end
 
+    # What even is a 500 row?
+    #
     # @param [String] line A single line in string format
+    # @param [Hash] _options
     # @return [Hash] the line parsed into a hash of information
     def parse_nem12_500(_line, _options = {}); end
 
+    # 900 is the last row a NEM12 should see...
+    #
     # @param [String] line A single line in string format
+    # @param [Hash] _options
     # @return [Hash] the line parsed into a hash of information
     def parse_nem12_900(_line, _options = {}); end
 
@@ -522,13 +550,13 @@ module AEMO
           nem12s << AEMO::NEM12.new('')
           nem12s.last.parse_nem12_200(line, strict: strict)
         when 300
-          nem12s.last.parse_nem12_300(line)
+          nem12s.last.parse_nem12_300(line, strict: strict)
         when 400
-          nem12s.last.parse_nem12_400(line)
+          nem12s.last.parse_nem12_400(line, strict: strict)
           # when 500
-          #   nem12s.last.parse_nem12_500(line)
+          #   nem12s.last.parse_nem12_500(line, strict: strict)
           # when 900
-          #   nem12s.last.parse_nem12_900(line)
+          #   nem12s.last.parse_nem12_900(line, strict: strict)
         end
       end
       # Return the array of NEM12 groups

data/lib/aemo/nmi/allocation.rb

@@ -440,7 +440,7 @@ module AEMO
       def initialize(title, type, opts = {})
         @title = title
         @type = parse_allocation_type(type)
-        @identifier = opts.fetch(:identifier, title.upcase)
+        @identifier = opts.fetch(:participant_id, title.upcase)
         @friendly_title = opts.fetch(:friendly_title, title)
         @exclude_nmi_patterns = opts.fetch(:excludes, [])
         @include_nmi_patterns = opts.fetch(:includes, [])

data/lib/aemo/version.rb

@@ -24,7 +24,7 @@
 # @author Joel Courtney <euphemize@gmail.com>
 module AEMO
   # aemo version
-  VERSION = '0.3.5'
+  VERSION = '0.3.6'
 
   # aemo version split amongst different revisions
   MAJOR_VERSION, MINOR_VERSION, REVISION = VERSION.split('.').map(&:to_i)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: aemo
 version: !ruby/object:Gem::Version
-  version: 0.3.5
+  version: 0.3.6
 platform: ruby
 authors:
 - Joel Courtney
@@ -571,7 +571,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.1
+rubygems_version: 3.0.3
 signing_key: 
 specification_version: 4
 summary: Gem providing functionality for the Australian Energy Market Operator data