aemo 0.1.27 → 0.1.28

data/spec/lib/aemo/region_spec.rb

@@ -2,17 +2,17 @@ require 'spec_helper'
 
 describe AEMO::Region do
   describe '.REGIONS' do
-    it "should be a hash" do
+    it 'should be a hash' do
       expect(AEMO::Region::REGIONS).to be_instance_of(Hash)
     end
   end
 
   describe 'creating a region' do
     it 'should raise an error if invalid region' do
-      expect {AEMO::Region.new('BOTTOMS')}.to raise_error(ArgumentError)
+      expect { AEMO::Region.new('BOTTOMS') }.to raise_error(ArgumentError)
     end
     it 'should create if region valid' do
-      expect {AEMO::Region.new('NSW')}.not_to raise_error
+      expect { AEMO::Region.new('NSW') }.not_to raise_error
     end
   end
 
@@ -31,11 +31,11 @@ describe AEMO::Region do
     end
 
     it 'should have a valid region' do
-      expect(@nsw.send(:is_valid_region?,'NSW')).to eq(true)
+      expect(@nsw.send(:valid_region?, 'NSW')).to eq(true)
     end
 
     it 'should have return invalid for invalid region' do
-      expect(@nsw.send(:is_valid_region?,'BOB')).to eq(false)
+      expect(@nsw.send(:valid_region?, 'BOB')).to eq(false)
     end
 
     describe 'AEMO::Region dispatch information' do
@@ -46,7 +46,6 @@ describe AEMO::Region do
         expect(@nsw.current_trading.count).to eq(AEMO::Market.current_trading(@nsw.abbr).count)
       end
     end
-
   end
 
   describe 'AEMO::Region class methods' do

data/spec/spec_helper.rb

@@ -2,55 +2,58 @@ require 'coveralls'
 require 'simplecov'
 require 'pry'
 require 'webmock/rspec'
+require 'aemo'
 
 WebMock.disable_net_connect!(allow_localhost: true)
 
-SimpleCov.formatter = SimpleCov::Formatter::MultiFormatter.new([
-  SimpleCov::Formatter::HTMLFormatter,
-  Coveralls::SimpleCov::Formatter
-])
+SimpleCov.formatter = SimpleCov::Formatter::MultiFormatter.new(
+  [
+    SimpleCov::Formatter::HTMLFormatter,
+    Coveralls::SimpleCov::Formatter
+  ]
+)
 SimpleCov.start
 
-require "aemo"
-
 RSpec.configure do |config|
   # WebMock
   config.before(:each) do
+    csv_headers = { 'Content-Type' => 'text/csv' }
+    xml_headers = { 'Content-Type' => 'text/xml' }
+
     # Market Data
-    stub_request(:get, "http://www.nemweb.com.au/mms.GRAPHS/GRAPHS/GRAPH_5NSW1.csv").
-      with(:headers => {'Accept'=>'*/*', 'User-Agent'=>'Ruby'}).
-      to_return(status: 200, body: File.new('spec/fixtures/GRAPH_5NSW1.csv'), headers: {'Content-Type'=>'text/csv'})
-    stub_request(:get, 'http://www.nemweb.com.au/mms.GRAPHS/GRAPHS/GRAPH_30NSW1.csv').
-      with(:headers => {'Accept'=>'*/*', 'User-Agent'=>'Ruby'}).
-      to_return(status: 200, body: File.new('spec/fixtures/GRAPH_30NSW1.csv'), headers: {'Content-Type'=>'text/csv'})
+    stub_request(:get, 'http://www.nemweb.com.au/mms.GRAPHS/GRAPHS/GRAPH_5NSW1.csv')
+      .with(headers: { 'Accept' => '*/*', 'User-Agent' => 'Ruby' })
+      .to_return(status: 200, body: File.new('spec/fixtures/GRAPH_5NSW1.csv'), headers: csv_headers)
+    stub_request(:get, 'http://www.nemweb.com.au/mms.GRAPHS/GRAPHS/GRAPH_30NSW1.csv')
+      .with(headers: { 'Accept' => '*/*', 'User-Agent' => 'Ruby' })
+      .to_return(status: 200, body: File.new('spec/fixtures/GRAPH_30NSW1.csv'), headers: csv_headers)
 
     # MSATS
-    stub_request(:get, /msats.prod.nemnet.net.au\/msats\/ws\/C4\/ER/).
-      with(headers: {'Accept'=>['text/xml'], 'Content-Type'=>'text/xml'}).
-      to_return(status: 200, body: File.new('spec/fixtures/MSATS/c4.xml'), headers: {'Content-Type'=>'text/xml'})
-    stub_request(:get, /msats.prod.nemnet.net.au\/msats\/ws\/MSATSLimits\/ER/).
-      with(headers: {'Accept'=>['text/xml'], 'Content-Type'=>'text/xml'}).
-      to_return(status: 200, body: File.new('spec/fixtures/MSATS/msats_limits.xml'), headers: {'Content-Type'=>'text/xml'})
-    stub_request(:get, /msats.prod.nemnet.net.au\/msats\/ws\/NMIDetail\/ER/).
-      with(headers: {'Accept'=>['text/xml'], 'Content-Type'=>'text/xml'}).
-      to_return(status: 200, body: File.new('spec/fixtures/MSATS/nmi_details.xml'), headers: {'Content-Type'=>'text/xml'})
-    stub_request(:get, /msats.prod.nemnet.net.au\/msats\/ws\/NMIDiscovery\/ER/).
-      with(headers: {'Accept'=>['text/xml'], 'Content-Type'=>'text/xml'}).
-      to_return(status: 200, body: File.new('spec/fixtures/MSATS/nmi_discovery_by_address.xml'), headers: {'Content-Type'=>'text/xml'})
-    stub_request(:get, /msats.prod.nemnet.net.au\/msats\/ws\/ParticipantSystemStatus\/ER/).
-      with(headers: {'Accept'=>'text/xml', 'Content-Type'=>'text/xml'}).
-      to_return(status: 200, body: File.new('spec/fixtures/MSATS/participant_system_status.xml'), headers: {'Content-Type'=>'text/xml'})
+    stub_request(:get, %r{msats.prod.nemnet.net.au\/msats\/ws\/C4\/ER})
+      .with(headers: { 'Accept' => ['text/xml'], 'Content-Type' => 'text/xml' })
+      .to_return(status: 200, body: File.new('spec/fixtures/MSATS/c4.xml'), headers: xml_headers)
+    stub_request(:get, %r{msats.prod.nemnet.net.au\/msats\/ws\/MSATSLimits\/ER})
+      .with(headers: { 'Accept' => ['text/xml'], 'Content-Type' => 'text/xml' })
+      .to_return(status: 200, body: File.new('spec/fixtures/MSATS/msats_limits.xml'), headers: xml_headers)
+    stub_request(:get, %r{msats.prod.nemnet.net.au\/msats\/ws\/NMIDetail\/ER})
+      .with(headers: { 'Accept' => ['text/xml'], 'Content-Type' => 'text/xml' })
+      .to_return(status: 200, body: File.new('spec/fixtures/MSATS/nmi_details.xml'), headers: xml_headers)
+    stub_request(:get, %r{msats.prod.nemnet.net.au\/msats\/ws\/NMIDiscovery\/ER})
+      .with(headers: { 'Accept' => ['text/xml'], 'Content-Type' => 'text/xml' })
+      .to_return(status: 200, body: File.new('spec/fixtures/MSATS/nmi_discovery_by_address.xml'), headers: xml_headers)
+    stub_request(:get, %r{msats.prod.nemnet.net.au\/msats\/ws\/ParticipantSystemStatus\/ER})
+      .with(headers: { 'Accept' => 'text/xml', 'Content-Type' => 'text/xml' })
+      .to_return(status: 200, body: File.new('spec/fixtures/MSATS/participant_system_status.xml'), headers: xml_headers)
     # MSATS ERRORS
-    stub_request(:get, /msats.prod.nemnet.net.au\/msats\/ws\/C4\/ER\?.+?NMI=4001234566.+?/).
-      with(headers: {'Accept'=>['text/xml'], 'Content-Type'=>'text/xml'}).
-      to_return(status: 404, body: "", headers: {'Content-Type'=>'text/xml'})
-    stub_request(:get, /msats.prod.nemnet.net.au\/msats\/ws\/NMIDetail\/ER\?.+?nmi=4001234566.+?/).
-      with(headers: {'Accept'=>['text/xml'], 'Content-Type'=>'text/xml'}).
-      to_return(status: 404, body: "", headers: {'Content-Type'=>'text/xml'})
+    stub_request(:get, %r{msats.prod.nemnet.net.au\/msats\/ws\/C4\/ER\?.+?NMI=4001234566.+?})
+      .with(headers: { 'Accept' => ['text/xml'], 'Content-Type' => 'text/xml' })
+      .to_return(status: 404, body: '', headers: xml_headers)
+    stub_request(:get, %r{msats.prod.nemnet.net.au\/msats\/ws\/NMIDetail\/ER\?.+?nmi=4001234566.+?})
+      .with(headers: { 'Accept' => ['text/xml'], 'Content-Type' => 'text/xml' })
+      .to_return(status: 404, body: '', headers: xml_headers)
   end
 
-  config.order = "random"
-
+  config.order = 'random'
 end
 
 def fixture(filename)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: aemo
 version: !ruby/object:Gem::Version
-  version: 0.1.27
+  version: 0.1.28
 platform: ruby
 authors:
 - Joel Courtney
@@ -293,6 +293,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: rubocop
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: Gem providing functionality for the Australian Energy Market Operator
   data. Supports NMIs, NEM12, MSATS Web Services and more
 email:
@@ -318,7 +332,7 @@ files:
 - lib/data/aemo-dlf.xml
 - lib/data/aemo-tni.json
 - lib/data/aemo-tni.xml
-- lib/data/xml-to-json.rb
+- lib/data/xml_to_json.rb
 - spec/aemo_spec.rb
 - spec/fixtures/GRAPH_30NSW1.csv
 - spec/fixtures/GRAPH_5NSW1.csv

data/lib/data/xml-to-json.rb

@@ -1,61 +0,0 @@
-require 'nokogiri'
-require 'json'
-require 'csv'
-require 'active_support/all'
-
-@path  = Dir.pwd
-@files = Dir.entries(@path).reject{|f| %w(. ..).include?(f)}
-
-@mlf_data = {}
-@dlf_data = {}
-
-# Let's get the CSV Data first
-
-# TNI to MLF
-CSV.open(File.join(@path,"tni-mlf-codes.csv"), headers: true, converters: :numeric).each do |row|
-  @mlf_data[row["TNI"]] ||= { location: row['Location'], voltage: row['Voltage'], loss_factors: [] }
-  @mlf_data[row["TNI"]][:loss_factors] << { start: DateTime.parse('2015-07-01T00:00:00+1000'), finish: DateTime.parse('2016-07-01T00:00:00+1000'), value: row['FY16']}
-  @mlf_data[row["TNI"]][:loss_factors] << { start: DateTime.parse('2014-07-01T00:00:00+1000'), finish: DateTime.parse('2015-07-01T00:00:00+1000'), value: row['FY15']}
-  @mlf_data[row["TNI"]][:loss_factors] << { start: DateTime.parse('2013-07-01T00:00:00+1000'), finish: DateTime.parse('2014-07-01T00:00:00+1000'), value: row['FY14']}
-end
-
-# TNI to MLF
-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|
-  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 }
-  open_file.close
-
-  xml.xpath("//Row").each do |row|
-    row_children = row.children
-    code = row_children.find{ |x| x.name == 'Code' }.children.first.text
-    output_data[code] ||= []
-    output_data_instance = {}
-    row_children.each do |row_child|
-      output_data_instance[row_child.name] = row_child.children.first.text
-    end
-    if file.match(/tni/)
-      puts "output_data_instance: #{output_data_instance.inspect}"
-      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{|x| DateTime.parse(output_data_instance['ToDate']) < x[:start] || DateTime.parse(output_data_instance['FromDate']) >= x[:finish] }
-        puts "output_data_instance[:mlf_data][:loss_factors]: #{output_data_instance[:mlf_data][:loss_factors].inspect}"
-      end
-    elsif file.match(/dlf/)
-      output_data_instance[:nsp_code] = @dlf_data[code]
-    end
-    output_data[code] << output_data_instance
-  end
-
-  File.open(File.join(@path,output_file),'w') do |write_file|
-    write_file.write(output_data.to_json)
-  end
-end