ardtweeno 0.5.0 → 0.6.0

data/lib/ardtweeno/configreader.rb

@@ -1,10 +1,27 @@
+=begin
 ####################################################################################################
-# @author       David Kirwan <davidkirwanirl@gmail.com>
-# @description  Configuration Reader Class for the Ardtweeno system
+# @author       David Kirwan https://github.com/davidkirwan/ardtweeno
+# @description  Ardtweeno Gateway
 #
-# @date         07-11-2012
+# @date         2014-08-12
 ####################################################################################################
 
+This file is part of Ardtweeno.
+
+Ardtweeno is free software: you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation, either version 3 of the License, or
+any later version.
+
+Ardtweeno is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with Foobar.  If not, see <http://www.gnu.org/licenses/>.
+=end
+
 require 'rubygems'
 require 'yaml'
 

data/lib/ardtweeno/db.rb

@@ -1,10 +1,27 @@
+=begin
 ####################################################################################################
-# @author       David Kirwan <davidkirwanirl@gmail.com>
-# @description  API class for the Ardtweeno system
+# @author       David Kirwan https://github.com/davidkirwan/ardtweeno
+# @description  Ardtweeno Gateway
 #
-# @date         08-01-2013
+# @date         2014-08-12
 ####################################################################################################
 
+This file is part of Ardtweeno.
+
+Ardtweeno is free software: you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation, either version 3 of the License, or
+any later version.
+
+Ardtweeno is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with Foobar.  If not, see <http://www.gnu.org/licenses/>.
+=end
+
 # Imports
 require 'rubygems'
 require 'logger'

data/lib/ardtweeno/dispatcher.rb

@@ -1,10 +1,27 @@
+=begin
 ####################################################################################################
 # @author       David Kirwan https://github.com/davidkirwan/ardtweeno
-# @description  Ardtweeno dispatcher system
+# @description  Ardtweeno Gateway
 #
-# @date         2013-08-18
+# @date         2014-08-12
 ####################################################################################################
 
+This file is part of Ardtweeno.
+
+Ardtweeno is free software: you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation, either version 3 of the License, or
+any later version.
+
+Ardtweeno is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with Foobar.  If not, see <http://www.gnu.org/licenses/>.
+=end
+
 # Imports
 require 'serialport'
 require 'logger'
@@ -73,6 +90,24 @@ module Ardtweeno
     
     
     
+    ##
+    # Ardtweeno::Dispatcher#constructLineplot method for constructing the line plot graph
+    #
+    # * *Args*    :
+    #   - ++ ->     
+    # * *Returns* :
+    #   -           Array data containing the 168 hourly packet totals for the last week,
+    #               Array of strings containing the names of the last 7 days
+    # * *Raises* :
+    #             
+    #
+    def construct_lineplot(params)
+      theData = Ardtweeno::API.buildLineplot(@nodeManager.nodeList, params)
+      
+      return theData
+    end
+    
+    
     ##
     # Ardtweeno::Dispatcher#constructTopology method for constructing the topology graph
     #
@@ -358,7 +393,9 @@ module Ardtweeno
        
         @log.debug "Constructing a new Ardtweeno::Packet from the payload.."
         packet = Ardtweeno::Packet.new(Ardtweeno.nextSeq(), payload["key"], payload["data"])
-          
+        
+	if packet.data.size > node.sensors.size then raise Ardtweeno::SensorException, "Mismatch between sensors and sensor data counts"; end
+
         @log.debug "Adding packet to the node.."
         node.enqueue(packet)
         
@@ -496,24 +533,6 @@ module Ardtweeno
       return false
 
     end
-
-
-    
-    ##
-    # Ardtweeno::Dispatcher#reboot which flushes data then reboots the Ardtweeno Gateway host
-    #
-    # * *Args*    :
-    #   - ++ ->   
-    # * *Returns* :
-    #   -         
-    # * *Raises* :
-    #
-    def reboot()
-      @log.debug "Dispatcher#reboot has been called, restarting the gateway host.."
-      
-      cmd = 'ls -l' #'sudo reboot'
-      sh "#{cmd}"
-    end
     
     
     
@@ -557,14 +576,14 @@ module Ardtweeno
         rawdata.each do |i|
           cpu << [start, i[:cpuload]]
           mem << [start, i[:memload]]
-          running << [start, i[:running]]
+          if i[:running] then running << [start, 100]; else running << [start, 0]; end
           
           start += 10000
         end
         
         cpuseries = {:label=>"CPU &#37;", :data=>cpu, :color=>"#ED0E0E"}
         memseries = {:label=>"MEM &#37;", :data=>mem, :color=>"#0E7AED"}
-        runningseries = {:label=>"Active", :data=>running}
+        runningseries = {:label=>"Parser Active", :data=>running, :color=>"#088A08"}
         
         return [cpuseries, memseries, runningseries]
         

data/lib/ardtweeno/exceptions.rb

@@ -1,4 +1,28 @@
-require 'rubygems'
+=begin
+####################################################################################################
+# @author       David Kirwan https://github.com/davidkirwan/ardtweeno
+# @description  Ardtweeno Gateway
+#
+# @date         2014-08-12
+####################################################################################################
+
+This file is part of Ardtweeno.
+
+Ardtweeno is free software: you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation, either version 3 of the License, or
+any later version.
+
+Ardtweeno is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with Foobar.  If not, see <http://www.gnu.org/licenses/>.
+=end
+
+
 require 'ardtweeno'
 
 module Ardtweeno
@@ -36,4 +60,6 @@ module Ardtweeno
   class AlreadyWatched < Exception
   end
   
+  class SensorException < Exception
+  end
 end

data/lib/ardtweeno/node.rb

@@ -1,9 +1,27 @@
+=begin
 ####################################################################################################
-# @author       David Kirwan <davidkirwanirl@gmail.com>
-# @description  Class to model an Ardtweeno Mesh Network Node
+# @author       David Kirwan https://github.com/davidkirwan/ardtweeno
+# @description  Ardtweeno Gateway
 #
-# @date         21-02-2013
+# @date         2014-08-12
 ####################################################################################################
+
+This file is part of Ardtweeno.
+
+Ardtweeno is free software: you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation, either version 3 of the License, or
+any later version.
+
+Ardtweeno is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with Foobar.  If not, see <http://www.gnu.org/licenses/>.
+=end
+
 # Imports
 require 'rubygems'
 require 'logger'

data/lib/ardtweeno/nodemanager.rb

@@ -1,10 +1,27 @@
+=begin
 ####################################################################################################
-# @author       David Kirwan <davidkirwanirl@gmail.com>
-# @description  Node Management class for the Ardtweeno Mesh Network
+# @author       David Kirwan https://github.com/davidkirwan/ardtweeno
+# @description  Ardtweeno Gateway
 #
-# @date         21-02-2013
+# @date         2014-08-12
 ####################################################################################################
 
+This file is part of Ardtweeno.
+
+Ardtweeno is free software: you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation, either version 3 of the License, or
+any later version.
+
+Ardtweeno is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with Foobar.  If not, see <http://www.gnu.org/licenses/>.
+=end
+
 # Imports
 require 'rubygems'
 require 'logger'

data/lib/ardtweeno/packet.rb

@@ -1,10 +1,27 @@
+=begin
 ####################################################################################################
-# @author       David Kirwan <davidkirwanirl@gmail.com>
-# @description  Packet Communication storage class for the Ardtweeno system
+# @author       David Kirwan https://github.com/davidkirwan/ardtweeno
+# @description  Ardtweeno Gateway
 #
-# @date         14-11-2012
+# @date         2014-08-12
 ####################################################################################################
 
+This file is part of Ardtweeno.
+
+Ardtweeno is free software: you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation, either version 3 of the License, or
+any later version.
+
+Ardtweeno is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with Foobar.  If not, see <http://www.gnu.org/licenses/>.
+=end
+
 # Imports
 require 'rubygems'
 require 'logger'
@@ -21,7 +38,7 @@ module Ardtweeno
   class Packet
     
     # Class fields
-    attr_accessor :key, :seqNo, :date, :hour, :minute, :node, :data 
+    attr_accessor :key, :seqNo, :date, :hour, :minute, :second, :node, :data 
     
     ##
     # Ardtweeno::Packet#new for the Packet class
@@ -41,6 +58,7 @@ module Ardtweeno
       @date = theDate
       @hour = ("%02d" % today.hour).to_s
       @minute = ("%02d" % today.min).to_s
+      @second = ("%02d" % today.sec).to_s
       @data = newData
       @key = newKey
       
