aemo 0.5.0 → 0.6.0

data/lib/aemo/nem12.rb

@@ -14,6 +14,9 @@ module AEMO
   # Namespace for classes and modules that handle AEMO Gem NEM12 interactions
   # @since 0.1.4
   class NEM12
+    CRLF = "\r\n"
+    CSV_SEPARATOR = ','
+
     @file_contents    = nil
     @header           = nil
     @nmi_data_details = []
@@ -26,10 +29,108 @@ module AEMO
     attr_reader   :data_details, :interval_data, :interval_events
     attr_accessor :file_contents, :header, :nmi_data_details, :nmi
 
+    # Class methods.
+    class << self
+      # @param [String] path_to_file the path to a file
+      # @return [Array<AEMO::NEM12>] NEM12 object
+      def parse_nem12_file(path_to_file, strict: true)
+        parse_nem12(File.read(path_to_file), strict:)
+      end
+
+      # @param [String] contents the path to a file
+      # @param [Boolean] strict
+      # @return [Array<AEMO::NEM12>] An array of NEM12 objects
+      def parse_nem12(contents, strict: true)
+        file_contents = contents.tr("\r", "\n").tr("\n\n", "\n").split("\n").delete_if(&:empty?)
+        # nothing to further process
+        return [] if file_contents.empty?
+
+        unless file_contents.first.parse_csv[0] == '100'
+          raise ArgumentError,
+                'First row should be have a RecordIndicator of 100 and be of type Header Record'
+        end
+
+        nem12s = []
+        header = AEMO::NEM12.parse_nem12_100(file_contents.first, strict:)
+        file_contents.each do |line|
+          case line[0..2].to_i
+          when 200
+            nem12s << AEMO::NEM12.new('')
+            nem12s.last.header = header
+            nem12s.last.parse_nem12_200(line, strict:)
+          when 300
+            nem12s.last.parse_nem12_300(line, strict:)
+          when 400
+            nem12s.last.parse_nem12_400(line, strict:)
+            # when 500
+            #   nem12s.last.parse_nem12_500(line, strict: strict)
+            # when 900
+            #   nem12s.last.parse_nem12_900(line, strict: strict)
+          end
+        end
+        # Return the array of NEM12 groups
+        nem12s
+      end
+
+      # Parses the header record
+      # @param [String] line A single line in string format
+      # @param [Boolean] strict
+      # @return [Hash] the line parsed into a hash of information
+      def parse_nem12_100(line, strict: true) # rubocop:disable Naming/VariableNumber
+        csv = line.parse_csv
+
+        raise ArgumentError, 'RecordIndicator is not 100'     if csv[0] != '100'
+        raise ArgumentError, 'VersionHeader is not NEM12'     if csv[1] != 'NEM12'
+
+        raise ArgumentError, 'Time is not valid' if strict && !AEMO::Time.valid_timestamp12?(csv[2])
+
+        raise ArgumentError, 'FromParticipant is not valid'  if csv[3].match(/.{1,10}/).nil?
+        raise ArgumentError, 'ToParticipant is not valid'    if csv[4].match(/.{1,10}/).nil?
+
+        datetime = strict && AEMO::Time.valid_timestamp12?(csv[2]) ? AEMO::Time.parse_timestamp12(csv[2]) : nil
+
+        {
+          record_indicator: csv[0].to_i,
+          version_header: csv[1],
+          datetime:,
+          from_participant: csv[3],
+          to_participant: csv[4]
+        }
+      end
+
+      # Default NEM12 100 row record.
+      #
+      # @return [String]
+      def default_nem12_100 # rubocop:disable Naming/VariableNumber
+        timestamp = AEMO::Time.format_timestamp12(::Time.now)
+
+        "100,NEM12,#{timestamp},ENOSI,ENOSI#{CRLF}"
+      end
+
+      # Default NEM12 100 row record.
+      #
+      # @return [String]
+      def default_nem12_900 # rubocop:disable Naming/VariableNumber
+        "900#{CRLF}"
+      end
+
+      # For a list of nem12s, turn into a single NEM12 CSV string with default header row.
+      #
+      # @param [Array<AEMO::NEM12>] nem12s
+      # @return [String]
+      def to_nem12_csv(nem12s:)
+        [
+          default_nem12_100,
+          nem12s.map(&:to_nem12_200_csv),
+          default_nem12_900
+        ].flatten.join
+      end
+    end
+
     # Initialize a NEM12 file
     # @param [string] nmi
     # @param [Hash] options
-    def initialize(nmi, options = {})
+    def initialize(nmi, options: {})
       @nmi              = AEMO::NMI.new(nmi) unless nmi.empty?
       @data_details     = []
       @interval_data    = []
@@ -41,49 +142,42 @@ module AEMO
 
     # Returns the NMI Identifier or nil
     def nmi_identifier
-      @nmi.nil? ? nil : @nmi.nmi
-    end
-
-    # 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
-
-      raise ArgumentError, 'RecordIndicator is not 100'     if csv[0] != '100'
-      raise ArgumentError, 'VersionHeader is not NEM12'     if csv[1] != 'NEM12'
-      raise ArgumentError, 'Time is not valid' if options[:strict] && (csv[2].match(/\d{12}/).nil? || csv[2] != Time.parse("#{csv[2]}00").strftime('%Y%m%d%H%M'))
-      raise ArgumentError, 'FromParticipant is not valid'  if csv[3].match(/.{1,10}/).nil?
-      raise ArgumentError, 'ToParticipant is not valid'    if csv[4].match(/.{1,10}/).nil?
-
-      {
-        record_indicator: csv[0].to_i,
-        version_header:   csv[1],
-        datetime:         Time.parse("#{csv[2]}+1000"),
-        from_participant: csv[3],
-        to_participant:   csv[4]
-      }
+      @nmi&.nmi
     end
 
     # Parses the NMI Data Details
     # @param [String] line A single line in string format
-    # @param [Hash] options
+    # @param [Boolean] strict
     # @return [Hash] the line parsed into a hash of information
-    def parse_nem12_200(line, options = {})
+    def parse_nem12_200(line, strict: true) # rubocop:disable Naming/VariableNumber
       csv = line.parse_csv
 
       raise ArgumentError, 'RecordIndicator is not 200'     if csv[0] != '200'
       raise ArgumentError, 'NMI is not valid'               unless AEMO::NMI.valid_nmi?(csv[1])
-      raise ArgumentError, 'NMIConfiguration is not valid' if options[:strict] && (csv[2].nil? || csv[2].match(/.{1,240}/).nil?)
+
+      if strict && (csv[2].nil? || csv[2].match(/.{1,240}/).nil?)
+        raise ArgumentError,
+              'NMIConfiguration is not valid'
+      end
+
       raise ArgumentError, 'RegisterID is not valid' if !csv[3].nil? && csv[3].match(/.{1,10}/).nil?
       raise ArgumentError, 'NMISuffix is not valid' if csv[4].nil? || csv[4].match(/[A-HJ-NP-Z][1-9A-HJ-NP-Z]/).nil?
-      raise ArgumentError, 'MDMDataStreamIdentifier is not valid' if !csv[5].nil? && !csv[5].empty? && !csv[5].match(/^\s*$/) && csv[5].match(/[A-Z0-9]{2}/).nil?
-      raise ArgumentError, 'MeterSerialNumber is not valid' if !csv[6].nil? && !csv[6].empty? && !csv[6].match(/^\s*$/) && csv[6].match(/[A-Z0-9]{2}/).nil?
+
+      if !csv[5].nil? && !csv[5].empty? && !csv[5].match(/^\s*$/) && csv[5].match(/[A-Z0-9]{2}/).nil?
+        raise ArgumentError,
+              'MDMDataStreamIdentifier is not valid'
+      end
+
+      if !csv[6].nil? && !csv[6].empty? && !csv[6].match(/^\s*$/) && csv[6].match(/[A-Z0-9]{2}/).nil?
+        raise ArgumentError,
+              'MeterSerialNumber is not valid'
+      end
+
       raise ArgumentError, 'UOM is not valid' if csv[7].nil? || csv[7].upcase.match(/[A-Z0-9]{2}/).nil?
       raise ArgumentError, 'UOM is not valid'               unless UOM.keys.map(&:upcase).include?(csv[7].upcase)
       raise ArgumentError, 'IntervalLength is not valid'    unless %w[1 5 10 15 30].include?(csv[8])
-      # raise ArgumentError, 'NextScheduledReadDate is not valid' if csv[9].match(/\d{8}/).nil? || csv[9] != Time.parse('#{csv[9]}').strftime('%Y%m%d')
+
+      # raise ArgumentError, 'NextScheduledReadDate is not valid' if !AEMO::Time.valid_timestamp8?(csv[9])
 
       @nmi = AEMO::NMI.new(csv[1])
 
@@ -103,43 +197,64 @@ module AEMO
     end
 
     # @param [String] line A single line in string format
-    # @param [Hash] options
+    # @param [Boolean] strict
     # @return [Array of hashes] the line parsed into a hash of information
-    def parse_nem12_300(line, options = {})
+    def parse_nem12_300(line, strict: true) # rubocop:disable Naming/VariableNumber
       csv = line.parse_csv
-      raise TypeError, 'Expected NMI Data Details to exist with IntervalLength specified' if @data_details.last.nil? || @data_details.last[:interval_length].nil?
+
+      if @data_details.last.nil? || @data_details.last[:interval_length].nil?
+        raise TypeError,
+              'Expected NMI Data Details to exist with IntervalLength specified'
+      end
 
       # ref: AEMO's MDFF Spec NEM12 and NEM13 v1.01 (2014-05-14)
       record_fixed_fields = %w[RecordIndicator IntervalDate QualityMethod ReasonCode ReasonDescription UpdateDatetime MSATSLoadDateTime]
       number_of_intervals = 1440 / @data_details.last[:interval_length]
+
       raise TypeError, 'Invalid record length' if csv.length != record_fixed_fields.length + number_of_intervals
 
       intervals_offset = number_of_intervals + 2
 
       raise ArgumentError, 'RecordIndicator is not 300' if csv[0] != '300'
-      raise ArgumentError, 'IntervalDate is not valid' if csv[1].match(/\d{8}/).nil? || csv[1] != Time.parse(csv[1].to_s).strftime('%Y%m%d')
+      raise ArgumentError, 'IntervalDate is not valid' unless AEMO::Time.valid_timestamp8?(csv[1])
+
       (2..(number_of_intervals + 1)).each do |i|
         raise ArgumentError, "Interval number #{i - 1} is not valid" if csv[i].nil? || csv[i].match(/\d+(\.\d+)?/).nil?
       end
-      raise ArgumentError, 'QualityMethod is not valid' unless csv[intervals_offset + 0].class == String
+
+      raise ArgumentError, 'QualityMethod is not valid' unless csv[intervals_offset + 0].instance_of?(String)
       raise ArgumentError, 'QualityMethod does not have valid length' unless [1, 3].include?(csv[intervals_offset + 0].length)
-      raise ArgumentError, 'QualityMethod does not have valid QualityFlag' unless QUALITY_FLAGS.keys.include?(csv[intervals_offset + 0][0])
+
+      unless QUALITY_FLAGS.keys.include?(csv[intervals_offset + 0][0])
+        raise ArgumentError,
+              'QualityMethod does not have valid QualityFlag'
+      end
+
       unless %w[A N V].include?(csv[intervals_offset + 0][0])
         raise ArgumentError, 'QualityMethod does not have valid length' unless csv[intervals_offset + 0].length == 3
-        raise ArgumentError, 'QualityMethod does not have valid MethodFlag' unless METHOD_FLAGS.keys.include?(csv[intervals_offset + 0][1..2].to_i)
-      end
-      unless %w[A N E].include?(csv[intervals_offset + 0][0])
-        raise ArgumentError, 'ReasonCode is not valid' unless REASON_CODES.keys.include?(csv[intervals_offset + 1].to_i)
+
+        unless METHOD_FLAGS.keys.include?(csv[intervals_offset + 0][1..2].to_i)
+          raise ArgumentError,
+                'QualityMethod does not have valid MethodFlag'
+        end
       end
-      if !csv[intervals_offset + 1].nil? && csv[intervals_offset + 1].to_i.zero?
-        raise ArgumentError, 'ReasonDescription is not valid' unless csv[intervals_offset + 2].class == String && !csv[intervals_offset + 2].empty?
+
+      raise ArgumentError, 'ReasonCode is not valid' if !%w[A N E].include?(csv[intervals_offset + 0][0]) && !REASON_CODES.keys.include?(csv[intervals_offset + 1].to_i)
+
+      if !csv[intervals_offset + 1].nil? && csv[intervals_offset + 1].to_i.zero? && !(csv[intervals_offset + 2].instance_of?(String) && !csv[intervals_offset + 2].empty?)
+        raise ArgumentError,
+              'ReasonDescription is not valid'
       end
-      if options[:strict]
-        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'
+
+      if strict
+        unless AEMO::Time.valid_timestamp14?(csv[intervals_offset + 3])
+          raise ArgumentError,
+                'UpdateDateTime is not valid'
         end
-        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'
+
+        if !csv[intervals_offset + 4].blank? && !AEMO::Time.valid_timestamp14?(csv[intervals_offset + 4])
+          raise ArgumentError,
+                'MSATSLoadDateTime is not valid'
         end
       end
 
@@ -159,18 +274,18 @@ module AEMO
       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?
+      if strict
+        updated_at = AEMO::Time.parse_timestamp14(csv[intervals_offset + 3]) unless csv[intervals_offset + 3].blank?
+        msats_load_at = AEMO::Time.parse_timestamp14(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"),
+        datetime: AEMO::Time.parse_timestamp8(csv[1]),
         value: nil,
-        flag: flag,
-        updated_at: updated_at,
-        msats_load_at: msats_load_at
+        flag:,
+        updated_at:,
+        msats_load_at:
       }
 
       intervals = []
@@ -185,14 +300,19 @@ module AEMO
     end
 
     # @param [String] line A single line in string format
-    # @param [Hash] options
+    # @param [Boolean] strict
     # @return [Hash] the line parsed into a hash of information
-    def parse_nem12_400(line, options = {})
+    def parse_nem12_400(line, strict: true) # rubocop:disable Lint/UnusedMethodArgument,Naming/VariableNumber
       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?
       raise ArgumentError, 'EndInterval is not valid'       if csv[2].nil? || csv[2].match(/^\d+$/).nil?
-      raise ArgumentError, 'QualityMethod is not valid'     if csv[3].nil? || csv[3].match(/^([AN]|([AEFNSV]\d{2}))$/).nil?
+
+      if csv[3].nil? || csv[3].match(/^([AN]|([AEFNSV]\d{2}))$/).nil?
+        raise ArgumentError,
+              'QualityMethod is not valid'
+      end
+
       # raise ArgumentError, 'ReasonCode is not valid'        if (csv[4].nil? && csv[3].match(/^ANE/)) || csv[4].match(/^\d{3}?$/) || csv[3].match(/^ANE/)
       # raise ArgumentError, 'ReasonDescription is not valid' if (csv[4].nil? && csv[3].match(/^ANE/)) || ( csv[5].match(/^$/) && csv[4].match(/^0$/) )
 
@@ -204,7 +324,8 @@ module AEMO
         interval_start_point = @interval_data.length - number_of_intervals
 
         # For each of these
-        base_interval_event = { datetime: nil, quality_method: csv[3], reason_code: (csv[4].nil? ? nil : csv[4].to_i), reason_description: csv[5] }
+        base_interval_event = { datetime: nil, quality_method: csv[3], reason_code: csv[4]&.to_i,
+                                reason_description: csv[5] }
 
         # Interval Numbers are 1-indexed
         ((csv[1].to_i)..(csv[2].to_i)).each do |i|
@@ -229,16 +350,16 @@ module AEMO
     # What even is a 500 row?
     #
     # @param [String] line A single line in string format
-    # @param [Hash] _options
+    # @param [Boolean] strict
     # @return [Hash] the line parsed into a hash of information
-    def parse_nem12_500(_line, _options = {}); end
+    def parse_nem12_500(_line, strict: true); end # rubocop:disable Naming/VariableNumber
 
     # 900 is the last row a NEM12 should see...
     #
     # @param [String] line A single line in string format
-    # @param [Hash] _options
+    # @param [Boolean] strict
     # @return [Hash] the line parsed into a hash of information
-    def parse_nem12_900(_line, _options = {}); end
+    def parse_nem12_900(_line, strict: true); end # rubocop:disable Naming/VariableNumber
 
     # Turns the flag to a string
     #
@@ -272,48 +393,133 @@ module AEMO
     def to_csv
       headers = %w[nmi suffix units datetime value flags]
       ([headers] + to_a.map do |row|
-        row[3] = row[3].strftime('%Y%m%d%H%M%S%z')
+        row[3] = row[3].strftime('%Y%m%d%TH%M%S%z')
         row
       end).map do |row|
         row.join(', ')
       end.join("\n")
     end
 
-    # @param [String] path_to_file the path to a file
-    # @return [Array<AEMO::NEM12>] NEM12 object
-    def self.parse_nem12_file(path_to_file, strict = true)
-      parse_nem12(File.read(path_to_file), strict)
+    # Output the AEMO::NEM12 to a valid NEM12 CSV string.
+    #
+    # @return [String]
+    def to_nem12_csv
+      [
+        to_nem12_100_csv,
+        to_nem12_200_csv,
+        to_nem12_900_csv
+      ].flatten.join
     end
 
-    # @param [String] contents the path to a file
-    # @param [Boolean] strict
-    # @return [Array<AEMO::NEM12>] An array of NEM12 objects
-    def self.parse_nem12(contents, strict = true)
-      file_contents = contents.tr("\r", "\n").tr("\n\n", "\n").split("\n").delete_if(&:empty?)
-      # nothing to further process
-      return [] if file_contents.empty?
-
-      raise ArgumentError, 'First row should be have a RecordIndicator of 100 and be of type Header Record' unless file_contents.first.parse_csv[0] == '100'
-
-      nem12s = []
-      AEMO::NEM12.parse_nem12_100(file_contents.first, strict: strict)
-      file_contents.each do |line|
-        case line[0..2].to_i
-        when 200
-          nem12s << AEMO::NEM12.new('')
-          nem12s.last.parse_nem12_200(line, strict: strict)
-        when 300
-          nem12s.last.parse_nem12_300(line, strict: strict)
-        when 400
-          nem12s.last.parse_nem12_400(line, strict: strict)
-          # when 500
-          #   nem12s.last.parse_nem12_500(line, strict: strict)
-          # when 900
-          #   nem12s.last.parse_nem12_900(line, strict: strict)
+    # Output the AEMO::NEM12 to a valid NEM12 100 row CSV string.
+    #
+    # @return [String]
+    def to_nem12_100_csv
+      return self.class.default_nem12_100 if header.nil?
+
+      [
+        header[:record_indicator],
+        header[:version_header],
+        AEMO::Time.format_timestamp12(header[:datetime]),
+        header[:from_participant],
+        header[:to_participant]
+      ].join(CSV_SEPARATOR) + CRLF
+    end
+
+    # Output the AEMO::NEM12 to a valid NEM12 200 row CSV string.
+    #
+    # @return [String]
+    def to_nem12_200_csv
+      return nil if data_details.length != 1
+
+      data_detail = data_details.first
+
+      [
+        [
+          data_detail[:record_indicator],
+          data_detail[:nmi],
+          data_detail[:nmi_configuration],
+          data_detail[:register_id],
+          data_detail[:nmi_suffix],
+          data_detail[:mdm_data_streaming_identifier],
+          data_detail[:meter_serial_number],
+          data_detail[:uom],
+          data_detail[:interval_length],
+          data_detail[:next_scheduled_read_date] # NOTE: this is not turned into a timestamp.
+        ].join(CSV_SEPARATOR),
+        to_nem12_300_csv
+      ].flatten.join(CRLF)
+    end
+
+    # Output the AEMO::NEM12 to a valid NEM12 300 row CSV string.
+    #
+    # @return [String]
+    def to_nem12_300_csv
+      lines = []
+
+      daily_datas = interval_data.group_by do |x|
+        AEMO::Time.format_timestamp8(x[:datetime] - 1.second)
+      end
+      daily_datas.keys.sort.each do |key|
+        daily_data = daily_datas[key].sort_by { |x| x[:datetime] }
+        has_flags = daily_data.map { |x| x[:flag]&.any? }.uniq.include?(true)
+
+        lines << [
+          '300',
+          key,
+          daily_data.map { |x| x[:value] },
+          has_flags ? 'V' : 'A',
+          '',
+          '',
+          daily_data.first[:updated_at] ? AEMO::Time.format_timestamp14(daily_data.first[:updated_at]) : nil,
+          daily_data.first[:msats_load_at] ? AEMO::Time.format_timestamp14(daily_data.first[:msats_load_at]) : nil
+        ].flatten.join(CSV_SEPARATOR)
+
+        next unless has_flags
+
+        lines << to_nem12_400_csv(daily_data:)
+      end
+
+      lines.join(CRLF) + CRLF
+    end
+
+    # Output the AEMO::NEM12 to a valid NEM12 400 row CSV string.
+    #
+    # @param [Array<Hash>] daily_data
+    # @return [String]
+    def to_nem12_400_csv(daily_data:)
+      daily_data.sort_by! { |x| x[:datetime] }
+
+      nem12_400_rows = []
+
+      daily_data.each_with_index do |x, i|
+        nem12_400_rows << { flag: x[:flag], start_index: i + 1, finish_index: i + 1 } if nem12_400_rows.empty?
+
+        if nem12_400_rows.last[:flag] == x[:flag]
+          nem12_400_rows.last[:finish_index] = i + 1
+          next
         end
+
+        nem12_400_rows << { flag: x[:flag], start_index: i + 1, finish_index: i + 1 }
       end
-      # Return the array of NEM12 groups
-      nem12s
+
+      nem12_400_rows.map do |row|
+        [
+          '400',
+          row[:start_index],
+          row[:finish_index],
+          row[:flag].nil? ? 'A' : "#{row[:flag][:quality_flag]}#{row[:flag][:method_flag]}",
+          row[:flag].nil? ? '' : row[:flag][:reason_code],
+          ''
+        ].join(CSV_SEPARATOR)
+      end.join(CRLF)
+    end
+
+    # Output the AEMO::NEM12 to a valid NEM12 900 row CSV string.
+    #
+    # @return [String]
+    def to_nem12_900_csv
+      self.class.default_nem12_900
     end
   end
 end

data/lib/aemo/nem13.rb

@@ -1,6 +1,5 @@
 # frozen_string_literal: true
 
 module AEMO
-  class NEM13
-  end
+  class NEM13; end # rubocop:disable Lint/EmptyClass
 end

data/lib/aemo/nmi/allocation.rb

@@ -155,7 +155,7 @@ module AEMO
           type: 'electricity',
           includes: [
             /^(SAAA[A-HJ-NP-VX-Z\d][A-HJ-NP-Z\d]{5})$/,
-            /^(SASMPL[\d]{4})$/,
+            /^(SASMPL\d{4})$/,
             /^(200[12]\d{6})$/
           ],
           excludes: []
@@ -405,8 +405,8 @@ module AEMO
         # Enumerable support
         #
         # @return [Enumerator]
-        def each(&block)
-          all.each(&block)
+        def each(&)
+          all.each(&)
         end
 
         # Finds the Allocation that encompasses a given NMI
@@ -444,7 +444,7 @@ module AEMO
         @friendly_title = opts.fetch(:friendly_title, title)
         @exclude_nmi_patterns = opts.fetch(:excludes, [])
         @include_nmi_patterns = opts.fetch(:includes, [])
-        @region = AEMO::Region.new(opts.fetch(:region)) if opts.dig(:region)
+        @region = AEMO::Region.new(opts.fetch(:region)) if opts[:region]
       end
 
       private
@@ -456,9 +456,8 @@ module AEMO
       # @return [Symbol]
       def parse_allocation_type(type)
         type_sym = type.to_sym
-        unless SUPPORTED_TYPES.include?(type_sym)
-          raise AEMO::InvalidNMIAllocationType
-        end
+        raise AEMO::InvalidNMIAllocationType unless SUPPORTED_TYPES.include?(type_sym)
+
         type_sym
       rescue NoMethodError
         raise AEMO::InvalidNMIAllocationType