parse_p1 0.0.3 → 0.0.4

data/CHANGELOG

@@ -1,3 +1,6 @@
+* 0.0.4
+  Make parsing of a P1 record more robust
+
 * 0.0.3
   Bug fix in determining if P1 data is valid
 

data/lib/parse_p1/base.rb

@@ -16,7 +16,13 @@ module ParseP1
     end
 
     def device_id
-      data.match(/^\/([a-zA-Z]{3}\d{1}.+)\r$/)
+      match_within_one_p1_record('\/([a-zA-Z]{3}\d{1}.+)\r$')
+    end
+
+    private
+
+    def match_within_one_p1_record(pattern)
+      data.match(/[\W|\w]*#{pattern}[\W|\w]*!/)
       $1
     end
 

data/lib/parse_p1/electricity.rb

@@ -3,13 +3,12 @@ module ParseP1
   module Electricity
 
     def electra_meter_id
-      data.match(/0:96.1.1\S(\d{1}[A-Z]{1}\d{1,96})\S/)
-      $1
+      match_within_one_p1_record('0:96.1.1\S(\d{1}[A-Z]{1}\d{1,96})\S')
     end
 
     def electricity_tariff_indicator
-      data.match(/0-0:96.14.0\S(\d{1,9})\S/)
-      $1.to_i
+      result = match_within_one_p1_record('0-0:96.14.0\S(\d{1,9})\S')
+      result.to_i if result
     end
 
     def electricity_actual_threshold
@@ -31,13 +30,13 @@ module ParseP1
     private
 
     def get_electricity(obis_code)
-      data.match(/#{obis_code}\S(\d{1,9}\.\d{1,3})\S/)
-      $1.to_f
+      data.match(/\/[\W|\w]*#{obis_code}\S(\d{1,9}\.\d{1,3})\S[\W|\w]*!/)
+      $1.to_f if $1
     end
 
     def get_actual_electricity(type)
       power = get_electricity("1-0:#{first_electricity_code(type)}.7.0")
-      (power * 1000).to_i #Return as watts instead of kW
+      (power * 1000).to_i if power#Return as watts instead of kW
     end
 
     def first_electricity_code(code)

data/lib/parse_p1/gas.rb

@@ -3,24 +3,22 @@ module ParseP1
   module Gas
 
     def gas_meter_id
-      data.match(/1:96.1.0\S(\d{1,96})\S/)
-      $1
+      match_within_one_p1_record('1:96.1.0\S(\d{1,96})\S')
     end
 
     #Only 2 digits for year!
     def last_hourly_reading_gas
-      data.match(/0-1:24.3.0\S(\d{12})\S/)
-      DateTime.new(('20'+$1[0..1]).to_i, $1[2..3].to_i, $1[4..5].to_i, $1[6..7].to_i, $1[8..9].to_i)
+      result = match_within_one_p1_record('0-1:24.3.0\S(\d{12})\S')
+      DateTime.new(('20'+result[0..1]).to_i, result[2..3].to_i, result[4..5].to_i, result[6..7].to_i, result[8..9].to_i) if result
     end
 
     def measurement_unit_gas
-      data.match(/\S0-1:24.2.1\S\S(\w+)\S/)
-      $1
+      match_within_one_p1_record('0-1:24.2.1\S\S(\w+)\S')
     end
 
     def gas_usage
-      data.match(/\S0-1:24.2.1\S\S\w+\S\r\n\S(\d+.\d+)\S/)
-      $1.to_f
+      result = match_within_one_p1_record('\S0-1:24.2.1\S\S\w+\S\r\n\S(\d+.\d+)\S')
+      result.to_f if result
     end
 
   end

data/lib/parse_p1/version.rb

@@ -1,3 +1,3 @@
 module ParseP1
-  VERSION = "0.0.3"
+  VERSION = "0.0.4"
 end

data/test/parse_p1_test.rb

@@ -3,8 +3,8 @@ require 'helper'
 class TestParseP1 < Test::Unit::TestCase
 
   def setup
-    #Data string as received on a Ruby on Rails application
-    @data = "\r\n/ABc1\\1AB123-4567\r\n\r\n0-0:96.1.1(1A123456789012345678901234567890)\r\n1-0:1.8.1(00136.787*kWh)\r\n1-0:1.8.2(00131.849*kWh)\r\n1-0:2.8.1(00002.345*kWh)\r\n1-0:2.8.2(00054.976*kWh)\r\n0-0:96.14.0(0002)\r\n1-0:1.7.0(0003.20*kW)\r\n1-0:2.7.0(0000.12*kW)\r\n0-0:17.0.0(0999.00*kW)\r\n0-0:96.3.10(1)\r\n0-0:96.13.1()\r\n0-0:96.13.0()\r\n0-1:24.1.0(3)\r\n0-1:96.1.0(1234567890123456789012345678901234)\r\n0-1:24.3.0(120502150000)(00)(60)(1)(0-1:24.2.1)(m3)\r\n(00092.112)\r\n0-1:24.4.0(1)\r\n!"
+    #Data string as received on a Ruby on Rails application with some uncleared data in front of it
+    @data = "sBs\u0012C\u0002\u0002\nK*r\"CKR[Wh)\r\n1-0:2.8.1(00000.000*kWh)\r\n1-0:2.8.2(00000.\r\n/ABc1\\1AB123-4567\r\n\r\n0-0:96.1.1(1A123456789012345678901234567890)\r\n1-0:1.8.1(00136.787*kWh)\r\n1-0:1.8.2(00131.849*kWh)\r\n1-0:2.8.1(00002.345*kWh)\r\n1-0:2.8.2(00054.976*kWh)\r\n0-0:96.14.0(0002)\r\n1-0:1.7.0(0003.20*kW)\r\n1-0:2.7.0(0000.12*kW)\r\n0-0:17.0.0(0999.00*kW)\r\n0-0:96.3.10(1)\r\n0-0:96.13.1()\r\n0-0:96.13.0()\r\n0-1:24.1.0(3)\r\n0-1:96.1.0(1234567890123456789012345678901234)\r\n0-1:24.3.0(120502150000)(00)(60)(1)(0-1:24.2.1)(m3)\r\n(00092.112)\r\n0-1:24.4.0(1)\r\n!"
     @p1   = ParseP1::Base.new(@data)
   end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: parse_p1
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.4
   prerelease: 
 platform: ruby
 authors:
@@ -13,7 +13,7 @@ date: 2012-05-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: shoulda
-  requirement: &2151909720 !ruby/object:Gem::Requirement
+  requirement: &2151890700 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2151909720
+  version_requirements: *2151890700
 - !ruby/object:Gem::Dependency
   name: guard
-  requirement: &2151909100 !ruby/object:Gem::Requirement
+  requirement: &2151889740 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2151909100
+  version_requirements: *2151889740
 - !ruby/object:Gem::Dependency
   name: guard-test
-  requirement: &2151908540 !ruby/object:Gem::Requirement
+  requirement: &2151888920 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,7 +43,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2151908540
+  version_requirements: *2151888920
 description: Parsing P1 Companion Standard used by Dutch Smart Meters. Used in combination
   with a Nanode posting the P1 data to emonWeb.org
 email: