parse_p1 0.0.2 → 0.0.3

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (6) hide show
  1. data/CHANGELOG +3 -0
  2. data/README.md +2 -2
  3. data/lib/parse_p1/base.rb +1 -1
  4. data/lib/parse_p1/version.rb +1 -1
  5. data/test/parse_p1_test.rb +1 -1
  6. metadata +7 -7
data/CHANGELOG CHANGED
@@ -1,3 +1,6 @@
1
+ * 0.0.3
2
+ Bug fix in determining if P1 data is valid
3
+
1
4
  * 0.0.2
2
5
  Parsing of electricity and gas values
3
6
 
data/README.md CHANGED
@@ -5,7 +5,7 @@ ParseP1
5
5
 
6
6
  Basic parser for P1 Companion Standard used by Dutch Smart Meters.
7
7
 
8
- *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*
8
+ *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.*
9
9
 
10
10
  Example of P1 data
11
11
  ==================
@@ -41,7 +41,7 @@ p1 = ParseP1::Base.new(p1_string)
41
41
  p1.electra_meter_id #-> 1A123456789012345678901234567890
42
42
  p1.electricity(:type => :import, :tariff => :normal) #-> 116.34 (kWH)
43
43
  p1.electricity(:type => :import, :actual => :true) #-> 1245 (watt)
44
- p1.gas_usage #-> 91.224 (watt)
44
+ p1.gas_usage #-> 91.224 (m3)
45
45
  </pre>
46
46
 
47
47
  See tests for futher available methods
data/lib/parse_p1/base.rb CHANGED
@@ -12,7 +12,7 @@ module ParseP1
12
12
  end
13
13
 
14
14
  def valid?
15
- !data.match(/!\r\n$/).nil? && !device_id.nil?
15
+ !data.match(/!$/).nil? && !device_id.nil?
16
16
  end
17
17
 
18
18
  def device_id
data/lib/parse_p1/version.rb CHANGED
@@ -1,3 +1,3 @@
1
1
  module ParseP1
2
- VERSION = "0.0.2"
2
+ VERSION = "0.0.3"
3
3
  end
data/test/parse_p1_test.rb CHANGED
@@ -4,7 +4,7 @@ class TestParseP1 < Test::Unit::TestCase
4
4
 
5
5
  def setup
6
6
  #Data string as received on a Ruby on Rails application
7
- @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"
7
+ @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!"
8
8
  @p1 = ParseP1::Base.new(@data)
9
9
  end
10
10
 
metadata CHANGED
@@ -1,7 +1,7 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: parse_p1
3
3
  version: !ruby/object:Gem::Version
4
- version: 0.0.2
4
+ version: 0.0.3
5
5
  prerelease:
6
6
  platform: ruby
7
7
  authors:
@@ -13,7 +13,7 @@ date: 2012-05-11 00:00:00.000000000 Z
13
13
  dependencies:
14
14
  - !ruby/object:Gem::Dependency
15
15
  name: shoulda
16
- requirement: &2151918740 !ruby/object:Gem::Requirement
16
+ requirement: &2151909720 !ruby/object:Gem::Requirement
17
17
  none: false
18
18
  requirements:
19
19
  - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
21
21
  version: '0'
22
22
  type: :development
23
23
  prerelease: false
24
- version_requirements: *2151918740
24
+ version_requirements: *2151909720
25
25
  - !ruby/object:Gem::Dependency
26
26
  name: guard
27
- requirement: &2151918120 !ruby/object:Gem::Requirement
27
+ requirement: &2151909100 !ruby/object:Gem::Requirement
28
28
  none: false
29
29
  requirements:
30
30
  - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
32
32
  version: '0'
33
33
  type: :development
34
34
  prerelease: false
35
- version_requirements: *2151918120
35
+ version_requirements: *2151909100
36
36
  - !ruby/object:Gem::Dependency
37
37
  name: guard-test
38
- requirement: &2151917380 !ruby/object:Gem::Requirement
38
+ requirement: &2151908540 !ruby/object:Gem::Requirement
39
39
  none: false
40
40
  requirements:
41
41
  - - ! '>='
@@ -43,7 +43,7 @@ dependencies:
43
43
  version: '0'
44
44
  type: :development
45
45
  prerelease: false
46
- version_requirements: *2151917380
46
+ version_requirements: *2151908540
47
47
  description: Parsing P1 Companion Standard used by Dutch Smart Meters. Used in combination
48
48
  with a Nanode posting the P1 data to emonWeb.org
49
49
  email: