aemo 0.1.14 → 0.1.15

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 55b1d416d39ba3d49361f5ee2f3d024f60d56820
-  data.tar.gz: 95c401f11e4b3786a1ca242c23a86f83c25ffe1a
+  metadata.gz: bfdc14964d912d1e5fa19f8d00bbcd36968d3d65
+  data.tar.gz: 5864b68a25e24bdbea94fcc3eebb4bd76fccc4cd
 SHA512:
-  metadata.gz: 5e6dcf774f34e228c0bd0484fc06b0ee8eba5b60a8adb42c217699cdd1947afd927be87e3a70ce227f69cab8fdd0b6f34ed2da2c0cc523bccd27f33a1e42a809
-  data.tar.gz: 2b992ea03bb9656a194fd297d97ee77b253528f71d94d4005b71fbbbe77024b4ca3111f9504dbe24a3be718236718dc824d135fc13b7f7aa12537ad063165822
+  metadata.gz: 31b1ae761b24d6e72d8f0b27e5f193549810365f0e3ea71ba7c514cc200407afb818ff7dfeda14e28014eb7ef6d81cd78686b5ee65d0096a46eb1b26ccf4ecb7
+  data.tar.gz: 10b305008ce90bfd3080b393c80e9e5e761f008d578a7588f9bb5ff6e10958ef53546a382285e80eae87ca19e48e9b2be61464557be5ab9f443e501fe75d4815

data/.gitignore

@@ -3,4 +3,5 @@
 # Don't include gems in the repository
 *.gem
 # Or documentation
-.yardoc/
+.yardoc/
+.env

data/Gemfile

@@ -1,19 +1,21 @@
-source "http://rubygems.org"
-# Add dependencies required to use your gem here.
-# Example:
-#   gem "activesupport", ">= 2.3.5"
+source "https://rubygems.org" do
+  # Add dependencies required to use your gem here.
+  # Example:
+  #   gem "activesupport", ">= 2.3.5"
 
-gem 'httparty',   '~0.13'
-gem 'json',       '~1.8'
-gem 'multi_xml',  '>= 0.5.2'
-gem 'coveralls', :require => false
+  gem 'httparty',   '~>0.13'
+  gem 'json',       '~>1.8'
+  gem 'multi_xml',  '>= 0.5.2'
+  gem 'coveralls', :require => false
+  gem 'zip'
 
-# Add dependencies to develop your gem here.
-# Include everything needed to run rake, tests, features, etc.
-# group :development do
-#   gem "shoulda", ">= 0"
-#   gem "rdoc", "~> 3.12"
-#   gem "bundler", ">= 1.0.0"
-#   gem "jeweler", ">= 1.8.4"
-#   gem "simplecov", ">= 0"
-# end
+  # Add dependencies to develop your gem here.
+  # Include everything needed to run rake, tests, features, etc.
+  group :development do
+    gem "rspec", ">= 0"
+    gem "rdoc", "~> 3.12"
+    gem "bundler", ">= 1.0.0"
+    gem "jeweler", ">= 1.8.4"
+    gem "simplecov", ">= 0"
+  end
+end

data/Gemfile.lock

@@ -1,7 +1,113 @@
 GEM
+  remote: https://rubygems.org/
   specs:
+    addressable (2.3.8)
+    builder (3.2.2)
+    coveralls (0.8.2)
+      json (~> 1.8)
+      rest-client (>= 1.6.8, < 2)
+      simplecov (~> 0.10.0)
+      term-ansicolor (~> 1.3)
+      thor (~> 0.19.1)
+    descendants_tracker (0.0.4)
+      thread_safe (~> 0.3, >= 0.3.1)
+    diff-lcs (1.2.5)
+    docile (1.1.5)
+    domain_name (0.5.24)
+      unf (>= 0.0.5, < 1.0.0)
+    faraday (0.9.1)
+      multipart-post (>= 1.2, < 3)
+    git (1.2.9.1)
+    github_api (0.12.4)
+      addressable (~> 2.3)
+      descendants_tracker (~> 0.0.4)
+      faraday (~> 0.8, < 0.10)
+      hashie (>= 3.4)
+      multi_json (>= 1.7.5, < 2.0)
+      nokogiri (~> 1.6.6)
+      oauth2
+    hashie (3.4.2)
+    highline (1.7.3)
+    http-cookie (1.0.2)
+      domain_name (~> 0.5)
+    httparty (0.13.5)
+      json (~> 1.8)
+      multi_xml (>= 0.5.2)
+    jeweler (2.0.1)
+      builder
+      bundler (>= 1.0)
+      git (>= 1.2.5)
+      github_api
+      highline (>= 1.6.15)
+      nokogiri (>= 1.5.10)
+      rake
+      rdoc
+    json (1.8.3)
+    jwt (1.5.1)
+    mime-types (2.6.1)
+    mini_portile (0.6.2)
+    multi_json (1.11.2)
+    multi_xml (0.5.5)
+    multipart-post (2.0.0)
+    netrc (0.10.3)
+    nokogiri (1.6.6.2)
+      mini_portile (~> 0.6.0)
+    oauth2 (1.0.0)
+      faraday (>= 0.8, < 0.10)
+      jwt (~> 1.0)
+      multi_json (~> 1.3)
+      multi_xml (~> 0.5)
+      rack (~> 1.2)
+    rack (1.6.4)
+    rake (10.4.2)
+    rdoc (3.12.2)
+      json (~> 1.4)
+    rest-client (1.8.0)
+      http-cookie (>= 1.0.2, < 2.0)
+      mime-types (>= 1.16, < 3.0)
+      netrc (~> 0.7)
+    rspec (3.3.0)
+      rspec-core (~> 3.3.0)
+      rspec-expectations (~> 3.3.0)
+      rspec-mocks (~> 3.3.0)
+    rspec-core (3.3.2)
+      rspec-support (~> 3.3.0)
+    rspec-expectations (3.3.1)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.3.0)
+    rspec-mocks (3.3.2)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.3.0)
+    rspec-support (3.3.0)
+    simplecov (0.10.0)
+      docile (~> 1.1.0)
+      json (~> 1.8)
+      simplecov-html (~> 0.10.0)
+    simplecov-html (0.10.0)
+    term-ansicolor (1.3.2)
+      tins (~> 1.0)
+    thor (0.19.1)
+    thread_safe (0.3.5)
+    tins (1.5.4)
+    unf (0.1.4)
+      unf_ext
+    unf_ext (0.0.7.1)
+    zip (2.0.2)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
+  bundler (>= 1.0.0)!
+  coveralls!
+  httparty (~> 0.13)!
+  jeweler (>= 1.8.4)!
+  json (~> 1.8)!
+  multi_xml (>= 0.5.2)!
+  rdoc (~> 3.12)!
+  rspec!
+  simplecov!
+  zip!
+
+BUNDLED WITH
+   1.10.3

data/aemo.gemspec

@@ -1,26 +1,29 @@
 # -*- encoding: utf-8 -*-
 $:.push File.expand_path('../lib', __FILE__)
+require 'aemo/version'
 
 Gem::Specification.new do |s|
   s.name        = 'aemo'
-  s.version     = '0.1.14'
+  s.version     = AEMO::VERSION
   s.platform    = Gem::Platform::RUBY
-  s.date        = '2015-03-23'
+  s.date        = '2015-08-27'
   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.authors     = ['Joel Courtney','Stuart Auld']
+  s.email       = ['jcourtney@cozero.com.au','sauld@cozero.com.au']
   s.homepage    = 'https://github.com/jufemaiz/aemo'
   s.license     = 'MIT'
-  
+
   s.required_ruby_version     = '>= 1.9.3'
 
   s.add_dependency 'json',      '~> 1.8'
+  s.add_dependency 'nokogiri',  '~> 1.6', '>= 1.6.6'
+  s.add_dependency 'zip',       '~>2.0'
   s.add_runtime_dependency 'multi_xml', '~> 0.5',   '>= 0.5.2'
-  s.add_runtime_dependency 'httparty',   '~> 0.13',  '>= 0.13.1'
+  s.add_runtime_dependency 'httparty',  '~> 0.13',  '>= 0.13.1'
 
   s.files         = `git ls-files`.split("\n")
   s.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")
   s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
   s.require_paths = ['lib']
-end
+end

data/lib/aemo/msats.rb

@@ -1,6 +1,6 @@
 require 'httparty'
 require 'aemo'
-require 'zip'
+# require 'zip'
 require 'nokogiri'
 require 'digest/sha1'
 
@@ -18,22 +18,21 @@ module AEMO
     include HTTParty
     # We like to debug
     # debug_output $stdout
-    
+
     # We like to SSLv3
     ssl_version :SSLv3
 
     # Where we like to party
     base_uri 'https://msats.prod.nemnet.net.au/msats/ws/'
-  
+
     def initialize(options = {})
       @@auth = {username: nil, password: nil}
-      @retailer = 'COZEROER'
 
       @@auth[:username]  = options[:username]        if options[:username].is_a?(String)
       @@auth[:password]  = options[:password]        if options[:password].is_a?(String)
       @@participant_id   = options[:participant_id]  if options[:participant_id].is_a?(String)
     end
-  
+
     # Single NMI Master (C4) Report
     # /C4/PARTICIPANT_IDENTIFIER?transactionId=XXX&nmi=XXX&checksum=X&type=XXX&reason=XXX
     #
@@ -51,10 +50,10 @@ module AEMO
       options[:participantId]   ||= nil
       options[:roleId]          ||= nil
       options[:inittransId]     ||= nil
-    
+
       query = {
         transactionId:  Digest::SHA1.hexdigest(Time.now.to_s)[0..35],
-        NMI:            nmi.nmi,      # Note: AEMO is a bunch of idiots, has case sensitivity but no consistency across requests. Muppets.
+        NMI:            nmi.nmi,      # Note: AEMO has case sensitivity but no consistency across requests.
         fromDate:       from_date,
         toDate:         to_date,
         asatDate:       as_at_date,
@@ -62,9 +61,13 @@ module AEMO
         roleId:         options[:role_id],
         inittransId:    options[:init_trans_id],
       }
-    
-      response =  self.get( "/C4/#{@@participant_id}", basic_auth: @@auth, headers: { 'Accept' => 'text/xml', 'Content-Type' => 'text/xml'}, query: query )    
-      response.parsed_response['aseXML']['Transactions']['Transaction']['ReportResponse']['ReportResults']
+
+      response =  self.get( "/C4/#{@@participant_id}", basic_auth: @@auth, headers: { 'Accept' => 'text/xml', 'Content-Type' => 'text/xml'}, query: query )
+      if response.response.code != '200'
+        response
+      else
+        response.parsed_response['aseXML']['Transactions']['Transaction']['ReportResponse']['ReportResults']
+      end
     end
 
     # MSATS Limits
@@ -76,27 +79,35 @@ module AEMO
         transactionId:  Digest::SHA1.hexdigest(Time.now.to_s)[0..35],
       }
       response =  self.get( "/MSATSLimits/#{@@participant_id}", basic_auth: @@auth, headers: { 'Accept' => 'text/xml', 'Content-Type' => 'text/xml'}, query: query )
-      response.parsed_response['aseXML']['Transactions']['Transaction']['ReportResponse']['ReportResults']
+      if response.response.code != '200'
+        response
+      else
+        response.parsed_response['aseXML']['Transactions']['Transaction']['ReportResponse']['ReportResults']
+      end
     end
-  
+
     # NMI Discovery - By Delivery Point Identifier
     #
     # @param [String] jurisdiction_code The Jurisdiction Code
-    # @param [Integer] delivery_point_identifier Delivery Point Iddentifier
+    # @param [Integer] delivery_point_identifier Delivery Point Identifier
     # @return [Hash] The response
     def self.nmi_discovery_by_delivery_point_identifier(jurisdiction_code,delivery_point_identifier)
       raise ArgumentError, 'jurisdiction_code is not valid' unless %w(ACT NEM NSW QLD SA VIC TAS).include?(jurisdiction_code)
       raise ArgumentError, 'delivery_point_identifier is not valid' unless delivery_point_identifier.respond_to?("to_i")
       raise ArgumentError, 'delivery_point_identifier is not valid' if( delivery_point_identifier.to_i < 10000000 || delivery_point_identifier.to_i > 99999999)
-    
+
       query = {
         transactionId:  Digest::SHA1.hexdigest(Time.now.to_s)[0..35],
         jurisdictionCode: jurisdiction_code,
         deliveryPointIdentifier: delivery_point_identifier.to_i
       }
-    
+
       response =  self.get( "/NMIDiscovery/#{@@participant_id}", basic_auth: @@auth, headers: { 'Accept' => 'text/xml', 'Content-Type' => 'text/xml'}, query: query )
-      response.parsed_response['aseXML']['Transactions']['Transaction']['NMIDiscoveryResponse']['NMIStandingData']
+      if response.response.code != '200'
+        response
+      else
+        response.parsed_response['aseXML']['Transactions']['Transaction']['NMIDiscoveryResponse']['NMIStandingData']
+      end
     end
 
     # NMI Discovery - By Meter Serial Numner
@@ -106,15 +117,19 @@ module AEMO
     # @return [Hash] The response
     def self.nmi_discovery_by_meter_serial_number(jurisdiction_code,meter_serial_number)
       raise ArgumentError, 'jurisdiction_code is not valid' unless %w(ACT NEM NSW QLD SA VIC TAS).include?(jurisdiction_code)
-    
+
       query = {
         transactionId:  Digest::SHA1.hexdigest(Time.now.to_s)[0..35],
         jurisdictionCode: jurisdiction_code,
         meterSerialNumber: meter_serial_number.to_i
       }
-    
+
       response = self.get( "/NMIDiscovery/#{@@participant_id}", basic_auth: @@auth, headers: { 'Accept' => 'text/xml', 'Content-Type' => 'text/xml'}, query: query )
-      response.parsed_response['aseXML']['Transactions']['Transaction']['NMIDiscoveryResponse']['NMIStandingData']
+      if response.response.code != '200'
+        response
+      else
+        response.parsed_response['aseXML']['Transactions']['Transaction']['NMIDiscoveryResponse']['NMIStandingData']
+      end
     end
 
     # NMI Discovery - By Address
@@ -124,7 +139,7 @@ module AEMO
     # @return [Hash] The response
     def self.nmi_discovery_by_address(jurisdiction_code,options = {})
       raise ArgumentError, 'jurisdiction_code is not valid' unless %w(ACT NEM NSW QLD SA VIC TAS).include?(jurisdiction_code)
-    
+
       options[:building_or_property_name] ||= nil
       options[:location_descriptor] ||= nil
       options[:lot_number] ||= nil
@@ -140,7 +155,7 @@ module AEMO
       options[:suburb_or_place_or_locality] ||= nil
       options[:postcode] ||= nil
       options[:state_or_territory] ||= jurisdiction_code
-    
+
       query = {
         transactionId:  Digest::SHA1.hexdigest(Time.now.to_s)[0..35],
         jurisdictionCode: jurisdiction_code,
@@ -160,9 +175,14 @@ module AEMO
         postcode: options[:postcode],
         stateOrTerritory: options[:state_or_territory]
       }
-    
+
       response = self.get( "/NMIDiscovery/#{@@participant_id}", basic_auth: @@auth, headers: { 'Accept' => 'text/xml', 'Content-Type' => 'text/xml'}, query: query )
-      response.parsed_response['aseXML']['Transactions']['Transaction']['NMIDiscoveryResponse']['NMIStandingData']
+      if response.response.code != '200'
+        response
+      else
+        myresponse = response.parsed_response['aseXML']['Transactions']['Transaction']['NMIDiscoveryResponse']['NMIStandingData']
+        myresponse.is_a?(Hash)? [ myresponse ] : myresponse
+      end
     end
 
     # NMI Detail
@@ -175,7 +195,7 @@ module AEMO
       end
       options[:type]    ||= nil
       options[:reason]  ||= nil
-    
+
       query = {
         transactionId: Digest::SHA1.hexdigest(Time.now.to_s)[0..35],
         nmi: nmi.nmi,
@@ -183,11 +203,15 @@ module AEMO
         type: options[:type],
         reason: options[:reason]
       }
-    
+
       response = self.get( "/NMIDetail/#{@@participant_id}", basic_auth: @@auth, headers: { 'Accept' => 'text/xml', 'Content-Type' => 'text/xml'}, query: query )
-      response.parsed_response['aseXML']['Transactions']['Transaction']['NMIStandingDataResponse']['NMIStandingData']
+      if response.response.code != '200'
+        response
+      else
+        response.parsed_response['aseXML']['Transactions']['Transaction']['NMIStandingDataResponse']['NMIStandingData']
+      end
     end
-  
+
     # Participant System Status
     # /ParticipantSystemStatus/PARTICIPANT_IDENTIFIER?transactionId=XXX
     #
@@ -197,10 +221,14 @@ module AEMO
         transactionId:  Digest::SHA1.hexdigest(Time.now.to_s)[0..35],
       }
       response = self.get( "/ParticipantSystemStatus/#{@@participant_id}", basic_auth: @@auth, headers: { 'Accept' => 'text/xml', 'Content-Type' => 'text/xml'}, query: query )
-      response.parsed_response['aseXML']['Transactions']['Transaction']['ReportResponse']['ReportResults']
+      if response.response.code != '200'
+        response
+      else
+        response.parsed_response['aseXML']['Transactions']['Transaction']['ReportResponse']['ReportResults']
+      end
     end
-  
-  
+
+
     # Sets the authentication credentials in a class variable.
     #
     # @param [String] email cl.ly email
@@ -210,13 +238,13 @@ module AEMO
       @@participant_id  = participant_id
       @@auth            = {username: username, password: password}
     end
-    
+
     # Check if credentials are available to use
     #
     # @return [Boolean] true/false if credentials are available
     def self.can_authenticate?
       !(@@participant_id.nil? || @@auth[:username].nil? || @@auth[:username].nil?)
     end
-    
+
   end
 end

data/lib/aemo/nem12.rb

@@ -12,7 +12,7 @@ module AEMO
       500 => 'B2B Details',
       900 => 'End'
     }
-    
+
     TRANSACTION_CODE_FLAGS = {
       'A' => 'Alteration',
       'C' => 'Meter Reconfiguration',
@@ -24,7 +24,7 @@ module AEMO
       'S' => 'Special Read',
       'R' => 'Removal of Meter'
     }
-    
+
     UOM = {
       'MWh'   => { :name => 'Megawatt Hour', :multiplier => 1e6 },
       'kWh'   => { :name => 'Kilowatt Hour', :multiplier => 1e3 },
@@ -50,7 +50,7 @@ module AEMO
       'A'     => { :name => 'Ampere', :multiplier => 1 },
       'pf'    => { :name => 'Power Factor', :multiplier => 1 }
     }
-    
+
     UOM_NON_SPEC_MAPPING = {
       'MWH'   => 'MWh',
       'KWH'   => 'kWh',
@@ -76,7 +76,7 @@ module AEMO
       'A'     => 'A',
       'PF'    => 'pf'
     }
-    
+
     QUALITY_FLAGS = {
       'A'     => 'Actual Data',
       'E'     => 'Forward Estimated Data',
@@ -85,7 +85,7 @@ module AEMO
       'S'     => 'Substituted Data',
       'V'     => 'Variable Data',
     }
-    
+
     METHOD_FLAGS = {
       11 => { type: ["SUB"], installation_type: [1,2,3,4], short_descriptor: "Check", description: "" },
       12 => { type: ["SUB"], installation_type: [1,2,3,4], short_descriptor: "Calculated", description: "" },
@@ -118,7 +118,7 @@ module AEMO
       74 => { type: ["SUB"], installation_type: 7, short_descriptor: "Agreed", description: "" },
       75 => { type: ["EST"], installation_type: 7, short_descriptor: "Existing Table", description: "" }
     }
-    
+
     REASON_CODES = {
       0 => 'Free Text Description',
       1 => 'Meter/Equipment Changed',
@@ -220,9 +220,9 @@ module AEMO
       97 => 'Excluded Data',
       98 => 'Parity Error',
       99 => 'Energy Type (Register Changed)'
-      
+
     }
-    
+
     DATA_STREAM_SUFFIX = {
       # Averaged Data Streams
       'A' => { :stream => 'Average', :description => 'Import', :units => 'kWh' },
@@ -250,18 +250,19 @@ module AEMO
       'W' => { :stream => 'Check',  :description => 'Par Metering Path',  :units => '' },
       'Z' => { :stream => 'Check',  :description => 'Volts or V2h or Amps or A2h',  :units => '' },
       # Net Meter Streams
-      'D' => { :stream => 'Net',    :description => 'Net', :units => 'kWh' },
-      'J' => { :stream => 'Net',    :description => 'Net', :units => 'kVArh' }
+      # 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  = []
-    
+
     attr_accessor :nmi, :file_contents
     attr_reader   :data_details, :interval_data, :interval_events
-    
+
     # Initialize a NEM12 file
     def initialize(nmi,options={})
       @nmi              = nmi
@@ -272,7 +273,7 @@ module AEMO
         eval "self.#{key} = #{options[key]}"
       end
     end
-    
+
     # @return [Integer] checksum of the NMI
     def nmi_checksum
       summation = 0
@@ -283,7 +284,7 @@ module AEMO
         end
         value = value.to_s.split(//).map{|i| i.to_i}.reduce(:+)
         summation += value
-      end      
+      end
       checksum = (10 - (summation % 10)) % 10
       checksum
     end
@@ -310,7 +311,7 @@ module AEMO
         :to_participant   => csv[4]
       }
     end
-    
+
     # Parses the NMI Data Details
     # @param line [String] A single line in string format
     # @return [Hash] the line parsed into a hash of information
@@ -334,7 +335,7 @@ module AEMO
       raise ArgumentError, 'UOM is not valid'               unless UOM.keys.map{|k| k.upcase}.include?(csv[7].upcase)
       raise ArgumentError, 'IntervalLength is not valid'    unless %w(1 5 10 15 30).include?(csv[8])
       # raise ArgumentError, 'NextScheduledReadDate is not valid' if csv[9].match(/\d{8}/).nil? || csv[9] != Time.parse("#{csv[9]}").strftime('%Y%m%d')
-      
+
       @nmi = csv[1]
 
       # Push onto the stack
@@ -351,7 +352,7 @@ module AEMO
         :next_scheduled_read_date => csv[9],
       }
     end
-    
+
     # @param line [String] A single line in string format
     # @return [Array of hashes] the line parsed into a hash of information
     def parse_nem12_300(line,options={})
@@ -360,7 +361,7 @@ module AEMO
       raise TypeError, 'Expected NMI Data Details to exist with IntervalLength specified' if @data_details.last.nil? || @data_details.last[:interval_length].nil?
       number_of_intervals = 1440 / @data_details.last[:interval_length]
       intervals_offset = number_of_intervals + 2
-      
+
       raise ArgumentError, 'RecordIndicator is not 300'     if csv[0] != '300'
       raise ArgumentError, 'IntervalDate is not valid'      if csv[1].match(/\d{8}/).nil? || csv[1] != Time.parse("#{csv[1]}").strftime('%Y%m%d')
       (2..(number_of_intervals+1)).each do |i|
@@ -385,7 +386,7 @@ module AEMO
           raise ArgumentError, 'MSATSLoadDateTime is not valid'   if csv[intervals_offset + 4].match(/\d{14}/).nil? || csv[intervals_offset + 4] != Time.parse("#{csv[intervals_offset + 4]}").strftime('%Y%m%d%H%M%S')
         end
       end
-      
+
       # Deal with flags if necessary
       flag = nil
       # Based on QualityMethod and ReasonCode
@@ -399,7 +400,7 @@ module AEMO
           flag[:reason_code] = csv[intervals_offset + 1].to_i
         end
       end
-      
+
       base_interval = { data_details: @data_details.last, datetime: Time.parse("#{csv[1]}000000+1000"), value: nil, flag: flag}
 
       intervals = []
@@ -412,7 +413,7 @@ module AEMO
       @interval_data += intervals
       intervals
     end
-    
+
     # @param line [String] A single line in string format
     # @return [Hash] the line parsed into a hash of information
     def parse_nem12_400(line)
