aemo 0.1.5 → 0.1.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a401245a1f7b25723a1ae670079c4d58a444f8f6
-  data.tar.gz: c48680094298ec88e7cfe69d2e849c061177a2ec
+  metadata.gz: cbb54d233f0bd13dcce773ff836b7877456a1a14
+  data.tar.gz: 5459c83ac0ea8cc02ba3d1645961e4af105ffd1d
 SHA512:
-  metadata.gz: cc19ba3f91983da75207c8d6328ab4ecce573b849bbaddfa4720b73ce05e4db00a1f8604ad3adebe18b88755d9801894055820339d18890bc820eef6f9315e71
-  data.tar.gz: 3151c7067018f9d059ddfe27d361172aef4a2a66ad301a25a0690d336e7a95c606ff6df699434c02d1cbc325a311fb2dfadbc490682b5139eb9f808124b12941
+  metadata.gz: 9253a01333a488789af1a50ecae9795a6ff695fa4eb48729610f3da6482fb1b7a31a789bf1de1336c18f3426954c713304b13fa12632b9726c9cd90f461e2494
+  data.tar.gz: 204bd766824e4c9e55ee24895e428febd5c19125b01128f7802961ce826b5fb4be61296e0e8191ec1401f6c830c4779ad74de748fb00416d171b638fc91d636d

data/aemo.gemspec

@@ -3,7 +3,7 @@ $:.push File.expand_path('../lib', __FILE__)
 
 Gem::Specification.new do |s|
   s.name        = 'aemo'
-  s.version     = '0.1.5'
+  s.version     = '0.1.6'
   s.platform    = Gem::Platform::RUBY
   s.date        = '2015-02-07'
   s.summary     = 'AEMO Gem'

data/lib/aemo/nmi.rb

@@ -420,8 +420,9 @@ module AEMO
     @address                      = nil
     @meters                       = nil
     @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
+    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 NEM12 file
     #
@@ -436,6 +437,7 @@ module AEMO
       @nmi              = nmi
       @meters           = {}
       @roles            = {}
+      @data_streams     = []
     end
 
     # A function to validate the instance's nmi value
@@ -510,7 +512,8 @@ module AEMO
             installation_type_code: meter['InstallationTypeCode'],
             next_scheduled_read_date: meter['NextScheduledReadDate'],
             read_type_code: meter['ReadTypeCode'],
-            registers: []
+            registers: [],
+            serial_number: meter['SerialNumber']
           )
           puts "@meters.inspect: #{@meters.inspect}"
           @meters[meter['SerialNumber']] = m
@@ -535,9 +538,25 @@ module AEMO
           @roles[role['Role']] = role['Party']
         end
       end
-
+      # DataStreams
+      unless @msats_detail['DataStreams'].nil?
+        @msats_detail['DataStreams']['DataStream'].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
       self
     end
+
+    # Returns a nice address from the structured one AEMO sends us
+    #
+    # @return [String]
+    def friendly_address
+      friendly_address = ''
+      if @address.is_a?(Hash)
+        friendly_address = @nmi.address.values.map{|x| x.is_a?(Hash) ? x.values.map{|y| y.is_a?(Hash) ? y.values.join(" ") : y }.join(" ") : x }.join(", ")
+      end
+      friendly_address
+    end
   
     # A function to validate the NMI provided
     #

metadata

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