domotics-core 0.2.2 → 0.2.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: cba0e62ef72ca6f4ec6d2e447b7c638756e90d94
-  data.tar.gz: 17ae8e492429b4d408bb9d2e7a5ccdd9a4d76d6d
+  metadata.gz: 02ebecc7f97e80de2536f358cecad8575b774fe0
+  data.tar.gz: 5883efe2e1f49b13f602956ddfcbbc79f532709e
 SHA512:
-  metadata.gz: 60e225476db67fcbe195379c7581402856a7edb60030b1f254ab13a6aca676fce3033daa7eb8ec235fc5a054ea1f60e4cacdcd27ea21a222f5c52e6da724462e
-  data.tar.gz: 89f6c92adda473ba4440d873d4a3a8707460e0ae95681094cf66f150c09c357fe1f0aa7071d632dd846c7a166a1ee353ff47eb7ab7b91c5e4584fb41e18b7ff8
+  metadata.gz: e27789dbc3e14975c31f149778d2855b28b63c019e3e0afd341fd693e43469bd8ff6f279d4cda8802233400487eee5738f226e98b4f5030bcb9fea624f94407e
+  data.tar.gz: 9ba2b8410f2e8b945f577f0988906e1bdd4adc8d569dad18231c27126b53fe3b707caf3291d063086841062e2fe3a4ad2d66b0d734b3ff2df5492913bb0bd4c1

data/lib/domotics/core/element.rb

@@ -57,7 +57,7 @@ module Domotics::Core
     end
 
     def to_s
-      "Element[#{@room.name}@#{@name}](id:#{__id__})"
+      "#{@room.name}@#{@name}(id:#{__id__})"
     end
   end
 end

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.inspect }
+        Domotics::Core::Setup.logger.debug { e.backtrace.join $/ }
         nil
       end
     end

data/lib/domotics/core/room.rb

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

data/lib/domotics/core/server.rb

@@ -37,9 +37,7 @@ module Domotics::Core
     end
 
     def self.run(args = {})
-      Thread.new do
-        Rack::Handler::Thin.run self.new, args
-      end
+      Rack::Handler::Thin.run self.new, args
     end
 
     private

data/lib/domotics/core/version.rb

@@ -1,6 +1,6 @@
 module Domotics
   module Core
-    VERSION = "0.2.2"
+    VERSION = "0.2.4"
   end
 end
 

data/lib/domotics/core/ws_server.rb

@@ -1,28 +1,34 @@
 module Domotics::Core
   class WsServer
-    @@channel = EM::Channel.new
+    @@parent = nil
     def initialize(args = {})
       @logger = Domotics::Core::Setup.logger || Logger.new(STDERR)
       @args = args
+      @@parent, @child = Socket.pair(:UNIX, :DGRAM, 0)
     end
     def run
-      Thread.new do
-        @logger.info { "Starting WebSocet Server on #{@args[:host]}:#{@args[:port]}" }
+      @logger.info { "[WebSocket] server [#{@args[:host]}:#{@args[:port]}]" }
+      fork do
+        @@parent.close
+        channel = EventMachine::Channel.new
+        Thread.new { loop { channel.push @child.recv(2**10) }}
         EventMachine::WebSocket.start(@args) do |ws|
           ws.onopen do
-            sid = @@channel.subscribe { |msg| ws.send msg }
+            sid = channel.subscribe { |msg| ws.send msg }
+            @logger.info { "[WebSocket] client [#{sid}]" }
             ws.onmessage do |msg|
-              @logger.info { "WebSocket message [#{msg}] from client [#{sid}]" }
+              @logger.info { "[WebSocket] message [#{msg}] from [#{sid}]" }
             end
             ws.onclose do
-              @@channel.unsubscribe(sid)
+              channel.unsubscribe(sid)
             end
           end
         end
       end
+      @child.close
     end
     def self.publish(msg)
-      @@channel.push msg
+      @@parent.send msg, 0 if @@parent
     end
   end
 end

data/lib/domotics/file_camera/camera_element.rb

@@ -3,7 +3,7 @@ module Domotics
     class CameraElement < Domotics::Core::Element
       def initialize(args = {})
         super
-        set_state @device.mode
+        set_state @device.mode if state != @device.mode
       end
       def image
         @device.current_link

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: domotics-core
 version: !ruby/object:Gem::Version
-  version: 0.2.2
+  version: 0.2.4
 platform: ruby
 authors:
 - goredar
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-04-03 00:00:00.000000000 Z
+date: 2014-04-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: domotics-arduino