parse_p1 0.0.4 → 0.0.5

Sign up to get free protection for your applications and to get access to all the features.
Files changed (5) hide show
  1. data/CHANGELOG +3 -0
  2. data/lib/parse_p1/electricity.rb +2 -2
  3. data/lib/parse_p1/version.rb +1 -1
  4. data/test/parse_p1_test.rb +4 -4
  5. metadata +30 -9
data/CHANGELOG CHANGED
@@ -1,3 +1,6 @@
1
+ * 0.0.5
2
+ Bug fix: normal and low tariffs for electricity were changed!
3
+
1
4
  * 0.0.4
2
5
  Make parsing of a P1 record more robust
3
6
 
data/lib/parse_p1/electricity.rb CHANGED
@@ -48,8 +48,8 @@ module ParseP1
48
48
 
49
49
  def second_electricity_code(tariff)
50
50
  case tariff
51
- when :normal; 1
52
- when :low; 2
51
+ when :low; 1
52
+ when :normal; 2
53
53
  end
54
54
  end
55
55
 
data/lib/parse_p1/version.rb CHANGED
@@ -1,3 +1,3 @@
1
1
  module ParseP1
2
- VERSION = "0.0.4"
2
+ VERSION = "0.0.5"
3
3
  end
data/test/parse_p1_test.rb CHANGED
@@ -53,22 +53,22 @@ class TestParseP1 < Test::Unit::TestCase
53
53
 
54
54
  #F9 (3,3)
55
55
  should 'return imported electricty with normal tarif' do
56
- assert_equal 136.787, @p1.electricity(:type => :import, :tariff => :normal)
56
+ assert_equal 136.787, @p1.electricity(:type => :import, :tariff => :low)
57
57
  end
58
58
 
59
59
  #F9 (3,3)
60
60
  should 'return imported electricty with low tarif' do
61
- assert_equal 131.849, @p1.electricity(:type => :import, :tariff => :low)
61
+ assert_equal 131.849, @p1.electricity(:type => :import, :tariff => :normal)
62
62
  end
63
63
 
64
64
  #F9 (3,3)
65
65
  should 'return electricty produced by client normal tarif' do
66
- assert_equal 2.345, @p1.electricity(:type => :export, :tariff => :normal)
66
+ assert_equal 2.345, @p1.electricity(:type => :export, :tariff => :low)
67
67
  end
68
68
 
69
69
  #F9 (3,3)
70
70
  should 'return electricty produced by client low tarif' do
71
- assert_equal 54.976, @p1.electricity(:type => :export, :tariff => :low)
71
+ assert_equal 54.976, @p1.electricity(:type => :export, :tariff => :normal)
72
72
  end
73
73
 
74
74
  context 'Actual data' do
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.4
4
+ version: 0.0.5
5
5
  prerelease:
6
6
  platform: ruby
7
7
  authors:
@@ -9,11 +9,11 @@ authors:
9
9
  autorequire:
10
10
  bindir: bin
11
11
  cert_chain: []
12
- date: 2012-05-11 00:00:00.000000000 Z
12
+ date: 2012-05-29 00:00:00.000000000 Z
13
13
  dependencies:
14
14
  - !ruby/object:Gem::Dependency
15
15
  name: shoulda
16
- requirement: &2151890700 !ruby/object:Gem::Requirement
16
+ requirement: !ruby/object:Gem::Requirement
17
17
  none: false
18
18
  requirements:
19
19
  - - ! '>='
@@ -21,10 +21,15 @@ dependencies:
21
21
  version: '0'
22
22
  type: :development
23
23
  prerelease: false
24
- version_requirements: *2151890700
24
+ version_requirements: !ruby/object:Gem::Requirement
25
+ none: false
26
+ requirements:
27
+ - - ! '>='
28
+ - !ruby/object:Gem::Version
29
+ version: '0'
25
30
  - !ruby/object:Gem::Dependency
26
31
  name: guard
27
- requirement: &2151889740 !ruby/object:Gem::Requirement
32
+ requirement: !ruby/object:Gem::Requirement
28
33
  none: false
29
34
  requirements:
30
35
  - - ! '>='
@@ -32,10 +37,15 @@ dependencies:
32
37
  version: '0'
33
38
  type: :development
34
39
  prerelease: false
35
- version_requirements: *2151889740
40
+ version_requirements: !ruby/object:Gem::Requirement
41
+ none: false
42
+ requirements:
43
+ - - ! '>='
44
+ - !ruby/object:Gem::Version
45
+ version: '0'
36
46
  - !ruby/object:Gem::Dependency
37
47
  name: guard-test
38
- requirement: &2151888920 !ruby/object:Gem::Requirement
48
+ requirement: !ruby/object:Gem::Requirement
39
49
  none: false
40
50
  requirements:
41
51
  - - ! '>='
@@ -43,7 +53,12 @@ dependencies:
43
53
  version: '0'
44
54
  type: :development
45
55
  prerelease: false
46
- version_requirements: *2151888920
56
+ version_requirements: !ruby/object:Gem::Requirement
57
+ none: false
58
+ requirements:
59
+ - - ! '>='
60
+ - !ruby/object:Gem::Version
61
+ version: '0'
47
62
  description: Parsing P1 Companion Standard used by Dutch Smart Meters. Used in combination
48
63
  with a Nanode posting the P1 data to emonWeb.org
49
64
  email:
@@ -88,15 +103,21 @@ required_ruby_version: !ruby/object:Gem::Requirement
88
103
  - - ! '>='
89
104
  - !ruby/object:Gem::Version
90
105
  version: '0'
106
+ segments:
107
+ - 0
108
+ hash: 1908051008069014212
91
109
  required_rubygems_version: !ruby/object:Gem::Requirement
92
110
  none: false
93
111
  requirements:
94
112
  - - ! '>='
95
113
  - !ruby/object:Gem::Version
96
114
  version: '0'
115
+ segments:
116
+ - 0
117
+ hash: 1908051008069014212
97
118
  requirements: []
98
119
  rubyforge_project: parse_p1
99
- rubygems_version: 1.8.6
120
+ rubygems_version: 1.8.24
100
121
  signing_key:
101
122
  specification_version: 3
102
123
  summary: Parsing P1 Companion Standard used by Dutch Smart Meters