@@ -68,7 +86,7 @@ module Ardtweeno
     def to_s
       # Build the string up from field data
       str = "Packet No: " + @seqNo.to_s + " Key: " + @key + " Node: " + @node + " Date: " + @date +
-            " " + @hour + ":" + @minute + " Data: " + @data.to_s  
+            " " + @hour + ":" + @minute + ":" + @second + " Data: " + @data.to_s  
       
       # Returns the built string
       return str
@@ -87,7 +105,7 @@ module Ardtweeno
     def to_json(options={})
       
       jsonStr = '{"date":"' + @date + '","hour":"' + @hour + '","minute":"' +
-      @minute.to_s + '","node":"' + @node + '","key":"' + @key + '","seqNo":' +
+      @minute + '","second":"' + @second + '","node":"' + @node + '","key":"' + @key + '","seqNo":' +
       @seqNo.to_s + ',"data":' + @data.to_json + '}'
       
       return jsonStr

data/lib/ardtweeno/restapi.rb

@@ -1,16 +1,34 @@
 $stdout.sync = true
+
+=begin
 ####################################################################################################
-# @author       David Kirwan <davidkirwanirl@gmail.com>
-# @description  Ardtweeno Application Gateway HTTP REST API Sinatra Web App
+# @author       David Kirwan https://github.com/davidkirwan/ardtweeno
+# @description  Ardtweeno Gateway
 #
-# @date         14-06-2013
+# @date         2014-08-12
 ####################################################################################################
+
+This file is part of Ardtweeno.
+
+Ardtweeno is free software: you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation, either version 3 of the License, or
+any later version.
+
+Ardtweeno is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with Foobar.  If not, see <http://www.gnu.org/licenses/>.
+=end
+
 ##### Require statements
 require 'rubygems'
 require 'sinatra/base'
-require 'ardtweeno'
 require 'logger'
-
+require 'ardtweeno'
 
 class RESTAPI < Sinatra::Base
 
@@ -19,7 +37,7 @@ class RESTAPI < Sinatra::Base
   set :root, File.join(File.dirname(__FILE__) + '/../../')
   set :public_folder, File.join(root, '/public')
   set :views, File.join(root, '/views')
-  
+  set :server, :puma  
   #############################################################################################
     
   # Create the logger instance
@@ -123,7 +141,7 @@ class RESTAPI < Sinatra::Base
   
   get '/graph/v1/punchcard/:node' do |node|
     begin
-      theData, theDays, theRange= @@theDispatcher.constructPunchcard(params)
+      theData, theDays, theRange = @@theDispatcher.constructPunchcard(params)
       
     rescue Exception => e
       throw :halt, [ 500, "500 Internal Server Error" ]
@@ -133,6 +151,19 @@ class RESTAPI < Sinatra::Base
   end
   
   
+  get '/graph/v1/lineplot/:node' do |node|
+    begin
+      theData = @@theDispatcher.construct_lineplot(params)
+      
+    rescue Exception => e
+      raise e
+      #throw :halt, [ 500, "500 Internal Server Error" ]
+    end
+
+    erb :lineplot, :locals => {:data=>theData, :node=>node}
+  end
+  
+  
   get "/#{settings.newsURI}/create/post" do
     running = @@theDispatcher.running?
     erb :createpost, :locals => {:running => running}
@@ -230,6 +261,8 @@ class RESTAPI < Sinatra::Base
         
     rescue Ardtweeno::NodeNotAuthorised => e
       throw :halt, [ 401, "401 Unauthorised" ]
+    rescue Ardtweeno::SensorException
+      throw :halt, [ 400, "400 Bad Request" ]
     rescue Exception => e
       throw :halt, [ 400, "400 Bad Request" ]
     end

data/lib/ardtweeno/ringbuffer.rb

@@ -1,10 +1,27 @@
+=begin
 ####################################################################################################
 # @author       David Kirwan https://github.com/davidkirwan/ardtweeno
-# @description  Ardtweeno::RingBuffer storage class
+# @description  Ardtweeno Gateway
 #
-# @date         2013-08-18
+# @date         2014-08-12
 ####################################################################################################
 
+This file is part of Ardtweeno.
+
+Ardtweeno is free software: you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation, either version 3 of the License, or
+any later version.
+
+Ardtweeno is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with Foobar.  If not, see <http://www.gnu.org/licenses/>.
+=end
+
 require 'ardtweeno'