green-button-data 0.4.0 → 0.4.1

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    OWE1NmM3NzE0MjFjYzVjODI1ZmIzNmQwNzM3ZWUzNDllYmRkMDVhMA==
+    MjY1ZGViODMxZWUwODVmMjM5YTA2MDRiNTA0ZGVkNTQ0MThlZWM0Ng==
   data.tar.gz: !binary |-
-    MTZmMTI3ZjE4MWI1Njg5NWE2ZGFkYjU4MWFkYTJiZDE5ZWVlM2U5Mg==
+    OWM5YWU0ZjU4NThjN2E0NjdlNGFhM2M1ZWRkYTgyZjllM2MxZGEyYQ==
 SHA512:
   metadata.gz: !binary |-
-    ODc1MTJkZjM2YjljYWVjMjI3NDJjOGI4YmQ5YTFhYThjY2ZhODFkNGZmZDI1
-    MDYwZmQ0NjgzMGY2OWZhOWMyZjZjMjllMGM4OGIxYzBmMWNjNzVjMWE5YTkz
-    NDhiYjBhZWU3NzU2MjgzYzY2YjIzNmQyY2ZiZDE1MTgyMGJjNzM=
+    MjBjOWM2YTYzODJlNDgxZjE1OWZlOGNlNTcwY2Y5YTg2ZDI3Y2UzZGEzMWQw
+    ZGU1OTAzMzU5M2MwOWJkODcxZDU4MjhkNTRmMmQzY2Y3YjdkNmM0YzVjMTIy
+    YjgwMWU3N2I5OWJlMWMzMWI1Y2JjYWQ0OTQ3Y2JiN2Q4ZjViYjE=
   data.tar.gz: !binary |-
-    MzVkYTJmZWNjNjVlNDE2ODA1N2RkNzYzNjAwMThlMDI5MTBmYjIyNTA1Mjcx
-    YTA2ZTI1NWQ5ZTBjNGQ1NGRmYmRhOTk1Y2JmZTA4NTdlNzE0OTE5YmZhZjM2
-    ZmQ2YTQxNzkwZjg1ZGNkYWQ5Mjg5Yzg5M2UxOTJmNWI1YjQ1YzM=
+    N2NlMWZkNzVjZjBlNDQ4YmFhNzA0ZjhlNzcwZDEyOGJmNGUyNjY0OTcxMTk4
+    YmMyMzg4YzQ3NDcyZmY4MzhhYWM0MWQ5OTA0ZjUzMjU2YTg3ZDM0OTk0YzY2
+    NTg0NTAyZjE1ZTY4NzUyMzAwYWUyNWQ5YzFhNTUyYjFlODc0Y2E=

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

@@ -160,7 +160,27 @@ module GreenButtonData
         entry_content = nil
 
         feed.entries.each do |entry|
-          match_data = /\/(([a-zA-Z]+)|([a-zA-Z]+)\/(\w+=*|(\d+,*\d*)+))\/*\z/.
+          # Matches resource name in URL (e.g. ApplicationInformation)
+          resource = '([a-zA-Z]+)'
+
+          # Matches Base 64 encoded resource ID used by PG&E for MeterReading
+          # resource identifier
+          base64_id = '\w+=*'
+
+          # Matches numeric ID with thousands separator in commas used for
+          # UsageSummary IDs for PG&E endpoints but also matches traditional
+          # digits without comma separator
+          num_id = '(\d+,*\d*)+'
+
+          # Matches GUID as the resource ID used mainly by PG&E for
+          # ApplicationInformation resource identifier
+          guid = '[0-9A-Fa-f]{8}-[0-9A-Fa-f]{4}-[0-9A-Fa-f]{4}-[0-9A-Fa-f]{4}' +
+                 '-[0-9A-Fa-f]{12}'
+
+          # Identifier can be any of the above patterns
+          identifier = "(#{base64_id}|#{num_id}|#{guid})"
+
+          match_data = /\/(#{resource}|#{resource}\/#{identifier})\/*\z/.
                        match(entry.self)
 
           unless match_data.nil?

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

@@ -1,3 +1,3 @@
 module GreenButtonData
-  VERSION = '0.4.0'
+  VERSION = '0.4.1'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: green-button-data
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.4.1
 platform: ruby
 authors:
 - Andrew Jo
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-09-11 00:00:00.000000000 Z
+date: 2015-09-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nokogiri