aemo 0.1.39 → 0.1.40

data/lib/data/xml_to_json.rb

@@ -1,10 +1,12 @@
+# frozen_string_literal: true
+
 require 'nokogiri'
 require 'json'
 require 'csv'
 require 'active_support/all'
 
 @path  = Dir.pwd
-@files = Dir.entries(@path).reject { |f| %w(. ..).include?(f) }
+@files = Dir.entries(@path).reject { |f| %w[. ..].include?(f) }
 
 @mlf_data = {}
 @dlf_data = {}
@@ -12,26 +14,38 @@ require 'active_support/all'
 # Let's get the CSV Data first
 
 # TNI to MLF
-file_contents = File.read(File.join(@path, 'tni-mlf-codes.csv')).encode('UTF-8', 'binary', invalid: :replace, undef: :replace, replace: '')
+file_contents = File.read(File.join(@path, 'tni-mlf-codes.csv'))
+                    .encode('UTF-8', 'binary', invalid: :replace,
+                                               undef: :replace, replace: '')
 CSV.parse(file_contents, headers: true, converters: :numeric).each do |row|
-  @mlf_data[row['TNI']] ||= { location: row['Location'], voltage: row['Voltage'], loss_factors: [] }
-  row.headers.select{|x| x =~ %r{^FY\d{2}$}}.sort.reverse.each do |fin_year|
+  @mlf_data[row['TNI']] ||= { location: row['Location'],
+                              voltage: row['Voltage'],
+                              loss_factors: [] }
+  row.headers.select { |x| x =~ /^FY\d{2}$/ }.sort.reverse.each do |fin_year|
     year = "20#{fin_year.match(/FY(\d{2})/)[1]}".to_i
-    @mlf_data[row['TNI']][:loss_factors] << { start: DateTime.parse("#{year - 1}-07-01T00:00:00+1000"), finish: DateTime.parse("#{year}-07-01T00:00:00+1000"), value: row[fin_year] }
+    @mlf_data[row['TNI']][:loss_factors] << {
+      start: DateTime.parse("#{year - 1}-07-01T00:00:00+1000"),
+      finish: DateTime.parse("#{year}-07-01T00:00:00+1000"),
+      value: row[fin_year]
+    }
   end
 end
 
 # TNI to MLF
-CSV.open(File.join(@path, 'aemo-dlf-dnsp.csv'), headers: true, converters: :numeric).each do |row|
+CSV.open(File.join(@path, 'aemo-dlf-dnsp.csv'),
+         headers: true, converters: :numeric).each do |row|
   @dlf_data[row['dlf_code']] ||= row['nsp_code']
 end
 
 # Now to create the DLF and TNI output JSON files for use
-@files.select { |x| ['aemo-tni.xml', 'aemo-dlf.xml'].include?(x) }.each do |file|
+@files.select { |x| ['aemo-tni.xml', 'aemo-dlf.xml'].include?(x) }
+      .each do |file|
   output_file = file.gsub('.xml', '.json')
   output_data = {}
   open_file = File.open(File.join(@path, file))
-  xml = Nokogiri::XML(open_file) { |c| c.options = Nokogiri::XML::ParseOptions::NOBLANKS }
+  xml = Nokogiri::XML(open_file) do |c|
+    c.options = Nokogiri::XML::ParseOptions::NOBLANKS
+  end
   open_file.close
 
   xml.xpath('//Row').each do |row|
@@ -47,10 +61,12 @@ end
       output_data_instance[:mlf_data] = {}
       unless @mlf_data[code].nil?
         output_data_instance[:mlf_data] = @mlf_data[code].deep_dup
-        output_data_instance[:mlf_data][:loss_factors] = output_data_instance[:mlf_data][:loss_factors].reject do |x|
-          DateTime.parse(output_data_instance['ToDate']) < x[:start] || DateTime.parse(output_data_instance['FromDate']) >= x[:finish]
+        output_data_instance[:mlf_data][:loss_factors].reject! do |x|
+          DateTime.parse(output_data_instance['ToDate']) < x[:start] ||
+            DateTime.parse(output_data_instance['FromDate']) >= x[:finish]
         end
-        puts "output_data_instance[:mlf_data][:loss_factors]: #{output_data_instance[:mlf_data][:loss_factors].inspect}"
+        puts 'output_data_instance[:mlf_data][:loss_factors]: ' \
+             "#{output_data_instance[:mlf_data][:loss_factors].inspect}"
       end
     elsif file =~ /dlf/
       output_data_instance[:nsp_code] = @dlf_data[code]

data/spec/aemo_spec.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require File.expand_path(File.join(File.dirname(__FILE__), 'spec_helper'))
 
 describe AEMO do

data/spec/lib/aemo/market/interval_spec.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'spec_helper'
 
 describe AEMO::Market::Interval do

data/spec/lib/aemo/market/node_spec.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'spec_helper'
 
 describe AEMO::Market::Node do

data/spec/lib/aemo/market_spec.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'spec_helper'
 
 describe AEMO::Market do
@@ -30,7 +32,7 @@ describe AEMO::Market do
 
   describe '.historic_trading' do
     it 'has an array of data' do
-      expect(AEMO::Market.historic_trading('NSW', 2015, 01).class).to eq(Array)
+      expect(AEMO::Market.historic_trading('NSW', 2015, 1).class).to eq(Array)
     end
   end
 end

data/spec/lib/aemo/meter_spec.rb

@@ -0,0 +1,18 @@
+# frozen_string_literal: true
+
+require 'spec_helper'
+
+describe AEMO::Meter do
+  describe 'instance methods' do
+    it 'creates a new instance' do
+      expect(AEMO::Meter.new).to be_a AEMO::Meter
+    end
+
+    it 'can be initialized from MSATS mumbo jumbo' do
+      AEMO::MSATS.authorize('ER', 'ER', 'ER')
+      nmi_detail_query = AEMO::MSATS.nmi_detail('4001234567')
+      meter = nmi_detail_query['MeterRegister']['Meter'].first
+      expect(AEMO::Meter.from_hash(meter)).to be_a AEMO::Meter
+    end
+  end
+end

data/spec/lib/aemo/msats_spec.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'spec_helper'
 
 describe AEMO::MSATS do

data/spec/lib/aemo/nem12_spec.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'spec_helper'
 require 'json'
 
@@ -10,12 +12,24 @@ describe AEMO::NEM12 do
     end
   end
 
+  describe '#nmi_identifier' do
+    it 'returns the NMI identifier or nil' do
+      Dir.entries(File.join(File.dirname(__FILE__), '..', '..', 'fixtures', 'NEM12'))
+         .reject { |f| %w[. .. .DS_Store].include?(f) }
+         .each do |file|
+        AEMO::NEM12.parse_nem12_file(fixture(File.join('NEM12', file))).each do |nem12|
+          expect(nem12.nmi_identifier).to be_a String
+        end
+      end
+    end
+  end
+
   describe '#parse_nem12' do
   end
 
   describe '.parse_nem12_file' do
     it 'should parse a file' do
-      Dir.entries(File.join(File.dirname(__FILE__), '..', '..', 'fixtures', 'NEM12')).reject { |f| %w(. .. .DS_Store).include?(f) }.each do |file|
+      Dir.entries(File.join(File.dirname(__FILE__), '..', '..', 'fixtures', 'NEM12')).reject { |f| %w[. .. .DS_Store].include?(f) }.each do |file|
         expect(AEMO::NEM12.parse_nem12_file(fixture(File.join('NEM12', file))).length).not_to eq(0)
       end
     end
@@ -52,5 +66,11 @@ describe AEMO::NEM12 do
   end
 
   describe '#flag_to_s' do
+    it 'converts the flags to a string' do
+      flag = { quality_flag: 'S', method_flag: 11, reason_code: 53 }
+      nem12 = AEMO::NEM12.new('NEEE000010')
+      expect(nem12.flag_to_s(flag))
+        .to eq 'Substituted Data - Check - Bees/Wasp In Meter Box'
+    end
   end
 end

data/spec/lib/aemo/nmi_spec.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'spec_helper'
 require 'json'
 
@@ -90,6 +92,7 @@ describe AEMO::NMI do
       end
     end
   end
+
   describe '#valid_nmi?' do
     it 'should validate nmi' do
       json.each do |nmi|
@@ -153,7 +156,7 @@ describe AEMO::NMI do
     end
     it 'should return a friendly address if the address is a nested hash' do
       nmi = AEMO::NMI.new('4001234567')
-      nmi.address = { house: { number: '1', suffix: 'B' }, street: 'Bob', street_type: 'Street', }
+      nmi.address = { house: { number: '1', suffix: 'B' }, street: 'Bob', street_type: 'Street' }
       expect(nmi.friendly_address).to eq('1 B, Bob, Street')
     end
   end

data/spec/lib/aemo/region_spec.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'spec_helper'
 
 describe AEMO::Region do

data/spec/spec_helper.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'coveralls'
 require 'simplecov'
 require 'webmock/rspec'
@@ -21,6 +23,14 @@ RSpec.configure do |config|
     csv_headers = { 'Content-Type' => 'text/csv' }
     xml_headers = { 'Content-Type' => 'text/xml' }
 
+    # Updated Market Data
+    stub_request(:get, 'https://aemo.com.au/aemo/data/nem/priceanddemand/PRICE_AND_DEMAND_201501_NSW1.csv')
+      .with(headers: { 'Accept' => '*/*', 'User-Agent' => 'Ruby' })
+      .to_return(status: 200, body: File.new('spec/fixtures/Market/DATA201501_NSW1.csv'), headers: csv_headers)
+    stub_request(:get, 'https://aemo.com.au/aemo/data/nem/priceanddemand/PRICE_AND_DEMAND_201502_NSW1.csv')
+      .with(headers: { 'Accept' => '*/*', 'User-Agent' => 'Ruby' })
+      .to_return(status: 200, body: File.new('spec/fixtures/Market/DATA201502_NSW1.csv'), headers: csv_headers)
+
     # Market Data
     stub_request(:get, 'http://www.nemweb.com.au/mms.GRAPHS/GRAPHS/GRAPH_5NSW1.csv')
       .with(headers: { 'Accept' => '*/*', 'User-Agent' => 'Ruby' })

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: aemo
 version: !ruby/object:Gem::Version
-  version: 0.1.39
+  version: 0.1.40
 platform: ruby
 authors:
 - Joel Courtney
@@ -46,26 +46,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 1.6.8
-- !ruby/object:Gem::Dependency
-  name: rubyzip
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.1'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 1.1.7
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.1'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 1.1.7
 - !ruby/object:Gem::Dependency
   name: multi_xml
   requirement: !ruby/object:Gem::Requirement
@@ -92,40 +72,40 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.13'
+        version: 0.13.0
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.13.1
+        version: 0.13.7
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.13'
+        version: 0.13.0
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.13.1
+        version: 0.13.7
 - !ruby/object:Gem::Dependency
   name: activesupport
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 4.0.0
-    - - "<"
+        version: '4.2'
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '5.1'
+        version: 4.2.6
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 4.0.0
-    - - "<"
+        version: '4.2'
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '5.1'
+        version: 4.2.6
 - !ruby/object:Gem::Dependency
   name: listen
   requirement: !ruby/object:Gem::Requirement
@@ -372,20 +352,20 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.41'
+        version: 0.41.0
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.41.1
+        version: 0.41.2
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.41'
+        version: 0.41.0
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.41.1
+        version: 0.41.2
 - !ruby/object:Gem::Dependency
   name: timecop
   requirement: !ruby/object:Gem::Requirement
@@ -421,11 +401,13 @@ files:
 - lib/aemo/market.rb
 - lib/aemo/market/interval.rb
 - lib/aemo/market/node.rb
+- lib/aemo/meter.rb
 - lib/aemo/msats.rb
 - lib/aemo/nem12.rb
 - lib/aemo/nem13.rb
 - lib/aemo/nmi.rb
 - lib/aemo/region.rb
+- lib/aemo/register.rb
 - lib/aemo/version.rb
 - lib/data/TNI-MLF-Codes.csv
 - lib/data/aemo-dlf-dnsp.csv
@@ -548,6 +530,7 @@ files:
 - spec/lib/aemo/market/interval_spec.rb
 - spec/lib/aemo/market/node_spec.rb
 - spec/lib/aemo/market_spec.rb
+- spec/lib/aemo/meter_spec.rb
 - spec/lib/aemo/msats_spec.rb
 - spec/lib/aemo/nem12_spec.rb
 - spec/lib/aemo/nmi_spec.rb
@@ -574,7 +557,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.6
+rubygems_version: 2.6.13
 signing_key: 
 specification_version: 4
 summary: Gem providing functionality for the Australian Energy Market Operator data
@@ -693,6 +676,7 @@ test_files:
 - spec/lib/aemo/market/interval_spec.rb
 - spec/lib/aemo/market/node_spec.rb
 - spec/lib/aemo/market_spec.rb
+- spec/lib/aemo/meter_spec.rb
 - spec/lib/aemo/msats_spec.rb
 - spec/lib/aemo/nem12_spec.rb
 - spec/lib/aemo/nmi_spec.rb