parse_p1 0.0.2 → 0.0.3

data/CHANGELOG

@@ -1,3 +1,6 @@
+* 0.0.3
+  Bug fix in determining if P1 data is valid
+
 * 0.0.2
   Parsing of electricity and gas values
 

data/README.md

@@ -5,7 +5,7 @@ ParseP1
 
 Basic parser for P1 Companion Standard used by Dutch Smart Meters.
 
-*Library is by no means complete (yet), it is now implemented only on one real example of a so called Dutch smart meter, in this case a Iskra MT382*
+*Library is by no means complete (yet), it is now implemented only on one real example of a so called Dutch smart meter, in this case a Iskra MT382.*
 
 Example of P1 data
 ==================
@@ -41,7 +41,7 @@ p1 = ParseP1::Base.new(p1_string)
 p1.electra_meter_id                                  #-> 1A123456789012345678901234567890
 p1.electricity(:type => :import, :tariff => :normal) #-> 116.34 (kWH)
 p1.electricity(:type => :import, :actual => :true)   #-> 1245   (watt)
-p1.gas_usage                                         #-> 91.224   (watt)
+p1.gas_usage                                         #-> 91.224 (m3)
 </pre>
 
 See tests for futher available methods

data/lib/parse_p1/base.rb

@@ -12,7 +12,7 @@ module ParseP1
     end
 
     def valid?
-      !data.match(/!\r\n$/).nil? && !device_id.nil?
+      !data.match(/!$/).nil? && !device_id.nil?
     end
 
     def device_id

data/lib/parse_p1/version.rb

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

data/test/parse_p1_test.rb

@@ -4,7 +4,7 @@ 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!\r\n"
+    @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!"
     @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.2
+  version: 0.0.3
   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: &2151918740 !ruby/object:Gem::Requirement
+  requirement: &2151909720 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2151918740
+  version_requirements: *2151909720
 - !ruby/object:Gem::Dependency
   name: guard
-  requirement: &2151918120 !ruby/object:Gem::Requirement
+  requirement: &2151909100 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2151918120
+  version_requirements: *2151909100
 - !ruby/object:Gem::Dependency
   name: guard-test
-  requirement: &2151917380 !ruby/object:Gem::Requirement
+  requirement: &2151908540 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,7 +43,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2151917380
+  version_requirements: *2151908540
 description: Parsing P1 Companion Standard used by Dutch Smart Meters. Used in combination
   with a Nanode posting the P1 data to emonWeb.org
 email: