domotics-core 0.1.10 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3a9249aba43383d48f079b2dff64a1bdf7803239
-  data.tar.gz: e20bb0ea0ad164ee103333986f8011b583de25d8
+  metadata.gz: 0a8ed63671e10315d7088954915555a65e06f584
+  data.tar.gz: 0236feacef77fb06929960aef64ffe8ad76f420d
 SHA512:
-  metadata.gz: d6e3337f02dc48e2590626dded52590fca8458f1c1d7463373dac6c49b3f649f0ed930d1429736a1f80a481b8b402f19d739b253865e5184adf91b13a3ea4001
-  data.tar.gz: a2e1b441bc9da43fc6d7b56e5cf57f03e278daeda0c0c86ec6931292bae93d86146e232835bbf02d61c10b6e38e11042583c8061e703335dd35cb5924a681018
+  metadata.gz: c2bba5ade068a12ef7dab4397f98179034629fbd4f4f6941a9855ccd7ccca3d7b34ae9be38ea7d19010a1a6048b0308625a5ab9531e860d3085a1672357c191f
+  data.tar.gz: e803b482603d93d6b0a37f410165f6dbd36ba241d980c0dc9588cc70a2b52c14c64b236db118a0b7ed643c63bf7f5af6f462a5f4ef1789bb6621e8fd7d9ef032

data/domotics-core.gemspec

@@ -25,6 +25,7 @@ Gem::Specification.new do |spec|
   spec.add_runtime_dependency "bson_ext"
   spec.add_runtime_dependency "rack"
   spec.add_runtime_dependency "rb-inotify"
+  spec.add_runtime_dependency "em-websocket"
 
   spec.add_development_dependency "bundler"
   spec.add_development_dependency "rake"

data/lib/domotics/core.rb

@@ -13,6 +13,8 @@ require 'securerandom'
 require 'rb-inotify'
 # From server
 require 'json'
+# From ws_server
+require 'em-websocket'
 
 module Domotics
   module Core

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

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

data/lib/domotics/core/server.rb

@@ -1,7 +1,7 @@
 module Domotics::Core
   class Server
     def initialize(args = {})
-      @logger = $logger || Logger.new(STDERR)
+      @logger = Domotics::Core::Setup.logger || Logger.new(STDERR)
     end
     def call(env)
       # [object]/[action]/[params]

data/lib/domotics/core/setup.rb

@@ -4,15 +4,13 @@ module Domotics::Core
   class Setup < BasicObject
     @@logger = ::Logger.new(::STDERR)
     @@logger.level = ::Logger::FATAL
-    $logger = @@logger
     def self.logger
       @@logger
     end
     def self.logger=(logger)
       @@logger = logger
-      $logger = @@logger
     end
-    
+
     def initialize(conf)
       @current_room = {}
       @current_device = {}

data/lib/domotics/core/version.rb

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

data/lib/domotics/core/ws_server.rb

@@ -0,0 +1,21 @@
+module Domotics::Core
+  class WsServer
+    def initialize(args = {})
+      @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)
+          end
+        end
+      end
+    end
+  end
+end

data/lib/domotics/file_camera/camera_element.rb

@@ -1,6 +1,10 @@
 module Domotics
   module FileCamera
     class CameraElement < Domotics::Core::Element
+      def initialize(args = {})
+        super
+        set_state @device.mode
+      end
       def image
         @device.current_link
       end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: domotics-core
 version: !ruby/object:Gem::Version
-  version: 0.1.10
+  version: 0.2.0
 platform: ruby
 authors:
 - goredar
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-04-01 00:00:00.000000000 Z
+date: 2014-04-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: domotics-arduino
@@ -108,6 +108,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: em-websocket
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -197,6 +211,7 @@ files:
 - lib/domotics/core/server.rb
 - lib/domotics/core/setup.rb
 - lib/domotics/core/version.rb
+- lib/domotics/core/ws_server.rb
 - lib/domotics/file_camera/camera_element.rb
 - lib/domotics/file_camera/digital_sensor.rb
 - test/config.test.rb