domotics-core 0.1.3 → 0.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 108fa6b03de1ea64aa02223d5a5066b1c817c215
-  data.tar.gz: 5f49ff8821f7fa5a5a04f64e58edfd5e0aa18edb
+  metadata.gz: 885324956d9dd4c0e6da8465153c495b9584ec27
+  data.tar.gz: 97a20a0f02fbba7c1c7d4c1556c1e5ab638476d5
 SHA512:
-  metadata.gz: b7e679fda2c5a15aa04b8b689f3fbbddba0633cc043358b4cf0b898af59daec328fbf072ad514986a9811259e86e9101e602666bf24bc5dfb5a15bfb3e389954
-  data.tar.gz: 6e10403b7a3ce8cfdc42e71f6817d2dfe2f17fbe19acff6ded800d91d435e8fd42cba990018688ed306ab77400f4b4d13eb19e85e0c65e5549f82014cdecfa89
+  metadata.gz: 737f3b1537896b46d54f41fe430845964991d4fdc60a757c4cb1714207bcd811dc85ad46d78008c7ce57e3425787b31f8e376bd3cb34c5ee6e5dd577fe5efdf8
+  data.tar.gz: bf230dfc73db18a385c6e7c1775d3bd2c90bcc9fd1926697917e08bdfa4f66d8d8ca50e10bee08fc81e12b2cceea0fb882c1f8ad387e72663c578b0255d732c3

data/domotics-core.gemspec

@@ -23,8 +23,8 @@ Gem::Specification.new do |spec|
   spec.add_runtime_dependency "hiredis"
   spec.add_runtime_dependency "mongo"
   spec.add_runtime_dependency "bson_ext"
-
   spec.add_runtime_dependency "rack"
+  spec.add_runtime_dependency "rb-inotify"
 
   spec.add_development_dependency "bundler"
   spec.add_development_dependency "rake"

data/lib/domotics/core.rb

@@ -1,12 +1,16 @@
+require 'bundler/setup'
 # From data_mongo
 require 'mongo'
 # From data_redis
 require 'redis'
 require 'hiredis'
 # From arduino_board
+#require "../domotics-arduino/lib/domotics/arduino"
 require 'domotics/arduino'
 # From server
 require 'json'
+# From file_camera_device
+require 'rb-inotify'
 
 module Domotics
   module Core
@@ -37,9 +41,9 @@ end
 
 gem_path = File.dirname(__FILE__)
 #require all
-Dir["#{gem_path}/core/data/*.rb"].each {|file| require file}
-Dir["#{gem_path}/core/*.rb"].each {|file| require file}
-Dir["#{gem_path}/core/helper/*.rb"].each {|file| require file}
+%w(core/data/*.rb core/*.rb core/helper/*.rb file_camera/*.rb).each do |path|
+  Dir["#{gem_path}/#{path}"].each {|file| require file}
+end
 # scan all devices and elements and populate class map
 [:device, :room, :element].each do |type|
   Dir["#{gem_path}/core/#{type}/*.rb"].each do |file|

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

@@ -0,0 +1,47 @@
+module Domotics::Core
+  class FileCameraDevice < Device #__as__ :file_camera
+    def initialize(args = {})
+      # Emulate element
+      @current_link = "xxx"
+      @camera_element = Element.new args
+      s = self
+      image_lambda = lambda { s.current_link }
+      file_lambda = lambda { |*args| s.current_file }
+      @camera_element.eigenclass.send :define_method, :image, image_lambda
+      @camera_element.eigenclass.send :define_method, :file, file_lambda
+      # Path to shots
+      @path = args[:path] || "/tmp"
+      @path.chop! if @path[-1] == "/"
+      # Shots file extension
+      @file_ext = args[:file_ext] || ".jpg"
+      @file_ext = ".#{@file_ext}" unless @file_ext[0] == "."
+      # Remove old shots
+      FileUtils.rm Dir.glob("#{@path}/*#{@file_ext}")
+      # Watch for new shots
+      Thread.new do
+        INotify::Notifier.new.tap do |x|
+          x.watch(@path, :create) { |event| event_handler event }
+        end.run
+      end
+      super
+    end
+    def event_handler(event)
+      filename = "#{@path}/#{event.name}"
+      # Wait untill close file and rename it
+      inot = INotify::Notifier.new
+      inot.watch(filename, :close_write) do |file|
+        @current_name = "#{@path}/#{Time.now.to_i}#{@file_ext}"
+        sleep 0.1
+        File.rename filename, @current_name
+      end
+      inot.process
+      inot.close
+    end
+    def current_link
+      "#{@camera_element.room.name}/#{@camera_element.name}/file/#{Time.now.to_i}#{@file_ext}"
+    end
+    def current_file(*args)
+      IO.read @current_name
+    end
+  end
+end

data/lib/domotics/core/element.rb

@@ -10,6 +10,12 @@ module Domotics::Core
       set_state(self.state || :off)
     end
 
+    def load_driver(args = {})
+      return unless args[:device_type]
+      device_space = args[:device_type].to_s.split("_").map{ |x| x.capitalize }.join
+      self.class.class_eval(%(include Domotics::#{device_space}::#{args[:driver]}), __FILE__, __LINE__)
+    end
+
     def state
       @@data[self].state
     end
@@ -19,13 +25,22 @@ module Domotics::Core
         { :elements =>
           { @name =>
             { :state => state,
-              :info => (info if respond_to? :info)
+              :info => info,
+              :img => image,
             }
           }
         }
       }
     end
 
+    def info
+      nil
+    end
+
+    def image
+      nil
+    end
+
     def set_state(value)
       @@data[self].state = value
       @room.notify({ event: :state_set, element: self }) unless @type == :dimmer

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

@@ -5,10 +5,8 @@ module Domotics::Core
       @touch = args[:touch]
       @taped = true
       #@tap_lock = Mutex.new
-      if args[:device_type]
-        eval_str = %(include Domotics::#{args[:device_type].capitalize}::#{@touch ? 'DigitalSensor' : 'NOSensor'})
-        self.class.class_eval(eval_str, __FILE__, __LINE__)
-      end
+      args[:driver] = @touch ? "DigitalSensor" : "NOSensor"
+      load_driver args
       super
     end
     def set_state(*args)

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

@@ -12,10 +12,8 @@ module Domotics::Core
       @type = args[:type] || :dimmer
       @fade_lock = Mutex.new
       @fade_thread = nil
-      if args[:device_type]
-        eval_str = %(include Domotics::#{args[:device_type].capitalize}::PWMPin)
-        self.class.class_eval(eval_str, __FILE__, __LINE__)
-      end
+      args[:driver] = "PWMPin"
+      load_driver args
       super
     end
 

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

@@ -2,10 +2,8 @@ module Domotics::Core
   class MotionSensor < Element
     def initialize(args = {})
       @type = args[:type] || :motion_sensor
-      if args[:device_type]
-        eval_str = %(include Domotics::#{args[:device_type].capitalize}::DigitalSensor)
-        self.class.class_eval(eval_str, __FILE__, __LINE__)
-      end
+      args[:driver] = "DigitalSensor"
+      load_driver args
       super
     end
     #def to_hls(state)

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

@@ -2,10 +2,8 @@ module Domotics::Core
   class ReedSwitch < Element
     def initialize(args = {})
       @type = args[:type] || :reed_switch
-      if args[:device_type]
-        eval_str = %(include Domotics::#{args[:device_type].capitalize}::NCSensor)
-        self.class.class_eval(eval_str, __FILE__, __LINE__)
-      end
+      args[:driver] = "NCSensor"
+      load_driver args
       super
     end
     #def to_hls(state)

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

@@ -5,10 +5,8 @@ module Domotics::Core
       @type = args[:type] || :switch
       @lag = nil
       @lag_lock = Mutex.new
-      if args[:device_type]
-        eval_str = %(include Domotics::#{args[:device_type].capitalize}::DigitalPin)
-        self.class.class_eval(eval_str, __FILE__, __LINE__)
-      end
+      args[:driver] = "DigitalPin"
+      load_driver args
       @initialized = false
       super
       @initialized = true

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

@@ -65,7 +65,7 @@ module Domotics::Core
 end
 
 class Object 
-  def eigenclass 
+  def eigenclass
     class << self
       self
     end 

data/lib/domotics/core/server.rb

@@ -5,7 +5,9 @@ module Domotics::Core
     end
     def call(env)
       # [object]/[action]/[params]
+      p env['PATH_INFO']
       request = env['PATH_INFO'][1..-1].split('/')
+      request[-1], form = request.last.split(".")
       object = request.shift
       return invalid 'room' unless object and object = Room[object.to_sym]
       return invalid 'element or action' unless object_action = request.shift
@@ -18,13 +20,20 @@ module Domotics::Core
       end
       return invalid 'action' unless action and object.respond_to? action
       begin
-        object.public_send(action, *request.map { |param| param.to_isym })
+        result = object.public_send(action, *request.map { |param| param.to_isym })
       rescue Exception => e
         @logger.error { e.message }
         @logger.debug { e }
         return invalid 'request'
       end
-      return ok object.verbose_state.to_json
+      case form
+      when "json"
+        return ok object.verbose_state.to_json
+      when "jpg"
+        return jpg result
+      else
+        return ok object.verbose_state
+      end
     end
 
     private
@@ -35,5 +44,8 @@ module Domotics::Core
     def ok(param)
       [200, {"Content-Type" => "text/html"}, [param]]
     end
+    def jpg(param)
+      [200, {"Content-Type" => "image/jpeg"}, [param]]
+    end
   end
 end

data/lib/domotics/core/setup.rb

@@ -43,6 +43,7 @@ module Domotics::Core
     def device(klass, args = {})
       @current_device[:name] = args[:name]
       @current_device[:type] = args[:type]
+      args[:room] = Room[@current_room[:name]]
       klass.new(args) unless Device[args[:name]]
       yield if ::Kernel.block_given?
       @current_device.clear

data/lib/domotics/core/version.rb

@@ -1,5 +1,5 @@
 module Domotics
   module Core
-    VERSION = "0.1.3"
+    VERSION = "0.1.4"
   end
 end

data/lib/domotics/file_camera/digital_sensor.rb

@@ -0,0 +1,6 @@
+module Domotics
+  module FileCamera
+    module DigitalSensor
+    end
+  end
+end

data/test/config.test.rb

@@ -1,4 +1,7 @@
 test_room :test do
+  file_camera :cam do
+    motion_sensor :cam_motion
+  end
   button :button_no_dev
   dimmer :dimmer_no_dev
   motion_sensor :ms_no_dev
@@ -13,4 +16,4 @@ test_room :test do
     rgb_strip :rgb, r: 9, g: 10, b: 11
     switch :light_1, pin: 13
   end
-end
+end

data/test/test_devices.rb

@@ -6,4 +6,6 @@ require "domotics/core"
 Domotics::Core::TestHelper.init
 
 class DomoticsDevicesTestCase < Test::Unit::TestCase
+  def test_file_camera
+  end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: domotics-core
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.1.4
 platform: ruby
 authors:
 - goredar
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-03-03 00:00:00.000000000 Z
+date: 2014-03-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: domotics-arduino
@@ -94,6 +94,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: rb-inotify
+  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
@@ -169,6 +183,7 @@ files:
 - lib/domotics/core/data/data_redis.rb
 - lib/domotics/core/device.rb
 - lib/domotics/core/device/arduino_board.rb
+- lib/domotics/core/device/file_camera_device.rb
 - lib/domotics/core/element.rb
 - lib/domotics/core/element/button.rb
 - lib/domotics/core/element/dimmer.rb
@@ -182,6 +197,7 @@ files:
 - lib/domotics/core/server.rb
 - lib/domotics/core/setup.rb
 - lib/domotics/core/version.rb
+- lib/domotics/file_camera/digital_sensor.rb
 - test/config.test.rb
 - test/test_devices.rb
 - test/test_elements.rb