aemo 0.1.39 → 0.1.40

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 393bc9a0f07713e90556d7704bb2d129bc398e1d
-  data.tar.gz: 9d370f741128cc703d0f4f492508a6455203c5e3
+  metadata.gz: 99c92027fe76a3d8367716e2274157b9239c48ee
+  data.tar.gz: 70d04cf7ed134fc1ac3aab96d8727e043c19104b
 SHA512:
-  metadata.gz: 40d6fc601b3f55f8c02cc4c9753e29e89e366ce4c9fd951bfd5708c1843286f064ffd5cbe24bec58bbdd8d95a4d006a2662943571e6c89501e9a9b0d8e6cc99b
-  data.tar.gz: 6e716d57f1ab10b2af33e7f70df066cba1142faa5d518cd6b27bb3280d03b3913b370532a1440dfc327f0c16b513accf1648f5d55af9c0983c626b7505a7e5c4
+  metadata.gz: 0ed1e45c8450de68f0adccf41f87ccbe0bb6cf44d87c417826f75b2738ecc8c13480eb7e087b5f5b66dfc9f73bbb83d887ed88008a773b76f3c9effd62dd8cd2
+  data.tar.gz: 8aadfb1e0b590c4527b01fa21cba54f1b651b78e613b834b86fd21716298612647719a23c6010b0e5abc21bdfacb1ea97becded6de357b058f715dba5c2679fb

data/lib/aemo.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'active_support/all'
 require 'httparty'
 require 'csv'
@@ -6,9 +8,11 @@ require 'aemo/region.rb'
 require 'aemo/market.rb'
 require 'aemo/market/interval.rb'
 require 'aemo/market/node.rb'
+require 'aemo/meter.rb'
 require 'aemo/nem12.rb'
 require 'aemo/nmi.rb'
 require 'aemo/msats.rb'
+require 'aemo/register.rb'
 require 'aemo/version.rb'
 
 # AEMO Module to encapsulate all AEMO classes

data/lib/aemo/dispatchable.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module AEMO
   class Region
     DISPATCH_TYPE   = ['Generator', 'Load Norm Off', 'Network Service Provider'].freeze

data/lib/aemo/market.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module AEMO
   # AEMO::Market
   #
@@ -13,7 +15,7 @@ module AEMO
       # Return the current dispatch dataset for a region
       #
       # @param [String, AEMO::Region] region AEMO::Region
-      # @return [Array<AEMO::Market::Interval>] an array of AEMO::Market::Intervals
+      # @return [Array<AEMO::Market::Interval>] the current dispatch data
       def current_dispatch(region)
         region = AEMO::Region.new(region) if region.is_a?(String)
 
@@ -25,7 +27,7 @@ module AEMO
       # Description of method
       #
       # @param [String, AEMO::Region] region AEMO::Region
-      # @return [Array<AEMO::Market::Interval>] an array of AEMO::Market::Intervals
+      # @return [Array<AEMO::Market::Interval>] the current trading data
       def current_trading(region)
         region = AEMO::Region.new(region) if region.is_a?(String)
 
@@ -44,16 +46,19 @@ module AEMO
         region = AEMO::Region.new(region) if region.is_a?(String)
 
         required_data = []
-        (start..finish).map { |d| { year: d.year, month: d.month } }.uniq.each do |period|
-          required_data += historic_trading(region, period[:year], period[:month])
+        (start..finish).map { |d| { year: d.year, month: d.month } }
+                       .uniq.each do |period|
+          required_data += historic_trading(region, period[:year],
+                                            period[:month])
         end
 
-        required_data.select { |values| values.datetime >= start && values.datetime <= finish }
+        required_data.select do |values|
+          values.datetime >= start && values.datetime <= finish
+        end
       end
 
       # Return an array of historic trading values for a Year, Month and Region
-      #   As per the historical data at
-      #   http://www.aemo.com.au/Electricity/Data/Price-and-Demand/Aggregated-Price-and-Demand-Data-Files/Aggregated-Price-and-Demand-2011-to-2016
+      #   As per the historical data from AEMO
       #
       # @param [String, AEMO::Region] region AEMO::Region
       # @param [Integer] year The year for the report from AEMO
@@ -62,11 +67,12 @@ module AEMO
       def historic_trading(region, year, month)
         region = AEMO::Region.new(region) if region.is_a?(String)
 
-        month = sprintf('%02d', month)
+        month = Kernel.format('%02d', month)
+        url = 'https://aemo.com.au/aemo/data/nem/priceanddemand/' \
+              "PRICE_AND_DEMAND_#{year}#{month}_#{region}1.csv"
 
-        response = HTTParty.get("http://aemo.com.au/aemo/data/nem/priceanddemand/PRICE_AND_DEMAND_#{year}#{month}_#{region}1.csv")
-        values = parse_response(response)
-        values
+        response = HTTParty.get(url)
+        parse_response(response)
       end
 
       protected

data/lib/aemo/market/interval.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module AEMO
   module Market
     # AEMO::Market::Interval
@@ -14,7 +16,7 @@ module AEMO
       attr_accessor :datetime, :region, :total_demand, :rrp, :period_type
 
       # Create a new instance of an Interval
-      # 
+      #
       # @param [Time] datetime
       # @param [Hash] options Hash of optional data values
       # @return [AEMO::Market::Interval]

data/lib/aemo/market/node.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module AEMO
   module Market
     # AEMO::Market::Interval
@@ -6,7 +8,7 @@ module AEMO
     # @abstract
     # @since 0.1.0
     class Node
-      IDENTIFIERS = %w(NSW QLD SA TAS VIC)
+      IDENTIFIERS = %w[NSW QLD SA TAS VIC].freeze
 
       attr_accessor :identifier
 
@@ -31,7 +33,7 @@ module AEMO
       #
       # @return [Array<AEMO::Market::Interval>]
       def current_trading
-        if @current_trading.empty? || @current_trading.reject { |i| i.period_type != 'TRADE' }.last.datetime != (Time.now - Time.now.to_i % 300)
+        if @current_trading.empty? || @current_trading.select { |i| i.period_type == 'TRADE' }.last.datetime != (Time.now - Time.now.to_i % 300)
           @current_trading = AEMO::Market.current_trading(@identifier)
         end
         @current_trading

data/lib/aemo/meter.rb

@@ -0,0 +1,37 @@
+# frozen_string_literal: true
+
+module AEMO
+  # AEMO::Meter represents a meter under a NMI
+  class Meter
+    attr_accessor :installation_type_code, :next_scheduled_read_date,
+                  :read_type_code, :registers, :serial_number, :status
+
+    # Initialize a meter
+    #
+    # @param [Hash] opts = {} the parameters to set
+    # @return [AEMO::Meter] an instance of an AEMO::Meter
+    def initialize(opts = {})
+      @installation_type_code   = opts[:installation_type_code]
+      @next_scheduled_read_date = opts[:next_scheduled_read_date]
+      @read_type_code           = opts[:read_type_code]
+      @registers                = opts[:registers] || []
+      @serial_number            = opts[:serial_number]
+      @status                   = opts[:status]
+    end
+
+    # Initialize a new meter from an MSATS hash
+    #
+    # @param [Hash] meter the MSATS hash
+    # @return [AEMO::Meter] description of returned object
+    def self.from_hash(meter)
+      AEMO::Meter.new(
+        installation_type_code: meter['InstallationTypeCode'],
+        next_scheduled_read_date: meter['NextScheduledReadDate'],
+        read_type_code: meter['ReadTypeCode'],
+        registers: [],
+        serial_number: meter['SerialNumber'],
+        status: meter['Status']
+      )
+    end
+  end
+end

data/lib/aemo/msats.rb

@@ -1,8 +1,9 @@
-require 'httparty'
+# frozen_string_literal: true
+
 require 'aemo'
-# require 'zip'
-require 'nokogiri'
 require 'digest/sha1'
+require 'httparty'
+require 'nokogiri'
 
 module AEMO
   # AEMO::MSATS
@@ -93,7 +94,7 @@ module AEMO
       # @param [Integer] delivery_point_identifier Delivery Point Identifier
       # @return [Hash] The response
       def 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, '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 < 10_000_000 || delivery_point_identifier.to_i > 99_999_999
 
@@ -117,7 +118,7 @@ module AEMO
       # @param [Integer] meter_serial_number The meter's serial number
       # @return [Hash] The response
       def 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)
+        raise ArgumentError, 'jurisdiction_code is not valid' unless %w[ACT NEM NSW QLD SA VIC TAS].include?(jurisdiction_code)
 
         query = {
           transactionId:  transaction_id,
@@ -139,7 +140,7 @@ module AEMO
       # @param [Integer] meter_serial_number The meter's serial number
       # @return [Hash] The response
       def nmi_discovery_by_address(jurisdiction_code, options = {})
-        raise ArgumentError, 'jurisdiction_code is not valid' unless %w(ACT NEM NSW QLD SA VIC TAS).include?(jurisdiction_code)
+        raise ArgumentError, 'jurisdiction_code is not valid' unless %w[ACT NEM NSW QLD SA VIC TAS].include?(jurisdiction_code)
 
         options[:building_or_property_name] ||= nil
         options[:location_descriptor] ||= nil

data/lib/aemo/nem12.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'csv'
 require 'time'
 
@@ -92,36 +94,36 @@ module AEMO
     }.freeze
 
     METHOD_FLAGS = {
-      11 => { type: %w(SUB), installation_type: [1, 2, 3, 4], short_descriptor: 'Check', description: '' },
-      12 => { type: %w(SUB), installation_type: [1, 2, 3, 4], short_descriptor: 'Calculated', description: '' },
-      13 => { type: %w(SUB), installation_type: [1, 2, 3, 4], short_descriptor: 'SCADA', description: '' },
-      14 => { type: %w(SUB), installation_type: [1, 2, 3, 4], short_descriptor: 'Like Day', description: '' },
-      15 => { type: %w(SUB), installation_type: [1, 2, 3, 4], short_descriptor: 'Average Like Day', description: '' },
-      16 => { type: %w(SUB), installation_type: [1, 2, 3, 4], short_descriptor: 'Agreed', description: '' },
-      17 => { type: %w(SUB), installation_type: [1, 2, 3, 4], short_descriptor: 'Linear', description: '' },
-      18 => { type: %w(SUB), installation_type: [1, 2, 3, 4], short_descriptor: 'Alternate', description: '' },
-      19 => { type: %w(SUB), installation_type: [1, 2, 3, 4], short_descriptor: 'Zero', description: '' },
-      51 => { type: %w(EST SUB), installation_type: 5, short_descriptor: 'Previous Year', description: '' },
-      52 => { type: %w(EST SUB), installation_type: 5, short_descriptor: 'Previous Read', description: '' },
-      53 => { type: %w(SUB), installation_type: 5, short_descriptor: 'Revision', description: '' },
-      54 => { type: %w(SUB), installation_type: 5, short_descriptor: 'Linear', description: '' },
-      55 => { type: %w(SUB), installation_type: 5, short_descriptor: 'Agreed', description: '' },
-      56 => { type: %w(EST SUB), installation_type: 5, short_descriptor: 'Prior to First Read - Agreed', description: '' },
-      57 => { type: %w(EST SUB), installation_type: 5, short_descriptor: 'Customer Class', description: '' },
-      58 => { type: %w(EST SUB), installation_type: 5, short_descriptor: 'Zero', description: '' },
-      61 => { type: %w(EST SUB), installation_type: 6, short_descriptor: 'Previous Year', description: '' },
-      62 => { type: %w(EST SUB), installation_type: 6, short_descriptor: 'Previous Read', description: '' },
-      63 => { type: %w(EST SUB), installation_type: 6, short_descriptor: 'Customer Class', description: '' },
-      64 => { type: %w(SUB), installation_type: 6, short_descriptor: 'Agreed', description: '' },
-      65 => { type: %w(EST), installation_type: 6, short_descriptor: 'ADL', description: '' },
-      66 => { type: %w(SUB), installation_type: 6, short_descriptor: 'Revision', description: '' },
-      67 => { type: %w(SUB), installation_type: 6, short_descriptor: 'Customer Read', description: '' },
-      68 => { type: %w(EST SUB), installation_type: 6, short_descriptor: 'Zero', description: '' },
-      71 => { type: %w(SUB), installation_type: 7, short_descriptor: 'Recalculation', description: '' },
-      72 => { type: %w(SUB), installation_type: 7, short_descriptor: 'Revised Table', description: '' },
-      73 => { type: %w(SUB), installation_type: 7, short_descriptor: 'Revised Algorithm', description: '' },
-      74 => { type: %w(SUB), installation_type: 7, short_descriptor: 'Agreed', description: '' },
-      75 => { type: %w(EST), installation_type: 7, short_descriptor: 'Existing Table', description: '' }
+      11 => { type: %w[SUB], installation_type: [1, 2, 3, 4], short_descriptor: 'Check', description: '' },
+      12 => { type: %w[SUB], installation_type: [1, 2, 3, 4], short_descriptor: 'Calculated', description: '' },
+      13 => { type: %w[SUB], installation_type: [1, 2, 3, 4], short_descriptor: 'SCADA', description: '' },
+      14 => { type: %w[SUB], installation_type: [1, 2, 3, 4], short_descriptor: 'Like Day', description: '' },
+      15 => { type: %w[SUB], installation_type: [1, 2, 3, 4], short_descriptor: 'Average Like Day', description: '' },
+      16 => { type: %w[SUB], installation_type: [1, 2, 3, 4], short_descriptor: 'Agreed', description: '' },
+      17 => { type: %w[SUB], installation_type: [1, 2, 3, 4], short_descriptor: 'Linear', description: '' },
+      18 => { type: %w[SUB], installation_type: [1, 2, 3, 4], short_descriptor: 'Alternate', description: '' },
+      19 => { type: %w[SUB], installation_type: [1, 2, 3, 4], short_descriptor: 'Zero', description: '' },
+      51 => { type: %w[EST SUB], installation_type: 5, short_descriptor: 'Previous Year', description: '' },
+      52 => { type: %w[EST SUB], installation_type: 5, short_descriptor: 'Previous Read', description: '' },
+      53 => { type: %w[SUB], installation_type: 5, short_descriptor: 'Revision', description: '' },
+      54 => { type: %w[SUB], installation_type: 5, short_descriptor: 'Linear', description: '' },
+      55 => { type: %w[SUB], installation_type: 5, short_descriptor: 'Agreed', description: '' },
+      56 => { type: %w[EST SUB], installation_type: 5, short_descriptor: 'Prior to First Read - Agreed', description: '' },
+      57 => { type: %w[EST SUB], installation_type: 5, short_descriptor: 'Customer Class', description: '' },
+      58 => { type: %w[EST SUB], installation_type: 5, short_descriptor: 'Zero', description: '' },
+      61 => { type: %w[EST SUB], installation_type: 6, short_descriptor: 'Previous Year', description: '' },
+      62 => { type: %w[EST SUB], installation_type: 6, short_descriptor: 'Previous Read', description: '' },
+      63 => { type: %w[EST SUB], installation_type: 6, short_descriptor: 'Customer Class', description: '' },
+      64 => { type: %w[SUB], installation_type: 6, short_descriptor: 'Agreed', description: '' },
+      65 => { type: %w[EST], installation_type: 6, short_descriptor: 'ADL', description: '' },
+      66 => { type: %w[SUB], installation_type: 6, short_descriptor: 'Revision', description: '' },
+      67 => { type: %w[SUB], installation_type: 6, short_descriptor: 'Customer Read', description: '' },
+      68 => { type: %w[EST SUB], installation_type: 6, short_descriptor: 'Zero', description: '' },
+      71 => { type: %w[SUB], installation_type: 7, short_descriptor: 'Recalculation', description: '' },
+      72 => { type: %w[SUB], installation_type: 7, short_descriptor: 'Revised Table', description: '' },
+      73 => { type: %w[SUB], installation_type: 7, short_descriptor: 'Revised Algorithm', description: '' },
+      74 => { type: %w[SUB], installation_type: 7, short_descriptor: 'Agreed', description: '' },
+      75 => { type: %w[EST], installation_type: 7, short_descriptor: 'Existing Table', description: '' }
     }.freeze
 
     REASON_CODES = {
@@ -332,7 +334,7 @@ module AEMO
       end
       raise ArgumentError, 'UOM is not valid'               if 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, '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 = AEMO::NMI.new(csv[1])
@@ -369,14 +371,14 @@ module AEMO
       raise ArgumentError, 'QualityMethod is not valid' unless csv[intervals_offset + 0].class == 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 %w(A N V).include?(csv[intervals_offset + 0][0])
+      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])
+      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)
       end
-      if !csv[intervals_offset + 1].nil? && csv[intervals_offset + 1].to_i == 0
+      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?
       end
       if options[:strict]
@@ -429,7 +431,7 @@ module AEMO
       interval_events = []
 
       # Only need to update flags for EFSV
-      unless %w(A N).include?csv[3]
+      unless %w[A N].include? csv[3]
         number_of_intervals = 1440 / @data_details.last[:interval_length]
         interval_start_point = @interval_data.length - number_of_intervals
 
@@ -460,13 +462,11 @@ module AEMO
 
     # @param [String] line A single line in string format
     # @return [Hash] the line parsed into a hash of information
-    def parse_nem12_500(_line, _options = {})
-    end
+    def parse_nem12_500(_line, _options = {}); end
 
     # @param [String] line A single line in string format
     # @return [Hash] the line parsed into a hash of information
-    def parse_nem12_900(_line, _options = {})
-    end
+    def parse_nem12_900(_line, _options = {}); end
 
     # Turns the flag to a string
     #
@@ -498,7 +498,7 @@ module AEMO
 
     # @return [Array] CSV of a NEM12 file a given Meter + Data Stream for easy reading
     def to_csv
-      headers = %w(nmi suffix units datetime value flags)
+      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

data/lib/aemo/nem13.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module AEMO
   class NEM13
   end

data/lib/aemo/nmi.rb

@@ -1,412 +1,328 @@
+# frozen_string_literal: true
+
 require 'csv'
 require 'json'
 require 'time'
 require 'ostruct'
 module AEMO
-  # AEMO::NMI acts as an object to simplify access to data and information about a NMI and provide verification of the NMI value
+  # AEMO::NMI acts as an object to simplify access to data and information
+  # about a NMI and provide verification of the NMI value
   class NMI
     # Operational Regions for the NMI
-    REGIONS = {
-      'ACT' => 'Australian Capital Territory',
-      'NSW' => 'New South Wales',
-      'QLD' => 'Queensland',
-      'SA'  => 'South Australia',
-      'TAS' => 'Tasmania',
-      'VIC' => 'Victoria',
-      'WA'  => 'Western Australia',
-      'NT'  => 'Northern Territory'
-    }.freeze
+    REGIONS = { 'ACT' => 'Australian Capital Territory',
+                'NSW' => 'New South Wales',
+                'QLD' => 'Queensland',
+                'SA'  => 'South Australia',
+                'TAS' => 'Tasmania',
+                'VIC' => 'Victoria',
+                'WA'  => 'Western Australia',
+                'NT'  => 'Northern Territory' }.freeze
 
-    # NMI_ALLOCATIONS as per AEMO Documentation at http://aemo.com.au/Electricity/Policies-and-Procedures/Retail-and-Metering/~/media/Files/Other/Retail% 20and% 20Metering/NMI_Allocation_List_v7_June_2012.ashx
-    #   Last accessed 2016-05-15
+    # NMI_ALLOCATIONS as per AEMO Documentation at
+    # https://www.aemo.com.au/-/media/Files/Electricity/NEM/Retail_and_Metering/
+    #   Metering-Procedures/NMI-Allocation-List.pdf
+    #   Last accessed 2017-08-01
     NMI_ALLOCATIONS = {
       'ACTEWP' => {
         title: 'Actew Distribution Ltd and Jemena Networks (ACT) Pty Ltd',
         friendly_title: 'ACTEWAgl',
         state: AEMO::Region.new('ACT'),
         type: 'electricity',
-        includes: [
-          /^(NGGG[A-HJ-NP-VX-Z\d][A-HJ-NP-Z\d]{5})$/,
-          /^(7001\d{6})$/
-        ],
-        excludes: [
-        ]
+        includes: [/^(NGGG[A-HJ-NP-VX-Z\d][A-HJ-NP-Z\d]{5})$/,
+                   /^(7001\d{6})$/],
+        excludes: []
       },
       'CNRGYP' => {
         title: 'Essential Energy',
         friendly_title: 'Essential Energy',
         state: AEMO::Region.new('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})$/
-        ],
-        excludes: [
-        ]
+        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})$/],
+        excludes: []
       },
       'ENERGYAP' => {
         title: 'Ausgrid',
         friendly_title: 'Ausgrid',
         state: AEMO::Region.new('NSW'),
         type: 'electricity',
-        includes: [
-          /^(NCCC[A-HJ-NP-VX-Z\d][A-HJ-NP-Z\d]{5})$/,
-          /^(410[234]\d{6})$/
-        ],
-        excludes: [
-        ]
+        includes: [/^(NCCC[A-HJ-NP-VX-Z\d][A-HJ-NP-Z\d]{5})$/,
+                   /^(410[234]\d{6})$/],
+        excludes: []
       },
       'INTEGP' => {
         title: 'Endeavour Energy',
         friendly_title: 'Endeavour Energy',
         state: AEMO::Region.new('NSW'),
         type: 'electricity',
-        includes: [
-          /^(NEEE[A-HJ-NP-VX-Z\d][A-HJ-NP-Z\d]{5})$/,
-          /^(431\d{7})$/
-        ],
-        excludes: [
-        ]
+        includes: [/^(NEEE[A-HJ-NP-VX-Z\d][A-HJ-NP-Z\d]{5})$/,
+                   /^(431\d{7})$/],
+        excludes: []
       },
       'TRANSGP' => {
         title: 'TransGrid',
         friendly_title: 'TransGrid',
         state: AEMO::Region.new('NSW'),
         type: 'electricity',
-        includes: [
-          /^(NTTT[A-HJ-NP-VX-Z\d][A-HJ-NP-Z\d]{5})$/,
-          /^(460810[0-8]\d{3})$/
-        ],
-        excludes: [
-        ]
+        includes: [/^(NTTT[A-HJ-NP-VX-Z\d][A-HJ-NP-Z\d]{5})$/,
+                   /^(460810[0-8]\d{3})$/],
+        excludes: []
       },
       'SNOWY' => {
         title: 'Snowy Hydro Ltd',
         friendly_title: 'Snowy Hydro',
         state: AEMO::Region.new('NSW'),
         type: 'electricity',
-        includes: [
-          /^(4708109\d{3})$/
-        ],
-        excludes: [
-        ]
+        includes: [/^(4708109\d{3})$/],
+        excludes: []
       },
       'NT_RESERVED' => {
         title: 'Northern Territory Reserved Block',
         friendly_title: 'Northern Territory Reserved Block',
         state: AEMO::Region.new('NT'),
         type: 'electricity',
-        includes: [
-          /^(250\d{7})$/
-        ],
-        excludes: [
-        ]
+        includes: [/^(250\d{7})$/],
+        excludes: []
       },
       'ERGONETP' => {
         title: 'Ergon Energy Corporation',
         friendly_title: 'Ergon Energy',
         state: AEMO::Region.new('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})$/
-        ],
-        excludes: [
-        ]
+        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})$/],
+        excludes: []
       },
       'ENERGEXP' => {
         title: 'ENERGEX Limited',
         friendly_title: 'Energex',
         state: AEMO::Region.new('QLD'),
         type: 'electricity',
-        includes: [
-          /^(QB\d{2}[A-HJ-NP-VX-Z\d][A-HJ-NP-Z\d]{5})$/,
-          /^(31\d{8})$/
-        ],
-        excludes: [
-        ]
+        includes: [/^(QB\d{2}[A-HJ-NP-VX-Z\d][A-HJ-NP-Z\d]{5})$/,
+                   /^(31\d{8})$/],
+        excludes: []
       },
       'PLINKP' => {
         title: 'Qld Electricity Transmission Corp (Powerlink)',
         friendly_title: 'Powerlink',
         state: AEMO::Region.new('QLD'),
         type: 'electricity',
-        includes: [
-          /^(Q[A-HJ-NP-Z\d]{3}W[A-HJ-NP-Z\d]{5})$/,
-          /^(320200\d{4})$/
-        ],
-        excludes: [
-        ]
+        includes: [/^(Q[A-HJ-NP-Z\d]{3}W[A-HJ-NP-Z\d]{5})$/,
+                   /^(320200\d{4})$/],
+        excludes: []
       },
       'UMPLP' => {
         title: 'SA Power Networks',
         friendly_title: 'SA Power Networks',
         state: AEMO::Region.new('SA'),
         type: 'electricity',
-        includes: [
-          /^(SAAA[A-HJ-NP-VX-Z\d][A-HJ-NP-Z\d]{5})$/,
-          /^(SASMPL[\d]{4})$/,
-          /^(200[12]\d{6})$/
-        ],
-        excludes: [
-        ]
+        includes: [/^(SAAA[A-HJ-NP-VX-Z\d][A-HJ-NP-Z\d]{5})$/,
+                   /^(SASMPL[\d]{4})$/,
+                   /^(200[12]\d{6})$/],
+        excludes: []
       },
       'ETSATP' => {
         title: 'ElectraNet SA',
         friendly_title: 'ElectraNet SA',
         state: AEMO::Region.new('SA'),
         type: 'electricity',
-        includes: [
-          /^(S[A-HJ-NP-Z\d]{3}W[A-HJ-NP-Z\d]{5})$/,
-          /^(210200\d{4})$/
-        ],
-        excludes: [
-        ]
+        includes: [/^(S[A-HJ-NP-Z\d]{3}W[A-HJ-NP-Z\d]{5})$/,
+                   /^(210200\d{4})$/],
+        excludes: []
       },
       'AURORAP' => {
         title: 'TasNetworks',
         friendly_title: 'TasNetworks',
         state: AEMO::Region.new('TAS'),
         type: 'electricity',
-        includes: [
-          /^(T000000(([0-4]\d{3})|(500[01])))$/,
-          /^(8000\d{6})$/,
-          /^(8590[23]\d{5})$/
-        ],
-        excludes: [
-        ]
+        includes: [/^(T000000(([0-4]\d{3})|(500[01])))$/,
+                   /^(8000\d{6})$/,
+                   /^(8590[23]\d{5})$/],
+        excludes: []
       },
       'TRANSEND' => {
         title: 'TasNetworks',
         friendly_title: 'TasNetworks',
         state: AEMO::Region.new('TAS'),
         type: 'electricity',
-        includes: [
-          /^(T[A-HJ-NP-Z\d]{3}W[A-HJ-NP-Z\d]{5})$/
-        ],
-        excludes: [
-        ]
+        includes: [/^(T[A-HJ-NP-Z\d]{3}W[A-HJ-NP-Z\d]{5})$/],
+        excludes: []
       },
       'CITIPP' => {
         title: 'CitiPower',
         friendly_title: 'CitiPower',
         state: AEMO::Region.new('VIC'),
         type: 'electricity',
-        includes: [
-          /^(VAAA[A-HJ-NP-VX-Z\d][A-HJ-NP-Z\d]{5})$/,
-          /^(610[23]\d{6})$/
-        ],
-        excludes: [
-        ]
+        includes: [/^(VAAA[A-HJ-NP-VX-Z\d][A-HJ-NP-Z\d]{5})$/,
+                   /^(610[23]\d{6})$/],
+        excludes: []
       },
       'EASTERN' => {
         title: 'SP AusNet',
         friendly_title: 'SP AusNet DNSP',
         state: AEMO::Region.new('VIC'),
         type: 'electricity',
-        includes: [
-          /^(VBBB[A-HJ-NP-VX-Z\d][A-HJ-NP-Z\d]{5})$/,
-          /^(630[56]\d{6})$/
-        ],
-        excludes: [
-        ]
+        includes: [/^(VBBB[A-HJ-NP-VX-Z\d][A-HJ-NP-Z\d]{5})$/,
+                   /^(630[56]\d{6})$/],
+        excludes: []
       },
       'POWCP' => {
         title: 'PowerCor Australia',
         friendly_title: 'PowerCor',
         state: AEMO::Region.new('VIC'),
         type: 'electricity',
-        includes: [
-          /^(VCCC[A-HJ-NP-VX-Z\d][A-HJ-NP-Z\d]{5})$/,
-          /^(620[34]\d{6})$/
-        ],
-        excludes: [
-        ]
+        includes: [/^(VCCC[A-HJ-NP-VX-Z\d][A-HJ-NP-Z\d]{5})$/,
+                   /^(620[34]\d{6})$/],
+        excludes: []
       },
       'SOLARISP' => {
         title: 'Jemena  Electricity Networks (VIC)',
         friendly_title: 'Jemena',
         state: AEMO::Region.new('VIC'),
         type: 'electricity',
-        includes: [
-          /^(VDDD[A-HJ-NP-VX-Z\d][A-HJ-NP-Z\d]{5})$/,
-          /^(6001\d{6})$/
-        ],
-        excludes: [
-        ]
+        includes: [/^(VDDD[A-HJ-NP-VX-Z\d][A-HJ-NP-Z\d]{5})$/,
+                   /^(6001\d{6})$/],
+        excludes: []
       },
       'UNITED' => {
         title: 'United Energy Distribution',
         friendly_title: 'United Energy',
         state: AEMO::Region.new('VIC'),
         type: 'electricity',
-        includes: [
-          /^(VEEE[A-HJ-NP-VX-Z\d][A-HJ-NP-Z\d]{5})$/,
-          /^(640[78]\d{6})$/
-        ],
-        excludes: [
-        ]
+        includes: [/^(VEEE[A-HJ-NP-VX-Z\d][A-HJ-NP-Z\d]{5})$/,
+                   /^(640[78]\d{6})$/],
+        excludes: []
       },
       'GPUPP' => {
         title: 'SP AusNet TNSP',
         friendly_title: 'SP AusNet TNSP',
         state: AEMO::Region.new('VIC'),
         type: 'electricity',
-        includes: [
-          /^(V[A-HJ-NP-Z\d]{3}W[A-HJ-NP-Z\d]{5})$/,
-          /^(650900\d{4})$/
-        ],
-        excludes: [
-        ]
+        includes: [/^(V[A-HJ-NP-Z\d]{3}W[A-HJ-NP-Z\d]{5})$/,
+                   /^(650900\d{4})$/],
+        excludes: []
       },
       'WESTERNPOWER' => {
         title: 'Western Power',
         friendly_title: 'Western Power',
         state: AEMO::Region.new('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})$/
-        ],
-        excludes: [
-        ]
+        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})$/],
+        excludes: []
       },
       'HORIZONPOWER' => {
         title: 'Horizon Power',
         friendly_title: 'Horizon Power',
         state: AEMO::Region.new('WA'),
         type: 'electricity',
-        includes: [
-          /^(8021\d{6})$/
-        ],
-        excludes: [
-        ]
+        includes: [/^(8021\d{6})$/],
+        excludes: []
       },
       'GAS_NSW' => {
         title: 'GAS NSW',
         friendly_title: 'GAS NSW',
         state: AEMO::Region.new('NSW'),
         type: 'gas',
-        includes: [
-          /^(52\d{8})$/
-        ],
-        excludes: [
-        ]
+        includes: [/^(52\d{8})$/],
+        excludes: []
       },
       'GAS_VIC' => {
         title: 'GAS VIC',
         friendly_title: 'GAS VIC',
         state: AEMO::Region.new('VIC'),
         type: 'gas',
-        includes: [
-          /^(53\d{8})$/
-        ],
-        excludes: [
-        ]
+        includes: [/^(53\d{8})$/],
+        excludes: []
       },
       'GAS_QLD' => {
         title: 'GAS QLD',
         friendly_title: 'GAS QLD',
         state: AEMO::Region.new('QLD'),
         type: 'gas',
-        includes: [
-          /^(54\d{8})$/
-        ],
-        excludes: [
-        ]
+        includes: [/^(54\d{8})$/],
+        excludes: []
       },
       'GAS_SA' => {
         title: 'GAS SA',
         friendly_title: 'GAS SA',
         state: AEMO::Region.new('SA'),
         type: 'gas',
-        includes: [
-          /^(55\d{8})$/
-        ],
-        excludes: [
-        ]
+        includes: [/^(55\d{8})$/],
+        excludes: []
       },
       'GAS_WA' => {
         title: 'GAS WA',
         friendly_title: 'GAS WA',
         state: AEMO::Region.new('WA'),
         type: 'gas',
-        includes: [
-          /^(56\d{8})$/
-        ],
-        excludes: [
-        ]
+        includes: [/^(56\d{8})$/],
+        excludes: []
       },
       'GAS_TAS' => {
         title: 'GAS TAS',
         friendly_title: 'GAS TAS',
         state: AEMO::Region.new('TAS'),
         type: 'gas',
-        includes: [
-          /^(57\d{8})$/
-        ],
-        excludes: [
-        ]
+        includes: [/^(57\d{8})$/],
+        excludes: []
       },
       'FEDAIRPORTS' => {
         title: 'Federal Airports Corporation (Sydney Airport)',
         friendly_title: 'Sydney Airport',
         state: AEMO::Region.new('NSW'),
         type: 'electricity',
-        includes: [
-          /^(NJJJNR[A-HJ-NP-Z\d]{4})$/
-        ],
-        excludes: [
-        ]
+        includes: [/^(NJJJNR[A-HJ-NP-Z\d]{4})$/],
+        excludes: []
       },
       'EXEMPTNETWORKS' => {
         title: 'Exempt Networks - various',
         friendly_title: 'Exempt Networks - various',
         state: '',
         type: 'electricity',
-        includes: [
-          /^(NKKK[A-HJ-NP-VX-Z\d][A-HJ-NP-Z\d]{5})$/,
-          /^(7102\d{6})$/
-        ],
-        excludes: [
-        ]
+        includes: [/^(NKKK[A-HJ-NP-VX-Z\d][A-HJ-NP-Z\d]{5})$/,
+                   /^(7102\d{6})$/],
+        excludes: []
       },
       'AEMORESERVED' => {
         title: 'AEMO Reserved',
         friendly_title: 'AEMO Reserved',
         state: '',
         type: 'electricity',
-        includes: [
-          /^(880[1-5]\d{6})$/,
-          /^(9\d{9})$/
-        ],
-        excludes: [
-        ]
+        includes: [/^(880[1-5]\d{6})$/,
+                   /^(9\d{9})$/],
+        excludes: []
       }
     }.freeze
     # Transmission Node Identifier Codes are loaded from a json file
     #  Obtained from http://www.nemweb.com.au/
     #
     #  See /lib/data for further data manipulation required
-    TNI_CODES = JSON.parse(File.read(File.join(File.dirname(__FILE__), '..', 'data', 'aemo-tni.json'))).freeze
+    TNI_CODES = JSON.parse(File.read(File.join(File.dirname(__FILE__), '..',
+                                               'data', 'aemo-tni.json'))).freeze
     # Distribution Loss Factor Codes are loaded from a json file
-    #  Obtained from MSATS, matching to DNSP from file http://www.aemo.com.au/Electricity/Market-Operations/Loss-Factors-and-Regional-Boundaries/~/media/Files/Other/loss% 20factors/DLF_FINAL_V2_2014_2015.ashx
-    #  Last accessed 2015-02-06
+    #  Obtained from MSATS, matching to DNSP from file
+    # https://www.aemo.com.au/-/media/Files/Electricity/NEM/
+    #   Security_and_Reliability/Loss_Factors_and_Regional_Boundaries/
+    #   2016/DLF_V3_2016_2017.pdf
+    #
+    #  Last accessed 2017-08-01
     #  See /lib/data for further data manipulation required
-    DLF_CODES = JSON.parse(File.read(File.join(File.dirname(__FILE__), '..', 'data', 'aemo-dlf.json'))).freeze
+    DLF_CODES = JSON.parse(File.read(File.join(File.dirname(__FILE__), '..',
+                                               'data', 'aemo-dlf.json'))).freeze
 
     # [String] National Meter Identifier
     @nmi                          = nil
@@ -423,18 +339,24 @@ module AEMO
     @roles                        = nil
     @data_streams                 = nil
 
-    attr_accessor :nmi, :msats_detail, :tni, :dlf, :customer_classification_code, :customer_threshold_code, :jurisdiction_code, :classification_code, :status, :address, :meters, :roles, :data_streams
+    attr_accessor :nmi, :msats_detail, :tni, :dlf,
+                  :customer_classification_code, :customer_threshold_code,
+                  :jurisdiction_code, :classification_code, :status, :address,
+                  :meters, :roles, :data_streams
 
     # Initialize a NMI file
     #
     # @param [String] nmi the National Meter Identifier (NMI)
     # @param [Hash] options a hash of options
-    # @option options [Hash] :msats_detail MSATS details as per #parse_msats_detail requirements
+    # @option options [Hash] :msats_detail MSATS details as per
+    #   #parse_msats_detail requirements
     # @return [AEMO::NMI] an instance of AEMO::NMI is returned
     def initialize(nmi, options = {})
       raise ArgumentError, 'NMI is not a string' unless nmi.is_a?(String)
       raise ArgumentError, 'NMI is not 10 characters' unless nmi.length == 10
-      raise ArgumentError, 'NMI is not constructed with valid characters' unless AEMO::NMI.valid_nmi?(nmi)
+      unless AEMO::NMI.valid_nmi?(nmi)
+        raise ArgumentError, 'NMI is not constructed with valid characters'
+      end
 
       @nmi          = nmi
       @meters       = []
@@ -459,17 +381,21 @@ module AEMO
       AEMO::NMI.network(@nmi)
     end
 
-    # A function to calculate the checksum value for a given National Meter Identifier
+    # A function to calculate the checksum value for a given
+    # National Meter Identifier
     #
-    # @param [Integer] checksum_value the checksum value to check against the current National Meter Identifier's checksum value
+    # @param [Integer] checksum_value the checksum value to check against the
+    #   current National Meter Identifier's checksum value
     # @return [Boolean] whether or not the checksum is valid
     def valid_checksum?(checksum_value)
       checksum_value == checksum
     end
 
-    # Checksum is a function to calculate the checksum value for a given National Meter Identifier
+    # Checksum is a function to calculate the checksum value for a given
+    # National Meter Identifier
     #
-    # @return [Integer] the checksum value for the current National Meter Identifier
+    # @return [Integer] the checksum value for the current National Meter
+    #   Identifier
     def checksum
       summation = 0
       @nmi.reverse.split(//).each_index do |i|
@@ -486,12 +412,14 @@ module AEMO
     #
     # @return [Hash] MSATS NMI Detail data
     def raw_msats_nmi_detail(options = {})
-      raise ArgumentError,
-            'MSATS has no authentication credentials' unless AEMO::MSATS.can_authenticate?
+      unless AEMO::MSATS.can_authenticate?
+        raise ArgumentError, 'MSATS has no authentication credentials'
+      end
       AEMO::MSATS.nmi_detail(@nmi, options)
     end
 
-    # Provided MSATS is configured, uses the raw MSATS data to augment NMI information
+    # Provided MSATS is configured, uses the raw MSATS data to augment NMI
+    # information
     #
     # @return [self] returns self
     def update_from_msats!(options = {})
@@ -523,27 +451,13 @@ module AEMO
       unless @msats_detail['MeterRegister'].nil?
         meters = @msats_detail['MeterRegister']['Meter']
         meters = [meters] if meters.is_a?(Hash)
-        meters.select { |x| !x['Status'].nil? }.each do |meter|
-          @meters << OpenStruct.new(
-            status: meter['Status'],
-            installation_type_code: meter['InstallationTypeCode'],
-            next_scheduled_read_date: meter['NextScheduledReadDate'],
-            read_type_code: meter['ReadTypeCode'],
-            registers: [],
-            serial_number: meter['SerialNumber']
-          )
+        meters.reject { |x| x['Status'].nil? }.each do |meter|
+          @meters << AEMO::Meter.from_hash(meter)
         end
         meters.select { |x| x['Status'].nil? }.each do |registers|
           m = @meters.find { |x| x.serial_number == registers['SerialNumber'] }
-          m.registers << OpenStruct.new(
-            controlled_load: (registers['RegisterConfiguration']['Register']['ControlledLoad'] == 'Y'),
-            dial_format: registers['RegisterConfiguration']['Register']['DialFormat'],
-            multiplier: registers['RegisterConfiguration']['Register']['Multiplier'],
-            network_tariff_code: registers['RegisterConfiguration']['Register']['NetworkTariffCode'],
-            register_id: registers['RegisterConfiguration']['Register']['RegisterID'],
-            status: registers['RegisterConfiguration']['Register']['Status'],
-            time_of_day: registers['RegisterConfiguration']['Register']['TimeOfDay'],
-            unit_of_measure: registers['RegisterConfiguration']['Register']['UnitOfMeasure']
+          m.registers << AEMO::Register.from_hash(
+            registers['RegisterConfiguration']['Register']
           )
         end
       end
@@ -588,10 +502,11 @@ module AEMO
       friendly_address
     end
 
-    # Returns the meter OpenStructs for the requested status (C/R)
+    # Returns the meters for the requested status (C/R)
     #
     # @param [String] status the stateus [C|R]
-    # @return [Array<OpenStruct>] Returns an array of OpenStructs for Meters with the status provided
+    # @return [Array<AEMO::Meter>] Returns an array of AEMO::Meters with the
+    #   status provided
     def meters_by_status(status = 'C')
       @meters.select { |x| x.status == status.to_s }
     end
@@ -599,7 +514,8 @@ module AEMO
     # Returns the data_stream OpenStructs for the requested status (A/I)
     #
     # @param [String] status the stateus [A|I]
-    # @return [Array<OpenStruct>] Returns an array of OpenStructs for the current Meters
+    # @return [Array<OpenStruct>] Returns an array of OpenStructs for the
+    #   current Meters
     def data_streams_by_status(status = 'A')
       @data_streams.select { |x| x.status == status.to_s }
     end
@@ -608,7 +524,8 @@ module AEMO
     #
     # @return [Integer] the current daily load for the meter in kWh
     def current_daily_load
-      data_streams_by_status.map { |x| x.averaged_daily_load.to_i }.inject(0, :+)
+      data_streams_by_status.map { |x| x.averaged_daily_load.to_i }
+                            .inject(0, :+)
     end
 
     # The current annual load in MWh
@@ -626,10 +543,12 @@ module AEMO
       ((nmi.length == 10) && !nmi.match(/^([A-HJ-NP-Z\d]{10})/).nil?)
     end
 
-    # A function to calculate the checksum value for a given National Meter Identifier
+    # A function to calculate the checksum value for a given National Meter
+    # Identifier
     #
     # @param [String] nmi the NMI to check the checksum against
-    # @param [Integer] checksum_value the checksum value to check against the current National Meter Identifier's checksum value
+    # @param [Integer] checksum_value the checksum value to check against the
+    #   current National Meter Identifier's checksum value
     # @return [Boolean] whether or not the checksum is valid
     def self.valid_checksum?(nmi, checksum_value)
       nmi = AEMO::NMI.new(nmi)
@@ -655,13 +574,20 @@ module AEMO
 
     # A function to return the distribution loss factor value for a given date
     #
-    # @param [DateTime, Time] datetime the date for the distribution loss factor value
+    # @param [DateTime, Time] datetime the date for the distribution loss factor
+    #   value
     # @return [nil, float] the distribution loss factor value
     def dlfc_value(datetime = DateTime.now)
-      raise 'No DLF set, ensure that you have set the value either via the update_from_msats! function or manually' if @dlf.nil?
+      if @dlf.nil?
+        raise 'No DLF set, ensure that you have set the value either via the' \
+              'update_from_msats! function or manually'
+      end
       raise 'DLF is invalid' unless DLF_CODES.keys.include?(@dlf)
       raise 'Invalid date' unless [DateTime, Time].include?(datetime.class)
-      possible_values = DLF_CODES[@dlf].select { |x| DateTime.parse(x['FromDate']) <= datetime && datetime <= DateTime.parse(x['ToDate']) }
+      possible_values = DLF_CODES[@dlf].select do |x|
+        DateTime.parse(x['FromDate']) <= datetime &&
+          DateTime.parse(x['ToDate']) >= datetime
+      end
       if possible_values.empty?
         nil
       else