rfid 0.0.1 → 0.0.2

data/lib/rfid.rb

@@ -3,6 +3,7 @@ require 'redis/connection/hiredis'
 require 'redis'
 require 'logger'
 require 'uri'
+require "cocaine"
 require 'rfid/core_ext'
 
 module Rfid
@@ -11,6 +12,7 @@ module Rfid
   autoload :WebSocket, 'rfid/websocket'
   autoload :Config, 'rfid/config'
   autoload :Event, 'rfid/event'
+  autoload :ClientMessage, 'rfid/client_message'
   
   extend self
   
@@ -63,6 +65,11 @@ module Rfid
     logger.info([timestamp, args.compact].flatten.join(' '))
   end
   
+  def initialize!
+    Cocaine::CommandLine.path = ["/opt/bin", "/usr/local/bin", "/usr/bin"]
+    Cocaine::CommandLine.logger = logger
+  end
+  
   protected
   
     def create_logger(filepath)

data/lib/rfid/client_message.rb

@@ -0,0 +1,43 @@
+require "cocaine"
+
+module Rfid
+  class ClientMessage
+    attr_reader :event_name, :data
+    
+    def initialize(body)
+      @hash = parse(body)
+      @event_name = @hash['event'] || 'default'
+      @data = @hash['data'] || {}
+    end
+  
+    def perform
+      case @event_name
+        when 'system' then run @data['command']
+        else
+          return false
+      end
+    end
+    
+    protected
+    
+      def parse(body)
+        begin
+          ActiveSupport::JSON.decode(body)
+        rescue Exception => e
+          Rfid.log "Error parse", body, e.message
+          return {}
+        end
+      end
+    
+      def run(binary, params = "", options = {})
+        return if binary.blank?
+        line = Cocaine::CommandLine.new(binary, params, options)
+        
+        begin
+          line.run
+        rescue Exception => e
+          Rfid.log "Error run", line.command, e.message
+        end
+      end
+  end
+end

data/lib/rfid/event.rb

@@ -37,7 +37,6 @@ module Rfid
       
       body = @cards.inject([]) do |arr, card|
         arr << Curl::PostField.content('event[cards][]', card)
-        arr
       end
       
       body << Curl::PostField.content('event[mode]', @mode)

data/lib/rfid/version.rb

@@ -1,3 +1,3 @@
 module Rfid
-  VERSION = "0.0.1".freeze
-end
+  VERSION = "0.0.2".freeze
+end

data/lib/rfid/websocket.rb

@@ -16,6 +16,7 @@ module Rfid
           Rfid::Translator.web_log('socket_opened', socket_id, "Origin: #{ws.request['host']}")
               
           ws.onmessage { |msg|
+            ClientMessage.new(msg).perform
             Rfid::Translator.web_log('client_message', socket_id, "Message", msg)
           }
 

data/lib/server.rb

@@ -3,6 +3,7 @@ require 'eventmachine'
 require 'thread'
 require 'rfid'
 
+Rfid.initialize!
 Thread.abort_on_exception = true
 threads = []
 
@@ -16,4 +17,4 @@ threads << Thread.new do
   EventMachine.run { Rfid::Translator.start }
 end
 
-threads.map(&:join)
+threads.map(&:join)

data/spec/models/client_message_spec.rb

@@ -0,0 +1,47 @@
+require 'spec_helper'
+
+describe Rfid::ClientMessage do
+  before(:all) do
+    Rfid.initialize!
+  end
+  
+  context "parse" do
+    before(:each) do
+      @message = Rfid::ClientMessage.new("{\"event\":\"system\",\"data\":{\"command\":\"echo\"},\"socket_id\":1}")
+    end
+    
+    it "should extract event_name" do
+      @message.event_name.should == "system"
+    end
+    
+    it "should extract data" do
+      @message.data.should == {"command" => "echo"}
+    end
+  end
+  
+  context "invalid body" do
+    before(:each) do
+      @message = Rfid::ClientMessage.new("wrong")
+    end
+    
+    it "should set default event_name" do
+      @message.event_name.should == "default"
+    end
+    
+    it "should set default data" do
+      @message.data.should == {}
+    end
+  end
+  
+  context "perform" do
+    before(:each) do
+      @message = Rfid::ClientMessage.new("{\"event\":\"system\",\"data\":{\"command\":\"echo\"},\"socket_id\":1}")
+    end
+    
+    it "should run command" do
+      lambda {
+        @message.perform
+      }.should_not raise_error
+    end
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rfid
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-12-08 00:00:00.000000000 Z
+date: 2012-02-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: em-websocket
-  requirement: &76301570 !ruby/object:Gem::Requirement
+  requirement: &82837190 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,10 +21,10 @@ dependencies:
         version: 0.3.5
   type: :runtime
   prerelease: false
-  version_requirements: *76301570
+  version_requirements: *82837190
 - !ruby/object:Gem::Dependency
   name: em-hiredis
-  requirement: &76300470 !ruby/object:Gem::Requirement
+  requirement: &82836960 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -32,10 +32,10 @@ dependencies:
         version: 0.1.0
   type: :runtime
   prerelease: false
-  version_requirements: *76300470
+  version_requirements: *82836960
 - !ruby/object:Gem::Dependency
   name: redis
-  requirement: &76299980 !ruby/object:Gem::Requirement
+  requirement: &82836730 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -43,10 +43,10 @@ dependencies:
         version: 2.2.2
   type: :runtime
   prerelease: false
-  version_requirements: *76299980
+  version_requirements: *82836730
 - !ruby/object:Gem::Dependency
   name: activesupport
-  requirement: &75797700 !ruby/object:Gem::Requirement
+  requirement: &82836500 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -54,10 +54,10 @@ dependencies:
         version: 3.1.3
   type: :runtime
   prerelease: false
-  version_requirements: *75797700
+  version_requirements: *82836500
 - !ruby/object:Gem::Dependency
   name: sinatra
-  requirement: &75796970 !ruby/object:Gem::Requirement
+  requirement: &82836270 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -65,10 +65,10 @@ dependencies:
         version: 1.3.1
   type: :runtime
   prerelease: false
-  version_requirements: *75796970
+  version_requirements: *82836270
 - !ruby/object:Gem::Dependency
   name: rack-contrib
-  requirement: &75795150 !ruby/object:Gem::Requirement
+  requirement: &82836040 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -76,10 +76,10 @@ dependencies:
         version: 1.1.0
   type: :runtime
   prerelease: false
-  version_requirements: *75795150
+  version_requirements: *82836040
 - !ruby/object:Gem::Dependency
   name: thin
-  requirement: &75794240 !ruby/object:Gem::Requirement
+  requirement: &82835810 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -87,10 +87,10 @@ dependencies:
         version: 1.3.0
   type: :runtime
   prerelease: false
-  version_requirements: *75794240
+  version_requirements: *82835810
 - !ruby/object:Gem::Dependency
   name: curb
-  requirement: &75792670 !ruby/object:Gem::Requirement
+  requirement: &82835580 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -98,10 +98,10 @@ dependencies:
         version: 0.7.16
   type: :runtime
   prerelease: false
-  version_requirements: *75792670
+  version_requirements: *82835580
 - !ruby/object:Gem::Dependency
   name: json
-  requirement: &75790260 !ruby/object:Gem::Requirement
+  requirement: &82835350 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -109,10 +109,21 @@ dependencies:
         version: 1.6.1
   type: :runtime
   prerelease: false
-  version_requirements: *75790260
+  version_requirements: *82835350
+- !ruby/object:Gem::Dependency
+  name: cocaine
+  requirement: &82835120 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.2.1
+  type: :runtime
+  prerelease: false
+  version_requirements: *82835120
 - !ruby/object:Gem::Dependency
   name: i18n
-  requirement: &75789800 !ruby/object:Gem::Requirement
+  requirement: &82834930 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -120,10 +131,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *75789800
+  version_requirements: *82834930
 - !ruby/object:Gem::Dependency
   name: daemons
-  requirement: &75789120 !ruby/object:Gem::Requirement
+  requirement: &82834700 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -131,10 +142,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *75789120
+  version_requirements: *82834700
 - !ruby/object:Gem::Dependency
   name: thor
-  requirement: &75788340 !ruby/object:Gem::Requirement
+  requirement: &82834490 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -142,7 +153,7 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *75788340
+  version_requirements: *82834490
 description: Provider for RFID API and driver by websokets protocol
 email: galeta.igor@gmail.com
 executables:
@@ -178,6 +189,7 @@ files:
 - lib/rfid/cli.rb
 - lib/rfid/config.rb
 - lib/rfid/application.rb
+- lib/rfid/client_message.rb
 - lib/rfid/core_ext.rb
 - lib/rfid/version.rb
 - lib/rfid/event.rb
@@ -191,6 +203,7 @@ files:
 - README.rdoc
 - INSTALL.rdoc
 - spec/rfid_spec.rb
+- spec/models/client_message_spec.rb
 - spec/models/event_spec.rb
 - spec/models/config_spec.rb
 - spec/models/application_spec.rb
@@ -222,6 +235,7 @@ specification_version: 3
 summary: Websocket for RFID
 test_files:
 - spec/rfid_spec.rb
+- spec/models/client_message_spec.rb
 - spec/models/event_spec.rb
 - spec/models/config_spec.rb
 - spec/models/application_spec.rb