aemo 0.1.16 → 0.1.17

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 832594e01ce71664640977db21679e44f79457e8
-  data.tar.gz: 1154b8205f53dfb56f73f59c7ccd9a632f55d345
+  metadata.gz: e9f534b1b97bec9bc352216cfc352bcbbc9a4883
+  data.tar.gz: 7f94739af0677d741fbc40a556db9a3c64912ca1
 SHA512:
-  metadata.gz: f399467b78bc4b78816a3b8248683c789460c1113fc81bf9cfaf07ea092b8e6819cbef86143fa96602f8039af6bb9ff1b4424527bd8083a6debeca1a95b70d11
-  data.tar.gz: 4d31d8e8f21284131a7f2ce75899e84462316fa57e8fdbe37a57f78be812e5d2dc9aa972af3022572d75da528e9d91ccf211ebf81fc2f9377e2653f9cb9ee5f2
+  metadata.gz: 33b75e75812ff15f24222447689792ff07c04ee5f71ec950f753284dc9bf2e8874996a3672a571dfe1990679192efce12f6bb76f76e0f2d0a5d1d5b51535ab74
+  data.tar.gz: 1b877767ec31988797dc055d537f12f52a3b97fbcecc05bbaec47e43810426bd4cf8014860477ca156913de2ba77d75ea6e2cab7b4c4f583741026ff1f45373a

data/Rakefile

@@ -0,0 +1,5 @@
+require 'bundler/gem_tasks'
+
+task :console do
+  exec "irb -r aemo -I ./lib"
+end

data/lib/aemo/msats.rb

@@ -62,7 +62,7 @@ module AEMO
         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 =  self.get( "/C4/#{@@participant_id}", basic_auth: @@auth, headers: { 'Accept' => 'text/xml', 'Content-Type' => 'text/xml'}, query: query, verify: (options[:verify_ssl] != false) )
       if response.response.code != '200'
         response
       else
@@ -78,7 +78,7 @@ module AEMO
       query = {
         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 =  self.get( "/MSATSLimits/#{@@participant_id}", basic_auth: @@auth, headers: { 'Accept' => 'text/xml', 'Content-Type' => 'text/xml'}, query: query, verify: (options[:verify_ssl] != false) )
       if response.response.code != '200'
         response
       else
@@ -102,7 +102,7 @@ module AEMO
         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 =  self.get( "/NMIDiscovery/#{@@participant_id}", basic_auth: @@auth, headers: { 'Accept' => 'text/xml', 'Content-Type' => 'text/xml'}, query: query, verify: (options[:verify_ssl] != false) )
       if response.response.code != '200'
         response
       else
@@ -124,7 +124,7 @@ module AEMO
         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 = self.get( "/NMIDiscovery/#{@@participant_id}", basic_auth: @@auth, headers: { 'Accept' => 'text/xml', 'Content-Type' => 'text/xml'}, query: query, verify: (options[:verify_ssl] != false) )
       if response.response.code != '200'
         response
       else
@@ -176,7 +176,7 @@ module AEMO
         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 = self.get( "/NMIDiscovery/#{@@participant_id}", basic_auth: @@auth, headers: { 'Accept' => 'text/xml', 'Content-Type' => 'text/xml'}, query: query, verify: (options[:verify_ssl] != false) )
       if response.response.code != '200'
         response
       else
@@ -204,7 +204,7 @@ module AEMO
         reason: options[:reason]
       }
 
-      response = self.get( "/NMIDetail/#{@@participant_id}", basic_auth: @@auth, headers: { 'Accept' => 'text/xml', 'Content-Type' => 'text/xml'}, query: query )
+      response = self.get( "/NMIDetail/#{@@participant_id}", basic_auth: @@auth, headers: { 'Accept' => 'text/xml', 'Content-Type' => 'text/xml'}, query: query, verify: (options[:verify_ssl] != false) )
       if response.response.code != '200'
         response
       else
@@ -220,7 +220,7 @@ module AEMO
       query = {
         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 = self.get( "/ParticipantSystemStatus/#{@@participant_id}", basic_auth: @@auth, headers: { 'Accept' => 'text/xml', 'Content-Type' => 'text/xml'}, query: query, verify: (options[:verify_ssl] != false) )
       if response.response.code != '200'
         response
       else

data/lib/aemo/nmi.rb

@@ -482,18 +482,18 @@ module AEMO
     # Provided MSATS is configured, gets the MSATS data for the NMI
     #
     # @return [Hash] MSATS NMI Detail data
-    def raw_msats_nmi_detail
+    def raw_msats_nmi_detail(options={})
       raise ArgumentError, 'MSATS has no authentication credentials' unless AEMO::MSATS.can_authenticate?
 
-      AEMO::MSATS.nmi_detail(@nmi)
+      AEMO::MSATS.nmi_detail(@nmi,options)
     end
 
     # Provided MSATS is configured, uses the raw MSATS data to augment NMI information
     #
     # @return [self] returns self
-    def update_from_msats!
+    def update_from_msats!(options={})
       # Update local cache
-      @msats_detail = raw_msats_nmi_detail
+      @msats_detail = raw_msats_nmi_detail(options)
       # Set the details if there are any
       unless @msats_detail['MasterData'].nil?
         @tni                          = @msats_detail['MasterData']['TransmissionNodeIdentifier']

data/lib/aemo/version.rb

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

data/spec/aemo/market_spec.rb

@@ -3,14 +3,14 @@ require File.expand_path(File.join(File.dirname(__FILE__), '..', 'spec_helper'))
 describe AEMO::Market do
   describe '.regions' do
     it "returns the SupportedFormats constant" do
-      AEMO::Market.regions.should == AEMO::Region::REGIONS
+      expect(AEMO::Market.regions).to eq(AEMO::Region::REGIONS)
     end
 
     it "returns the SupportedFormats constant for subclasses" do
       class MyParser < HTTParty::Parser
         SupportedFormats = {"application/atom+xml" => :atom}
       end
-      MyParser.formats.should == {"application/atom+xml" => :atom}
+      expect(MyParser.formats).to eq({"application/atom+xml" => :atom})
     end
   end
-end
+end

data/spec/aemo/region_spec.rb

@@ -3,7 +3,7 @@ require File.expand_path(File.join(File.dirname(__FILE__), '..', 'spec_helper'))
 describe AEMO::Region do
   describe '.REGIONS' do
     it "should be a hash" do
-      AEMO::Market.regions.should be_instance_of(Hash)
+      expect(AEMO::Market.regions).to be_instance_of(Hash)
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: aemo
 version: !ruby/object:Gem::Version
-  version: 0.1.16
+  version: 0.1.17
 platform: ruby
 authors:
 - Joel Courtney
@@ -112,6 +112,7 @@ files:
 - Gemfile
 - Gemfile.lock
 - README.md
+- Rakefile
 - aemo.gemspec
 - lib/aemo.rb
 - lib/aemo/dispatchable.rb