parse_p1 0.0.7 → 0.0.8

data/CHANGELOG

@@ -1,3 +1,6 @@
+* 0.0.8
+  Improve robustness of parsing records with irregularities and different use of carriage return and line feed
+
 * 0.0.7
   Set encoding to UTF8
  

data/lib/parse_p1/base.rb

@@ -18,7 +18,7 @@ module ParseP1
     end
 
     def device_id
-      match_within_one_p1_record('\/([a-zA-Z]{3}\d{1}.+)\r$')
+      match_within_one_p1_record('\/([a-zA-Z]{3}\d{1}.+[a-zA-Z]{2}\d{3}-\d{4})')
     end
 
     private

data/lib/parse_p1/electricity.rb

@@ -5,16 +5,16 @@ module ParseP1
   module Electricity
 
     def electra_meter_id
-      match_within_one_p1_record('0:96.1.1\S(\d{1}[A-Z]{1}\d{1,96})\S')
+      match_within_one_p1_record('0:96\.1\.1\S(\d{1}[A-Z]{1}\d{1,96})\S')
     end
 
     def electricity_tariff_indicator
-      result = match_within_one_p1_record('0-0:96.14.0\S(\d{1,9})\S')
+      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
-      electricity('0-0:17.0.0')
+      electricity('0-0:17\.0\.0')
     end
 
     def electra_import_low
@@ -57,7 +57,7 @@ module ParseP1
     end
 
     def get_actual_electricity(type)
-      power = get_electricity("1-0:#{first_electricity_code(type)}.7.0")
+      power = get_electricity("1-0:#{first_electricity_code(type)}\.7\.0")
       (power * 1000).to_i if power#Return as watts instead of kW
     end
 

data/lib/parse_p1/gas.rb

@@ -5,21 +5,21 @@ module ParseP1
   module Gas
 
     def gas_meter_id
-      match_within_one_p1_record('1:96.1.0\S(\d{1,96})\S')
+      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
-      result = match_within_one_p1_record('0-1:24.3.0\S(\d{12})\S')
+      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
-      match_within_one_p1_record('0-1:24.2.1\S\S(\w+)\S')
+      match_within_one_p1_record('0-1:24\.2\.1\S\S(\w+)\S')
     end
 
     def gas_usage
-      result = match_within_one_p1_record('\S0-1:24.2.1\S\S\w+\S\r\n\S(\d+.\d+)\S')
+      result = match_within_one_p1_record('\S0-1:24\.2\.1\S\S\w+\S\W{1,2}\S(\d{5}\.\d{3})\S')
       result.to_f if result
     end
 

data/lib/parse_p1/version.rb

@@ -1,3 +1,3 @@
 module ParseP1
-  VERSION = "0.0.7"
+  VERSION = "0.0.8"
 end

data/test/parse_p1_test.rb

@@ -1,10 +1,15 @@
+# encoding: UTF-8
+
 require 'helper'
 
 class TestParseP1 < Test::Unit::TestCase
 
   def setup
     #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!"
+    @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!"
+    @data2 = "//ABc1\u0001AB123-4567\n0-0:96.1.1(1A123456789012345678901234567890)\n1-0:1.8.1(02145.375*kWh)\n1-0:1.8.2(02043.840*kWh)\n1-0:2.8.1(00000.000*kWh)\n1-0:2.8.2(00000.001*kWh)\n0-0:96.14.0(0001)\n1-0:1.7.0(0000.82*kW)\n1-0:2.7.0(0000.00*kW)\n0-0:17.0.0(0999.00*kW)\n0-0:96.3.10(1)\n0-0:96.13.1()\n0-0:96.13.0()\n0-1:24.1.0(3)\n0-1:96.1.0(3338303034303031313338323831383131)\n0-1:24.3.0(130406220000)(00)(60)(1)(0-1:24.2.1)(m3)\n(01878.044)\n0-1:24.4.0(1)\n!"
+    @data3 = "//ABc1\\1AB123-4567\n0-0:96.1.1(1A123456789012345678901234567890)\n1-0:1.8.1(02145.452*kWh)\n1-0:1.8.2(02043.840*kWh)\n1-0:2.8.1(00000.000*kWh)\n1-0:2.8.2(00000.001*kWh)\n0-0:96.14.0(0001)\n1-0:1.7.0(0000.80*kW)\n1-0:2.7.0(0000.00*kW)\n0-0:17.0.0(0999.00*kW)\n0-0:96.3.10(1)\n0-0:96.13.1()\n0-0:96.13.0()\n0-1:24.1.0(3)\n0-1:96.1.0(3338303034303031313338323831383131)\n0-1:24.3.0(130406220000)(00)(60)(1)(0-1:24.2.1)(m3)\n(01878.044)\n0-1:24.4.0(1)\n!"
+
     @p1   = ParseP1::Base.new(@data)
   end
 
@@ -108,4 +113,20 @@ class TestParseP1 < Test::Unit::TestCase
 
   end
 
+  context 'Data with irregularities' do
+    setup do
+      @p2 = ParseP1::Base.new(@data2)
+      @p3 = ParseP1::Base.new(@data3)
+
+    end
+    should 'return the device_id of the meter' do
+      assert  @p2.device_id
+      assert  @p3.device_id
+    end
+    should 'return the gas_usage of the meter' do
+      assert_equal 1878.044, @p2.gas_usage
+      assert_equal 1878.044, @p3.gas_usage
+    end
+  end
+
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: parse_p1
 version: !ruby/object:Gem::Version
-  version: 0.0.7
+  version: 0.0.8
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-03-29 00:00:00.000000000 Z
+date: 2013-04-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: shoulda
@@ -106,7 +106,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -4362141269315082656
+      hash: -4033320981012269
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -115,7 +115,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -4362141269315082656
+      hash: -4033320981012269
 requirements: []
 rubyforge_project: parse_p1
 rubygems_version: 1.8.25