parse_p1 0.1.2 → 0.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 12b21367683c263e498f20a990a933b034900eca
-  data.tar.gz: b9e91fcb0d9c93554155479125a6e8cb637abbc0
+  metadata.gz: c3dd2f4ba31b21b70fec7cbcf76210c924220250
+  data.tar.gz: 86c401fd3c42cfbbad396c8ec0913e069e6b547e
 SHA512:
-  metadata.gz: ed469bf8177e2cb80c41d161bb62a6dda3e707900dd326ef801815bace4abe5e1c5acff809ce6ba2f99993afad29de0966ca33934f4b9de6e6df7e8924af9744
-  data.tar.gz: 098e6dc7fb7e446fde5814731e3e647284ba227bc6d05ea9f50a27ba237fd3d4c728be596c6a942d2b878a0d1d877aae2b850c2754aac5da366bcb5d08fc9ae9
+  metadata.gz: 486d8c85117127a101f00ba0ab79966752f23f1874bccbfaae617fb02180ce227e44b797c0decf5ad29750ca85c59a5cb15b8588f2d1d33391581d1bb8b5f9fa
+  data.tar.gz: d3459f8d2a61aa60cf4f0f31e15ac164b36db6d1681690075521b40bb26abf5e2cd5a4f51cbd517fb7d4179ded7a00b29cadcab1324d096329ce3f659d83eccb

data/CHANGELOG

@@ -1,4 +1,7 @@
-* 0.1.2
+* 0.1.3
+  Now with correct normal and low electricity values (were switched after the major refactor 0.1.1)
+
+* 0.1.2 (Flawed)
   Remove dependency on awesome_print
 
 * 0.1.1 (Flawed)

data/lib/parse_p1/electricity.rb

@@ -18,19 +18,19 @@ module ParseP1
     end
 
     def electra_import_low
-      get_electricity('1-0:1.8.1')
+      get_electricity('1-0:1.8.2')
     end
 
     def electra_import_normal
-      get_electricity('1-0:1.8.2')
+      get_electricity('1-0:1.8.1')
     end
 
     def electra_export_low
-      get_electricity('1-0:2.8.1')
+      get_electricity('1-0:2.8.2')
     end
 
     def electra_export_normal
-      get_electricity('1-0:2.8.2')
+      get_electricity('1-0:2.8.1')
     end
 
     #Only for backward compatibility

data/lib/parse_p1/version.rb

@@ -1,3 +1,3 @@
 module ParseP1
-  VERSION = "0.1.2"
+  VERSION = "0.1.3"
 end

data/test/parse_p1_IskraMT171_meter_test.rb

@@ -45,27 +45,27 @@ class TestParseP1_IskraMT171Meter < Test::Unit::TestCase
     end
 
     #F9 (3,3)
-    should 'return imported electricty with low tarif' do
-      assert_equal 477.462, @p1.electricity(:type => :import, :tariff => :low)
-      assert_equal 477.462, @p1.electra_import_low
+    should 'return imported electricty with normal tarif' do
+      assert_equal 477.462, @p1.electricity(:type => :import, :tariff => :normal)
+      assert_equal 477.462, @p1.electra_import_normal
     end
 
     #F9 (3,3)
-    should 'return imported electricty with normal tarif' do
-      assert_equal 546.069, @p1.electricity(:type => :import, :tariff => :normal)
-      assert_equal 546.069, @p1.electra_import_normal
+    should 'return imported electricty with low tarif' do
+      assert_equal 546.069, @p1.electricity(:type => :import, :tariff => :low)
+      assert_equal 546.069, @p1.electra_import_low
     end
 
     #F9 (3,3)
-    should 'return electricty produced by client low tarif' do
-      assert_equal 13.172, @p1.electricity(:type => :export, :tariff => :low)
-      assert_equal 13.172, @p1.electra_export_low
+    should 'return electricty produced by client normal tarif' do
+      assert_equal 13.172, @p1.electricity(:type => :export, :tariff => :normal)
+      assert_equal 13.172, @p1.electra_export_normal
     end
 
     #F9 (3,3)
-    should 'return electricty produced by client normal tarif' do
-      assert_equal 31.349, @p1.electricity(:type => :export, :tariff => :normal)
-      assert_equal 31.349, @p1.electra_export_normal
+    should 'return electricty produced by client low tarif' do
+      assert_equal 31.349, @p1.electricity(:type => :export, :tariff => :low)
+      assert_equal 31.349, @p1.electra_export_low
     end
 
     context 'Actual data' do

data/test/parse_p1_landisgyr_e350_test.rb

@@ -38,27 +38,27 @@ class TestParseP1LandisGyrE350 < Test::Unit::TestCase
      end
 
      #F9 (3,3)
-     should 'return imported electricty with low tarif' do
-       assert_equal 2622.819, @p1.electricity(:type => :import, :tariff => :low)
-       assert_equal 2622.819, @p1.electra_import_low
+     should 'return imported electricty with normal tarif' do
+       assert_equal 2622.819, @p1.electricity(:type => :import, :tariff => :normal)
+       assert_equal 2622.819, @p1.electra_import_normal
      end
 
      #F9 (3,3)
-     should 'return imported electricty with normal tarif' do
-       assert_equal 1693.579, @p1.electricity(:type => :import, :tariff => :normal)
-       assert_equal 1693.579, @p1.electra_import_normal
+     should 'return imported electricty with low tarif' do
+       assert_equal 1693.579, @p1.electricity(:type => :import, :tariff => :low)
+       assert_equal 1693.579, @p1.electra_import_low
      end
 
      #F9 (3,3)
-     should 'return electricty produced by client low tarif' do
-       assert_equal 79.439, @p1.electricity(:type => :export, :tariff => :low)
-       assert_equal 79.439, @p1.electra_export_low
+     should 'return electricty produced by client normal tarif' do
+       assert_equal 79.439, @p1.electricity(:type => :export, :tariff => :normal)
+       assert_equal 79.439, @p1.electra_export_normal
      end
 
      #F9 (3,3)
-     should 'return electricty produced by client normal tarif' do
-       assert_equal 215.374, @p1.electricity(:type => :export, :tariff => :normal)
-       assert_equal 215.374, @p1.electra_export_normal
+     should 'return electricty produced by client low tarif' do
+       assert_equal 215.374, @p1.electricity(:type => :export, :tariff => :low)
+       assert_equal 215.374, @p1.electra_export_low
      end
 
      context 'Actual data' do

data/test/parse_p1_test.rb

@@ -47,27 +47,27 @@ class TestParseP1 < Test::Unit::TestCase
     end
 
     #F9 (3,3)
-    should 'return imported electricty with low tarif' do
-      assert_equal 136.787, @p1.electricity(:type => :import, :tariff => :low)
-      assert_equal 136.787, @p1.electra_import_low
+    should 'return imported electricty with normal tarif' do
+      assert_equal 136.787, @p1.electricity(:type => :import, :tariff => :normal)
+      assert_equal 136.787, @p1.electra_import_normal
     end
 
     #F9 (3,3)
-    should 'return imported electricty with normal tarif' do
-      assert_equal 131.849, @p1.electricity(:type => :import, :tariff => :normal)
-      assert_equal 131.849, @p1.electra_import_normal
+    should 'return imported electricty with low tarif' do
+      assert_equal 131.849, @p1.electricity(:type => :import, :tariff => :low)
+      assert_equal 131.849, @p1.electra_import_low
     end
 
     #F9 (3,3)
-    should 'return electricty produced by client low tarif' do
-      assert_equal 2.345, @p1.electricity(:type => :export, :tariff => :low)
-      assert_equal 2.345, @p1.electra_export_low
+    should 'return electricty produced by client normal tarif' do
+      assert_equal 2.345, @p1.electricity(:type => :export, :tariff => :normal)
+      assert_equal 2.345, @p1.electra_export_normal
     end
 
     #F9 (3,3)
-    should 'return electricty produced by client normal tarif' do
-      assert_equal 54.976, @p1.electricity(:type => :export, :tariff => :normal)
-      assert_equal 54.976, @p1.electra_export_normal
+    should 'return electricty produced by client low tarif' do
+      assert_equal 54.976, @p1.electricity(:type => :export, :tariff => :low)
+      assert_equal 54.976, @p1.electra_export_low
     end
 
     context 'Actual data' do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: parse_p1
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.1.3
 platform: ruby
 authors:
 - Frank Oxener
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-04-16 00:00:00.000000000 Z
+date: 2015-04-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: minitest
@@ -121,7 +121,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5
+rubygems_version: 2.4.6
 signing_key: 
 specification_version: 4
 summary: Parsing P1 Companion Standard used by Dutch Smart Meters