genability 0.2.0 → 0.3.0

data/lib/genability/client/price.rb

@@ -39,7 +39,7 @@ module Genability
       def prices_params(from_date_time, options)
         {
           "fromDateTime" => format_to_iso8601(from_date_time),
-          "toDateTime" => format_to_iso8601(options[:to]),
+          "toDateTime" => format_to_iso8601(options[:to] || options[:to_date_time]),
           "territoryId" => options[:territory_id],
           "consumptionAmount" => options[:consumption_amount],
           "demandAmount" => options[:demand_amount]

data/lib/genability/client/property.rb

@@ -1,12 +1,40 @@
 module Genability
   class Client
-
+    # Properties are metadata associated with a tariff. They are frequently
+    # used to determine applicability for a particular set of rates within a
+    # tariff. For example, the property cityLimits is used when a tariff has
+    # different rates based on whether the consumer lives inside or outside
+    # the city limits.
     module Property
-
+      # This allows you to retrieve one Property using its keyname. This is
+      # particularly useful when using the Calculator as it may require you to
+      # specify certain applicability values prior to making the calculation.
+      #
+      # @format :json
+      # @authenticated true
+      # @rate_limited true
+      # @param key_name [String] Property key name
+      # @return [Hashie::Mash] Details for a property.
+      # @see https://developer.genability.com/documentation/api-reference/public/property
       def property(key_name)
         get("public/properties/#{key_name}").results.first
       end
 
+      # This returns a list of Properties based on a search criteria. The result
+      # set is an array of Property objects in the standard response format.
+      #
+      # @format :json
+      # @authenticated true
+      # @rate_limited true
+      # @param options [Hash] A customizable set of options.
+      # @option options [Integer] :entity_id Filters the result set to only include
+      #   Properties that belong to this entityId. EntityType must also be specified,
+      #   otherwise this is ignored (Optional).
+      # @option options [String] :entity_type Filters the result set to only include
+      #   Properties that belong to this entityType. EntityId must also be specified,
+      #   otherwise this is ignored. Currently the only supported value is 'LSE' (Optional)
+      # @return [Array] Array of property objects.
+      # @see https://developer.genability.com/documentation/api-reference/public/property
       def properties(options = {})
         get("public/properties", property_params(options)).results
       end

data/lib/genability/client/season.rb

@@ -13,12 +13,49 @@ module Genability
       # @authenticated true
       # @rate_limited true
       # @param load_serving_entity_id [Integer] Unique Genability ID (primary key) for a Load Serving Entity.
+      # @param options [Hash] A customizable set of options.
+      # @option options [String] :search The string of text to search on. This
+      #   can also be a regular expression, in which case you should set the
+      #   'isRegex' flag to true. (Optional)
+      # @option options [String] :search_on Comma separated list of fields to
+      #   query on. When searchOn is specified, the text provided in the search
+      #   string field will be searched within these fields. The list of fields
+      #   to search on depend on the entity being searched for. Read the documentation
+      #   for the entity for more details on the fields that can be searched, and
+      #   the default fields to be searched if searchOn is not specified. (Optional)
+      # @option options [Boolean] :starts_with When true, the search will only
+      #   return results that begin with the specified search string. Otherwise,
+      #   any match of the search string will be returned as a result. Default is
+      #   false. (Optional)
+      # @option options [Boolean] :ends_with When true, the search will only return
+      #   results that end with the specified search string. Otherwise, any match of
+      #   the search string will be returned as a result. Default is false. (Optional)
+      # @option options [Boolean] :is_regex When true, the provided search string
+      #   will be regarded as a regular expression and the search will return results
+      #   matching the regular expression. Default is false. (Optional)
+      # @option options [String] :sort_on Comma separated list of fields to sort on.
+      #   This can also be input via Array Inputs (see above). (Optional)
+      # @option options [String] :sort_order Comma separated list of ordering.
+      #   Possible values are 'ASC' and 'DESC'. Default is 'ASC'. If your sortOn
+      #   contains multiple fields and you would like to order fields individually,
+      #   you can pass in a comma separated list here (or use Array Inputs, see above).
+      #   For example, if your sortOn contained 5 fields, and your sortOrder contained
+      #   'ASC, DESC, DESC', these would be applied to the first three items in the sortOn
+      #   field. The remaining two would default to ASC. (Optional)
       # @return [Array] list of season groups for a load serving entity.
       # @see https://developer.genability.com/documentation/api-reference/public/season
       # @example Return a list of season groups for Pacific Gas & Electric Co
       #   Genability.seasons(734)
-      def seasons(load_serving_entity_id)
-        get("public/seasons", { :lseId => load_serving_entity_id }).results
+      def seasons(load_serving_entity_id, options = {})
+        get("public/seasons", season_params(load_serving_entity_id, options)).results
+      end
+
+      private
+
+      def season_params(load_serving_entity_id, options)
+        { :lseId => load_serving_entity_id }.
+          delete_if{ |k,v| v.nil? }.
+          merge( search_params(options) )
       end
 
     end

data/lib/genability/client/tariff.rb

@@ -16,14 +16,57 @@ module Genability
       # @authenticated true
       # @rate_limited true
       # @param options [Hash] A customizable set of options.
-      # @option options [Integer] :lse_id Filter tariffs for a specific Load Serving Entity. (Optional)
-      # @option options [Date] :effective_on  Only tariffs that are effective on this date. (Optional)
-      # @option options [String, Array] :customer_classes Only include these customer classes. Choices are: RESIDENTIAL, GENERAL. (Optional)
-      # @option options [String, Array] :tariff_types Only include these tariff types. Choices are: DEFAULT, ALTERNATIVE, OPTIONAL_EXTRA, RIDER. (Optional)
-      # @option options [String] :zip_code Return tariffs for this zip or post code. (Optional)
-      # @option options [Boolean] :populate_rates Populates the rate details for the returned Tariffs. (Optional)
-      # @option options [Integer] :page The page number to begin the result set from. If not specified, this will begin with the first result set. (Optional)
-      # @option options [Integer] :per_page The number of results to return. If not specified, this will return 25 results. (Optional)
+      # @option options [Integer] :lse_id Filter tariffs for a specific Load Serving
+      #   Entity. (Optional)
+      # @option options [Date] :effective_on  Only tariffs that are effective on
+      #   this date. (Optional)
+      # @option options [Date] :from Only include tariffs that are effective on or
+      #   after this date (Optional)
+      # @option options [Date] :to Only include tariffs that are effective on or
+      #   before this date (Optional)
+      # @option options [String, Array] :customer_classes Only include these customer
+      #   classes. Choices are: RESIDENTIAL, GENERAL. (Optional)
+      # @option options [String, Array] :tariff_types Only include these tariff types.
+      #   Choices are: DEFAULT, ALTERNATIVE, OPTIONAL_EXTRA, RIDER. (Optional)
+      # @option options [String] :zip_code Return tariffs for this zip or post
+      #   code. (Optional)
+      # @option options [Boolean] :populate_rates Populates the rate details for the
+      #   returned Tariff. (Optional)
+      # @option options [Boolean] :populate_properties Populates the properties
+      #   for the returned Tariffs (Optional; defaults to false)
+      # @option options [Integer] :page The page number to begin the result
+      #   set from. If not specified, this will begin with the first result
+      #   set. (Optional)
+      # @option options [Integer] :per_page The number of results to return.
+      #   If not specified, this will return 25 results. (Optional)
+      # @option options [String] :search The string of text to search on. This
+      #   can also be a regular expression, in which case you should set the
+      #   'isRegex' flag to true. (Optional)
+      # @option options [String] :search_on Comma separated list of fields to
+      #   query on. When searchOn is specified, the text provided in the search
+      #   string field will be searched within these fields. The list of fields
+      #   to search on depend on the entity being searched for. Read the documentation
+      #   for the entity for more details on the fields that can be searched, and
+      #   the default fields to be searched if searchOn is not specified. (Optional)
+      # @option options [Boolean] :starts_with When true, the search will only
+      #   return results that begin with the specified search string. Otherwise,
+      #   any match of the search string will be returned as a result. Default is
+      #   false. (Optional)
+      # @option options [Boolean] :ends_with When true, the search will only return
+      #   results that end with the specified search string. Otherwise, any match of
+      #   the search string will be returned as a result. Default is false. (Optional)
+      # @option options [Boolean] :is_regex When true, the provided search string
+      #   will be regarded as a regular expression and the search will return results
+      #   matching the regular expression. Default is false. (Optional)
+      # @option options [String] :sort_on Comma separated list of fields to sort on.
+      #   This can also be input via Array Inputs (see above). (Optional)
+      # @option options [String] :sort_order Comma separated list of ordering.
+      #   Possible values are 'ASC' and 'DESC'. Default is 'ASC'. If your sortOn
+      #   contains multiple fields and you would like to order fields individually,
+      #   you can pass in a comma separated list here (or use Array Inputs, see above).
+      #   For example, if your sortOn contained 5 fields, and your sortOrder contained
+      #   'ASC, DESC, DESC', these would be applied to the first three items in the sortOn
+      #   field. The remaining two would default to ASC. (Optional)
       # @return [Array] List of tariffs.
       # @see https://developer.genability.com/documentation/api-reference/public/tariff
       # @example Return the first 25 tariffs
@@ -45,7 +88,10 @@ module Genability
       # @rate_limited true
       # @param tariff_id [Integer] Unique Genability ID (primary key) for a tariff.
       # @param options [Hash] A customizable set of options.
-      # @option options [Boolean] :populate_rates Populates the rate details for the returned Tariff. (Optional)
+      # @option options [Boolean] :populate_rates Populates the rate details for the
+      #   returned Tariff. (Optional)
+      # @option options [Boolean] :populate_properties Populates the properties
+      #   for the returned Tariffs (Optional; defaults to false)
       # @return [Hashie::Mash] A tariff.
       # @see https://developer.genability.com/documentation/api-reference/public/tariff
       # @example Return the residential serice tariff for Georgia Power Co
@@ -59,18 +105,23 @@ module Genability
       def tariffs_params(options)
         {
           'lseId' => options[:lse_id],
-          'effectiveOn' => options[:effective_on],
+          'effectiveOn' => format_to_iso8601(options[:effective_on]),
+          'fromDateTime' => format_to_iso8601(options[:from] || options[:from_date_time]),
+          'toDateTime' => format_to_iso8601(options[:to] || options[:to_date_time]),
           'customerClasses' => multi_option_handler(options[:customer_classes]),
           'tariffTypes' => multi_option_handler(options[:tariff_types]),
-          'zipCode' => options[:zip_code]
+          'zipCode' => options[:zip_code],
+          'accountId' => options[:account_id]
         }.delete_if{ |k,v| v.nil? }.
           merge( tariff_params(options) ).
+          merge( search_params(options) ).
           merge( pagination_params(options) )
       end
 
       def tariff_params(options)
         {
-          'populateRates' => convert_to_boolean(options[:populate_rates])
+          'populateRates' => convert_to_boolean(options[:populate_rates]),
+          'populateProperties' => convert_to_boolean(options[:populate_properties])
         }.delete_if{ |k,v| v.nil? }
       end
 

data/lib/genability/client/territory.rb

@@ -25,9 +25,12 @@ module Genability
       # @format :json
       # @authenticated true
       # @rate_limited true
-      # @param territory_id [Integer] Unique Genability ID (primary key) for each Territory.
+      # @param territory_id [Integer] Unique Genability ID (primary key) for
+      #   each Territory.
       # @param options [Hash] A customizable set of options.
-      # @option options [Boolean] :populate_items If true, this returns a List of TerritoryItems for each Territory in the result set. (Optional; defaults to false)
+      # @option options [Boolean] :populate_items If true, this returns a List
+      #   of TerritoryItems for each Territory in the result set. (Optional;
+      #   defaults to false)
       # @return [Hashie::Mash] Details for one territory.
       # @see https://developer.genability.com/documentation/api-reference/public/territory
       # @example Return territory Baseline Region V for Pacific Gas & Electric Co
@@ -42,15 +45,55 @@ module Genability
       # @authenticated true
       # @rate_limited true
       # @param options [Hash] A customizable set of options.
-      # @option options [Integer] :lse_id Filter tariffs for a specific Load Serving Entity. (Optional)
-      # @option options [Boolean] :populate_items If true, this returns a List of TerritoryItems for each Territory in the result set. (Optional; defaults to false)
-      # @option options [Integer] :master_tariff_id Filters the result set to only include territories covered by this master tariff id. (Optional)
-      # @option options [String] :contains_item_type Filters the result set to include a particular type of territory. Possible values are: CITY, ZIPCODE, STATE, COUNTY. (Optional)
-      # @option options [String] :contains_item_value Filters the Types by this value. e.g. 94115 when searching for types of ZIPCODE. (Optional)
+      # @option options [Integer] :lse_id Filter tariffs for a specific Load
+      #   Serving Entity. (Optional)
+      # @option options [Boolean] :populate_items If true, this returns a List
+      #   of TerritoryItems for each Territory in the result set. (Optional;
+      #   defaults to false)
+      # @option options [Integer] :master_tariff_id Filters the result set to
+      #   only include territories covered by this master tariff id. (Optional)
+      # @option options [String] :contains_item_type Filters the result set to
+      #   include a particular type of territory. Possible values are: CITY,
+      #   ZIPCODE, STATE, COUNTY. (Optional)
+      # @option options [String] :contains_item_value Filters the Types by
+      #   this value. e.g. 94115 when searching for types of ZIPCODE. (Optional)
+      # @option options [String] :usage_type Filters the result set to only
+      #   include territories of the specified usageType. Possible values are:
+      #   SERVICE, TARIFF. (Optional)
+      # @option options [String] :search The string of text to search on. This
+      #   can also be a regular expression, in which case you should set the
+      #   'isRegex' flag to true. (Optional)
+      # @option options [String] :search_on Comma separated list of fields to
+      #   query on. When searchOn is specified, the text provided in the search
+      #   string field will be searched within these fields. The list of fields
+      #   to search on depend on the entity being searched for. Read the documentation
+      #   for the entity for more details on the fields that can be searched, and
+      #   the default fields to be searched if searchOn is not specified. (Optional)
+      # @option options [Boolean] :starts_with When true, the search will only
+      #   return results that begin with the specified search string. Otherwise,
+      #   any match of the search string will be returned as a result. Default is
+      #   false. (Optional)
+      # @option options [Boolean] :ends_with When true, the search will only return
+      #   results that end with the specified search string. Otherwise, any match of
+      #   the search string will be returned as a result. Default is false. (Optional)
+      # @option options [Boolean] :is_regex When true, the provided search string
+      #   will be regarded as a regular expression and the search will return results
+      #   matching the regular expression. Default is false. (Optional)
+      # @option options [String] :sort_on Comma separated list of fields to sort on.
+      #   This can also be input via Array Inputs (see above). (Optional)
+      # @option options [String] :sort_order Comma separated list of ordering.
+      #   Possible values are 'ASC' and 'DESC'. Default is 'ASC'. If your sortOn
+      #   contains multiple fields and you would like to order fields individually,
+      #   you can pass in a comma separated list here (or use Array Inputs, see above).
+      #   For example, if your sortOn contained 5 fields, and your sortOrder contained
+      #   'ASC, DESC, DESC', these would be applied to the first three items in the sortOn
+      #   field. The remaining two would default to ASC. (Optional)
       # @return [Array] List of territories.
       # @see https://developer.genability.com/documentation/api-reference/public/territory
       # @example Return a list of territories for Pacific Gas & Electric Co
       #   Genability.territories(:lse_id => 734)
+      # @example Get a Territory ID from a Zipcode
+      #   Genability.territories(:lse_id => 734, :contains_item_type => 'ZIPCODE', :contains_item_value => 94115)
       def territories(options = {})
         get("public/territories", territories_params(options)).results
       end
@@ -68,9 +111,11 @@ module Genability
           'lseId' => options[:lse_id],
           'masterTariffId' => options[:master_tariff_id],
           'containsItemType' => options[:contains_item_type],
-          'containsItemValue' => options[:contains_item_value]
+          'containsItemValue' => options[:contains_item_value],
+          'usageType' => options[:usage_type]
         }.delete_if{ |k,v| v.nil? }.
           merge( territory_params(options) ).
+          merge( search_params(options) ).
           merge( pagination_params(options) )
       end
 

data/lib/genability/client/time_of_use.rb

@@ -11,19 +11,52 @@ module Genability
     #      Periods. A Period is a range of days and times that this TOU applies to.
     module TimeOfUse
 
-      # Returns a particular time of use group using its time of use group ID and the load serving entity ID.
+      # Returns a particular time of use group using its time of use group ID and
+      # the load serving entity ID.
       #
       # @format :json
       # @authenticated true
       # @rate_limited true
-      # @param load_serving_entity_id [Integer] Unique Genability ID (primary key) for a Load Serving Entity.
-      # @param time_of_use_group_id [Integer] Genability ID (primary key) for this Time of Use Group. This is unique within the LSE, not across LSE's so you will always need to specify the LSE ID when requested a TOU Group.
+      # @param load_serving_entity_id [Integer] Unique Genability ID (primary key)
+      #   for a Load Serving Entity.
+      # @param time_of_use_group_id [Integer] Genability ID (primary key) for this
+      #   Time of Use Group. This is unique within the LSE, not across LSE's so you
+      #   will always need to specify the LSE ID when requested a TOU Group.
+      # @param options [Hash] A customizable set of options.
+      # @option options [String] :search The string of text to search on. This
+      #   can also be a regular expression, in which case you should set the
+      #   'isRegex' flag to true. (Optional)
+      # @option options [String] :search_on Comma separated list of fields to
+      #   query on. When searchOn is specified, the text provided in the search
+      #   string field will be searched within these fields. The list of fields
+      #   to search on depend on the entity being searched for. Read the documentation
+      #   for the entity for more details on the fields that can be searched, and
+      #   the default fields to be searched if searchOn is not specified. (Optional)
+      # @option options [Boolean] :starts_with When true, the search will only
+      #   return results that begin with the specified search string. Otherwise,
+      #   any match of the search string will be returned as a result. Default is
+      #   false. (Optional)
+      # @option options [Boolean] :ends_with When true, the search will only return
+      #   results that end with the specified search string. Otherwise, any match of
+      #   the search string will be returned as a result. Default is false. (Optional)
+      # @option options [Boolean] :is_regex When true, the provided search string
+      #   will be regarded as a regular expression and the search will return results
+      #   matching the regular expression. Default is false. (Optional)
+      # @option options [String] :sort_on Comma separated list of fields to sort on.
+      #   This can also be input via Array Inputs (see above). (Optional)
+      # @option options [String] :sort_order Comma separated list of ordering.
+      #   Possible values are 'ASC' and 'DESC'. Default is 'ASC'. If your sortOn
+      #   contains multiple fields and you would like to order fields individually,
+      #   you can pass in a comma separated list here (or use Array Inputs, see above).
+      #   For example, if your sortOn contained 5 fields, and your sortOrder contained
+      #   'ASC, DESC, DESC', these would be applied to the first three items in the sortOn
+      #   field. The remaining two would default to ASC. (Optional)
       # @return [Hashie::Mash] Return the time of uses for a load serving entity.
       # @see https://developer.genability.com/documentation/api-reference/public/time-of-use
       # @example Return the time of use group for Georgia Power Co
       #   Genability.time_of_uses(2756, 1)
-      def time_of_uses(load_serving_entity_id, time_of_use_group_id)
-        get("public/timeofuses/#{load_serving_entity_id}/#{time_of_use_group_id}").results.first
+      def time_of_uses(load_serving_entity_id, time_of_use_group_id, options = {})
+        get("public/timeofuses/#{load_serving_entity_id}/#{time_of_use_group_id}", tou_params(options)).results.first
       end
 
       alias :tou :time_of_uses
@@ -35,11 +68,18 @@ module Genability
       # @format :json
       # @authenticated true
       # @rate_limited true
-      # @param load_serving_entity_id [Integer] Unique Genability ID (primary key) for a Load Serving Entity.
-      # @param time_of_use_group_id [Integer] Genability ID (primary key) for this Time of Use Group. This is unique within the LSE, not across LSE's so you will always need to specify the LSE ID when requested a TOU Group.
+      # @param load_serving_entity_id [Integer] Unique Genability ID (primary key) for
+      #   a Load Serving Entity.
+      # @param time_of_use_group_id [Integer] Genability ID (primary key) for this Time
+      #   of Use Group. This is unique within the LSE, not across LSE's so you will
+      #   always need to specify the LSE ID when requested a TOU Group.
       # @param options [Hash] A customizable set of options.
-      # @option options [DateTime] :from ISO 8601 format for the starting date and time of the requested Intervals. Defaults to current day and time if not specified. (Optional)
-      # @option options [DateTime] :to ISO 8601 format for the ending date and time of the requested Intervals. Defaults to one week after the fromDateTime. (Optional)
+      # @option options [DateTime] :from ISO 8601 format for the starting date and
+      #   time of the requested Intervals. Defaults to current day and time if
+      #   not specified. (Optional)
+      # @option options [DateTime] :to ISO 8601 format for the ending date and
+      #   time of the requested Intervals. Defaults to one week after the
+      #   fromDateTime. (Optional)
       # @return [Array] Returns all the Intervals for a Time of Use Group.
       # @see https://developer.genability.com/documentation/api-reference/public/time-of-use
       # @example Return the intervals for the time of use group for Georgia Power Co
@@ -54,6 +94,10 @@ module Genability
 
       private
 
+      def tou_params(options)
+        search_params(options)
+      end
+
       def interval_params(options)
         {
           'fromDateTime' => format_to_iso8601(options[:from]),

data/lib/genability/connection.rb

@@ -29,6 +29,8 @@ module Genability
           end
         end
         connection.use Faraday::Response::RaiseHttp5xx
+        connection.use Faraday::Request::Multipart
+        connection.use Faraday::Request::UrlEncoded
         connection.adapter(adapter)
       end
     end

data/lib/genability/error.rb

@@ -19,7 +19,7 @@ module Genability
 
   # Raised when the tariff input for the calculate method is
   # not an array or hash
-  class InvalidTariffInput < Error; end
+  class InvalidInput < Error; end
 
 end
 

data/lib/genability/request.rb

@@ -34,8 +34,13 @@ module Genability
           request.params['appKey'] = application_key
         when :post, :put
           request.path = path
-          request.headers['Content-Type'] = 'application/json'
-          request.body = options unless options.empty?
+          if options['fileData']
+            request.headers['Content-type'] = 'multipart/form-data'
+            request.body = options
+          else
+            request.headers['Content-Type'] = 'application/json;charset=utf-8'
+            request.body = options unless options.empty?
+          end
         end
       end
       raw ? response : response.body

data/lib/mashie_extensions.rb

@@ -7,7 +7,15 @@ class Hashie::Mash
   def to_friendly_hash
     out = {}
     keys.each do |k|
-      out[genability_to_ruby_friendly(k)] = Hashie::Hash === self[k] ? self[k].to_hash : self[k]
+      out[genability_to_ruby_friendly(k)] = case self[k]
+      when Hashie::Hash
+        self[k].to_friendly_hash
+      when Array
+        self[k].collect(&:to_friendly_hash)
+      else
+        self[k]
+      end
+      #Hashie::Hash === self[k] ? self[k].to_friendly_hash : self[k]
     end
     out
   end

data/spec/cassettes/calculate.yml

@@ -1,55 +1,82 @@
---- 
-- !ruby/struct:VCR::HTTPInteraction 
-  request: !ruby/struct:VCR::Request 
+---
+- !ruby/struct:VCR::HTTPInteraction
+  request: !ruby/struct:VCR::Request
     method: :get
     uri: http://api.genability.com:80/rest/beta/calculate/512?appId=ValidAppID&appKey=ValidAppKey&cityLimits=Inside&connectionType=Primary%20Connection&fromDateTime=2011-09-01T00:00:00.0-0400&toDateTime=2011-09-10T00:00:00.0-0400
     body: 
-    headers: 
-      accept: 
+    headers:
+      accept:
       - application/json; charset=utf-8
-      user-agent: 
+      user-agent:
       - Genability API Ruby Gem
-      accept-encoding: 
+      accept-encoding:
       - gzip;q=1.0,deflate;q=0.6,identity;q=0.3
-  response: !ruby/struct:VCR::Response 
-    status: !ruby/struct:VCR::ResponseStatus 
+  response: !ruby/struct:VCR::Response
+    status: !ruby/struct:VCR::ResponseStatus
       code: 200
       message: OK
-    headers: 
-      server: 
-      - Apache-Coyote/1.1
-      content-type: 
+    headers:
+      access-control-allow-origin:
+      - ! '*'
+      content-type:
       - application/json;charset=utf-8
-      transfer-encoding: 
+      date:
+      - Sat, 05 May 2012 18:43:30 GMT
+      server:
+      - Apache/2.2.16 (Ubuntu)
+      transfer-encoding:
       - chunked
-      date: 
-      - Wed, 26 Oct 2011 06:44:52 GMT
-    body: "{\"status\":\"success\",\"count\":3,\"type\":\"PropertyData\",\"results\":[{\"keyName\":\"consumption\",\"dataType\":\"DECIMAL\",\"fromDateTime\":\"2011-09-01T00:00:00.000-0400\",\"toDateTime\":\"2011-09-10T00:00:00.000-0400\",\"unit\":\"kwh\"},{\"keyName\":\"cityLimits\",\"dataType\":\"CHOICE\",\"fromDateTime\":\"2011-09-01T00:00:00.000-0400\",\"toDateTime\":\"2011-09-10T00:00:00.000-0400\",\"dataValue\":\"Inside\"},{\"keyName\":\"connectionType\",\"dataType\":\"CHOICE\",\"fromDateTime\":\"2011-09-01T00:00:00.000-0400\",\"toDateTime\":\"2011-09-10T00:00:00.000-0400\",\"dataValue\":\"Primary Connection\"}]}"
-    http_version: "1.1"
-- !ruby/struct:VCR::HTTPInteraction 
-  request: !ruby/struct:VCR::Request 
+      connection:
+      - keep-alive
+    body: ! '{"status":"success","count":3,"type":"PropertyData","results":[{"keyName":"consumption","dataType":"DECIMAL","fromDateTime":"2011-09-01T00:00:00-04:00","toDateTime":"2011-09-10T00:00:00-04:00","unit":"kwh"},{"keyName":"cityLimits","displayName":"Service
+      Area (Inside/outside city limits)","description":"Has service inside or outside
+      city limits","dataType":"CHOICE","fromDateTime":"2011-09-01T00:00:00-04:00","toDateTime":"2011-09-10T00:00:00-04:00"},{"keyName":"connectionType","displayName":"Connection
+      Type","description":"Where or how the service is connected to the grid (e.g.
+      primary, transmission, subtransmission).","dataType":"CHOICE","fromDateTime":"2011-09-01T00:00:00-04:00","toDateTime":"2011-09-10T00:00:00-04:00"}]}'
+    http_version: '1.1'
+- !ruby/struct:VCR::HTTPInteraction
+  request: !ruby/struct:VCR::Request
     method: :post
-    uri: http://api.genability.com:80/rest/beta/calculate/512
-    body: "{\"fromDateTime\":\"2011-09-01T00:00:00.0-0400\",\"toDateTime\":\"2011-09-10T00:00:00.0-0400\",\"tariffInputs\":[{\"keyName\":\"consumption\",\"dataType\":\"DECIMAL\",\"fromDateTime\":\"2011-09-01T00:00:00.000-0400\",\"toDateTime\":\"2011-09-10T00:00:00.000-0400\",\"unit\":\"kwh\"},{\"keyName\":\"cityLimits\",\"dataType\":\"CHOICE\",\"fromDateTime\":\"2011-09-01T00:00:00.000-0400\",\"toDateTime\":\"2011-09-10T00:00:00.000-0400\",\"dataValue\":\"Inside\"},{\"keyName\":\"connectionType\",\"dataType\":\"CHOICE\",\"fromDateTime\":\"2011-09-01T00:00:00.000-0400\",\"toDateTime\":\"2011-09-10T00:00:00.000-0400\",\"dataValue\":\"Primary Connection\"}],\"appId\":\"ValidAppID\",\"appKey\":\"ValidAppKey\"}"
-    headers: 
-      accept: 
+    uri: http://api.genability.com:80/rest/beta/calculate/512?appId=ValidAppID&appKey=ValidAppKey
+    body: ! '{"fromDateTime":"2011-09-01T00:00:00.0-0400","toDateTime":"2011-09-10T00:00:00.0-0400","tariffInputs":[{"keyName":"consumption","dataType":"DECIMAL","fromDateTime":"2011-09-01T00:00:00-04:00","toDateTime":"2011-09-10T00:00:00-04:00","unit":"kwh"},{"keyName":"cityLimits","displayName":"Service
+      Area (Inside/outside city limits)","description":"Has service inside or outside
+      city limits","dataType":"CHOICE","fromDateTime":"2011-09-01T00:00:00-04:00","toDateTime":"2011-09-10T00:00:00-04:00"},{"keyName":"connectionType","displayName":"Connection
+      Type","description":"Where or how the service is connected to the grid (e.g.
+      primary, transmission, subtransmission).","dataType":"CHOICE","fromDateTime":"2011-09-01T00:00:00-04:00","toDateTime":"2011-09-10T00:00:00-04:00"}]}'
+    headers:
+      accept:
       - application/json; charset=utf-8
-      user-agent: 
+      user-agent:
       - Genability API Ruby Gem
-      content-type: 
-      - application/json
-  response: !ruby/struct:VCR::Response 
-    status: !ruby/struct:VCR::ResponseStatus 
+      content-type:
+      - application/json;charset=utf-8
+  response: !ruby/struct:VCR::Response
+    status: !ruby/struct:VCR::ResponseStatus
       code: 200
       message: OK
-    headers: 
-      server: 
-      - Apache-Coyote/1.1
-      content-type: 
+    headers:
+      access-control-allow-origin:
+      - ! '*'
+      content-type:
       - application/json;charset=utf-8
-      transfer-encoding: 
+      date:
+      - Sat, 05 May 2012 18:43:31 GMT
+      server:
+      - Apache/2.2.16 (Ubuntu)
+      transfer-encoding:
       - chunked
-      date: 
-      - Wed, 26 Oct 2011 06:44:52 GMT
-    body: "{\"status\":\"success\",\"count\":1,\"type\":\"CalculatedCost\",\"results\":[{\"masterTariffId\":512,\"tariffName\":\"Residential Service\",\"fromDateTime\":\"2011-09-01T00:00:00.000-0400\",\"toDateTime\":\"2011-09-10T00:00:00.000-0400\",\"totalCost\":10.837188000000000000000000,\"items\":[{\"tariffRateId\":2734,\"tariffRateBandId\":3258,\"rateGroupName\":\"Basic Service Charge\",\"rateName\":\"Basic Service Charge\",\"fromDateTime\":\"2011-09-01T00:00:00.000-0400\",\"toDateTime\":\"2011-09-10T00:00:00.000-0400\",\"rateType\":\"COST_PER_UNIT\",\"quantityKey\":\"fixed\",\"itemQuantity\":1.000000,\"itemCount\":1,\"cost\":9.000000},{\"tariffRateId\":2736,\"tariffRateBandId\":3262,\"rateGroupName\":\"Energy Charges\",\"rateName\":\"Summer Energy Charges\",\"fromDateTime\":\"2011-09-01T00:00:00.000-0400\",\"toDateTime\":\"2011-09-10T00:00:00.000-0400\",\"rateType\":\"COST_PER_UNIT\",\"quantityKey\":\"consumption\",\"itemQuantity\":0.000000,\"itemCount\":1,\"cost\":0E-12},{\"tariffRateId\":2737,\"tariffRateBandId\":3265,\"rateGroupName\":\"Minimum Monthly Bill\",\"rateName\":\"Minimum Charge\",\"fromDateTime\":\"2011-09-01T00:00:00.000-0400\",\"toDateTime\":\"2011-09-10T00:00:00.000-0400\",\"rateType\":\"COST_PER_UNIT\",\"quantityKey\":\"minimum\",\"itemQuantity\":1.000000,\"itemCount\":1,\"cost\":0},{\"tariffRateId\":2723,\"tariffRateBandId\":3247,\"rateGroupName\":\"Demand Side Management Residential Schedule\",\"rateName\":\"Demand Side Management Residential Schedule\",\"fromDateTime\":\"2011-09-01T00:00:00.000-0400\",\"toDateTime\":\"2011-09-10T00:00:00.000-0400\",\"rateType\":\"PERCENTAGE\",\"quantityKey\":\"fixed\",\"itemQuantity\":1.000000,\"itemCount\":1,\"cost\":0.146457000000000000},{\"tariffRateId\":2724,\"tariffRateBandId\":3248,\"rateGroupName\":\"Environmental Compliance Cost Recovery Schedule\",\"rateName\":\"Environmental Compliance Cost Recovery Schedule\",\"fromDateTime\":\"2011-09-01T00:00:00.000-0400\",\"toDateTime\":\"2011-09-10T00:00:00.000-0400\",\"rateType\":\"PERCENTAGE\",\"quantityKey\":\"fixed\",\"itemQuantity\":1.000000,\"itemCount\":1,\"cost\":0.901179000000000000},{\"tariffRateId\":1444637,\"tariffRateBandId\":1415268,\"rateGroupName\":\"Fuel Cost Recovery Schedule\",\"rateName\":\"Summer\",\"fromDateTime\":\"2011-09-01T00:00:00.000-0400\",\"toDateTime\":\"2011-09-10T00:00:00.000-0400\",\"rateType\":\"COST_PER_UNIT\",\"quantityKey\":\"consumption\",\"itemQuantity\":0.000000,\"itemCount\":1,\"cost\":0E-12},{\"tariffRateId\":1444636,\"tariffRateBandId\":1415250,\"rateGroupName\":\"Municipal Franchise Fee Schedule\",\"rateName\":\"Municipal Franchise Fee Schedule\",\"fromDateTime\":\"2011-09-01T00:00:00.000-0400\",\"toDateTime\":\"2011-09-10T00:00:00.000-0400\",\"rateType\":\"PERCENTAGE\",\"quantityKey\":\"QUANTITY\",\"itemQuantity\":1.000000,\"itemCount\":1,\"cost\":0.261981000000000000000000},{\"tariffRateId\":2733,\"tariffRateBandId\":3257,\"rateGroupName\":\"Nuclear Construction Cost Recovery Schedule\",\"rateName\":\"Nuclear Construction Cost Recovery Schedule\",\"fromDateTime\":\"2011-09-01T00:00:00.000-0400\",\"toDateTime\":\"2011-09-10T00:00:00.000-0400\",\"rateType\":\"PERCENTAGE\",\"quantityKey\":\"fixed\",\"itemQuantity\":1.000000,\"itemCount\":1,\"cost\":0.527571000000000000}]}]}"
-    http_version: "1.1"
+      connection:
+      - keep-alive
+    body: ! '{"status":"success","count":1,"type":"CalculatedCost","results":[{"masterTariffId":512,"tariffName":"Residential
+      Service","fromDateTime":"2011-09-01T00:00:00-04:00","toDateTime":"2011-09-10T00:00:00-04:00","totalCost":2.865347,"accuracy":1.000000,"items":[{"tariffRateId":2734,"tariffRateBandId":3258,"rateGroupName":"Basic
+      Service Charge","rateName":"Basic Service Charge","fromDateTime":"2011-09-01T00:00:00-04:00","toDateTime":"2011-10-01T00:00:00-04:00","rateType":"COST_PER_UNIT","quantityKey":"fixed","itemQuantity":1.000000,"itemCount":1,"cost":2.700000},{"tariffRateId":2736,"tariffRateBandId":3262,"rateGroupName":"Energy
+      Charges","rateName":"Summer Rate","fromDateTime":"2011-09-01T00:00:00-04:00","toDateTime":"2011-10-01T00:00:00-04:00","rateType":"COST_PER_UNIT","quantityKey":"consumption","itemQuantity":0.000000,"itemCount":1,"cost":0.000000},{"tariffRateId":16977076,"tariffRateBandId":10162044,"rateGroupName":"Fuel
+      Cost Recovery Charge","rateName":"Secondary Distribution Customer - Summer","fromDateTime":"2011-09-01T00:00:00-04:00","toDateTime":"2011-10-01T00:00:00-04:00","rateType":"COST_PER_UNIT","quantityKey":"consumption","itemQuantity":0.000000,"itemCount":1,"cost":0.000000},{"tariffRateId":16977071,"tariffRateBandId":10162039,"rateGroupName":"Environmental
+      Compliance Cost Recovery Charge","rateName":"Environmental Compliance Cost Recovery
+      Charge","fromDateTime":"2011-09-01T00:00:00-04:00","toDateTime":"2011-10-01T00:00:00-04:00","rateType":"PERCENTAGE","quantityKey":"QUANTITY","itemQuantity":1.000000,"rateAmount":10.013100,"itemCount":1,"cost":0.081106},{"tariffRateId":16977072,"tariffRateBandId":10162040,"rateGroupName":"Nuclear
+      Construction Cost Recovery Charge","rateName":"Nuclear Construction Cost Recovery
+      Charge","fromDateTime":"2011-09-01T00:00:00-04:00","toDateTime":"2011-10-01T00:00:00-04:00","rateType":"PERCENTAGE","quantityKey":"QUANTITY","itemQuantity":1.000000,"rateAmount":5.861900,"itemCount":1,"cost":0.047481},{"tariffRateId":16977073,"tariffRateBandId":10162041,"rateGroupName":"Demand
+      Side Management Charge","rateName":"Demand Side Management Charge","fromDateTime":"2011-09-01T00:00:00-04:00","toDateTime":"2011-10-01T00:00:00-04:00","rateType":"PERCENTAGE","quantityKey":"QUANTITY","itemQuantity":1.000000,"rateAmount":1.627300,"itemCount":1,"cost":0.013181},{"tariffRateId":16977074,"tariffRateBandId":10162042,"rateGroupName":"Municipal
+      Franchise Fee","rateName":"Inside City Limit Customer","fromDateTime":"2011-09-01T00:00:00-04:00","toDateTime":"2011-10-01T00:00:00-04:00","rateType":"PERCENTAGE","quantityKey":"QUANTITY","itemQuantity":1.000000,"rateAmount":2.910900,"itemCount":1,"cost":0.023578},{"tariffRateId":2737,"tariffRateBandId":3265,"rateGroupName":"Minimum
+      Charge","rateName":"Minimum Charge","fromDateTime":"2011-09-01T00:00:00-04:00","toDateTime":"2011-09-10T00:00:00-04:00","rateType":"COST_PER_UNIT","quantityKey":"minimum","itemQuantity":1.000000,"rateAmount":9.000000,"itemCount":1,"cost":0.000000}],"assumptions":[{"keyName":"tariffId","dataType":"INTEGER","fromDateTime":"2011-09-01T00:00:00-04:00","toDateTime":"2011-09-10T00:00:00-04:00","dataValue":"512","accuracy":1}]}]}'
+    http_version: '1.1'