parse_p1 0.0.9 → 0.1.0

data/CHANGELOG

@@ -1,3 +1,6 @@
+* 0.1.0
+  Parse Gas values with different OBIS codes because of RF module on Gas meter
+
 * 0.0.9
   Another improvement of irregular data
 

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|2]: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|2]: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|2]: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\W{1,2}\S(\d{5}\.\d{3})\S')
+      result = match_within_one_p1_record('\S0-[1|2]: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.9"
+  VERSION = "0.1.0"
 end

data/test/parse_p1_test.rb

@@ -7,6 +7,7 @@ class TestParseP1 < Test::Unit::TestCase
   setup do
     #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 = "//ISk5\\2MT382-1003\r\n\r\n0-0:96.1.1(5A424556303035303735343938383131)\r\n1-0:1.8.1(01472.740*kWh)\r\n1-0:1.8.2(01664.635*kWh)\r\n1-0:2.8.1(00000.000*kWh)\r\n1-0:2.8.2(00000.001*kWh)\r\n0-0:96.14.0(0001)\r\n1-0:1.7.0(0000.51*kW)\r\n1-0:2.7.0(0000.00*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-2:24.1.0(3)\r\n0-2:96.1.0(3338303034303031323138333338363132)\r\n0-2:24.3.0(130615120000)(00)(60)(1)(0-2:24.2.1)(m3)\r\n(02910.805)\r\n0-2:24.4.0(1)\r\n!"
     @p1   = ParseP1::Base.new(@data)
   end
 
@@ -110,6 +111,33 @@ class TestParseP1 < Test::Unit::TestCase
 
   end
 
+  context 'Gas data send through RF (different OBIS codes)' do
+
+    setup do
+      #Different OBIS codes for RF gas measurement:
+      # => 0-2:24.1.0
+      # => 0-2:96.1.0
+      # => 0-2:24.3.0
+      # => 0-2:24.2.1
+      # => 0-2:24.4.0
+      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-2:24.1.0(3)\r\n0-2:96.1.0(1234567890123456789012345678901234)\r\n0-2:24.3.0(120502150000)(00)(60)(1)(0-2:24.2.1)(m3)\r\n(00092.112)\r\n0-2:24.4.0(1)\r\n!"
+      @p2   = ParseP1::Base.new(@data)
+    end
+
+    should 'return the last hourly reading of gas usage' do
+      assert_equal DateTime.new(2012,5,2,15,0), @p2.last_hourly_reading_gas
+    end
+
+    should 'return the measurement unit of gas usage' do
+      assert_equal 'm3', @p2.measurement_unit_gas
+    end
+
+    should 'return the total usage of gas' do
+      assert_equal 92.112, @p2.gas_usage
+    end
+
+  end
+
   context 'Data with irregularities' do
 
     setup do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: parse_p1
 version: !ruby/object:Gem::Version
-  version: 0.0.9
+  version: 0.1.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-04-11 00:00:00.000000000 Z
+date: 2013-06-15 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: -231798999645191839
+      hash: 1064997931082939182
 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: -231798999645191839
+      hash: 1064997931082939182
 requirements: []
 rubyforge_project: parse_p1
 rubygems_version: 1.8.25