@@ -423,14 +424,14 @@ module AEMO
       raise ArgumentError, 'QualityMethod is not valid'     if csv[3].match(/^([AN]|([AEFNSV]\d{2}))$/).nil?
       # raise ArgumentError, 'ReasonCode is not valid'        if (csv[4].nil? && csv[3].match(/^ANE/)) || csv[4].match(/^\d{3}?$/) || csv[3].match(/^ANE/)
       # raise ArgumentError, 'ReasonDescription is not valid' if (csv[4].nil? && csv[3].match(/^ANE/)) || ( csv[5].match(/^$/) && csv[4].match(/^0$/) )
-      
+
       interval_events = []
-      
+
       # Only need to update flags for EFSV
       unless %w(A N).include?csv[3]
         number_of_intervals = 1440 / @data_details.last[:interval_length]
         interval_start_point = @interval_data.length - number_of_intervals
-      
+
         # For each of these
         base_interval_event = { datetime: nil, quality_method: csv[3], reason_code: (csv[4].nil? ? nil : csv[4].to_i), reason_description: csv[5] }
 
@@ -455,17 +456,17 @@ module AEMO
       end
       interval_events
     end
-    
+
     # @param line [String] A single line in string format
     # @return [Hash] the line parsed into a hash of information
     def parse_nem12_500(line,options={})
     end
-    
+
     # @param line [String] A single line in string format
     # @return [Hash] the line parsed into a hash of information
     def parse_nem12_900(line,options={})
     end
-    
+
     # Turns the flag to a string
     #
     # @param [Hash] the object of a flag
@@ -493,31 +494,31 @@ module AEMO
       end
       values
     end
-    
+
     # @return [Array] CSV of a NEM12 file a given Meter + Data Stream for easy reading
     def to_csv
       headers = ['nmi','suffix','units','datetime','value','flags']
       ([headers]+self.to_a.map{|row| row[3]=row[3].strftime("%Y%m%d%H%M%S%z"); row}).map{|row| row.join(',')}.join("\n")
     end
-    
+
     # @param nmi [String] a NMI that is to be checked for validity
     # @return [Boolean] determines if the NMI is valid
     def self.valid_nmi?(nmi)
       (nmi.class == String && nmi.length == 10 && !nmi.match(/^[A-Z1-9][A-Z0-9]{9}$/).nil?)
     end
-    
+
     # @param path_to_file [String] the path to a file
-    # @return [] NEM12 object 
+    # @return [] NEM12 object
     def self.parse_nem12_file(path_to_file, strict = false)
       parse_nem12(File.read(path_to_file),strict)
     end
-        
+
     # @param contents [String] the path to a file
     # @return [Array[AEMO::NEM12]] An array of NEM12 objects
     def self.parse_nem12(contents, strict=false)
       file_contents = contents.gsub(/\r/,"\n").gsub(/\n\n/,"\n").split("\n").delete_if{|line| line.empty? }
       raise ArgumentError, 'First row should be have a RecordIndicator of 100 and be of type Header Record' unless file_contents.first.parse_csv[0] == '100'
-      
+
       nem12s = []
       nem12_100 = AEMO::NEM12.parse_nem12_100(file_contents.first,:strict => strict)
       nem12 = nil
@@ -539,6 +540,6 @@ module AEMO
       # Return the array of NEM12 groups
       nem12s
     end
-    
+
   end
-end
+end

data/lib/aemo/nmi.rb

@@ -161,7 +161,7 @@ module AEMO
         excludes: [
         ]
       },
