teleinfo 0.0.3 → 0.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1e10c9712ac2920c109a4eefff000c6671d4e70e
-  data.tar.gz: 4ed94c8c70f0c1511699784c4a8b5a7bbea1fb84
+  metadata.gz: 6a2e5151fc0f9dbec1fba1108594c584ecc4e117
+  data.tar.gz: 10da7915e62199e51315977da784e86e6fbdfae5
 SHA512:
-  metadata.gz: ff0c6a269c1b2355f46d7b303e6971ed7673d8026d4dd555e590b78f91e3878d52c99b64b5d453e30186599bae28a0dad6878b0755607b0c9a91d87e4f83a752
-  data.tar.gz: b9dd55ab1c06ff706a53d7273724a8fcf4484df91c5203b5dd97ca1ec04f3ff9cc994176d2a45b69e0628e3671ce2e5734077d47ab8c2aabd4573de771971939
+  metadata.gz: 8c3e077084c4c7c6527e36481e71ac5878c5edb948c8c0d8b7715b860429073dfaaca4b5b257fe8de07a58b8479c6e241054a3a6d5997fe9a24a33d5ba43b648
+  data.tar.gz: aa71929e5e90f8f7c7dec11ac7359165550e2b0cdfe80a57189f51e519e1cbd99d48ddcc01b49281862ecf27d62c5b6e3f103017f20a704d25ddac5bfd9230f3

data/CHANGELOG

@@ -1,3 +1,6 @@
+0.0.4
+  * Handle "TEMPO" tarif. Thanks to Guillaume Betous
+
 0.0.3
   * Handle "BASE" tarif. Thanks to Guillaume Betous
 

data/README.md

@@ -44,7 +44,7 @@ or
 
     $ cat /dev/ttyAMA0 | teleinfo
 
-You'll get on stdout a Hash representation like:
+You'll get on stdout a JSON representation like:
 
     {"adco":"424242424242","optarif":"HC","isousc":30,"hchc":25036224,"hchp":40244232,"ptec":"HP","iinst":16,"imax":41,"papp":3580,"hhphc":"D"}
 

data/lib/teleinfo/frame.rb

@@ -29,11 +29,11 @@ module Teleinfo
           @data[:optarif] = $1.sub(/\.+$/, '')
         when /^ISOUSC (\d{2}) ./
           @data[:isousc] = $1.to_i
-        when /^BASE (\d{9}) ./
+        when /^BASE (\d{9}) ./ # BASE TARIF
           @data[:base] = $1.to_i
-        when /^HCHC (\d{9}) ./
-          @data[:hchc] = $1.to_i
-        when /^HCHP (\d{9}) ./
+        when /^HCHC (\d{9}) ./ # HPHC TARIF
+          @data[:hchc] = $1.to_i # HPHC TARIF
+        when /^HCHP (\d{9}) ./ # HPHC TARIF
           @data[:hchp] = $1.to_i
         when /^PAPP (\d{5}) ./
           @data[:papp] = $1.to_i
@@ -43,9 +43,23 @@ module Teleinfo
           @data[:iinst] = $1.to_i
         when /^IMAX (\d{3}) ./
           @data[:imax] = $1.to_i
-        when /^HHPHC (\S{1})/
+        when /^HHPHC (\S{1})/ # HPHC TARIF
           @data[:hhphc] = $1
-        when /^ADPS (\d{3})/
+        when /^BBRHCJB (\d{9}) ./ # TEMPO Jour Bleu
+          @data[:bbrhcjb] = $1.to_i
+        when /^BBRHPJB (\d{9}) ./
+          @data[:bbrhpjb] = $1.to_i # TEMPO Jour Bleu
+        when /^BBRHCJW (\d{9}) ./
+          @data[:bbrhcjw] = $1.to_i # TEMPO Jour Blanc
+        when /^BBRHPJW (\d{9}) ./
+          @data[:bbrhpjw] = $1.to_i # TEMPO Jour Blanc
+        when /^BBRHCJR (\d{9}) ./
+          @data[:bbrhcjr] = $1.to_i # TEMPO Jour rouge
+        when /^BBRHPJR (\d{9}) ./
+          @data[:bbrhpjr] = $1.to_i # TEMPO Jour rouge
+        when /^DEMAIN (\S{4}) ./ # TEMPO lendemain
+          @data[:bbrhpjr] = $1
+        when /^ADPS (\d{3})/ # Alerte dépassement de seuil
           @data[:adps] = $1.to_i
         when /MOTDETAT/
           # always 00000…

data/lib/teleinfo/version.rb

@@ -1,3 +1,3 @@
 module Teleinfo
-  VERSION = "0.0.3"
+  VERSION = "0.0.4"
 end

data/spec/frame_spec.rb

@@ -1,10 +1,9 @@
 require 'spec_helper'
 
-StringFrame = [
+StringFrameHPHC = [
                 'ADCO 424242424242 E',
                 'OPTARIF HC.. <',
                 'ISOUSC 30 9',
-                'BASE 101597537 1',
                 'HCHC 023995979 ;',
                 'HCHP 038653523 6',
                 'PTEC HP..  ',
@@ -14,6 +13,36 @@ StringFrame = [
                 'HHPHC D'
              ]
 
+StringFrameBASE = [
+                'ADCO 424242424242 E',
+                'OPTARIF HC.. <',
+                'ISOUSC 30 9',
+                'BASE 101597537 1',
+                'PTEC TH.. $',
+                'IINST 008 _',
+                'IMAX 041 D',
+                'PAPP 01770 0',
+             ]
+
+StringFrameTEMPO = [
+                'ADCO 424242424242 E',
+                'OPTARIF BBR( S',
+                'ISOUSC 90 ?',
+                'BBRHCJB 044659149 G',
+                'BBRHPJB 106861212 E',
+                'BBRHCJW 009486954 _',
+                'BBRHPJW 017712424 [',
+                'BBRHCJR 005468651 P',
+                'BBRHPJR 009396630 ^',
+                'PTEC HPJB P',
+                'DEMAIN ---- "',
+                'IINST 022 [',
+                'IMAX 041 D',
+                'PAPP 05240 ,',
+                'HHPHC Y D',
+                'MOTDETAT 000000 B'
+             ]
+
 describe Teleinfo::Frame do
   it 'should instanciate only with a non empty Array of String' do
     expect{ Teleinfo::Frame.new() }.to raise_error
@@ -26,17 +55,18 @@ describe Teleinfo::Frame do
   end
 
   it 'should have no error when parsing a correct frame' do
-    frame = Teleinfo::Frame.new(StringFrame)
+    frame = Teleinfo::Frame.new(StringFrameBASE)
+    expect(frame.errors).to eq([])
+    frame = Teleinfo::Frame.new(StringFrameHPHC)
     expect(frame.errors).to eq([])
   end
 
-  it 'should return valid Hash on #to_hash' do
-    frame = Teleinfo::Frame.new(StringFrame)
+  it 'should return valid Hash on #to_hash for HPHC' do
+    frame = Teleinfo::Frame.new(StringFrameHPHC)
     expect(frame.to_hash).to eq({
                                   :adco=>"424242424242",
                                   :optarif=>"HC",
                                   :isousc=>30,
-                                  :base=>101597537,
                                   :hchc=>23995979,
                                   :hchp=>38653523,
                                   :ptec=>"HP",
@@ -46,4 +76,38 @@ describe Teleinfo::Frame do
                                   :hhphc=>"D"
                                  })
   end
+
+  it 'should return valid Hash on #to_hash for BASE' do
+    frame = Teleinfo::Frame.new(StringFrameBASE)
+    expect(frame.to_hash).to eq({
+                                  :adco=>"424242424242",
+                                  :optarif=>"HC",
+                                  :isousc=>30,
+                                  :base=>101597537,
+                                  :ptec=>'TH',
+                                  :iinst=>8,
+                                  :imax=>41,
+                                  :papp=>1770
+                                 })
+  end
+
+  it 'should return valid Hash on #to_hash for TEMPO' do
+    frame = Teleinfo::Frame.new(StringFrameTEMPO)
+    expect(frame.to_hash).to eq({
+                                  :adco=>"424242424242",
+                                  :bbrhcjb => 44659149,
+                                  :bbrhcjr => 5468651,
+                                  :bbrhcjw => 9486954,
+                                  :bbrhpjb => 106861212,
+                                  :bbrhpjr => "----",
+                                  :bbrhpjw => 17712424,
+                                  :hhphc=>"Y",
+                                  :optarif=>"BBR(",
+                                  :isousc=>90,
+                                  :ptec=>'HPJB',
+                                  :iinst=>22,
+                                  :imax=>41,
+                                  :papp=>5240
+                                 })
+  end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: teleinfo
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.4
 platform: ruby
 authors:
 - Thomas Lecavelier
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-03-16 00:00:00.000000000 Z
+date: 2015-03-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler