aemo 0.1.6 → 0.1.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: cbb54d233f0bd13dcce773ff836b7877456a1a14
-  data.tar.gz: 5459c83ac0ea8cc02ba3d1645961e4af105ffd1d
+  metadata.gz: 8ea10bd77f54b36de7128da38ceb13247b0b08b1
+  data.tar.gz: 89f8f122e89391b19d3ba3b84c4b2a93d2eb9928
 SHA512:
-  metadata.gz: 9253a01333a488789af1a50ecae9795a6ff695fa4eb48729610f3da6482fb1b7a31a789bf1de1336c18f3426954c713304b13fa12632b9726c9cd90f461e2494
-  data.tar.gz: 204bd766824e4c9e55ee24895e428febd5c19125b01128f7802961ce826b5fb4be61296e0e8191ec1401f6c830c4779ad74de748fb00416d171b638fc91d636d
+  metadata.gz: 8962bbee938ad756b7e3ea72e9416ae90f66eecd534d7d157ba9b9131cf9e57900d8b7934b00ccb53d06bd8ac6674fd003223487be3df7f8d47439d66b219f1e
+  data.tar.gz: c5acfee90eacd6344c41d5167fc709744cad92db4aeea9f6fed983fb2c12229414e08f650f8130f32a11ff6d136aa6ed654e9eb0e0425623538e5e8ec8827b0a

data/aemo.gemspec

@@ -3,9 +3,9 @@ $:.push File.expand_path('../lib', __FILE__)
 
 Gem::Specification.new do |s|
   s.name        = 'aemo'
-  s.version     = '0.1.6'
+  s.version     = '0.1.7'
   s.platform    = Gem::Platform::RUBY
-  s.date        = '2015-02-07'
+  s.date        = '2015-02-26'
   s.summary     = 'AEMO Gem'
   s.description = 'Gem providing functionality for the Australian Energy Market Operator data'
   s.authors     = ['Joel Courtney']

data/lib/aemo.rb

@@ -6,6 +6,7 @@ require 'aemo/region.rb'
 require 'aemo/nem12.rb'
 require 'aemo/nmi.rb'
 require 'aemo/msats.rb'
+require 'aemo/version.rb'
 
 # AEMO Module to encapsulate all AEMO classes
 module AEMO

data/lib/aemo/nmi.rb

@@ -435,7 +435,7 @@ module AEMO
       raise ArgumentError.new("NMI is not constructed with valid characters") unless AEMO::NMI.valid_nmi?(nmi)
       
       @nmi              = nmi
-      @meters           = {}
+      @meters           = []
       @roles            = {}
       @data_streams     = []
     end
@@ -503,11 +503,15 @@ module AEMO
       @classification_code          = @msats_detail['MasterData']['NMIClassificationCode']
       @status                       = @msats_detail['MasterData']['Status']
       @address                      = @msats_detail['MasterData']['Address']
-      @meters                ||= {}
+      @meters                       ||= []
+      @roles                        ||= {}
+      @data_streams                 ||= []
       # Meters
       unless @msats_detail['MeterRegister'].nil?
-        @msats_detail['MeterRegister']['Meter'].select{|x| !x['Status'].nil? }.each do |meter|
-          m = OpenStruct.new(
+        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'],
@@ -515,11 +519,10 @@ module AEMO
             registers: [],
             serial_number: meter['SerialNumber']
           )
-          puts "@meters.inspect: #{@meters.inspect}"
-          @meters[meter['SerialNumber']] = m
         end
