evok-to-mqtt 0.1.0 → 0.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3db1b32b0c22c3c9bffb59f9ca9fc80eb83cf6a7d9e17c88755a7c0fa1aad8f1
-  data.tar.gz: 3786dd14185c93a5085f8bbe6380f49a68e7b98ea32f0230188bd1f42edba046
+  metadata.gz: 3b8a025e0a49655d2600d98163bb1038e0cdba9a4a4131012940efb8e17b8b63
+  data.tar.gz: d564c74d4024df8ecbee13394ffe70163ce0eb2cd96dc7e16abbe6f99ea4e8ae
 SHA512:
-  metadata.gz: 190ea00c248819ea318ef416870f1add390223862f5c7d90a3e84a79bab20a5623629a11d9747bbacf537fac1b5f32152a1acda30f6f76afc677b7f0dd86a121
-  data.tar.gz: 4fd52972c8c6a0c4eec569c7da0462ee038f23e885f624dc57f37485d157ade43ee6ed1d7e8641e3466f7afb957e5d28d501f475b30bfdb9899b6846801d89ce
+  metadata.gz: 91d6da3ddae3de197b740bb0b8504a0b8000cf4af0068748b625bf0659825e01982595e6c8a359a5aac7c9c111a7349b32baf93e550d13b4e2fdf6e847a3e591
+  data.tar.gz: 9723748c9e94304aa33c72a43c5154c896231663d0f8f69d450ff0c693aa7f154002e7dee9a15fee7546554359aae23f8123fddc6d7320749d9a361d5360cb6e

data/Gemfile.lock

@@ -2,8 +2,8 @@ PATH
   remote: .
   specs:
     evok-to-mqtt (0.1.0)
-      em-mqtt
-      websocket-eventmachine-client
+      em-mqtt (~> 0.0.5)
+      websocket-eventmachine-client (~> 1.2)
 
 GEM
   remote: https://rubygems.org/

data/README.md

@@ -4,19 +4,7 @@ A bridge between Unipi's EVOK and MQTT message bus. It uses websockets to connec
 
 ## Installation
 
-Add this line to your application's Gemfile:
-
-```ruby
-gem 'evok-to-mqtt'
-```
-
-And then execute:
-
-    $ bundle
-
-Or install it yourself as:
-
-    $ gem install evok-to-mqtt
+$ gem install evok-to-mqtt
 
 ## Usage
 
@@ -32,7 +20,7 @@ To install this gem onto your local machine, run `bundle exec rake install`. To
 
 ## Contributing
 
-Bug reports and pull requests are welcome on GitHub at https://github.com/[USERNAME]/evok-to-mqtt.
+Bug reports and pull requests are welcome on GitHub at https://github.com/aufi/evok-to-mqtt.
 
 ## License
 

data/lib/evok-to-mqtt.rb

@@ -4,7 +4,7 @@
 
 module EvokToMqtt
   def self.run(evok_host, mqtt_host)
-    app = EvokToMqtt::Worker.new(evok_host, mqtt_host)
+    app = EvokToMqtt::Worker.new(evok_host, mqtt_host, EvokToMqtt::Mappers::ToHaab.new)
     app.run
   end
 end

data/lib/evok-to-mqtt/mappers/to_haab.rb

@@ -0,0 +1,33 @@
+module EvokToMqtt
+  module Mappers
+    class ToHaab
+      def initialize
+        @statuses = {}
+      end
+
+      def process(mqtt, evok_event)
+        # puts "Statuses"
+        # p @statuses
+        id      = evok_event["circuit"]
+        now     = Time.now
+        payload = evok_event
+
+        # Neuron input is assumed for now
+        if @statuses[id]
+          if @statuses[id][:value] == 0 && evok_event['value'] == 1
+            mqtt.publish id, {action: 'down', data: payload}
+          elsif @statuses[id][:value] == 1 && evok_event['value'] == 0
+            mqtt.publish id, {action: 'up', data: payload}
+            mqtt.publish id, {action: 'click', data: payload} if now - @statuses[id][:changed_at] < 2  # seconds
+            # ignore events not changing value
+          end
+          @statuses[id][:value] = evok_event['value']
+          @statuses[id][:changed_at] = now
+        else
+          @statuses[id] = {value: evok_event['value'], changed_at: now}
+          mqtt.publish id, {action: 'down', data: payload}
+        end
+      end
+    end
+  end
+end

data/lib/evok-to-mqtt/version.rb

@@ -1,3 +1,3 @@
 module EvokToMqtt
-  VERSION = "0.1.0"
+  VERSION = "0.1.1"
 end

data/lib/evok-to-mqtt/worker.rb

@@ -5,11 +5,10 @@ require 'em/mqtt'
 
 module EvokToMqtt
   class Worker
-    def initialize(evok_host, mqtt_host)
-      #@evok = ::Faye::WebSocket::Client.new("ws://#{evok_host}:8080/ws")
+    def initialize(evok_host, mqtt_host, mapper)
       @evok_host = evok_host
-      #@mqtt = ::MQTT::Client.connect(mqtt_host)
       @mqtt_host = mqtt_host
+      @mapper    = mapper
     end
 
     def run
@@ -18,10 +17,9 @@ module EvokToMqtt
         @mqtt = ::EventMachine::MQTT::ClientConnection.connect(@mqtt_host)
 
         @evok.onmessage do |msg|
-          # puts "Recieved message: #{msg}"
+          puts "Recieved message: #{msg}"
           JSON.parse(msg).each do |event|
-            puts event
-            @mqtt.publish event["circuit"], event
+            @mapper.process(@mqtt, event)
           end
         end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: evok-to-mqtt
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
 platform: ruby
 authors:
 - Marek Aufart
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-08-28 00:00:00.000000000 Z
+date: 2018-08-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: websocket-eventmachine-client
@@ -100,7 +100,7 @@ files:
 - bin/setup
 - evok-to-mqtt.gemspec
 - lib/evok-to-mqtt.rb
-- lib/evok-to-mqtt/mappers/evok_to_haab.rb
+- lib/evok-to-mqtt/mappers/to_haab.rb
 - lib/evok-to-mqtt/version.rb
 - lib/evok-to-mqtt/worker.rb
 homepage: https://github.com/aufi/evok-to-mqtt

data/lib/evok-to-mqtt/mappers/evok_to_haab.rb

@@ -1,7 +0,0 @@
-module EvokToMqtt
-  module Mappers
-    class EvokToHaab
-
-    end
-  end
-end