aemo 0.3.4 → 0.4.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1443b588f5e1788990cd664a451296af4a5386c4851b894ae7de29e62b677d37
-  data.tar.gz: c9638e4a8581a27b8797f44b42911b2543c36f7c70d32af809602baf43405e61
+  metadata.gz: 98c8087e9430d757f5f0326a10ce9a6f9b2eb8fb6b413335499289a02e70022a
+  data.tar.gz: 1a80168bf15d0046e74c055714a9b49d6b141ee24eeb35a7254d44ef5f6007ab
 SHA512:
-  metadata.gz: 744c0200a98d66165f8b9d86808fd424a7c5bcf9e7ef0ccf9f6ed147ab5d7827d9c90eda79c6c2f8203413ce3b4bcf86de108691d31fc276857439014f0a48d2
-  data.tar.gz: 6c23a44d9eb7231f14657b5dbb58d60a3da42b079901cedcd5554dd8014411c1bbdadb747bd4848963408707a5d35f827b0e5229032f78c7f633e15230f39fbf
+  metadata.gz: d5a42692ef180b3ae84da2cbc61e81d7c2b74b35bddeddf3d26491e8ea5158a352c02d7c74d1f5125c20cd4e1dd6a500e3c374d1407de4045f243d4775b34d96
+  data.tar.gz: cbcce7c2aa879525fc862549316ecbcf1db04dbd61d21c73fe59a20dc9d1db666a29c23e7eeef9ef5b8521265adc5956a1c428009dc458f4489a3d7dc291e9ea

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
@@ -338,7 +342,7 @@ module AEMO
         register_id: csv[3],
         nmi_suffix: csv[4],
         mdm_data_streaming_identifier: csv[5],
-        meter_serial_nubmer: csv[6],
+        meter_serial_number: csv[6],
         uom: csv[7].upcase,
         interval_length: csv[8].to_i,
         next_scheduled_read_date: csv[9]
@@ -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.4'
+  VERSION = '0.4.1'
 
   # aemo version split amongst different revisions
   MAJOR_VERSION, MINOR_VERSION, REVISION = VERSION.split('.').map(&:to_i)

metadata

@@ -1,17 +1,17 @@
 --- !ruby/object:Gem::Specification
 name: aemo
 version: !ruby/object:Gem::Version
-  version: 0.3.4
+  version: 0.4.1
 platform: ruby
 authors:
 - Joel Courtney
 - Stuart Auld
 - Neil Parikh
 - Olivier Nsabimana
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2018-11-17 00:00:00.000000000 Z
+date: 2020-12-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -22,7 +22,7 @@ dependencies:
         version: 4.2.6
     - - "<"
       - !ruby/object:Gem::Version
-        version: '5.2'
+        version: '7.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -32,7 +32,7 @@ dependencies:
         version: 4.2.6
     - - "<"
       - !ruby/object:Gem::Version
-        version: '5.2'
+        version: '7.1'
 - !ruby/object:Gem::Dependency
   name: httparty
   requirement: !ruby/object:Gem::Requirement
@@ -77,62 +77,96 @@ dependencies:
   name: multi_xml
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.5.0
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.6'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.5.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.5.0
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.6'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.5.0
 - !ruby/object:Gem::Dependency
   name: nokogiri
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.8'
+        version: '1.10'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.8.5
+        version: 1.10.4
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.8'
+        version: '1.10'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.8.5
+        version: 1.10.4
 - !ruby/object:Gem::Dependency
-  name: awesome_print
+  name: rexml
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.8.0
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: addressable
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.8'
+        version: '2.8'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 2.8.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.8'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 2.8.0
+- !ruby/object:Gem::Dependency
+  name: awesome_print
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.8'
     - - ">="
       - !ruby/object:Gem::Version
         version: 1.8.0
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.8'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.8.0
 - !ruby/object:Gem::Dependency
   name: coveralls
   requirement: !ruby/object:Gem::Requirement
@@ -177,62 +211,62 @@ dependencies:
   name: guard-yard
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 2.2.0
     - - "~>"
       - !ruby/object:Gem::Version
         version: '2.2'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 2.2.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 2.2.0
     - - "~>"
       - !ruby/object:Gem::Version
         version: '2.2'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 2.2.0
 - !ruby/object:Gem::Dependency
-  name: jeweler
+  name: listen
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.3'
+        version: '3.1'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 2.3.7
+        version: 3.5.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.3'
+        version: '3.1'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 2.3.7
+        version: 3.5.0
 - !ruby/object:Gem::Dependency
-  name: listen
+  name: minitest
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.1'
-    - - '='
+        version: '5.14'
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 3.1.5
+        version: 5.14.2
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.1'
-    - - '='
+        version: '5.14'
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 3.1.5
+        version: 5.14.2
 - !ruby/object:Gem::Dependency
   name: rack
   requirement: !ruby/object:Gem::Requirement
@@ -257,60 +291,60 @@ dependencies:
   name: rdoc
   requirement: !ruby/object:Gem::Requirement
     requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '6.3'
     - - ">="
       - !ruby/object:Gem::Version
         version: 5.1.0
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '5.1'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '6.3'
     - - ">="
       - !ruby/object:Gem::Version
         version: 5.1.0
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '5.1'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 3.7.0
     - - "~>"
       - !ruby/object:Gem::Version
         version: '3.7'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 3.7.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 3.7.0
     - - "~>"
       - !ruby/object:Gem::Version
         version: '3.7'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 3.7.0
 - !ruby/object:Gem::Dependency
   name: rubocop
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 0.52.1
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: 0.52.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 0.52.1
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: 0.52.1
 - !ruby/object:Gem::Dependency
@@ -357,22 +391,22 @@ dependencies:
   name: webmock
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 3.1.0
     - - "~>"
       - !ruby/object:Gem::Version
         version: '3.1'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 3.1.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 3.1.0
     - - "~>"
       - !ruby/object:Gem::Version
         version: '3.1'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 3.1.0
 - !ruby/object:Gem::Dependency
   name: yard
   requirement: !ruby/object:Gem::Requirement
@@ -556,7 +590,7 @@ homepage: https://github.com/jufemaiz/aemo
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -564,15 +598,15 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.3.0
+      version: 2.6.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.1
-signing_key: 
+rubygems_version: 3.2.23
+signing_key:
 specification_version: 4
 summary: Gem providing functionality for the Australian Energy Market Operator data
 test_files: