keyhole 0.1.0 → 0.1.1

data/lib/keyhole.rb

@@ -5,6 +5,7 @@ require File.dirname(__FILE__) + '/query_server'
 require 'em-websocket'
 require 'sinatra/base'
 require 'thin'
+require 'em-mysqlplus'
 
 
 EventMachine.run{
@@ -13,13 +14,14 @@ EventMachine.run{
   # of multiple servers. Or, it can just be an http-based reporting tool.
   class Querier < Sinatra::Base    
     get "/" do 
-      return "This is Keyhole, with #{$clients.length} clients connected"
+      return "This is Keyhole, with #{$clients.length} trackers and #{$webclients.length} webclients connected."
     end    
   end
   
   
-  $channel = EM::Channel.new
-  $clients = {}
+  $channel    = EM::Channel.new
+  $clients    = {}
+  $webclients = {}
     
   EventMachine::start_server "0.0.0.0", 5000, SatParser
   EventMachine::start_server "0.0.0.0", 5500, QueryServer
@@ -28,11 +30,11 @@ EventMachine.run{
   EventMachine::WebSocket.start(:host => "0.0.0.0", :port => 8080, :debug => true) do |ws|
     ws.onopen{
       sid = $channel.subscribe { |msg| ws.send msg }      
-      $clients[sid] = true
+      $webclients[sid] = true
       ws.onmessage{|msg| $channel.push "Ninja!" }
       ws.onclose{
         $channel.unsubscribe(sid)
-        $clients.delete(sid)
+        $webclients.delete(sid)
       }      
     }    
   end

data/lib/query_server.rb

@@ -1,9 +1,10 @@
 # QueryServer responds to telnet-calls on its designated port, and responds
 # with things...
 class QueryServer < EventMachine::Connection
-  
   def post_init
     send_data "#{$clients.length} clients connected"
+    
+    
   end
   
   def receive_data(data)

data/lib/sat_parser.rb

@@ -1,12 +1,17 @@
 class SatParser < EventMachine::Connection
     
+  attr_accessor :db  
+    
   def post_init
-    puts "GSAT connected"
+    $clients.push(self)
+    db = EventMachine::MySQL.new(:host => "localhost", :username => "root", :database => "keyhole_development")
+    $channel << "{event:'connect', 'type':'tracker'}"
   end
   
   def receive_data(data)
     puts "Data received..."
     puts data.inspect
+    db.query("insert into locations(latitude, longitude) value('ninja', 'neger');")
     $channel << data
   end
   

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: keyhole
 version: !ruby/object:Gem::Version 
-  hash: 27
+  hash: 25
   prerelease: false
   segments: 
   - 0
   - 1
-  - 0
-  version: 0.1.0
+  - 1
+  version: 0.1.1
 platform: ruby
 authors: 
 - buffpojken