aemo 0.1.22 → 0.1.23

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b0d12cca1c4b2adde869316eea0d16874d7e2c29
-  data.tar.gz: 1f2707793c79ce1ef1dbd7c469c2738498ec3770
+  metadata.gz: b20ce4d815543d07216701db47a72312737db305
+  data.tar.gz: fdfc8776f7fa87f93e1610577e8fe3676ab1f43d
 SHA512:
-  metadata.gz: 34020a0543ec0f72a4ba36f125d4f1351892b7472f78eb4395ecd9b20f756f20e8943d493c3e06a975bbb5797247d37606275c4094f12612ffc37348ba177fb6
-  data.tar.gz: b10d68d05989bfd3a4620bbbca36040ecb435542704fa5f75f1a1fb9977a008ff54379f16eb4a9a72088c179626791e7518e769fb35d3b163558521e4442f182
+  metadata.gz: 51800d16c005e07a0be7fd05de0ccda4224b1aed8159fa148a16d994fac919ff068fec769bedac7f319a0264087ed57471de7e62c8e10e622c0bba0963af5732
+  data.tar.gz: c48aaa496f7796c066229953d4a95b667819bd608bfed1ccb854487c006d171c4ccf06cc6d9bf9694bee28d880e6d902485190c2e07567045714a2ef4d330855

data/lib/aemo/nem12.rb

@@ -1,7 +1,10 @@
 require 'csv'
 require 'time'
+
 module AEMO
-  class NEM12
+  # Namespace for classes and modules that handle AEMO Gem NEM12 interactions
+  # @since 0.1.4
+  module NEM12
     # As per AEMO NEM12 Specification
     # http://www.aemo.com.au/Consultations/National-Electricity-Market/Open/~/media/Files/Other/consultations/nem/Meter%20Data%20File%20Format%20Specification%20NEM12_NEM13/MDFF_Specification_NEM12_NEM13_Final_v102_clean.ashx
     RECORD_INDICATORS = {
@@ -223,45 +226,11 @@ module AEMO
 
     }
 
-    DATA_STREAM_SUFFIX = {
-      # Averaged Data Streams
-      'A' => { :stream => 'Average', :description => 'Import', :units => 'kWh' },
-      'D' => { :stream => 'Average', :description => 'Export', :units => 'kWh' },
-      'J' => { :stream => 'Average', :description => 'Import', :units => 'kVArh' },
-      'P' => { :stream => 'Average', :description => 'Export', :units => 'kVArh' },
-      'S' => { :stream => 'Average', :description => '',       :units => 'kVAh' },
-      # Master Data Streams
-      'B' => { :stream => 'Master',  :description => 'Import', :units => 'kWh' },
-      'E' => { :stream => 'Master',  :description => 'Export', :units => 'kWh' },
-      'K' => { :stream => 'Master',  :description => 'Import', :units => 'kVArh' },
-      'Q' => { :stream => 'Master',  :description => 'Export', :units => 'kVArh' },
-      'T' => { :stream => 'Master',  :description => '',       :units => 'kVAh' },
-      'G' => { :stream => 'Master',  :description => 'Power Factor',       :units => 'PF' },
-      'H' => { :stream => 'Master',  :description => 'Q Metering',         :units => 'Qh' },
-      'M' => { :stream => 'Master',  :description => 'Par Metering',  :units => 'parh' },
-      'V' => { :stream => 'Master',  :description => 'Volts or V2h or Amps or A2h',  :units => '' },
-      # Check Meter Streams
-      'C' => { :stream => 'Check',  :description => 'Import', :units => 'kWh' },
-      'F' => { :stream => 'Check',  :description => 'Export', :units => 'kWh' },
-      'L' => { :stream => 'Check',  :description => 'Import', :units => 'kVArh' },
-      'R' => { :stream => 'Check',  :description => 'Export', :units => 'kVArh' },
-      'U' => { :stream => 'Check',  :description => '',       :units => 'kVAh' },
-      'Y' => { :stream => 'Check',  :description => 'Q Metering',         :units => 'Qh' },
-      'W' => { :stream => 'Check',  :description => 'Par Metering Path',  :units => '' },
-      'Z' => { :stream => 'Check',  :description => 'Volts or V2h or Amps or A2h',  :units => '' },
-      # Net Meter Streams
-      # AEMO: NOTE THAT D AND J ARE PREVIOUSLY DEFINED
-      # 'D' => { :stream => 'Net',    :description => 'Net', :units => 'kWh' },
-      # 'J' => { :stream => 'Net',    :description => 'Net', :units => 'kVArh' }
-    }
-
-    @nmi              = nil
-    @data_details     = []
-    @interval_data    = []
-    @interval_events  = []
+    @file_contents    = nil
+    @header           = nil
+    @nmi_data_details = []
 
-    attr_accessor :nmi, :file_contents
-    attr_reader   :data_details, :interval_data, :interval_events
+    attr_accessor :file_contents, :header, :nmi_data_details
 
     # Initialize a NEM12 file
     def initialize(nmi,options={})

data/lib/aemo/nmi.rb

@@ -648,7 +648,9 @@ module AEMO
     def dlfc_values(start = DateTime.now, finish=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?
       raise 'DLF is invalid' unless DLF_CODES.keys.include?(@dlf)
-      raise 'Invalid date' unless [DateTime,Time].include?(datetime.class)
+      raise 'Invalid start' unless [DateTime,Time].include?(start.class)
+      raise 'Invalid finish' unless [DateTime,Time].include?(finish.class)
+      raise 'start cannot be after finish' if start > finish
       DLF_CODES[@dlf].reject{|x| start > DateTime.parse(x['ToDate']) || finish < DateTime.parse(x['FromDate']) }.map{|x| { 'start' => x['FromDate'], 'finish' => x['ToDate'], 'value' => x['Value'].to_f}}
     end
 

data/lib/aemo/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: aemo
 version: !ruby/object:Gem::Version
-  version: 0.1.22
+  version: 0.1.23
 platform: ruby
 authors:
 - Joel Courtney