aemo 0.1.16 → 0.1.17
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/Rakefile +5 -0
- data/lib/aemo/msats.rb +7 -7
- data/lib/aemo/nmi.rb +4 -4
- data/lib/aemo/version.rb +1 -1
- data/spec/aemo/market_spec.rb +3 -3
- data/spec/aemo/region_spec.rb +1 -1
- metadata +2 -1
checksums.yaml
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
---
|
2
2
|
SHA1:
|
3
|
-
metadata.gz:
|
4
|
-
data.tar.gz:
|
3
|
+
metadata.gz: e9f534b1b97bec9bc352216cfc352bcbbc9a4883
|
4
|
+
data.tar.gz: 7f94739af0677d741fbc40a556db9a3c64912ca1
|
5
5
|
SHA512:
|
6
|
-
metadata.gz:
|
7
|
-
data.tar.gz:
|
6
|
+
metadata.gz: 33b75e75812ff15f24222447689792ff07c04ee5f71ec950f753284dc9bf2e8874996a3672a571dfe1990679192efce12f6bb76f76e0f2d0a5d1d5b51535ab74
|
7
|
+
data.tar.gz: 1b877767ec31988797dc055d537f12f52a3b97fbcecc05bbaec47e43810426bd4cf8014860477ca156913de2ba77d75ea6e2cab7b4c4f583741026ff1f45373a
|
data/Rakefile
ADDED
data/lib/aemo/msats.rb
CHANGED
@@ -62,7 +62,7 @@ module AEMO
|
|
62
62
|
inittransId: options[:init_trans_id],
|
63
63
|
}
|
64
64
|
|
65
|
-
response = self.get( "/C4/#{@@participant_id}", basic_auth: @@auth, headers: { 'Accept' => 'text/xml', 'Content-Type' => 'text/xml'}, query: query )
|
65
|
+
response = self.get( "/C4/#{@@participant_id}", basic_auth: @@auth, headers: { 'Accept' => 'text/xml', 'Content-Type' => 'text/xml'}, query: query, verify: (options[:verify_ssl] != false) )
|
66
66
|
if response.response.code != '200'
|
67
67
|
response
|
68
68
|
else
|
@@ -78,7 +78,7 @@ module AEMO
|
|
78
78
|
query = {
|
79
79
|
transactionId: Digest::SHA1.hexdigest(Time.now.to_s)[0..35],
|
80
80
|
}
|
81
|
-
response = self.get( "/MSATSLimits/#{@@participant_id}", basic_auth: @@auth, headers: { 'Accept' => 'text/xml', 'Content-Type' => 'text/xml'}, query: query )
|
81
|
+
response = self.get( "/MSATSLimits/#{@@participant_id}", basic_auth: @@auth, headers: { 'Accept' => 'text/xml', 'Content-Type' => 'text/xml'}, query: query, verify: (options[:verify_ssl] != false) )
|
82
82
|
if response.response.code != '200'
|
83
83
|
response
|
84
84
|
else
|
@@ -102,7 +102,7 @@ module AEMO
|
|
102
102
|
deliveryPointIdentifier: delivery_point_identifier.to_i
|
103
103
|
}
|
104
104
|
|
105
|
-
response = self.get( "/NMIDiscovery/#{@@participant_id}", basic_auth: @@auth, headers: { 'Accept' => 'text/xml', 'Content-Type' => 'text/xml'}, query: query )
|
105
|
+
response = self.get( "/NMIDiscovery/#{@@participant_id}", basic_auth: @@auth, headers: { 'Accept' => 'text/xml', 'Content-Type' => 'text/xml'}, query: query, verify: (options[:verify_ssl] != false) )
|
106
106
|
if response.response.code != '200'
|
107
107
|
response
|
108
108
|
else
|
@@ -124,7 +124,7 @@ module AEMO
|
|
124
124
|
meterSerialNumber: meter_serial_number.to_i
|
125
125
|
}
|
126
126
|
|
127
|
-
response = self.get( "/NMIDiscovery/#{@@participant_id}", basic_auth: @@auth, headers: { 'Accept' => 'text/xml', 'Content-Type' => 'text/xml'}, query: query )
|
127
|
+
response = self.get( "/NMIDiscovery/#{@@participant_id}", basic_auth: @@auth, headers: { 'Accept' => 'text/xml', 'Content-Type' => 'text/xml'}, query: query, verify: (options[:verify_ssl] != false) )
|
128
128
|
if response.response.code != '200'
|
129
129
|
response
|
130
130
|
else
|
@@ -176,7 +176,7 @@ module AEMO
|
|
176
176
|
stateOrTerritory: options[:state_or_territory]
|
177
177
|
}
|
178
178
|
|
179
|
-
response = self.get( "/NMIDiscovery/#{@@participant_id}", basic_auth: @@auth, headers: { 'Accept' => 'text/xml', 'Content-Type' => 'text/xml'}, query: query )
|
179
|
+
response = self.get( "/NMIDiscovery/#{@@participant_id}", basic_auth: @@auth, headers: { 'Accept' => 'text/xml', 'Content-Type' => 'text/xml'}, query: query, verify: (options[:verify_ssl] != false) )
|
180
180
|
if response.response.code != '200'
|
181
181
|
response
|
182
182
|
else
|
@@ -204,7 +204,7 @@ module AEMO
|
|
204
204
|
reason: options[:reason]
|
205
205
|
}
|
206
206
|
|
207
|
-
response = self.get( "/NMIDetail/#{@@participant_id}", basic_auth: @@auth, headers: { 'Accept' => 'text/xml', 'Content-Type' => 'text/xml'}, query: query )
|
207
|
+
response = self.get( "/NMIDetail/#{@@participant_id}", basic_auth: @@auth, headers: { 'Accept' => 'text/xml', 'Content-Type' => 'text/xml'}, query: query, verify: (options[:verify_ssl] != false) )
|
208
208
|
if response.response.code != '200'
|
209
209
|
response
|
210
210
|
else
|
@@ -220,7 +220,7 @@ module AEMO
|
|
220
220
|
query = {
|
221
221
|
transactionId: Digest::SHA1.hexdigest(Time.now.to_s)[0..35],
|
222
222
|
}
|
223
|
-
response = self.get( "/ParticipantSystemStatus/#{@@participant_id}", basic_auth: @@auth, headers: { 'Accept' => 'text/xml', 'Content-Type' => 'text/xml'}, query: query )
|
223
|
+
response = self.get( "/ParticipantSystemStatus/#{@@participant_id}", basic_auth: @@auth, headers: { 'Accept' => 'text/xml', 'Content-Type' => 'text/xml'}, query: query, verify: (options[:verify_ssl] != false) )
|
224
224
|
if response.response.code != '200'
|
225
225
|
response
|
226
226
|
else
|
data/lib/aemo/nmi.rb
CHANGED
@@ -482,18 +482,18 @@ module AEMO
|
|
482
482
|
# Provided MSATS is configured, gets the MSATS data for the NMI
|
483
483
|
#
|
484
484
|
# @return [Hash] MSATS NMI Detail data
|
485
|
-
def raw_msats_nmi_detail
|
485
|
+
def raw_msats_nmi_detail(options={})
|
486
486
|
raise ArgumentError, 'MSATS has no authentication credentials' unless AEMO::MSATS.can_authenticate?
|
487
487
|
|
488
|
-
AEMO::MSATS.nmi_detail(@nmi)
|
488
|
+
AEMO::MSATS.nmi_detail(@nmi,options)
|
489
489
|
end
|
490
490
|
|
491
491
|
# Provided MSATS is configured, uses the raw MSATS data to augment NMI information
|
492
492
|
#
|
493
493
|
# @return [self] returns self
|
494
|
-
def update_from_msats!
|
494
|
+
def update_from_msats!(options={})
|
495
495
|
# Update local cache
|
496
|
-
@msats_detail = raw_msats_nmi_detail
|
496
|
+
@msats_detail = raw_msats_nmi_detail(options)
|
497
497
|
# Set the details if there are any
|
498
498
|
unless @msats_detail['MasterData'].nil?
|
499
499
|
@tni = @msats_detail['MasterData']['TransmissionNodeIdentifier']
|
data/lib/aemo/version.rb
CHANGED
data/spec/aemo/market_spec.rb
CHANGED
@@ -3,14 +3,14 @@ require File.expand_path(File.join(File.dirname(__FILE__), '..', 'spec_helper'))
|
|
3
3
|
describe AEMO::Market do
|
4
4
|
describe '.regions' do
|
5
5
|
it "returns the SupportedFormats constant" do
|
6
|
-
AEMO::Market.regions.
|
6
|
+
expect(AEMO::Market.regions).to eq(AEMO::Region::REGIONS)
|
7
7
|
end
|
8
8
|
|
9
9
|
it "returns the SupportedFormats constant for subclasses" do
|
10
10
|
class MyParser < HTTParty::Parser
|
11
11
|
SupportedFormats = {"application/atom+xml" => :atom}
|
12
12
|
end
|
13
|
-
MyParser.formats.
|
13
|
+
expect(MyParser.formats).to eq({"application/atom+xml" => :atom})
|
14
14
|
end
|
15
15
|
end
|
16
|
-
end
|
16
|
+
end
|
data/spec/aemo/region_spec.rb
CHANGED
@@ -3,7 +3,7 @@ require File.expand_path(File.join(File.dirname(__FILE__), '..', 'spec_helper'))
|
|
3
3
|
describe AEMO::Region do
|
4
4
|
describe '.REGIONS' do
|
5
5
|
it "should be a hash" do
|
6
|
-
AEMO::Market.regions.
|
6
|
+
expect(AEMO::Market.regions).to be_instance_of(Hash)
|
7
7
|
end
|
8
8
|
end
|
9
9
|
end
|
metadata
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
2
2
|
name: aemo
|
3
3
|
version: !ruby/object:Gem::Version
|
4
|
-
version: 0.1.
|
4
|
+
version: 0.1.17
|
5
5
|
platform: ruby
|
6
6
|
authors:
|
7
7
|
- Joel Courtney
|
@@ -112,6 +112,7 @@ files:
|
|
112
112
|
- Gemfile
|
113
113
|
- Gemfile.lock
|
114
114
|
- README.md
|
115
|
+
- Rakefile
|
115
116
|
- aemo.gemspec
|
116
117
|
- lib/aemo.rb
|
117
118
|
- lib/aemo/dispatchable.rb
|