aemo 0.1.29 → 0.1.30

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6297d3115749bc5050a726f333f7aa3ccd2cf488
-  data.tar.gz: 19d244d2d6da4813f5fe22870f8551324665ebf2
+  metadata.gz: 0e5f6b117f4035ad3a7be1f8d8525d073c599d12
+  data.tar.gz: 12c27b4672c2efb084bec8e7d088053f44ceefd8
 SHA512:
-  metadata.gz: 1781680bf8e73d3cdb0abfbfe7fd5566b7c8c70fcad8a92a34bdeca43062bff591b5c21228c5c3b1977510f31bc5db1e64d98f3b1b382a4e62072d6d284241a5
-  data.tar.gz: 1d7ceae339055b5c4d1f43209dbf615a0a7db77e6586a9785a908146882f1437810e17939604cbdb9836c01f30af1fa2ed86304a6365d5eda6d5451cdd737a77
+  metadata.gz: 1e93926c4e57dd83c339791166561f6ececd4da2caedf08f9a51dfeb4b8d36b18c32aa824c2c6aeefb99550f48bdb58974eef58e59b601a5e02cec4c0d159d65
+  data.tar.gz: cfb96c5c4da1ea97960df208df7cf4dfceded46ff5176005e5833f843ebf0da29793fbc9ef555cc6f86f6b6954a0c730f5780a9e387db0b424ee1b62d29c56ff

data/lib/aemo/nmi.rb

@@ -604,13 +604,20 @@ module AEMO
       @data_streams.select { |x| x.status == status.to_s }
     end
 
-    # The current daily load
+    # The current daily load in kWh
     #
-    # @return [Integer] the current daily load for the meter
+    # @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, :+)
     end
 
+    # The current annual load in MWh
+    #
+    # @return [Integer] the current annual load for the meter in MWh
+    def current_annual_load
+      (current_daily_load * 365.2425 / 1000).to_i
+    end
+
     # A function to validate the NMI provided
     #
     # @param nmi [String] the nmi to be checked

data/lib/aemo/version.rb

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

data/spec/lib/aemo/nmi_spec.rb

@@ -160,6 +160,13 @@ describe AEMO::NMI do
     end
   end
 
+  describe '#current_annual_load' do
+    it 'should return zero for no data' do
+      @nmi = AEMO::NMI.new('4001234567')
+      expect(@nmi.current_daily_load).to eq(0)
+    end
+  end
+
   describe '#meters_by_status' do
     before(:each) do
       @nmi = AEMO::NMI.new('4001234567')

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: aemo
 version: !ruby/object:Gem::Version
-  version: 0.1.29
+  version: 0.1.30
 platform: ruby
 authors:
 - Joel Courtney
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-02-16 00:00:00.000000000 Z
+date: 2016-06-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json