-        @msats_detail['MeterRegister']['Meter'].select{|x| x['Status'].nil? }.each do |registers|
-          register = OpenStruct.new(
+        meters.select{|x| x['Status'].nil? }.each do |registers|
+          m = @meters.find{|x| x.serial_number == registers['SerialNumber']}
+          m.registers << register = OpenStruct.new(
             controlled_load: (registers['RegisterConfiguration']['Register']['ControlledLoad'] == 'Y'),
             dial_format: registers['RegisterConfiguration']['Register']['DialFormat'],
             multiplier: registers['RegisterConfiguration']['Register']['Multiplier'],
@@ -529,18 +532,21 @@ module AEMO
             time_of_day: registers['RegisterConfiguration']['Register']['TimeOfDay'],
             unit_of_measure: registers['RegisterConfiguration']['Register']['UnitOfMeasure']
           )
-          @meters[registers['SerialNumber']].registers << register
         end
       end
       # Roles
       unless @msats_detail['RoleAssignments'].nil?
-        @msats_detail['RoleAssignments']['RoleAssignment'].each do |role|
+        role_assignments = @msats_detail['RoleAssignments']['RoleAssignment']
+        role_assignments = [role_assignments] if role_assignments.is_a?(Hash)
+        role_assignments.each do |role|
           @roles[role['Role']] = role['Party']
         end
       end
       # DataStreams
       unless @msats_detail['DataStreams'].nil?
-        @msats_detail['DataStreams']['DataStream'].each do |stream|
+        data_streams = @msats_detail['DataStreams']['DataStream']
+        data_streams = [data_streams] if data_streams.is_a?(Hash) # Deal with issue of only one existing
+        data_streams.each do |stream|
           @data_streams << OpenStruct.new(suffix: stream['Suffix'], profile_name: stream['ProfileName'],averaged_daily_load: stream['AveragedDailyLoad'], data_stream_type: stream['DataStreamType'],status: stream['Status'])
         end
       end
@@ -557,6 +563,30 @@ module AEMO
       end
       friendly_address
     end
+
+    # Returns the meter OpenStructs for the requested status (C/R)
+    #
+    # @param status [String] the stateus [C|R]
+    # @return [Array<OpenStruct>] Returns an array of OpenStructs for Meters with the status provided
+    def meters_by_status(status = 'C')
+      @meters.select{|x| x.status == "#{status}"}
+    end
+  
+    # Returns the data_stream OpenStructs for the requested status (A/I)
+    #
+    # @param status [String] the stateus [A|I]
+    # @return [Array<OpenStruct>] Returns an array of OpenStructs for the current Meters
+    def data_streams_by_status(state = 'A')
+      @data_streams.select{|x| x.status == "#{status}"}
+    end
+  
+    # The current daily load
+    #
+    # @return [Integer] the current daily load for the meter
+    def current_daily_load
+      active_data_streams = data_streams_by_status()
+      current_daily_load = 0 + data_streams_by_status.map{|x| x.averaged_daily_load.to_i }.reduce(:+)
+    end
   
     # A function to validate the NMI provided
     #

data/lib/aemo/version.rb

@@ -0,0 +1,29 @@
+# -*- coding: UTF-8 -*-
+#
+# Copyright 2014 Joel Courtney
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#    http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+# Deal with AEMO data - nicely!
+#
+# The namespace for code of aemo gem
+#
+#
+# @author Joel Courtney <euphemize@gmail.com>
+module AEMO
+  # aemo version
+  VERSION = '0.1.7'
+
+  # aemo version split amongst different revisions
+  MAJOR_VERSION, MINOR_VERSION, REVISION = VERSION.split('.').map(&:to_i)
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: aemo
 version: !ruby/object:Gem::Version
-  version: 0.1.6
+  version: 0.1.7
 platform: ruby
 authors:
 - Joel Courtney
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-02-07 00:00:00.000000000 Z
+date: 2015-02-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json
@@ -86,6 +86,7 @@ files:
 - lib/aemo/nem13.rb
 - lib/aemo/nmi.rb
 - lib/aemo/region.rb
+- lib/aemo/version.rb
 - lib/data/TNI-MLF-Codes.csv
 - lib/data/aemo-dlf-dnsp.csv
 - lib/data/aemo-dlf.json