aemo 0.1.2 → 0.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: cdfc7a39bd7e378a3afcac8bb6344c76688c56e9
-  data.tar.gz: caa84ecfed837ea4ef4ac315fd07d6c8d0299742
+  metadata.gz: 1ba274738c0e34092ed68c13514d9c1b7bcbca6b
+  data.tar.gz: 9f7bdf4173e22a4126ba046ca73e4f4bdebde738
 SHA512:
-  metadata.gz: 3e2268fd5b21c14aa7ee760fadfeb740f4153f1f5df8d3fb9b727b7ce5b699ed3ac47fc9d12332c0af74eac7c3d8656fb04a37b9034bebc85da4d03282c202be
-  data.tar.gz: e75d4c368bdde13634259c08ff6cbcccfb89efee72402ef99c936c861460f36e473d7b118276f8acd7d2a3adcd41f1a3aec7f3a0e4028bc16f95b37bc7e1e826
+  metadata.gz: bf633a733423f986ce4455eef3db76d18bdc656c9766e8c2697f369082dace85096a6242597adabe0f453034e52bc2d7187fdaaa03483a0909222a32960dbec0
+  data.tar.gz: 8717d3baeb5f1ae3a141299977c060beffb133e01bea097773ffbb737b1d0163d40c0316688c677b7166644381114204b753f8f622e170956a4447e090c3e42e

data/aemo.gemspec

@@ -3,15 +3,16 @@ $:.push File.expand_path('../lib', __FILE__)
 
 Gem::Specification.new do |s|
   s.name        = 'aemo'
-  s.version     = '0.1.2'
+  s.version     = '0.1.3'
   s.platform    = Gem::Platform::RUBY
   s.date        = '2014-08-19'
   s.summary     = 'AEMO Gem'
   s.description = 'Gem providing functionality for the Australian Energy Market Operator data'
   s.authors     = ['Joel Courtney']
   s.email       = ['jcourtney@cozero.com.au']
-  s.homepage    = 'https://github.com/jufemaiz/aemo'
-  s.license     = 'MIT'
+  s.homepage    =
+    'https://bitbucket.org/jufemaiz/aemo-gem'
+  s.license       = 'MIT'
   
   s.required_ruby_version     = '>= 1.9.3'
 

data/lib/aemo/nem12.rb

@@ -51,6 +51,32 @@ module AEMO
       'pf'    => { :name => 'Power Factor', :multiplier => 1 }
     }
     
+    UOM_NON_SPEC_MAPPING = {
+      'MWH'   => 'MWh',
+      'KWH'   => 'kWh',
+      'WH'    => 'Wh',
+      'MW'    => 'MW',
+      'KW'    => 'kW',
+      'W'     => 'W',
+      'MVARH' => 'MVArh',
+      'KVARH' => 'kVArh',
+      'VARH'  => 'VArh',
+      'MVAR'  => 'MVAr',
+      'KVAR'  => 'kVAr',
+      'VAR'   => 'VAr',
+      'MVAH'  => 'MVAh',
+      'KVAH'  => 'kVAh',
+      'VAH'   => 'VAh',
+      'MVA'   => 'MVA',
+      'KVA'   => 'kVA',
+      'VA'    => 'VA',
+      'KV'    => 'kV',
+      'V'     => 'V',
+      'KA'    => 'kA',
+      'A'     => 'A',
+      'PF'    => 'pf'
+    }
+    
     QUALITY_FLAGS = {
       'A'     => 'Actual Data',
       'E'     => 'Forward Estimated Data',
@@ -360,6 +386,7 @@ module AEMO
       end
       
       base_interval = { :data_details => @data_details.last, :datetime => Time.parse("#{csv[1]}000000+1000"), :value => nil, :flag => nil}
+
       intervals = []
       (2..(number_of_intervals+1)).each do |i|
         interval = base_interval.dup
@@ -445,7 +472,11 @@ module AEMO
         
     # @return [Array] array of a NEM12 file a given Meter + Data Stream for easy reading
     def to_a
-      values = @interval_data.map{|d| [d[:data_details][:nmi],d[:data_details][:nmi_suffix].upcase,d[:data_details][:uom],d[:datetime],d[:value],d[:flag]]}
+      values = @interval_data.map do |d|
+        uom = UOM[UOM_NON_SPEC_MAPPING[d[:data_details][:uom].upcase]]
+        
+        [d[:data_details][:nmi],d[:data_details][:nmi_suffix].upcase,d[:data_details][:uom],d[:datetime],d[:value],d[:flag]]
+      end
       values
     end
     

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: aemo
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.1.3
 platform: ruby
 authors:
 - Joel Courtney
@@ -191,7 +191,7 @@ files:
 - spec/fixtures/nmi_checksum.json
 - spec/spec.opts
 - spec/spec_helper.rb
-homepage: https://github.com/jufemaiz/aemo
+homepage: https://bitbucket.org/jufemaiz/aemo-gem
 licenses:
 - MIT
 metadata: {}