wits 1.0.2 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 32370807e7d5a4d40fdd98a743a2ca07018e198f
-  data.tar.gz: e365779ce0fc43349d063d2c2dcfe186318f20ac
+  metadata.gz: e8f7e641a95b83b891eb2cd3bb2f8dc15e7d3e00
+  data.tar.gz: 92b37df47a3f1e1d058385c7a52f0b4e4766fc1f
 SHA512:
-  metadata.gz: 202af69d43140c38469a4fb1b661795793d084c505db61b03908d766be9f47890202ffe29f5e5627f58f909f29095a0d9255c07eaa070e6daf67e869f43c3bd4
-  data.tar.gz: 95c2d46b9c3a55377b1b3a2f4931d04819e4c5193db0c79d25095547ea1fc302390f2411e2e5b22443a2a888d750bd789425e393322ebf9318f0ca8a99a38b49
+  metadata.gz: c0f9598434a6c6658383a344f3611dfe0e30184d000c6cacc0fa28134b2100c70ad98af7b02d0959ccac43f02dd3542abf6551352dbf126da69d769d82028371
+  data.tar.gz: be10c01bf7447fab927acb052726235d6541471e28bece3bb61d21f9c8b757207903bb041f661271885e3ec078932bf43590628874db1bb6ed4e79e17e8cad1e

data/CHANGELOG.md

@@ -1,6 +1,8 @@
-Unreleased
+1.1.0 / 2017-03-05
 ------
-No changes
+* Dropping official support for Ruby versions 2.1 and below.
+* Use the new site (currently available on www2.electricityinfo.co.nz)
+* Interim prices is supported in the new site
 
 1.0.2 / 2016-09-23
 ------

data/README.md

@@ -47,7 +47,7 @@ Or install it yourself as:
 
 
 ## Supported Ruby versions
-wits supports MRI Ruby 1.9+ and the JRuby equivalent. The specific Ruby versions we build and test on can be found at [TravisCI](https://travis-ci.org/gchan/wits).
+wits officially supports MRI Ruby 2.2+ and the JRuby equivalent. wits may work for older versions of Ruby however we no longer test against these unsupported versions. The specific Ruby versions we build and test on can be found at [TravisCI](https://travis-ci.org/gchan/wits).
 
 ## Usage
 
@@ -58,9 +58,15 @@ Half-hourly final/interim prices can be retrieved in the following ways:
 
 ```ruby
 Wits.prices('ben2201') # Defaults to the day before yesterday
+Wits.final_prices('ben2201')
 Wits.prices('BEN', '29/03/2015')
 Wits.prices('ben', Time.parse('29/03/2015 13:37'))
 Wits.prices('BEN2201', Date.parse('29/03/2015'))
+
+Wits.interim_prices('ben2201') # Defaults to the day before yesterday
+Wits.interim_prices('BEN', '29/03/2015')
+Wits.interim_prices('ben', Time.parse('29/03/2015 13:37'))
+Wits.interim_prices('BEN2201', Date.parse('29/03/2015'))
 ```
 
 If no date-like argument is provided, data for the day before yesterday will be retrieved.
@@ -71,9 +77,13 @@ There are convenient methods for known nodes. Use `Wits::Nodes.nodes` to see a l
 Wits.ben_prices
 Wits.benmore_prices('29/03/2015')
 Wits.ben2201_prices(Time.parse('29/03/2015 13:37'))
+
+Wits.ben_interim_prices
+Wits.benmore_interim_prices('29/03/2015')
+Wits.ben2201_interim_prices(Time.parse('29/03/2015 13:37'))
 ```
 
-For Final/Interim prices, there are shorter methods without the `_prices` suffix.
+For Final prices, there are shorter methods without the `_prices` suffix.
 
 ```ruby
 Wits.ben
@@ -168,7 +178,9 @@ For instance, if the NZT time for the first trading period is `2015-03-29 00:00:
 
 #### Known Issues
 
-There is no reliable method (without web scraping) of distinguishing interim half-hourly prices from final prices. Until the WITS CSV file correctly reports the price type, the half-hourly prices are always reported as 'Final'
+_This information is related to the old WITS site. It may no longer apply to the new WITS site._
+
+~~There is no reliable method (without web scraping) of distinguishing interim half-hourly prices from final prices. Until the WITS CSV file correctly reports the price type, the half-hourly prices are always reported as 'Final'~~ _Interim and final prices can now  be retrieved via their respective Ruby methods_
 
 The CSV files for five minute prices and average five minute prices are missing some data rows on days when daylight savings ends. As a result, wits will return incomplete (and possibly invalid) data for dates when daylight savings ends (e.g. 5 April 2015).
 

data/lib/wits/client.rb

@@ -21,7 +21,7 @@ module Wits
     end
 
     def self.client
-      @client ||= Faraday.new(url: 'https://www.electricityinfo.co.nz') do |connection|
+      @client ||= Faraday.new(url: 'https://www2.electricityinfo.co.nz') do |connection|
         connection.adapter Faraday.default_adapter
         connection.use Faraday::Response::RaiseError
       end
@@ -29,26 +29,23 @@ module Wits
 
     private
 
-    # WITS is buggy and doesn't use status codes.
-    # This is the most reliable method of determining whether
-    # we actually have a meaningful CSV file
+    # Check if the CSV contains more than just the header
+    # or if the there is no CSV (i.e we received an HTML file)
     def self.check_for_data(response)
-      return unless response.body =~ /html/i ||
-                    response.body.length < 300
-
-      fail Wits::Error::ResourceNotFound
+      raise Wits::Error::ResourceNotFound if response.body.include?('html') ||
+                                             CSV.parse(response.body).size <= 1
     end
 
     def self.handle_error(error)
       case error
       when Faraday::ConnectionFailed
-        raise Wits::Error::ConnectionFailed.new error
+        raise Wits::Error::ConnectionFailed, error
       when Faraday::ResourceNotFound
-        raise Wits::Error::ResourceNotFound.new error
+        raise Wits::Error::ResourceNotFound, error
       when Faraday::TimeoutError
-        raise Wits::Error::TimeoutError.new error
+        raise Wits::Error::TimeoutError, error
       else # Faraday::ClientError
-        raise Wits::Error::ClientError.new error
+        raise Wits::Error::ClientError, error
       end
     end
   end

data/lib/wits/final_interim_prices/convenience_methods.rb

@@ -24,6 +24,16 @@ module Wits
 
           # def halfway_bush_prices
           create_prices_method("#{name.downcase.tr(' ', '_')}_prices", node)
+
+
+          # def ben2201_interim_prices
+          create_interim_prices_method(node.downcase, node)
+
+          # def hay_interim_prices
+          create_interim_prices_method(node.downcase[0..2], node)
+
+          # def halfway_bush_interim_prices
+          create_interim_prices_method(name.downcase.tr(' ', '_'), node)
         end
       end
 
@@ -34,6 +44,12 @@ module Wits
           prices(node, *args)
         end
       end
+
+      def self.create_interim_prices_method(method_prefix, node)
+        define_method "#{method_prefix}_interim_prices" do |*args|
+          interim_prices(node, *args)
+        end
+      end
     end
   end
 end

data/lib/wits/final_interim_prices.rb

@@ -10,66 +10,20 @@ module Wits
     extend self
     extend Helpers
     extend ConvenienceMethods
+    include PriceCodes
 
     def self.extended(base)
       base.extend Helpers
       base.extend ConvenienceMethods
     end
 
-    def prices(node, date = nz_current_date - 2)
-      node = format_node(node)
-      date = format_date(date)
-
-      request_prices(node, date)
-    end
-
-    private
-
-    def request_prices(node, date)
-      response = Wits::Client.get_csv do |request|
-        request.url(
-          'comitFta/ftaPage.download',
-          pNode: node,
-          pDate: date
-        )
-      end
-
-      parse_prices_csv(response.body)
-    end
-
-    def parse_prices_csv(csv)
-      csv = CSV.parse(csv)
-
-      price_type, node, date = read_prices_header(csv)
-      prices                 = process_prices(csv, date)
-
-      format_prices(node, date, prices, price_type)
-    rescue StandardError => error
-      raise Wits::Error::ParsingError.new(error)
+    def prices(node, date = nz_current_date - 3, type = FINAL)
+      csv = request_prices(node, date, type)
+      parse_csv(csv, type)
     end
 
-    def read_prices_header(csv)
-      header_regexp = %r{(.*) Prices for Node (.{3}\d{4}) on (\d{2}\/\d{2}\/\d{4})}
-
-      header = csv.shift.shift
-      price_type, node, date = header.match(header_regexp).captures
-
-      date = Date.parse date
-
-      csv.shift # discard second header
-
-      [price_type, node, date]
-    end
-
-    def process_prices(csv, date)
-      times = []
-
-      csv.map do |time, trading_period, price|
-        repeated_time = times.include?(time)
-        times << time
-
-        format_price(date, time, trading_period, price, repeated_time)
-      end
+    def interim_prices(node, date = nz_current_date - 1)
+      prices(node, date, INTERIM)
     end
   end
 end

data/lib/wits/five_minute_prices.rb

@@ -10,82 +10,20 @@ module Wits
     extend self
     extend Helpers
     extend ConvenienceMethods
+    include PriceCodes
 
     def self.extended(base)
       base.extend Helpers
       base.extend ConvenienceMethods
     end
 
-    def average_five_minute_prices(node, date = nz_current_date)
-      five_minute_prices(node, date, :average)
-    end
-
-    def five_minute_prices(node, date = nz_current_date, type = :price)
-      node = format_node(node)
-      date = format_date(date)
-      type = format_price_type(type)
-
-      request_five_min_prices(node, date, type)
-    end
-
-    private
-
-    def format_price_type(type)
-      if type == :price
-        'Price'
-      else
-        'Average'
-      end
-    end
-
-    def request_five_min_prices(node, date, type)
-      response = Wits::Client.get_csv do |request|
-        request.url(
-          'comitFta/five_min_prices.download',
-          INchoice:    'SEL', # Mandatory
-          INdate:       date,
-          INgip:        node,
-          INperiodfrom: 1,
-          INperiodto:   50,
-          INtype:       type
-        )
-      end
-
-      parse_five_min_csv(response.body, type)
-    end
-
-    def parse_five_min_csv(csv, type)
-      csv = CSV.parse(csv.sub("\r\n", "\n"))
-
-      node, date = process_five_min_metadata(csv)
-      prices     = process_five_min_prices(csv)
-      price_type = 'Five Minute'
-
-      price_type = "Average #{price_type}" if type == 'Average'
-
-      format_prices(node, date, prices, price_type)
-    rescue StandardError => error
-      raise Wits::Error::ParsingError.new(error)
+    def five_minute_prices(node, date = nz_current_date, type = FIVE_MINUTE)
+      csv = request_prices(node, date, type)
+      parse_csv(csv, type)
     end
 
-    def process_five_min_metadata(csv)
-      csv.shift # discard header
-
-      node = csv.first[0]
-      date = Date.parse csv.first[1]
-
-      [node, date]
-    end
-
-    def process_five_min_prices(csv)
-      times = []
-
-      csv.map do |_node, date, trading_period, time, price, *_|
-        repeated_time = times.include?(time)
-        times << time
-
-        format_price(date, time, trading_period, price, repeated_time)
-      end
+    def average_five_minute_prices(node, date = nz_current_date)
+      five_minute_prices(node, date, AVERAGE)
     end
   end
 end

data/lib/wits/helpers.rb

@@ -1,10 +1,19 @@
 require 'tzinfo'
 require 'wits/nodes'
+require 'wits/price_codes'
 
 module Wits
   module Helpers
     private
 
+    def format_price_type(type)
+      Wits::PriceCodes::PRICE_TYPES[type]
+    end
+
+    def price_description(type_code)
+      Wits::PriceCodes::PRICE_DESCRIPTION[type_code]
+    end
+
     def format_node(node)
       node = node.to_s.upcase
 
@@ -16,16 +25,24 @@ module Wits
     end
 
     def format_date(date)
-      if date.respond_to?(:strftime)
-        date.strftime('%d/%m/%Y')
+      if date.is_a?(String)
+        Time.parse(date).to_date.iso8601
       else
-        date
+        date.to_date.iso8601
       end
     end
 
-    def format_price(date, time, trading_period, price, repeated_time)
+    def format_price_thirty_min(date, _time, trading_period, price, repeated_time)
       {
-        time: parse_nz_time(date, time, repeated_time),
+        time: parse_nz_time(date, '', repeated_time) + 60 * 30 * (trading_period.to_i - 1),
+        trading_period: trading_period.to_i,
+        price: price.to_f
+      }
+    end
+
+    def format_price_five_minute(_date, time, trading_period, price, repeated_time)
+      {
+        time: parse_nz_time(time[0..9], time[0..-4], repeated_time) - 5 * 60,
         trading_period: trading_period.to_i,
         price: price.to_f
       }
@@ -38,10 +55,68 @@ module Wits
         node_name: Wits::Nodes.nodes[node.to_sym],
         price_type: price_type,
         date: date,
-        prices: prices.sort_by { |price| price[:time] }
+        prices: prices
       }
     end
 
+    def process_metadata(csv)
+      csv.shift # discard header
+
+      node = csv.first[0]
+      date = Date.parse csv.first[1]
+
+      [node, date]
+    end
+
+    def process_prices(csv)
+      times = []
+
+      csv.map do |_node, date, trading_period, price, _, _, time, type|
+        repeated_time = times.include?(time)
+        times << time
+
+        if type == 'I'
+          format_price_five_minute(date, time, trading_period, price, repeated_time)
+        else
+          format_price_thirty_min(date, time, trading_period, price, repeated_time)
+        end
+      end
+    end
+
+    def request_prices(node, date, type)
+      node = format_node(node)
+      date = format_date(date)
+      type = format_price_type(type)
+
+      response = Wits::Client.get_csv do |request|
+        request.url('download/prices')
+
+        request.params['search_form[date_from]'] = date
+        request.params['search_form[date_to]'] = date
+        request.params['search_form[tp_from]'] = 1
+        # Maximum trading period is 50 but it doesn't appear
+        # to work for average prices (only half the data is returned)
+        request.params['search_form[tp_to]'] = 100
+        request.params['search_form[nodes]'] = [node]
+        request.params['search_form[market_types]'] = ['E']
+        request.params['search_form[run_types]'] = [type]
+      end
+
+      response.body
+    end
+
+    def parse_csv(csv, type)
+      csv = CSV.parse(csv.sub("\r\n", "\n"))
+
+      node, date = process_metadata(csv)
+      prices     = process_prices(csv)
+      price_type = price_description(type)
+
+      format_prices(node, date, prices, price_type)
+    rescue StandardError => error
+      raise Wits::Error::ParsingError, error
+    end
+
     def parse_nz_time(date, time, repeated_time)
       date = Date.parse(date) unless date.is_a?(Date)
 

data/lib/wits/nodes.rb

@@ -25,10 +25,9 @@ module Wits
     # }
     SHORT_CODES = Hash[
       NODES.keys.map { |node| node[0..2].to_sym }
-        .zip(NODES.keys.map(&:to_s))
+                  .zip(NODES.keys.map(&:to_s))
     ].freeze
 
-
     def nodes
       NODES
     end

data/lib/wits/price_codes.rb

@@ -0,0 +1,22 @@
+module Wits
+  module PriceCodes
+    FINAL = :final
+    INTERIM = :interim
+    AVERAGE = :average
+    FIVE_MINUTE = :five_minute
+
+    PRICE_TYPES = {
+      FINAL => 'F',
+      INTERIM => 'T',
+      AVERAGE => '5',
+      FIVE_MINUTE => 'I'
+    }.freeze
+
+    PRICE_DESCRIPTION = {
+      FINAL => 'Final',
+      INTERIM => 'Interim',
+      AVERAGE => 'Average Five Minute',
+      FIVE_MINUTE => 'Five Minute'
+    }.freeze
+  end
+end

data/lib/wits/version.rb

@@ -1,3 +1,3 @@
 module Wits
-  VERSION = "1.0.2"
+  VERSION = '1.1.0'.freeze
 end

data/lib/wits.rb

@@ -2,6 +2,7 @@ require 'faraday'
 
 require 'wits/version'
 require 'wits/nodes'
+require 'wits/price_codes'
 require 'wits/final_interim_prices'
 require 'wits/five_minute_prices'
 

data/wits.gemspec

@@ -7,7 +7,7 @@ Gem::Specification.new do |spec|
   spec.name          = 'wits'
   spec.version       = Wits::VERSION
   spec.authors       = ['Gordon Chan']
-  spec.email         = ['developer.gordon@gmail.com']
+  spec.email         = ['developer.gordon+github@gmail.com']
 
   spec.summary       = 'Retrieves electricity data from WITS Free to Air'
   spec.description   = 'A Ruby interface for WITS (Wholesale and
@@ -20,23 +20,23 @@ Gem::Specification.new do |spec|
   spec.require_paths = ['lib']
   spec.platform      = Gem::Platform::RUBY
 
-  spec.add_runtime_dependency 'faraday', '~> 0.9.1'
+  spec.add_runtime_dependency 'faraday', '~> 0.11.0'
   spec.add_runtime_dependency 'tzinfo', '~> 1.2.2'
 
   spec.add_development_dependency 'bundler', '~> 1.6'
-  spec.add_development_dependency 'rake', '~> 10.0'
+  spec.add_development_dependency 'rake', '~> 12.0'
   spec.add_development_dependency 'pry', '~> 0.10.1'
 
-  spec.add_development_dependency 'guard-rspec', '~> 4.5.0'
-  spec.add_development_dependency 'rspec', '~> 3.2.0'
-  spec.add_development_dependency 'vcr', '~> 2.9.3'
-  spec.add_development_dependency 'webmock', '~> 1.21.0'
-  spec.add_development_dependency 'multi_json', '~> 1.11.0'
-  spec.add_development_dependency 'timecop', '~> 0.7.3'
-  spec.add_development_dependency 'simplecov', '~> 0.9.2'
-  spec.add_development_dependency 'rubocop', '~> 0.29.1'
-  spec.add_development_dependency 'coveralls', '~> 0.8.0'
-  spec.add_development_dependency 'codeclimate-test-reporter', '~> 0.4.7'
-  spec.add_development_dependency 'tins', '~> 1.6.0'
-  spec.add_development_dependency 'listen', '~> 3.0.5'
+  spec.add_development_dependency 'guard-rspec', '~> 4.7.3'
+  spec.add_development_dependency 'rspec', '~> 3.5.0'
+  spec.add_development_dependency 'vcr', '~> 3.0.3'
+  spec.add_development_dependency 'webmock', '~> 2.3.2'
+  spec.add_development_dependency 'multi_json', '~> 1.12.1'
+  spec.add_development_dependency 'timecop', '~> 0.8.1'
+  spec.add_development_dependency 'simplecov', '~> 0.12.0'
+  spec.add_development_dependency 'rubocop', '~> 0.47.1'
+  spec.add_development_dependency 'coveralls', '~> 0.8.19'
+  spec.add_development_dependency 'codeclimate-test-reporter', '~> 1.0.5'
+  spec.add_development_dependency 'tins', '~> 1.13.2'
+  spec.add_development_dependency 'listen', '~> 3.1.5'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: wits
 version: !ruby/object:Gem::Version
-  version: 1.0.2
+  version: 1.1.0
 platform: ruby
 authors:
 - Gordon Chan
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-09-23 00:00:00.000000000 Z
+date: 2017-03-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faraday
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.9.1
+        version: 0.11.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.9.1
+        version: 0.11.0
 - !ruby/object:Gem::Dependency
   name: tzinfo
   requirement: !ruby/object:Gem::Requirement
@@ -58,14 +58,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '12.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '12.0'
 - !ruby/object:Gem::Dependency
   name: pry
   requirement: !ruby/object:Gem::Requirement
@@ -86,173 +86,173 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 4.5.0
+        version: 4.7.3
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 4.5.0
+        version: 4.7.3
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.2.0
+        version: 3.5.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.2.0
+        version: 3.5.0
 - !ruby/object:Gem::Dependency
   name: vcr
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.9.3
+        version: 3.0.3
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.9.3
+        version: 3.0.3
 - !ruby/object:Gem::Dependency
   name: webmock
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.21.0
+        version: 2.3.2
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.21.0
+        version: 2.3.2
 - !ruby/object:Gem::Dependency
   name: multi_json
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.11.0
+        version: 1.12.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.11.0
+        version: 1.12.1
 - !ruby/object:Gem::Dependency
   name: timecop
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.7.3
+        version: 0.8.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.7.3
+        version: 0.8.1
 - !ruby/object:Gem::Dependency
   name: simplecov
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.9.2
+        version: 0.12.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.9.2
+        version: 0.12.0
 - !ruby/object:Gem::Dependency
   name: rubocop
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.29.1
+        version: 0.47.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.29.1
+        version: 0.47.1
 - !ruby/object:Gem::Dependency
   name: coveralls
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.8.0
+        version: 0.8.19
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.8.0
+        version: 0.8.19
 - !ruby/object:Gem::Dependency
   name: codeclimate-test-reporter
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.4.7
+        version: 1.0.5
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.4.7
+        version: 1.0.5
 - !ruby/object:Gem::Dependency
   name: tins
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.6.0
+        version: 1.13.2
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.6.0
+        version: 1.13.2
 - !ruby/object:Gem::Dependency
   name: listen
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.0.5
+        version: 3.1.5
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.0.5
+        version: 3.1.5
 description: |-
   A Ruby interface for WITS (Wholesale and
       information trading system) to retrieve New Zealand electricity data.
 email:
-- developer.gordon@gmail.com
+- developer.gordon+github@gmail.com
 executables: []
 extensions: []
 extra_rdoc_files: []
@@ -269,6 +269,7 @@ files:
 - lib/wits/five_minute_prices/convenience_methods.rb
 - lib/wits/helpers.rb
 - lib/wits/nodes.rb
+- lib/wits/price_codes.rb
 - lib/wits/version.rb
 - wits.gemspec
 homepage: https://www.github.com/gchan/wits
@@ -291,7 +292,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 2.6.8
 signing_key: 
 specification_version: 4
 summary: Retrieves electricity data from WITS Free to Air