domotics-core 0.2.1 → 0.2.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: d31d71816c9455bade9c824b113015a28910e2d6
-  data.tar.gz: 05587d42ffd80c7c24a82397293e9f47a9971715
+SHA256:
+  metadata.gz: aa3e061dd51a3ebe28885793ab969d98f67df951c4fec5ff3e90bd48b1c76f89
+  data.tar.gz: 175278d956f8ccafda95bb89a371172181581c297f3fb9cad6eb9a7e4589027e
 SHA512:
-  metadata.gz: 79d8973f4ea95522a1398e06532642858a7379abf44181a7819aae2988b4b8ed9feb0ca3af9336fb8470d59b545722dde781008bffbc0a85fa2e11929b96a153
-  data.tar.gz: e210292eb529442ab3d7de20dc706e2fd320207064c0b25fdcbdb951b0cf1542e42599519989f22c01c0a833d46993c668823a00b41472fdbc66f5796205d180
+  metadata.gz: 67c0ff46d5504c10d22278e300a57047fe45d23310890cb56c2153fd0c6f0e2144efabca02a5f37d7f6b022b45fd61ae387e5fac65cce5cc7443bc86740081f8
+  data.tar.gz: 12f3e5e769cb24e392f48c0c10afe6e9d962381294c74588e2372752b005b5f50498ded8a4ce0a6db82936abe9be61384f30a6bb145cb65bdb9226e33293e449

data/domotics-core.gemspec

@@ -1,21 +1,20 @@
-# coding: utf-8
-lib = File.expand_path('../lib', __FILE__)
+lib = File.expand_path("../lib", __FILE__)
 $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
-require 'domotics/core/version'
+require "domotics/core/version"
 
 Gem::Specification.new do |spec|
-  spec.name          = "domotics-core"
-  spec.version       = Domotics::Core::VERSION
-  spec.authors       = ["goredar"]
-  spec.email         = ["info@goredar.it"]
-  spec.summary       = %q{Home automation system.}
-  spec.description   = %q{Main core elements}
-  spec.homepage      = "https://goredar.it"
-  spec.license       = "MIT"
+  spec.name = "domotics-core"
+  spec.version = Domotics::Core::VERSION
+  spec.authors = ["goredar"]
+  spec.email = ["info@goredar.it"]
+  spec.summary = "Home automation system."
+  spec.description = "Main core elements"
+  spec.homepage = "https://goredar.it"
+  spec.license = "MIT"
 
-  spec.files         = `git ls-files -z`.split("\x0")
-  spec.executables   = spec.files.grep(%r{^bin/}) { |f| File.basename(f) }
-  spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
+  spec.files = `git ls-files -z`.split("\x0")
+  spec.executables = spec.files.grep(%r{^bin/}) { |f| File.basename(f) }
+  spec.test_files = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ["lib"]
 
   spec.add_runtime_dependency "domotics-arduino"

data/lib/domotics/core/device/file_camera_device.rb

@@ -1,8 +1,11 @@
 module Domotics::Core
   class FileCameraDevice < Device #__as__ :file_camera
+
     attr_accessor :mode
     attr_reader :current_file_name, :camera_element
+
     def initialize(args = {})
+      @sensors = []
       @current_file_name = nil
       @mode = args[:mode] || :watch
       # Emulate element
@@ -24,6 +27,11 @@ module Domotics::Core
       end
       super
     end
+
+    def register_sensor(sensor)
+      @sensors << sensor
+    end
+
     def event_handler(event)
       return if File.extname(event.name) != @file_ext
       # Wait untill close file and rename it
@@ -41,10 +49,14 @@ module Domotics::Core
         @current_file_name = nil
         FileUtils.rm "#{@path}/#{event.name}"
       end
+      @sensors.each { |sensor| sensor.state_changed :motion_detection }
+      @camera_element.state_changed :new_image
     end
+
     def current_link
       "#{@camera_element.room.name}/#{@camera_element.name}/file/#{Time.now.to_i}#{@file_ext}"
     end
+
     def current_file
       IO.read @current_file_name if @current_file_name
     end

data/lib/domotics/core/element.rb

@@ -1,7 +1,7 @@
 module Domotics::Core
   class Element
     @@data = DataHash.new
-    attr_reader :name, :type, :room
+    attr_reader :name, :type, :room, :device
 
     def initialize(args = {})
       @room = args[:room]
@@ -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/element/button.rb

@@ -3,35 +3,26 @@ module Domotics::Core
     def initialize(args = {})
       @type = args[:type] || :button
       @touch = args[:touch]
-      @taped = true
-      #@tap_lock = Mutex.new
+      @last_on = nil
       args[:driver] = @touch ? "DigitalSensor" : "NOSensor"
       load_driver args
       super
     end
-    def set_state(*args)
+
+    def set_state(*_args)
       nil
     end
 
     def state_changed(value)
       case value
       when :on
-        (@last_on = Time.now; @taped = false) if @taped
+        @last_on = Time.now
       when :off
         case Time.now - (@last_on || Time.now)
-        when 0...0.01 then return # debounce
-        when 0.01...0.3 then super :tap; @taped = true
-        when 0.3...1 then super :long_tap; @taped = true
-          #@tap_lock.synchronize do
-          #  if @tap and @tap.alive?
-          #    @tap.kill
-          #    @tap = nil
-          #    super :double_tap
-          #  else
-          #    @tap = Thread.new { sleep 0.25; super :tap }
-          #  end
-          #end
-        else super :long_tap_x2; @taped = true
+        when 0...0.03 then nil # debounce
+        when 0.03...0.3 then super :tap
+        when 0.3...1 then super :long_tap
+        when 1...2 then super :long_tap_x2
         end
       end
     end

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

@@ -6,9 +6,9 @@ module Domotics::Core
       load_driver args
       super
     end
-    #def to_hls(state)
-    #  super == :on ? :move : :no_move
-    #end
+    def to_hls(state)
+      super == :on ? :move : :no_move
+    end
     def set_state(*args)
       nil
     end

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

@@ -6,9 +6,9 @@ module Domotics::Core
       load_driver args
       super
     end
-    #def to_hls(state)
-    #  super == :on ? :open : :close
-    #end
+    def to_hls(state)
+      super == :on ? :open : :close
+    end
     def set_state(*args)
       nil
     end

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

@@ -1,6 +1,6 @@
 module Domotics::Core
   class Switch < Element
-    MINIMUM_LAG = 1
+    MINIMUM_LAG = 0
     def initialize(args = {})
       @type = args[:type] || :switch
       @lag = nil
@@ -11,52 +11,62 @@ module Domotics::Core
       super
       @initialized = true
     end
+
     def set_state(value)
       @initialized ? (super unless state == value) : super
     end
+
     def on(timer = nil)
       set_state :on
       lag(:off, timer)
     end
+
     def on?
       state == :on
     end
+
     def delay_on(timer)
       lag(:on, timer)
     end
+
     def off(timer = nil)
       set_state :off
       lag(:on, timer)
     end
+
     def off?
       state == :off
     end
-    def delay_off(timer)
-      lag(:off, timer)
+
+    def delay_off(timer, &block)
+      lag(:off, timer, &block)
     end
+
     def toggle(timer = nil)
       set_state state == :off ? :on : :off
       lag(:toggle, timer)
     end
+
     def delay_toggle(timer)
       lag(:toggle, timer)
     end
 
     private
 
-    def lag(action = nil, timer = nil)
+    def lag(action = nil, timer = nil, &block)
       # Kill previous action -> out of date
       @lag_lock.synchronize do
-        if @lag and @lag.alive?
+        if @lag && @lag.alive?
           @lag.kill
           @lag = nil
         end
-        raise ArgumentError unless (timer.is_a?(Integer) and timer >= MINIMUM_LAG)
+        raise ArgumentError unless timer.is_a?(Integer) && (timer >= MINIMUM_LAG)
+
         # Delayed action
-        @lag = Thread.new do
+        @lag = Thread.new {
           sleep timer
-          public_send action
-        end
+          block_given? ? (public_send(action) if block.call) : public_send(action)
+        }
       end
     rescue ArgumentError
       nil

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

@@ -2,8 +2,6 @@ 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]
@@ -38,8 +36,8 @@ module Domotics::Core
       end
     end
 
-    def run
-      Rack::Handler::Thin.run Rack::Builder.new{ run Domotics::Core::Server.new }, @args
+    def self.run(args = {})
+      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.1"
+    VERSION = "0.2.8"
   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

data/lib/domotics/file_camera/digital_sensor.rb

@@ -1,6 +1,13 @@
 module Domotics
   module FileCamera
     module DigitalSensor
+
+      def initialize(args = {})
+        @device ||= args[:device]
+        @device && @device.register_sensor(self)
+        super
+      end
+
     end
   end
 end

data/test/test_devices.rb

@@ -38,5 +38,6 @@ class DomoticsDevicesTestCase < Test::Unit::TestCase
     %x{echo "[test foto content]" > /tmp/test_foto_4.jpg}
     sleep 0.5
     assert_equal "[test foto content]", cam.camera_element.file.chomp
+    assert_equal Domotics::Core::Room[:test].last_event(cam.camera_element.name), :state_changed => :new_image
   end
 end

data/test/test_elements.rb

@@ -60,4 +60,14 @@ class DomoticsElementsTestCase < Test::Unit::TestCase
     sleep 0.01
     assert_equal room.last_event(btn.name), :state_changed => :long_tap
   end
-end
+
+  def test_camera_motion_sensor
+    room = Domotics::Core::Room[:test]
+    cam_mt = room.cam_motion
+    saved_mode = cam_el.device.mode
+    %x{echo "[test foto content]" > /tmp/test_foto.jpg}
+    sleep 0.5
+    assert_equal room.last_event(cam_mt.name), :state_changed => :motion_detection
+    assert_equal cam_el.device.mode, saved_mode
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: domotics-core
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.2.8
 platform: ruby
 authors:
 - goredar
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2014-04-02 00:00:00.000000000 Z
+date: 2020-10-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: domotics-arduino
@@ -223,7 +223,7 @@ homepage: https://goredar.it
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -238,9 +238,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.2.2
-signing_key: 
+rubygems_version: 3.1.4
+signing_key:
 specification_version: 4
 summary: Home automation system.
 test_files: