ardtweeno 0.3.1 → 0.4.0

data/lib/ardtweeno/restapi.rb

@@ -10,7 +10,7 @@ require 'rubygems'
 require 'sinatra/base'
 require 'ardtweeno'
 require 'logger'
-require 'rufus/scheduler'
+
 
 class RESTAPI < Sinatra::Base
 
@@ -58,9 +58,6 @@ class RESTAPI < Sinatra::Base
     set :options, {:test=>true, :log=>Logger.new(STDOUT), :level=>Logger::DEBUG, :confdata=>@confdata}
   end
   
-  # Rufus-scheduler object
-  set :scheduler, Rufus::Scheduler.start_new
-  
   # Setup the system for use
   Ardtweeno.setup(settings.options)
   @@theDispatcher = Ardtweeno::Dispatcher.instance
@@ -70,21 +67,6 @@ class RESTAPI < Sinatra::Base
   
   # Posts URI
   set :newsURI, @@theDispatcher.getPostsURI
-  
-#########################################################################################################  
-
-
-  settings.scheduler.every '60m' do
-      
-    begin
-      settings.log.debug "Running scheduled data flush"
-      @@theDispatcher.flush()
-                        
-    rescue Ardtweeno::DBError => e
-      settings.log.warn "ERROR: #{e.message}"
-    end
-     
-  end
 
     
 #########################################################################################################
@@ -109,7 +91,40 @@ class RESTAPI < Sinatra::Base
   
   
   get '/status' do
-    erb :status
+    begin
+      diskusage = @@theDispatcher.diskUsage
+      
+    rescue Exception => e
+      throw :halt, [ 500, "500 Internal Server Error" ]
+    end
+    
+    erb :status, :locals => {:diskusage=>diskusage}
+  end
+  
+  
+  get '/topology' do
+    settings.log.debug params.inspect
+    
+    begin
+      theResponse = @@theDispatcher.constructTopology(params)
+      
+    rescue Exception => e
+      throw :halt, [ 500, "500 Internal Server Error" ]
+    end
+    
+    erb :topology, :locals => {:theTopology=>theResponse}
+  end
+  
+  
+  get '/graph/v1/punchcard/:node' do |node|
+    begin
+      theData, theDays, theRange= @@theDispatcher.constructPunchcard(params)
+      
+    rescue Exception => e
+      throw :halt, [ 500, "500 Internal Server Error" ]
+    end
+
+    erb :punchcard, :locals => {:node=>params[:node], :ourGraphData=>theData, :ourGraphDays=>theDays, :ourGraphRange=>theRange}
   end
   
   
@@ -229,10 +244,35 @@ class RESTAPI < Sinatra::Base
     rescue Exception => e
       throw :halt, [ 400, "400 Bad Request" ]
     end
+  end
+  
+  
+  get '/api/v1/watch/:node' do |node|
+    settings.log.debug params.inspect
+    throw :halt, [ 404, "404 Page Not Found" ] unless @@theDispatcher.authenticate?(params[:key])
+    settings.log.debug "Check if a node is being watched"
     
+    begin
+      @@theDispatcher.watched?(params).to_json
+    rescue Exception => e
+      throw :halt, [ 400, "400 Bad Request" ]
+    end
   end
 
 
+  get '/api/v1/watch' do
+    settings.log.debug params.inspect
+    throw :halt, [ 404, "404 Page Not Found" ] unless @@theDispatcher.authenticate?(params[:key])
+    settings.log.debug "Check if a node is being watched"
+    
+    begin
+      @@theDispatcher.watchList.to_json
+    rescue Exception => e
+      raise e
+      #throw :halt, [ 400, "400 Bad Request" ]
+    end
+  end
+
 #########################################################################################################
   
   get '/api/v1/system/config' do
@@ -292,22 +332,33 @@ class RESTAPI < Sinatra::Base
 
 
   get '/api/v1/system/status' do
-    # Considering making this api target public to avoid having to store API keys in the highcarts.js
-    # graphs..
-    #throw :halt, [ 404, "404 Page Not Found" ] unless @@theDispatcher.authenticate?(params[:key])
     settings.log.debug "The system status hook has been called, reading the host configuration"
 
     begin
-      return @@theDispatcher.status?().to_json
+      return @@theDispatcher.status?.to_json
       
     rescue Exception => e
-      raise e
-      #throw :halt, [ 500, "500 Internal Server Error" ]
+      throw :halt, [ 500, "500 Internal Server Error" ]
     end
 
   end
 
+
+  get '/api/v1/system/status/list' do
+    settings.log.debug "The system status list hook has been called, returning the last 15 mins of status data"
+    
+    begin
+      return {:buffer=>@@theDispatcher.statuslist}.to_json
+      
+    rescue Exception => e
+      throw :halt, [ 500, "500 Internal Server Error"]
+    end
+  end
+
 #########################################################################################################
 
+
+
+
 # End of RESTAPI Class
 end

data/lib/ardtweeno/ringbuffer.rb

@@ -0,0 +1,115 @@
+####################################################################################################
+# @author       David Kirwan https://github.com/davidkirwan/ardtweeno
+# @description  Ardtweeno::RingBuffer storage class
+#
+# @date         2013-08-18
+####################################################################################################
+
+require 'ardtweeno'
+
+
+module Ardtweeno
+  class RingBuffer
+  
+  
+    ##
+    # Ardtweeno::RingBuffer#new Constructor
+    #
+    # * *Args*    :
+    #   - ++ ->   Fixnum size
+    # * *Returns* :
+    #   -         An instanciated copy of the RingBuffer class
+    # * *Raises* :
+    #             TypeError if size is of type other than a Fixnum,
+    #             ArgumentError if size is < 1
+    #
+    def initialize(size)
+      unless size.class == Fixnum then raise TypeError, "Size must be a Fixnum"; end
+      unless size >= 1 then raise ArgumentError, "Size must be a Fixnum of size >= 1"; end
+      @max = size
+      @buffer = []
+    end
+    
+    
+    
+    ##
+    # Ardtweeno::RingBuffer#push This method adds an element at the end of the buffer, if size is exceeded, 
+    # the first element is dropped
+    #
+    # * *Args*    :
+    #   - ++ ->   
+    # * *Returns* :
+    #   -         
+    # * *Raises* :
+    #             
+    def push(line)
+      if @buffer.size == @max
+        @buffer.shift
+      end
+      @buffer.push(line)
+    end
+    
+    
+    
+    ##
+    # Ardtweeno::RingBuffer#clear empties the internal buffer
+    #
+    # * *Args*    :
+    #   - ++ ->   
+    # * *Returns* :
+    #   -         
+    # * *Raises* :
+    #
+    def clear 
+      @buffer = []
+    end
+    
+    
+    
+    ##
+    # Ardtweeno::RingBuffer#to_a
+    #
+    # * *Args*    :
+    #   - ++ ->   
+    # * *Returns* :
+    #   -         Copy of the internal buffer in Array form
+    # * *Raises* :
+    #
+    def to_a
+      return @buffer.dup
+    end
+    
+    
+    
+    ##
+    # Ardtweeno::RingBuffer#to_s converts the internal buffer to a String 
+    #
+    # * *Args*    :
+    #   - ++ ->   
+    # * *Returns* :
+    #   -         String representation of the internal buffer
+    # * *Raises* :
+    #
+    def to_s
+      return @buffer.to_s  
+    end
+    
+    
+    
+    ##
+    # Ardtweeno::RingBuffer#each call the closure block on each element in the buffer 
+    #
+    # * *Args*    :
+    #   - ++ ->   
+    # * *Returns* :
+    #   -         
+    # * *Raises* :
+    #
+    def each(&block)
+      @buffer.each(&block)
+    end
+    
+    
+    
+  end # End of RingBuffer class
+end # End of Ardtweeno module

data/lib/ardtweeno.rb

@@ -5,7 +5,6 @@
 # @date         14-06-2013
 ####################################################################################################
 
-require 'rubygems'
 require 'logger'
 require 'fileutils'
 require 'ardtweeno/serialparser'
@@ -17,6 +16,7 @@ require 'ardtweeno/node'
 require 'ardtweeno/configreader'
 require 'ardtweeno/api'
 require 'ardtweeno/db'
+require 'ardtweeno/ringbuffer'
 
 
 ##
@@ -37,7 +37,7 @@ module Ardtweeno
     Ardtweeno::NODEPATH = Ardtweeno::CONFIGPATH + "/nodelist.yaml" unless defined? Ardtweeno::NODEPATH
     Ardtweeno::POSTPATH = Ardtweeno::CONFIGPATH + "/posts.yaml" unless defined? Ardtweeno::POSTPATH
         
-    # Global Variables
+    # Class Variables
     @@seqCount = 0 unless defined? @@seqCount
     @@options = {} unless defined? @@options    
     

data/public/main.css

@@ -1,34 +1,63 @@
 html, body {
-        margin: 0;
-        padding: 0;
+    margin: 0;
+    padding: 0;
 }
 
 body {
-        background: #1E1C17;
-        color: #ccc;
-        font-family: 'Trebuchet MS', 'Lucida Grande', Arial, Helvetica, sans-serif;
-        line-height: 1.2em;
+    background: #1E1C17;
+    color: #ccc;
+    font-family: 'Trebuchet MS', 'Lucida Grande', Arial, Helvetica, sans-serif;
+    line-height: 1.2em;
 }
 
 img {
-        border: 0;
+    border: 0;
 }
 
 .preloader{
-        display:block;
-        margin:120px auto;
+    display:block;
+    margin:120px auto;
+}
+
+#punchcard-home {
+	position:relative;
+	right: 15px;
+}
+
+#punchcard-title {
+	position: relative;
+	top: -90px;
+	left: 125px;
+}
+
+#punchcard-range {
+	position: relative;
+	top: -90px;
+	left: 125px;
+}
+
+#punchcard-holder {
+	position: relative;
+	top: -90px;
+	background-color: #F0F0F0;
+	margin: 1em;
+	border-radius: 10px;
+}
+
+#topology-canvas {
+	background-color: #F0F0F0;
 }
 
 #status {
-        position: relative;
-        top: 6px;
+    position: relative;
+    top: 6px;
 }
 
 
 a {
-        text-decoration: underline;
-        color: #FCC240;
-        text-decoration: none;
+    text-decoration: underline;
+    color: #FCC240;
+    text-decoration: none;
 }
 a:hover {
         color: #BF4B31;
@@ -462,3 +491,40 @@ table th[class*="span"],
   background-color: #c4e3f3;
 }
 
+
+.graph-container {
+	box-sizing: border-box;
+	width: 850px;
+	height: 450px;
+	padding: 20px 15px 15px 15px;
+	margin: 15px auto 30px auto;
+	border: 1px solid #ddd;
+	background: #fff;
+	background: linear-gradient(#f6f6f6 0, #fff 50px);
+	background: -o-linear-gradient(#f6f6f6 0, #fff 50px);
+	background: -ms-linear-gradient(#f6f6f6 0, #fff 50px);
+	background: -moz-linear-gradient(#f6f6f6 0, #fff 50px);
+	background: -webkit-linear-gradient(#f6f6f6 0, #fff 50px);
+	box-shadow: 0 3px 10px rgba(0,0,0,0.15);
+	-o-box-shadow: 0 3px 10px rgba(0,0,0,0.1);
+	-ms-box-shadow: 0 3px 10px rgba(0,0,0,0.1);
+	-moz-box-shadow: 0 3px 10px rgba(0,0,0,0.1);
+	-webkit-box-shadow: 0 3px 10px rgba(0,0,0,0.1);
+}
+
+
+.graph-container {
+	width: 85%;
+	height: 300px;
+}
+
+.graph-placeholder {
+	width: 100%;
+	height: 100%;
+	font-size: 14px;
+	line-height: 1.2em;
+}
+
+.legend table {
+	border-spacing: 5px;
+}

data/public/main.js

@@ -1,5 +1,11 @@
 var containerId = '#tabs-container';
 var tabsId = '#tabs';
+var keepUpdating = false;
+
+
+function hashchanged(){
+	keepUpdating = false;	
+}
 
 $(document).ready(function(){
 	// Preload tab on page load
@@ -18,6 +24,7 @@ $(document).ready(function(){
     });
 });
 
+
 function loadTab(tabObj){
     if(!tabObj || !tabObj.length){ return; }
     $(containerId).addClass('loading');
@@ -27,4 +34,4 @@ function loadTab(tabObj){
         $(containerId).removeClass('loading');
         $(containerId).fadeIn('fast');
     });
-}
+}

data/test/api_test.rb

@@ -13,8 +13,6 @@ class APITest < Test::Unit::TestCase
 
   include Rack::Test::Methods
   
-  attr_accessor :dispatch, :nodelist, :params, :date, :hour, :minute, :confdata
-  
   
   # Test suite fixtures
   def setup
@@ -51,7 +49,7 @@ class APITest < Test::Unit::TestCase
       
       # Create a DateTime instance
       today = DateTime.now
-      theDate = today.year.to_s() + "-" + "%02d" % today.month.to_s() + "-" + "%02d" % today.day.to_s()
+      theDate = today.year.to_s() + "-" + "%02d" % today.month.to_s() + "-" + "%02d" % today.day.to_s() 
       
       # Default values
       @date = theDate
@@ -85,7 +83,6 @@ class APITest < Test::Unit::TestCase
                   :withhourwrong=> {:hour=>"022"},
                   :withminute=> {:minute=>@minute},
                   :withminutewrong=> {:minute=>"022"},
-                  :withseqno=> {:seqno=>35},
                   :withseqnowrong=> {:seqno=>50000},
                   :withversion=> {:version=> "0.5.0"},
                   :withversionwrong=> {:version=> "0.0.0"},
@@ -101,6 +98,45 @@ class APITest < Test::Unit::TestCase
         @dispatch.store('{"data":[23.5,997.5,65],"key":"abcdef1"}')
       end
       
+      @punchData = Array.new
+       
+      144.times do
+        @punchData << 0
+      end
+      
+      (1..today.hour).each do
+        @punchData << 0
+      end
+      
+      @punchData << 5
+      
+      ((today.hour + 1)..23).each do
+        @punchData << 0
+      end
+      
+      @punchDays = Array.new
+      
+      theStart = today - 6
+      
+      (theStart..today).each do |i|
+        @punchDays << i.strftime('%a')
+      end
+      
+      @punchDays.reverse!
+      
+      theStartDay = "%02d" % theStart.day
+      theStartMonth = "%02d" % theStart.month
+      theStartYear = theStart.year.to_s
+            
+      theEndDay = "%02d" % today.day
+      theEndMonth = "%02d" % today.month
+      theEndYear = today.year.to_s
+      
+      startRange = theStartYear + "-" + theStartMonth + "-" + theStartDay
+      endRange = theEndYear + "-" + theEndMonth + "-" + theEndDay
+      
+      @punchRange = "#{startRange} to #{endRange}"
+      
     rescue Exception => e
       puts e.message
       puts e.backtrace
@@ -129,8 +165,7 @@ class APITest < Test::Unit::TestCase
     
   end
   
-  
-    
+      
   # Test the retrievenodes method
   def test_retrievenodes
     results = @dispatch.retrieve_nodes(@params[:empty])
@@ -184,13 +219,19 @@ class APITest < Test::Unit::TestCase
   
   # Test the handleSeqNo method
   def test_handleSeqNo
-    results = @dispatch.retrieve_packets(@params[:withseqno])   
+    initial = @dispatch.retrieve_packets(@params[:empty])
+    value = initial[:packets].first
+    
+    sequenceNo = {:seqno=>value.seqNo}
+    
+    results = @dispatch.retrieve_packets(sequenceNo)   
     assert_equal(1, results[:packets].size)
     
     results = @dispatch.retrieve_packets(@params[:withseqnowrong])
     assert_equal(0, results[:packets].size)
   end
   
+  
   # Test the handleMinute method
   def test_handleMinute
     results = @dispatch.retrieve_packets(@params[:withminute])
@@ -273,5 +314,17 @@ class APITest < Test::Unit::TestCase
     end
     
   end
+  
+  
+  # Test the buildPunchcard method
+  def test_buildPunchcard
+    data, days, range = Ardtweeno::API.buildPunchcard(@nodeList, {:node=>"node1"})
+    
+    assert_equal(data, @punchData)
+    assert_equal(days, @punchDays)
+    assert_equal(range, @punchRange)
+  end
+
+
 
 end

data/test/debug/run_mock

@@ -1,7 +1,7 @@
 require 'rubygems'
 require 'serialport'
 require 'json'
-require "./serialport_mock.rb"
+require "../serialport_mock.rb"
 
 mock = SerialDeviceMock.new('/dev/pts/3', 9600, 100)
   

data/test/debug/run_packet_push

@@ -7,8 +7,8 @@ while true
   testData = {"data" => [rand(0..100)], "key" => "2dbf44a68b77b15bfa5bc3d66c97892a57402bbe"}.to_json
   testData2 = {"data" => [rand(0..100), rand(0..1000)], "key" => "a46fe0c4dab0453f5d86bed6206040880f59393e"}.to_json
   
-  puts Typhoeus::Request.post("http://192.168.1.8:4567/api/v1/packets", :body=> {:key => key, :payload=>testData})
-  sleep(rand(0..90))
-  #puts Typhoeus::Request.post("http://localhost:4567/api/v1/packets", :body=> {:key => key, :payload=>testData2})
-  #sleep(rand(0.90))
+  puts Typhoeus::Request.post("http://localhost:4567/api/v1/packets", :body=> {:key => key, :payload=>testData})
+  sleep(rand(0..9))
+  puts Typhoeus::Request.post("http://localhost:4567/api/v1/packets", :body=> {:key => key, :payload=>testData2})
+  sleep(rand(0.9))
 end

data/test/debug/run_post_watch

@@ -4,9 +4,9 @@ require 'json'
 
 
 body = {:key=> "1230aea77d7bd38898fec74a75a87738dea9f657", 
-		:node=>"node1",
-		:notifyURL=>"http://192.168.1.2:5000/push/node1", 
+#		:node=>"node1",
+		:notifyURL=>"http://localhost:5000/push/node1", 
 		:method=>"GET", 
-		:timeout=>"60"}
+		:timeout=>60}
 
-puts Typhoeus::Request.post("http://192.168.1.8:4567/api/v1/watch/node1", :body=>body)
+puts Typhoeus::Request.post("http://localhost:4567/api/v1/watch/node1", :body=>body)

data/test/dispatcher_test.rb

@@ -2,10 +2,9 @@
 # @author       David Kirwan https://github.com/davidkirwan/ardtweeno
 # @description  Ardtweeno dispatcher test fixtures
 #
-# @date         14-06-2013
+# @date         2013-06-14
 ####################################################################################################
 
-require 'rubygems'
 require 'test/unit'
 require 'rack/test'
 require 'ardtweeno'
@@ -19,8 +18,6 @@ class DispatcherTest < Test::Unit::TestCase
 
   include Rack::Test::Methods
   
-  attr_accessor :dispatch, :confdata
-  
   
   # Test suite fixtures
   def setup
@@ -76,20 +73,20 @@ class DispatcherTest < Test::Unit::TestCase
                  :method=>"GET", 
                  :timeout=>60}
                             
-      @nomethod = {:node=>"node1",
+      @nomethod = {:node=>"node2",
                    :notifyURL=>"http://192.168.1.2:5000/push/node1",
                    :timeout=>60}
       
-      @notimeout = {:node=>"node1",
+      @notimeout = {:node=>"node3",
                     :notifyURL=>"http://192.168.1.2:5000/push/node1", 
                     :method=>"GET"}
       
-      @invalidtimeout = {:node=>"node1",
+      @invalidtimeout = {:node=>"node4",
                          :notifyURL=>"http://192.168.1.2:5000/push/node1", 
                          :method=>"GET", 
                          :timeout=>-60}
       
-      @invalidmethod = {:node=>"node1",
+      @invalidmethod = {:node=>"node5",
                         :notifyURL=>"http://192.168.1.2:5000/push/node1", 
                         :method=>"POSTSS", 
                         :timeout=>60}
@@ -192,6 +189,7 @@ class DispatcherTest < Test::Unit::TestCase
     assert_nothing_raised do
       @dispatch.addWatch(@validwatch)
     end
+    assert_equal({:watched=>true}, @dispatch.watched?({:node=>"node1"}))
     
     assert_raise Ardtweeno::AlreadyWatched do
       @dispatch.addWatch(@validwatch)  
@@ -200,22 +198,27 @@ class DispatcherTest < Test::Unit::TestCase
     assert_raise Ardtweeno::InvalidWatch do
       @dispatch.addWatch(@nonode)  
     end
+    assert_equal({:watched=>false}, @dispatch.watched?({}))
     
     assert_raise Ardtweeno::InvalidWatch do
       @dispatch.addWatch(@nomethod)  
     end
+    assert_equal({:watched=>false}, @dispatch.watched?({:node=>"node2"}))
     
     assert_raise Ardtweeno::InvalidWatch do
       @dispatch.addWatch(@notimeout)  
     end
+    assert_equal({:watched=>false}, @dispatch.watched?({:node=>"node3"}))
     
     assert_raise Ardtweeno::InvalidWatch do
       @dispatch.addWatch(@invalidtimeout)  
     end
+    assert_equal({:watched=>false}, @dispatch.watched?({:node=>"node4"}))
 
     assert_raise Ardtweeno::InvalidWatch do
       @dispatch.addWatch(@invalidmethod)  
     end
+    assert_equal({:watched=>false}, @dispatch.watched?({:node=>"node5"}))
 
   end