green-button-data 0.3.1 → 0.3.2

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    MGI3MGE4OTJjMTE1NjMzMWUwY2QyODA5NTNmZjFlZDgxNmI4YjZiYg==
+    MDZiY2U4YTc5MWZjMGQ0YmEzNTEzMTk5MmQwZDA5YzlmZWI3Mjk4MA==
   data.tar.gz: !binary |-
-    MTdiZmJhMDZlYTNlZGMzYWQyMGU5NTM2MWUzYmYyYTJhNDExOGU4Ng==
+    M2VmZWZkOGI2MzU5NTgxZTMwYjVkNzZiYzM4ZjEyYjE0YjY3NzliYQ==
 SHA512:
   metadata.gz: !binary |-
-    NTY3NDczMDNjNzRiNGEyZWY1MjYwMDNiYjk0OGFlYTQ5ODJjYTYyMTAwZDg3
-    ZjYwYWUwYTlkMTcxNzE0NzYyNzg4YjBlOTBkYjYyZDYzODEzN2JlMDVjYTAz
-    NDNmY2FhYzU0ZGEwMzY1ZmRlODU4NjhmM2Y4NWY3MzI4MjY4Y2I=
+    MjZlN2JlYTI1YTk2NzliNmY1Mzg2ZGRiZDM1ZjFhN2VlMzdhODA0ODJhMmJm
+    MzY4MGY1MjdlMzRjYzIxMWNjNDliY2EyOWFkODY0MDU3MTA1MThhYzAzOTNi
+    ZTY3ZDg2ZGJlYmUxNWY1OWM3OTEwY2NmOTc0ZTg4NGZiMTE3OTA=
   data.tar.gz: !binary |-
-    MDM3NmM0NmNhNGIwZTc4MDRiNDQyZTYzZmVhYjUzOWM2NjdiODJjM2RhMWRi
-    MTAzNmRiMTljMzc2YzRmNjU2MzM4N2ZhMDUxOTg5Y2NhMmI2ODBiMjNjZGIx
-    YTQ1YWY3YmI5MzkxNWEyM2I1ZTY3YjJiNDI4ZDQwN2JkN2JmNzk=
+    MjgzZjk3MGQzNWNlZWZkMGViZDBhMmFhNDQzZGVkN2E2MWVhYzU4M2U3NzNi
+    MzE3Njc1NGRlOTFiMzE4YWNjOTU3YzAyMjdkMjAzMzU1Yzg3M2JkYjRjYTc1
+    NmYwYmI2NWNiZjdmOTUxNmFhNjg0ZTc3NDRkNWZkMWRlYTY1MmE=

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.3.1'
+  VERSION = '0.3.2'
 end

metadata

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