green-button-data 0.4.2 → 0.5.0

checksums.yaml

@@ -1,7 +1,15 @@
 ---
-SHA1:
-  metadata.gz: 1ceb62da3fba8372097a53e504b7a9a5873dd2ff
-  data.tar.gz: 44fc0e9c4c3ee4a6ffac789714a250322cd8c3ef
+!binary "U0hBMQ==":
+  metadata.gz: !binary |-
+    MGY5ZWIwYjc2ODMxMDk0NjM2NTA5OTkyNzJhODhiNWQ1ZGE0MWM0Yw==
+  data.tar.gz: !binary |-
+    MDQ0MTJkOTc0OWI3OTkyNjc5MmQ1NzE2NWUzYzAwZGFhMjBhMDZiMA==
 SHA512:
-  metadata.gz: 69d63b6058a2eae2b6339c59ae2acd5adfc5a68ab19b87bbba35e4ad797b59ad5849970aa8593c496cff0e4fc417cea0d6d9bd5e0d0155dc64eca1d04b1b2a56
-  data.tar.gz: e0367553136129ea42ff0c84f8abb185256e0d2d73bc984840f4a8178691193c3a1bc31142069b323b77342bde47522aa215eff085fc183b85b9e72d93bf3c6b
+  metadata.gz: !binary |-
+    NGU2MmY5NDYwZTAzN2VhZGIxNzliYzVmYmQzYWMwOGVjMDkxNjY0NDE5Yjkw
+    ZmM2MTIxMmRmNTM4MzdlYjI2NWI1MDUxYzMzNzM2ZWRmODRiYTdlZjg2MGQw
+    OWFjMDI4ZDJlYzZhMGFmZmEwYTAwMTVlYTVhNGRiOGEyOTA5MmE=
+  data.tar.gz: !binary |-
+    YjY0YWQ5ZGFkN2RjODFiNDcxMjlkNWM5N2U0M2UwYjNjZDJkYWViMzBlZWRj
+    OTNjN2M2MjQ3ZmVjY2MyMmU0ZjBhMWJkMDJiMGI5MmI5ZWEwNzdlNjJhMTNm
+    ZDNkY2FkZWM3M2UzN2I2YjBiMjQ5OGFmN2Y3ZjJlZjQzMjlmNDI=

data/lib/green-button-data/parser/cost_additional_detail_last_period.rb

@@ -0,0 +1,38 @@
+module GreenButtonData
+  module Parser
+    class CostAdditionalDetailLastPeriod
+      include SAXMachine
+
+      element :powerOfTenMultiplier, class: Integer,
+              as: :power_of_ten_multiplier
+      element :uom, class: Integer
+      element :value, class: Integer
+      element :note
+      element :itemKind, class: Integer, as: :item_kind
+
+      def value
+        @value
+      end
+
+      def note
+        @note
+      end
+
+      # ESPI Namespacing
+      element :'espi:powerOfTenMultiplier', class: Integer,
+              as: :power_of_ten_multiplier
+      element :'espi:uom', class: Integer, as: :uom
+      element :'espi:value', class: Integer, as: :value
+      element :'espi:note', as: :note
+      element :'espi:itemKind', class: Integer, as: :item_kind
+
+      # Special case for PG&E generic namespacing
+      element :'ns0:powerOfTenMultiplier', class: Integer,
+              as: :power_of_ten_multiplier
+      element :'ns0:uom', class: Integer, as: :uom
+      element :'ns0:value', class: Integer, as: :value
+      element :'ns0:note', as: :note
+      element :'ns0:itemKind', class: Integer, as: :item_kind
+    end
+  end
+end

data/lib/green-button-data/parser/usage_summary.rb

@@ -10,8 +10,9 @@ module GreenButtonData
       element :billToDate, class: Integer, as: :bill_to_date
       element :costAdditionalLastPeriod, class: Integer,
               as: :cost_additional_last_period
-      element :costAdditionalDetailLastPeriod, class: Integer,
-              as: :cost_additional_detail_last_period
+      elements :costAdditionalDetailLastPeriod,
+              class: CostAdditionalDetailLastPeriod,
+              as: :cost_additional_detail_last_periods
       element :currency, class: Integer
       element :overallConsumptionLastPeriod, class: SummaryMeasurement,
               as: :overall_consumption_last_period
@@ -36,6 +37,8 @@ module GreenButtonData
       element :ratchetDemandPeriod, class: Interval, as: :ratchet_demand_period
       element :statusTimeStamp, class: Integer, as: :status_time_stamp
       element :commodity, class: Integer
+      element :readCycle, as: :read_cycle
+      element :tariffProfile, as: :tariff
 
       def currency
         CURRENCY[@currency]
@@ -59,8 +62,9 @@ module GreenButtonData
       element :'espi:billToDate', class: Integer, as: :bill_to_date
       element :'espi:costAdditionalLastPeriod', class: Integer,
               as: :cost_additional_last_period
-      element :'espi:costAdditionalDetailLastPeriod', class: Integer,
-              as: :cost_additional_detail_last_period
+      elements :'espi:costAdditionalDetailLastPeriod',
+              class: CostAdditionalDetailLastPeriod,
+              as: :cost_additional_detail_last_periods
       element :'espi:currency', class: Integer, as: :currency
       element :'espi:overallConsumptionLastPeriod', class: SummaryMeasurement,
               as: :overall_consumption_last_period
@@ -89,6 +93,8 @@ module GreenButtonData
               as: :ratchet_demand_period
       element :'espi:statusTimeStamp', class: Integer, as: :status_time_stamp
       element :'espi:commodity', class: Integer, as: :commodity
+      element :'espi:readCycle', as: :read_cycle
+      element :'espi:tariffProfile', as: :tariff
 
       # Special case for PG&E which uses generic namespacing
       element :'ns0:billingPeriod', class: Interval, as: :billing_period
@@ -96,8 +102,9 @@ module GreenButtonData
       element :'ns0:billToDate', class: Integer, as: :bill_to_date
       element :'ns0:costAdditionalLastPeriod', class: Integer,
               as: :cost_additional_last_period
-      element :'ns0:costAdditionalDetailLastPeriod', class: Integer,
-              as: :cost_additional_detail_last_period
+      elements :'ns0:costAdditionalDetailLastPeriod',
+              class: CostAdditionalDetailLastPeriod,
+              as: :cost_additional_detail_last_periods
       element :'ns0:currency', class: Integer, as: :currency
       element :'ns0:overallConsumptionLastPeriod', class: SummaryMeasurement,
               as: :overall_consumption_last_period
@@ -126,6 +133,8 @@ module GreenButtonData
               as: :ratchet_demand_period
       element :'ns0:statusTimeStamp', class: Integer, as: :status_time_stamp
       element :'ns0:commodity', class: Integer, as: :commodity
+      element :'ns0:readCycle', as: :read_cycle
+      element :'ns0:tariffProfile', as: :tariff
     end
   end
 end

data/lib/green-button-data/parser.rb

@@ -8,6 +8,7 @@ require 'green-button-data/parser/service_category'
 require 'green-button-data/parser/local_time_parameters'
 require 'green-button-data/parser/reading_type'
 require 'green-button-data/parser/summary_measurement'
+require 'green-button-data/parser/cost_additional_detail_last_period'
 require 'green-button-data/parser/usage_point'
 require 'green-button-data/parser/usage_summary'
 require 'green-button-data/parser/content'

data/lib/green-button-data/usage_summary.rb

@@ -4,7 +4,9 @@ module GreenButtonData
     include Utilities
 
     attr_reader :billing_period,
-                :overall_consumption_last_period
+                :overall_consumption_last_period,
+                :tariff,
+                :cost_additional_detail_last_periods
 
     attr_writer :commodity,
                 :quality_of_reading

data/lib/green-button-data/version.rb

@@ -1,3 +1,3 @@
 module GreenButtonData
-  VERSION = '0.4.2'
+  VERSION = '0.5.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: green-button-data
 version: !ruby/object:Gem::Version
-  version: 0.4.2
+  version: 0.5.0
 platform: ruby
 authors:
 - Andrew Jo
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-01-27 00:00:00.000000000 Z
+date: 2016-03-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nokogiri
@@ -151,6 +151,7 @@ files:
 - lib/green-button-data/parser/application_information.rb
 - lib/green-button-data/parser/authorization.rb
 - lib/green-button-data/parser/content.rb
+- lib/green-button-data/parser/cost_additional_detail_last_period.rb
 - lib/green-button-data/parser/entry.rb
 - lib/green-button-data/parser/feed.rb
 - lib/green-button-data/parser/interval.rb
@@ -179,17 +180,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ! '>='
     - !ruby/object:Gem::Version
       version: 1.9.3
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.6
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: Parser for Green Button data format