-      'TRANSEND' => {
+      'ETSATP' => {
         title: 'ElectraNet SA',
         friendly_title: 'ElectraNet SA',
         state: 'SA',
@@ -398,7 +398,7 @@ module AEMO
     }
     # Transmission Node Identifier Codes are loaded from a json file
     #  Obtained from http://www.nemweb.com.au/
-    #  
+    #
     #  See /lib/data for further data manipulation required
     TNI_CODES = JSON.parse(File.read(File.join(File.dirname(__FILE__),'..','data','aemo-tni.json')))
     # Distribution Loss Factor Codes are loaded from a json file
@@ -406,7 +406,7 @@ module AEMO
     #  Last accessed 2015-02-06
     #  See /lib/data for further data manipulation required
     DLF_CODES = JSON.parse(File.read(File.join(File.dirname(__FILE__),'..','data','aemo-dlf.json')))
-    
+
     # [String] National Meter Identifier
     @nmi                          = nil
     @msats_detail                 = nil
@@ -421,9 +421,9 @@ module AEMO
     @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, :data_streams
-    
+
     # Initialize a NEM12 file
     #
     # @param nmi [String] the National Meter Identifier (NMI)
@@ -433,7 +433,7 @@ module AEMO
       raise ArgumentError.new("NMI is not a string") unless nmi.is_a?(String)
       raise ArgumentError.new("NMI is not 10 characters") unless nmi.length == 10
       raise ArgumentError.new("NMI is not constructed with valid characters") unless AEMO::NMI.valid_nmi?(nmi)
-      
+
       @nmi              = nmi
       @meters           = []
       @roles            = {}
@@ -446,14 +446,14 @@ module AEMO
     def valid_nmi?
       AEMO::NMI.valid_nmi?(@nmi)
     end
-  
+
     # Find the Network of NMI
     #
     # @returns [Hash] The Network information
     def network
       AEMO::NMI.network(@nmi)
     end
-  
+
     # A function to calculate the checksum value for a given National Meter Identifier
     #
     # @param checksum_value [Integer] the checksum value to check against the current National Meter Identifier's checksum value
@@ -474,20 +474,20 @@ module AEMO
         end
         value = value.to_s.split(//).map{|i| i.to_i}.reduce(:+)
         summation += value
-      end      
+      end
       checksum = (10 - (summation % 10)) % 10
       checksum
     end
-    
+
     # Provided MSATS is configured, gets the MSATS data for the NMI
     #
     # @return [Hash] MSATS NMI Detail data
     def raw_msats_nmi_detail
       raise ArgumentError, 'MSATS has no authentication credentials' unless AEMO::MSATS.can_authenticate?
-      
+
       AEMO::MSATS.nmi_detail(@nmi)
     end
-    
+
     # Provided MSATS is configured, uses the raw MSATS data to augment NMI information
     #
     # @return [self] returns self
@@ -573,7 +573,7 @@ module AEMO
     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]
@@ -581,14 +581,14 @@ module AEMO
     def data_streams_by_status(status = '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
       data_streams_by_status().inject(0) { |sum, stream| sum += stream.averaged_daily_load.to_i }
     end
-  
+
     # A function to validate the NMI provided
     #
     # @param nmi [String] the nmi to be checked
@@ -606,7 +606,7 @@ module AEMO
       nmi = AEMO::NMI.new(nmi)
       nmi.valid_checksum?(checksum_value)
     end
-  
+
     # Find the Network for a given NMI
     #
     # @param nmi [String] NMI
@@ -633,5 +633,5 @@ module AEMO
     end
 
   end
-  
+
 end

data/lib/aemo/version.rb

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

metadata

@@ -1,14 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: aemo
 version: !ruby/object:Gem::Version
-  version: 0.1.14
+  version: 0.1.15
 platform: ruby
 authors:
 - Joel Courtney
+- Stuart Auld
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-03-23 00:00:00.000000000 Z
+date: 2015-08-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json
@@ -24,6 +25,40 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.8'
+- !ruby/object:Gem::Dependency
+  name: nokogiri
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.6'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.6.6
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.6'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.6.6
+- !ruby/object:Gem::Dependency
+  name: zip
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.0'
 - !ruby/object:Gem::Dependency
   name: multi_xml
   requirement: !ruby/object:Gem::Requirement
@@ -68,6 +103,7 @@ description: Gem providing functionality for the Australian Energy Market Operat
   data
 email:
 - jcourtney@cozero.com.au
+- sauld@cozero.com.au
 executables: []
 extensions: []
 extra_rdoc_files: []
@@ -223,7 +259,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.4.6
 signing_key: 
 specification_version: 4
 summary: AEMO Gem
@@ -337,4 +373,3 @@ test_files:
 - spec/fixtures/nmi_checksum.json
 - spec/spec.opts
 - spec/spec_helper.rb
-has_rdoc: