aemo 0.1.19 → 0.1.20

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f13c2c3cba6af132505b335b02c89f824a9dc395
-  data.tar.gz: bb6baee5af7b9e6678f66577de8a1b90286bbcb3
+  metadata.gz: b3e40a98a48936fc6d75e8ca014f672a364cf929
+  data.tar.gz: 40af65e47491619e9a0dfcfb3df1a612577b7dac
 SHA512:
-  metadata.gz: 3ef0598c97beb9f2f6f9a149faa3dbf8912e169538b9e468e04aeb6109ecb1f9a651bd797fe80fa01a968de69e8651fa276802cbb00286e40b8e48c51dbf9c2a
-  data.tar.gz: 21e5ca2a5203d48b0896315fe5704b0a4cba2409836e7e0aa058647a7ae7cba55a5820aa58860af032ecdb9336cade77d1c6c544f7b59d2ce59a564ef6d37c5e
+  metadata.gz: 7070f2d1022a383ddba4283f418f3e6c093500d14ee27632124609df94a6e23cd3bd55ffbd92ad849baa032488768ae5a4a508f1c5d19f89bbe0b80ff494445e
+  data.tar.gz: 884cd99295dbeeb6c302420d186e5c72dc3ff87b2217b3211e67ae7b211b52ae6babb793acc8e0aef87e302db0dacbe398949527879dddc8f05bf8e2853749c9

data/lib/aemo.rb

@@ -1,7 +1,6 @@
 require 'active_support/all'
 require 'httparty'
 require 'csv'
-require 'pry'
 
 require 'aemo/market.rb'
 require 'aemo/market/interval.rb'

data/lib/aemo/market.rb

@@ -2,11 +2,7 @@ module AEMO
   module Market
     include HTTParty
     base_uri 'www.nemweb.com.au'
-  
-    def self.regions
-      AEMO::Region::REGIONS
-    end
-    
+
     def self.current_dispatch(region)
       response = AEMO::Market.get "/mms.GRAPHS/GRAPHS/GRAPH_5#{region}1.csv"
       values = AEMO::Market.parse_response(response)
@@ -18,7 +14,7 @@ module AEMO
       values = AEMO::Market.parse_response(response)
       values
     end
-  
+
     # ######### #
       protected
     # ######### #
@@ -37,4 +33,3 @@ module AEMO
   end
 
 end
-

data/lib/aemo/msats.rb

@@ -52,7 +52,7 @@ module AEMO
       options[:inittransId]     ||= nil
 
       query = {
-        transactionId:  Digest::SHA1.hexdigest(Time.now.to_s)[0..35],
+        transactionId:  transaction_id,
         NMI:            nmi.nmi,      # Note: AEMO has case sensitivity but no consistency across requests.
         fromDate:       from_date,
         toDate:         to_date,
@@ -74,11 +74,11 @@ module AEMO
     # /MSATSLimits/PARTICIPANT_IDENTIFIER?transactionId=XXX
     #
     # @return [Hash] The report results from the MSATS Limits web service query
-    def self.msats_limits
+    def self.msats_limits(options={})
       query = {
-        transactionId:  Digest::SHA1.hexdigest(Time.now.to_s)[0..35],
+        transactionId:  transaction_id,
       }
-      response =  self.get( "/MSATSLimits/#{@@participant_id}", basic_auth: @@auth, headers: { 'Accept' => 'text/xml', 'Content-Type' => 'text/xml'}, query: query, verify: (options[:verify_ssl] != false) )
+      response = self.get( "/MSATSLimits/#{@@participant_id}", basic_auth: @@auth, headers: { 'Accept' => 'text/xml', 'Content-Type' => 'text/xml'}, query: query, verify: (options[:verify_ssl] != false) )
       if response.response.code != '200'
         response
       else
@@ -91,13 +91,13 @@ module AEMO
     # @param [String] jurisdiction_code The Jurisdiction Code
     # @param [Integer] delivery_point_identifier Delivery Point Identifier
     # @return [Hash] The response
-    def self.nmi_discovery_by_delivery_point_identifier(jurisdiction_code,delivery_point_identifier)
+    def self.nmi_discovery_by_delivery_point_identifier(jurisdiction_code,delivery_point_identifier,options={})
       raise ArgumentError, 'jurisdiction_code is not valid' unless %w(ACT NEM NSW QLD SA VIC TAS).include?(jurisdiction_code)
       raise ArgumentError, 'delivery_point_identifier is not valid' unless delivery_point_identifier.respond_to?("to_i")
       raise ArgumentError, 'delivery_point_identifier is not valid' if( delivery_point_identifier.to_i < 10000000 || delivery_point_identifier.to_i > 99999999)
 
       query = {
-        transactionId:  Digest::SHA1.hexdigest(Time.now.to_s)[0..35],
+        transactionId:  transaction_id,
         jurisdictionCode: jurisdiction_code,
         deliveryPointIdentifier: delivery_point_identifier.to_i
       }
@@ -115,11 +115,11 @@ module AEMO
     # @param [String] jurisdiction_code The Jurisdiction Code
     # @param [Integer] meter_serial_number The meter's serial number
     # @return [Hash] The response
-    def self.nmi_discovery_by_meter_serial_number(jurisdiction_code,meter_serial_number)
+    def self.nmi_discovery_by_meter_serial_number(jurisdiction_code,meter_serial_number,options={})
       raise ArgumentError, 'jurisdiction_code is not valid' unless %w(ACT NEM NSW QLD SA VIC TAS).include?(jurisdiction_code)
 
       query = {
-        transactionId:  Digest::SHA1.hexdigest(Time.now.to_s)[0..35],
+        transactionId:  transaction_id,
         jurisdictionCode: jurisdiction_code,
         meterSerialNumber: meter_serial_number.to_i
       }
@@ -157,7 +157,7 @@ module AEMO
       options[:state_or_territory] ||= jurisdiction_code
 
       query = {
-        transactionId:  Digest::SHA1.hexdigest(Time.now.to_s)[0..35],
+        transactionId:  transaction_id,
         jurisdictionCode: jurisdiction_code,
         buildingOrPropertyName: options[:building_or_property_name],
         locationDescriptor: options[:location_descriptor],
@@ -197,7 +197,7 @@ module AEMO
       options[:reason]  ||= nil
 
       query = {
-        transactionId: Digest::SHA1.hexdigest(Time.now.to_s)[0..35],
+        transactionId: transaction_id,
         nmi: nmi.nmi,
         checksum: nmi.checksum,
         type: options[:type],
@@ -216,9 +216,9 @@ module AEMO
     # /ParticipantSystemStatus/PARTICIPANT_IDENTIFIER?transactionId=XXX
     #
     # @return [Hash] The report results from the Participant System Status web service query
-    def self.system_status
+    def self.system_status(options={})
       query = {
-        transactionId:  Digest::SHA1.hexdigest(Time.now.to_s)[0..35],
+        transactionId:  transaction_id,
       }
       response = self.get( "/ParticipantSystemStatus/#{@@participant_id}", basic_auth: @@auth, headers: { 'Accept' => 'text/xml', 'Content-Type' => 'text/xml'}, query: query, verify: (options[:verify_ssl] != false) )
       if response.response.code != '200'
@@ -246,5 +246,12 @@ module AEMO
       !(@@participant_id.nil? || @@auth[:username].nil? || @@auth[:password].nil?)
     end
 
+    # Method for creating a unique transaction id
+    #
+    # @return [String] the transaction id
+    def self.transaction_id
+      Digest::SHA1.hexdigest(Time.now.to_s)[0..35]
+    end
+
   end
 end

data/lib/aemo/nem12.rb

@@ -265,7 +265,7 @@ module AEMO
 
     # Initialize a NEM12 file
     def initialize(nmi,options={})
-      @nmi              = nmi
+      @nmi              = AEMO::NMI.new(nmi) unless nmi.empty?
       @data_details     = []
       @interval_data    = []
       @interval_events  = []
@@ -274,21 +274,6 @@ module AEMO
       end
     end
 
-    # @return [Integer] checksum of the NMI
-    def nmi_checksum
-      summation = 0
-      @nmi.reverse.split(//).each_index do |i|
-        value = nmi[nmi.length - i - 1].ord
-        if(i % 2 == 0)
-          value = value * 2
-        end
-        value = value.to_s.split(//).map{|i| i.to_i}.reduce(:+)
-        summation += value
-      end
-      checksum = (10 - (summation % 10)) % 10
-      checksum
-    end
-
     # Parses the header record
     # @param line [String] A single line in string format
     # @return [Hash] the line parsed into a hash of information
@@ -319,10 +304,10 @@ module AEMO
       csv = line.parse_csv
 
       raise ArgumentError, 'RecordIndicator is not 200'     if csv[0] != '200'
-      raise ArgumentError, 'NMI is not valid'               if csv[1].match(/[A-Z0-9]{10}/).nil?
+      raise ArgumentError, 'NMI is not valid'               if !AEMO::NMI.valid_nmi?(csv[1])
       raise ArgumentError, 'NMIConfiguration is not valid'  if csv[2].match(/.{1,240}/).nil?
       unless csv[3].nil?
-        raise ArgumentError, 'RegisterID is not valid'        if csv[3].match(/.{1,10}/).nil?
+        raise ArgumentError, 'RegisterID is not valid'      if csv[3].match(/.{1,10}/).nil?
       end
       raise ArgumentError, 'NMISuffix is not valid'         if csv[4].match(/[A-HJ-NP-Z][1-9A-HJ-NP-Z]/).nil?
       if !csv[5].nil? && !csv[5].empty? && !csv[5].match(/^\s*$/)
@@ -336,7 +321,7 @@ module AEMO
       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')
 
-      @nmi = csv[1]
+      @nmi = AEMO::NMI.new(csv[1])
 
       # Push onto the stack
       @data_details << {
@@ -501,12 +486,6 @@ module AEMO
       ([headers]+self.to_a.map{|row| row[3]=row[3].strftime("%Y%m%d%H%M%S%z"); row}).map{|row| row.join(',')}.join("\n")
     end
 
-    # @param nmi [String] a NMI that is to be checked for validity
-    # @return [Boolean] determines if the NMI is valid
-    def self.valid_nmi?(nmi)
-      (nmi.class == String && nmi.length == 10 && !nmi.match(/^[A-Z1-9][A-Z0-9]{9}$/).nil?)
-    end
-
     # @param path_to_file [String] the path to a file
     # @return [] NEM12 object
     def self.parse_nem12_file(path_to_file, strict = false)

data/lib/aemo/nmi.rb

@@ -25,8 +25,8 @@ module AEMO
         state: 'ACT',
         type: 'electricity',
         includes: [
-          (/^(NGGG[A-HJ-NP-VX-Z\d][A-HJ-NP-Z\d]{5})$/),
-          (/^(7001\d{6})$/)
+          /^(NGGG[A-HJ-NP-VX-Z\d][A-HJ-NP-Z\d]{5})$/,
+          /^(7001\d{6})$/
         ],
         excludes: [
         ]
@@ -37,14 +37,14 @@ module AEMO
         state: 'NSW',
         type: 'electricity',
         includes: [
-          (/^(NAAA[A-HJ-NP-VX-Z\d][A-HJ-NP-Z\d]{5})$/),
-          (/^(NBBB[A-HJ-NP-VX-Z\d][A-HJ-NP-Z\d]{5})$/),
-          (/^(NDDD[A-HJ-NP-VX-Z\d][A-HJ-NP-Z\d]{5})$/),
-          (/^(NFFF[A-HJ-NP-VX-Z\d][A-HJ-NP-Z\d]{5})$/),
-          (/^(4001\d{6})$/),
-          (/^(4508\d{6})$/),
-          (/^(4204\d{6})$/),
-          (/^(4407\d{6})$/)
+          /^(NAAA[A-HJ-NP-VX-Z\d][A-HJ-NP-Z\d]{5})$/,
+          /^(NBBB[A-HJ-NP-VX-Z\d][A-HJ-NP-Z\d]{5})$/,
+          /^(NDDD[A-HJ-NP-VX-Z\d][A-HJ-NP-Z\d]{5})$/,
+          /^(NFFF[A-HJ-NP-VX-Z\d][A-HJ-NP-Z\d]{5})$/,
+          /^(4001\d{6})$/,
+          /^(4508\d{6})$/,
+          /^(4204\d{6})$/,
+          /^(4407\d{6})$/
         ],
         excludes: [
         ]
@@ -55,8 +55,8 @@ module AEMO
         state: 'NSW',
         type: 'electricity',
         includes: [
-          (/^(NCCC[A-HJ-NP-VX-Z\d][A-HJ-NP-Z\d]{5})$/),
-          (/^(410[234]\d{6})$/)
+          /^(NCCC[A-HJ-NP-VX-Z\d][A-HJ-NP-Z\d]{5})$/,
+          /^(410[234]\d{6})$/
         ],
         excludes: [
         ]
@@ -67,8 +67,8 @@ module AEMO
         state: 'NSW',
         type: 'electricity',
         includes: [
-          (/^(NEEE[A-HJ-NP-VX-Z\d][A-HJ-NP-Z\d]{5})$/),
-          (/^(431\d{7})$/)
+          /^(NEEE[A-HJ-NP-VX-Z\d][A-HJ-NP-Z\d]{5})$/,
+          /^(431\d{7})$/
         ],
         excludes: [
         ]
@@ -79,8 +79,8 @@ module AEMO
         state: 'NSW',
         type: 'electricity',
         includes: [
-          (/^(NTTT[A-HJ-NP-VX-Z\d][A-HJ-NP-Z\d]{5})$/),
-          (/^(460810[0-8]\d{3})$/)
+          /^(NTTT[A-HJ-NP-VX-Z\d][A-HJ-NP-Z\d]{5})$/,
+          /^(460810[0-8]\d{3})$/
         ],
         excludes: [
         ]
@@ -91,7 +91,7 @@ module AEMO
         state: 'NSW',
         type: 'electricity',
         includes: [
-          (/^(4708109\d{3})$/)
+          /^(4708109\d{3})$/
         ],
         excludes: [
         ]
@@ -102,7 +102,7 @@ module AEMO
         state: 'NT',
         type: 'electricity',
         includes: [
-          (/^(250\d{7})$/)
+          /^(250\d{7})$/
         ],
         excludes: [
         ]
@@ -113,13 +113,13 @@ module AEMO
         state: 'QLD',
         type: 'electricity',
         includes: [
-          (/^(QAAA[A-HJ-NP-VX-Z\d][A-HJ-NP-Z\d]{5})$/),
-          (/^(QCCC[A-HJ-NP-VX-Z\d][A-HJ-NP-Z\d]{5})$/),
-          (/^(QDDD[A-HJ-NP-VX-Z\d][A-HJ-NP-Z\d]{5})$/),
-          (/^(QEEE[A-HJ-NP-VX-Z\d][A-HJ-NP-Z\d]{5})$/),
-          (/^(QFFF[A-HJ-NP-VX-Z\d][A-HJ-NP-Z\d]{5})$/),
-          (/^(QGGG[A-HJ-NP-VX-Z\d][A-HJ-NP-Z\d]{5})$/),
-          (/^(30\d{8})$/)
+          /^(QAAA[A-HJ-NP-VX-Z\d][A-HJ-NP-Z\d]{5})$/,
+          /^(QCCC[A-HJ-NP-VX-Z\d][A-HJ-NP-Z\d]{5})$/,
+          /^(QDDD[A-HJ-NP-VX-Z\d][A-HJ-NP-Z\d]{5})$/,
+          /^(QEEE[A-HJ-NP-VX-Z\d][A-HJ-NP-Z\d]{5})$/,
+          /^(QFFF[A-HJ-NP-VX-Z\d][A-HJ-NP-Z\d]{5})$/,
+          /^(QGGG[A-HJ-NP-VX-Z\d][A-HJ-NP-Z\d]{5})$/,
+          /^(30\d{8})$/
         ],
         excludes: [
         ]
@@ -130,8 +130,8 @@ module AEMO
         state: 'QLD',
         type: 'electricity',
         includes: [
-          (/^(QB\d{2}[A-HJ-NP-VX-Z\d][A-HJ-NP-Z\d]{5})$/),
-          (/^(31\d{8})$/)
+          /^(QB\d{2}[A-HJ-NP-VX-Z\d][A-HJ-NP-Z\d]{5})$/,
+          /^(31\d{8})$/
         ],
         excludes: [
         ]
@@ -142,8 +142,8 @@ module AEMO
         state: 'QLD',
         type: 'electricity',
         includes: [
-          (/^(Q[A-HJ-NP-Z\d]{3}W[A-HJ-NP-Z\d]{5})$/),
-          (/^(320200\d{4})$/)
+          /^(Q[A-HJ-NP-Z\d]{3}W[A-HJ-NP-Z\d]{5})$/,
+          /^(320200\d{4})$/
         ],
         excludes: [
         ]
@@ -154,9 +154,9 @@ module AEMO
         state: 'SA',
         type: 'electricity',
         includes: [
-          (/^(SAAA[A-HJ-NP-VX-Z\d][A-HJ-NP-Z\d]{5})$/),
-          (/^(SASMPL[\d]{4})$/),
-          (/^(200[12]\d{6})$/)
+          /^(SAAA[A-HJ-NP-VX-Z\d][A-HJ-NP-Z\d]{5})$/,
+          /^(SASMPL[\d]{4})$/,
+          /^(200[12]\d{6})$/
         ],
         excludes: [
         ]
@@ -167,8 +167,8 @@ module AEMO
         state: 'SA',
         type: 'electricity',
         includes: [
-          (/^(S[A-HJ-NP-Z\d]{3}W[A-HJ-NP-Z\d]{5})$/),
-          (/^(210200\d{4})$/)
+          /^(S[A-HJ-NP-Z\d]{3}W[A-HJ-NP-Z\d]{5})$/,
+          /^(210200\d{4})$/
         ],
         excludes: [
         ]
@@ -179,9 +179,9 @@ module AEMO
         state: 'TAS',
         type: 'electricity',
         includes: [
-          (/^(T000000(([0-4]\d{3})|(500[01])))$/),
-          (/^(8000\d{6})$/),
-          (/^(8590[23]\d{5})$/)
+          /^(T000000(([0-4]\d{3})|(500[01])))$/,
+          /^(8000\d{6})$/,
+          /^(8590[23]\d{5})$/
         ],
         excludes: [
         ]
@@ -192,7 +192,7 @@ module AEMO
         state: 'TAS',
         type: 'electricity',
         includes: [
-          (/^(T[A-HJ-NP-Z\d]{3}W[A-HJ-NP-Z\d]{5})$/),
+          /^(T[A-HJ-NP-Z\d]{3}W[A-HJ-NP-Z\d]{5})$/,
         ],
         excludes: [
         ]
@@ -203,8 +203,8 @@ module AEMO
         state: 'VIC',
         type: 'electricity',
         includes: [
-          (/^(VAAA[A-HJ-NP-VX-Z\d][A-HJ-NP-Z\d]{5})$/),
-          (/^(610[23]\d{6})$/)
+          /^(VAAA[A-HJ-NP-VX-Z\d][A-HJ-NP-Z\d]{5})$/,
+          /^(610[23]\d{6})$/
         ],
         excludes: [
         ]
@@ -215,8 +215,8 @@ module AEMO
         state: 'VIC',
         type: 'electricity',
         includes: [
-          (/^(VBBB[A-HJ-NP-VX-Z\d][A-HJ-NP-Z\d]{5})$/),
-          (/^(630[56]\d{6})$/)
+          /^(VBBB[A-HJ-NP-VX-Z\d][A-HJ-NP-Z\d]{5})$/,
+          /^(630[56]\d{6})$/
         ],
         excludes: [
         ]
@@ -227,8 +227,8 @@ module AEMO
         state: 'VIC',
         type: 'electricity',
         includes: [
-          (/^(VCCC[A-HJ-NP-VX-Z\d][A-HJ-NP-Z\d]{5})$/),
-          (/^(620[34]\d{6})$/)
+          /^(VCCC[A-HJ-NP-VX-Z\d][A-HJ-NP-Z\d]{5})$/,
+          /^(620[34]\d{6})$/
         ],
         excludes: [
         ]
@@ -239,8 +239,8 @@ module AEMO
         state: 'VIC',
         type: 'electricity',
         includes: [
-          (/^(VDDD[A-HJ-NP-VX-Z\d][A-HJ-NP-Z\d]{5})$/),
-          (/^(6001\d{6})$/)
+          /^(VDDD[A-HJ-NP-VX-Z\d][A-HJ-NP-Z\d]{5})$/,
+          /^(6001\d{6})$/
         ],
         excludes: [
         ]
@@ -251,8 +251,8 @@ module AEMO
         state: 'VIC',
         type: 'electricity',
         includes: [
-          (/^(VEEE[A-HJ-NP-VX-Z\d][A-HJ-NP-Z\d]{5})$/),
-          (/^(640[78]\d{6})$/)
+          /^(VEEE[A-HJ-NP-VX-Z\d][A-HJ-NP-Z\d]{5})$/,
+          /^(640[78]\d{6})$/
         ],
         excludes: [
         ]
@@ -263,8 +263,8 @@ module AEMO
         state: 'VIC',
         type: 'electricity',
         includes: [
-          (/^(V[A-HJ-NP-Z\d]{3}W[A-HJ-NP-Z\d]{5})$/),
-          (/^(650900\d{4})$/)
+          /^(V[A-HJ-NP-Z\d]{3}W[A-HJ-NP-Z\d]{5})$/,
+          /^(650900\d{4})$/
         ],
         excludes: [
         ]
@@ -275,10 +275,10 @@ module AEMO
         state: 'WA',
         type: 'electricity',
         includes: [
-          (/^(WAAA[A-HJ-NP-VX-Z\d][A-HJ-NP-Z\d]{5})$/),
-          (/^(800[1-9]\d{6})$/),
-          (/^(801\d{7})$/),
-          (/^(8020\d{6})$/)
+          /^(WAAA[A-HJ-NP-VX-Z\d][A-HJ-NP-Z\d]{5})$/,
+          /^(800[1-9]\d{6})$/,
+          /^(801\d{7})$/,
+          /^(8020\d{6})$/
         ],
         excludes: [
         ]
@@ -289,7 +289,7 @@ module AEMO
         state: 'WA',
         type: 'electricity',
         includes: [
-          (/^(8021\d{6})$/)
+          /^(8021\d{6})$/
         ],
         excludes: [
         ]
@@ -300,7 +300,7 @@ module AEMO
         state: 'NSW',
         type: 'gas',
         includes: [
-          (/^(52\d{8})$/)
+          /^(52\d{8})$/
         ],
         excludes: [
         ]
@@ -311,7 +311,7 @@ module AEMO
         state: 'VIC',
         type: 'gas',
         includes: [
-          (/^(53\d{8})$/)
+          /^(53\d{8})$/
         ],
         excludes: [
         ]
@@ -322,7 +322,7 @@ module AEMO
         state: 'QLD',
         type: 'gas',
         includes: [
-          (/^(54\d{8})$/)
+          /^(54\d{8})$/
         ],
         excludes: [
         ]
@@ -333,7 +333,7 @@ module AEMO
         state: 'SA',
         type: 'gas',
         includes: [
-          (/^(55\d{8})$/)
+          /^(55\d{8})$/
         ],
         excludes: [
         ]
@@ -344,7 +344,7 @@ module AEMO
         state: 'WA',
         type: 'gas',
         includes: [
-          (/^(56\d{8})$/)
+          /^(56\d{8})$/
         ],
         excludes: [
         ]
@@ -355,7 +355,7 @@ module AEMO
         state: 'TAS',
         type: 'gas',
         includes: [
-          (/^(57\d{8})$/)
+          /^(57\d{8})$/
         ],
         excludes: [
         ]
@@ -366,7 +366,7 @@ module AEMO
         state: 'NSW',
         type: 'electricity',
         includes: [
-          (/^(NJJJNR[A-HJ-NP-Z\d]{4})$/)
+          /^(NJJJNR[A-HJ-NP-Z\d]{4})$/
         ],
         excludes: [
         ]
@@ -377,8 +377,8 @@ module AEMO
         state: '',
         type: 'electricity',
         includes: [
-          (/^(NKKK[A-HJ-NP-VX-Z\d][A-HJ-NP-Z\d]{5})$/),
-          (/^(7102\d{6})$/)
+          /^(NKKK[A-HJ-NP-VX-Z\d][A-HJ-NP-Z\d]{5})$/,
+          /^(7102\d{6})$/
         ],
         excludes: [
         ]
@@ -389,8 +389,8 @@ module AEMO
         state: '',
         type: 'electricity',
         includes: [
-          (/^(880[1-5]\d{6})$/),
-          (/^(9\d{9})$/)
+          /^(880[1-5]\d{6})$/,
+          /^(9\d{9})$/
         ],
         excludes: [
         ]
@@ -665,10 +665,6 @@ module AEMO
       protected
     # ######### #
 
-    def is_valid_region?(region)
-      REGIONS.keys.include?(region)
-    end
-
   end
 
 end