domotics-core 0.2.0 → 0.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0a8ed63671e10315d7088954915555a65e06f584
-  data.tar.gz: 0236feacef77fb06929960aef64ffe8ad76f420d
+  metadata.gz: d31d71816c9455bade9c824b113015a28910e2d6
+  data.tar.gz: 05587d42ffd80c7c24a82397293e9f47a9971715
 SHA512:
-  metadata.gz: c2bba5ade068a12ef7dab4397f98179034629fbd4f4f6941a9855ccd7ccca3d7b34ae9be38ea7d19010a1a6048b0308625a5ab9531e860d3085a1672357c191f
-  data.tar.gz: e803b482603d93d6b0a37f410165f6dbd36ba241d980c0dc9588cc70a2b52c14c64b236db118a0b7ed643c63bf7f5af6f462a5f4ef1789bb6621e8fd7d9ef032
+  metadata.gz: 79d8973f4ea95522a1398e06532642858a7379abf44181a7819aae2988b4b8ed9feb0ca3af9336fb8470d59b545722dde781008bffbc0a85fa2e11929b96a153
+  data.tar.gz: e210292eb529442ab3d7de20dc706e2fd320207064c0b25fdcbdb951b0cf1542e42599519989f22c01c0a833d46993c668823a00b41472fdbc66f5796205d180

data/lib/domotics/core/element/dimmer.rb

@@ -17,6 +17,10 @@ module Domotics::Core
       super
     end
 
+    def state
+      st = super
+      st.is_a?(Integer) ? st : 0
+    end
     def set_state(value = DEFAULT_LEVEL, opt = {})
       unless opt[:kill_fader] == :no
         @fade_lock.synchronize do

data/lib/domotics/core/element/rgb_strip.rb

@@ -25,9 +25,11 @@ module Domotics::Core
     end
 
     def off
-      kill_crazy
-      @strips.values.each { |strip| strip.off } if on?
-      set_state :off
+      if on?
+        kill_crazy
+        @strips.values.each { |strip| strip.off }
+        set_state :off
+      end
     end
 
     def color

data/lib/domotics/core/helper/helper.rb

@@ -7,7 +7,7 @@ Thread.class_eval do
         block.call
       rescue Exception => e
         Domotics::Core::Setup.logger.error { e.message }
-        Domotics::Core::Setup.logger.debug { e }
+        Domotics::Core::Setup.logger.debug { e.inspect }
         nil
       end
     end

data/lib/domotics/core/room.rb

@@ -58,6 +58,7 @@ module Domotics::Core
     def event_handler(msg = {})
       event, element = msg[:event], msg[:element]
       @logger.info { "Event message :#{event} from #{element} with state [#{element.state}]" }
+      Domotics::Core::WsServer.publish "#{element.room.name}/#{element.name}"
     end
 
     def destroy

data/lib/domotics/core/server.rb

@@ -2,6 +2,8 @@ module Domotics::Core
   class Server
     def initialize(args = {})
       @logger = Domotics::Core::Setup.logger || Logger.new(STDERR)
+      @args = {}
+      @args[:Host], @args[:Port] = args[:host], args[:port]
     end
     def call(env)
       # [object]/[action]/[params]
@@ -22,7 +24,7 @@ module Domotics::Core
         result = object.public_send(action, *request.map { |param| param.to_isym })
       rescue Exception => e
         @logger.error { e.message }
-        @logger.debug { e }
+        @logger.debug { e.backtrace.join $/ }
         return invalid 'request'
       end
       case form
@@ -36,6 +38,10 @@ module Domotics::Core
       end
     end
 
+    def run
+      Rack::Handler::Thin.run Rack::Builder.new{ run Domotics::Core::Server.new }, @args
+    end
+
     private
 
     def invalid(param)

data/lib/domotics/core/version.rb

@@ -1,6 +1,6 @@
 module Domotics
   module Core
-    VERSION = "0.2.0"
+    VERSION = "0.2.1"
   end
 end
 

data/lib/domotics/core/ws_server.rb

@@ -1,21 +1,28 @@
 module Domotics::Core
   class WsServer
+    @@channel = EM::Channel.new
     def initialize(args = {})
+      @logger = Domotics::Core::Setup.logger || Logger.new(STDERR)
       @args = args
-      @channel = EM::Channel.new
     end
     def run
-      EventMachine::WebSocket.start(:host => "0.0.0.0", :port => 8080) do |ws|
-        ws.onopen do
-          sid = @channel.subscribe { |msg| ws.send msg }
-          ws.onmessage do |msg|
-            
-          end
-          ws.onclose do
-            @channel.unsubscribe(sid)
+      Thread.new do
+        @logger.info { "Starting WebSocet Server on #{@args[:host]}:#{@args[:port]}" }
+        EventMachine::WebSocket.start(@args) do |ws|
+          ws.onopen do
+            sid = @@channel.subscribe { |msg| ws.send msg }
+            ws.onmessage do |msg|
+              @logger.info { "WebSocket message [#{msg}] from client [#{sid}]" }
+            end
+            ws.onclose do
+              @@channel.unsubscribe(sid)
+            end
           end
         end
       end
     end
+    def self.publish(msg)
+      @@channel.push msg
+    end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: domotics-core
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.1
 platform: ruby
 authors:
 - goredar