msg-chumby-display 0.0.2 → 0.1.0

data/VERSION

@@ -1 +1 @@
-0.0.2
+0.1.0

data/bin/msg-chumby-daemon

@@ -6,23 +6,51 @@ $:.unshift << libpath
 require 'rubygems'
 require 'msg-chumby-daemon.rb'
 
+#TODO: Make generic. This is the ID of the CC-HPC flukso.
+sensor_id="67e9fa794684e4902730be208e9d734e"
+token="bb8640e074de14b9d444be7b1359707f"
+
 reading_cache=MSG_Chumby::Reading_Cache.new();
 $demo_importer=MSG_Chumby::DemoReadingImporter.new(reading_cache, 400);
-$importer_thread=nil;
-$server=MSG_Chumby::HTTP_XML_Server.new("127.0.0.1", 3000, reading_cache);
+$lasthour_importer=MSG_Chumby::LastHourImporter.new(reading_cache, sensor_id, token);
+$lastday_importer=MSG_Chumby::LastDayImporter.new(reading_cache, sensor_id, token);
+$shortterm_thread=nil;
+$longterm_thread=nil;
+$server=MSG_Chumby::HTTP_XML_Server.new("0.0.0.0", 3000, reading_cache);
+
 
 def startAll
   $server.start();
-  $importer_thread=Thread.new() {
-    $demo_importer.doWork();
+  $shortterm_thread=Thread.new() {
+    loop do
+      puts "Running short term import" 
+      begin
+        $demo_importer.doWork();
+      rescue StandardError => e
+        puts "ERROR in short-term thread: #{e}"
+      end
+      sleep(3);
+    end
+  }
+  $longterm_thread=Thread.new() {
+    loop do
+      puts "Running long term import" 
+      begin
+        $lasthour_importer.doWork();
+        $lastday_importer.doWork();
+      rescue StandardError => e
+        puts "ERROR in long-term thread: #{e}"
+      end
+      sleep(10);
+    end
   }
   $server.join();
-  $importer_thread.join();
 end
 
 def stopAll
+  $shortterm_thread.stop() unless $importer_thread.stop?;
+  $longterm_thread.stop() unless $importer_thread.stop?;
   $server.stop() 
-  $importer_thread.stop() unless $importer_thread.stop?;
   exit;
 end
 

data/lib/msg-chumby-daemon/http-xml-server.rb

@@ -1,6 +1,7 @@
 require 'rubygems'
 require 'xmlsimple'
 require 'mongrel'
+#require 'pp'
 
 module MSG_Chumby
   $counter=0;
@@ -48,6 +49,74 @@ module MSG_Chumby
     end
   end
 
+  class LastHourHandler < Mongrel::HttpHandler
+    def initialize(reading_cache)
+      @reading_cache=reading_cache;
+    end
+    def process(request, response)
+      response.start(200) do |head,out|
+        head["Content-Type"] = "text/xml"
+        readings=(@reading_cache.last_hour())  
+        # Even if there are currently no readings we need to provide
+        # them.
+        if readings==nil
+          readings = Array.new();
+          (0..59).each {|i|
+            timestamp = Time.now.to_i - (i * 60)
+            readings << Flukso::UTCReading.new(timestamp, 0.0) 
+          }
+        end
+        flat_data=Array.new;
+        readings.each{|reading|
+          if not reading.nan? #(reading.value*1.0).nan?
+            # Skip NaN values.
+          #else
+            time=Time.at(reading.utc_timestamp);
+            current_reading=
+              {'time' => [ time.strftime("%H:%M:%S")], 'value' => [reading.value]};
+            flat_data << current_reading
+          end
+        }
+        #pp flat_data
+        out.write(XmlSimple.xml_out( { 'reading' => flat_data} ,{'RootName' => "last_hour"}));
+      end
+    end
+  end
+  class LastDayHandler < Mongrel::HttpHandler
+    def initialize(reading_cache)
+      @reading_cache=reading_cache;
+    end
+    def process(request, response)
+      response.start(200) do |head,out|
+        head["Content-Type"] = "text/xml"
+        readings=(@reading_cache.last_day())  
+        # Even if there are currently no readings we need to provide
+        # them.
+        if readings==nil
+          readings = Array.new();
+          (0..95).each {|i|
+            timestamp = Time.now.to_i - (i * 60 * 15)
+            readings << Flukso::UTCReading.new(timestamp, 0.0) 
+          }
+        end
+        flat_data=Array.new;
+        readings.each{|reading|
+          if not reading.nan? #(reading.value*1.0).nan?
+            # Skip NaN values.
+            time=Time.at(reading.utc_timestamp);
+            current_reading= {
+              'dayofyear' => [ time.strftime("%j")], 
+              'time' => [ time.strftime("%H:%M:%S")], 
+              'value' => [reading.value]
+            };
+            flat_data << current_reading
+          end
+        }
+        #pp flat_data
+        out.write(XmlSimple.xml_out( { 'reading' => flat_data} ,{'RootName' => "last_day"}));
+      end
+    end
+  end
 
   class HTTP_XML_Server
     def initialize(host, port, reading_cache)
@@ -55,6 +124,8 @@ module MSG_Chumby
       @server.register("/time", TimeHandler.new)
       @server.register("/reset", ResetHandler.new)
       @server.register("/last_reading", LastReadingHandler.new(reading_cache))
+      @server.register("/last_hour", LastHourHandler.new(reading_cache))
+      @server.register("/last_day", LastDayHandler.new(reading_cache))
     end
     def start
       @threads=@server.run

data/lib/msg-chumby-daemon/reading-cache.rb

@@ -5,6 +5,10 @@ module MSG_Chumby
     def initialize
       @last_reading=nil;
       @last_reading_mutex=Mutex.new();
+      @last_hour=nil;
+      @last_hour_mutex=Mutex.new();
+      @last_day=nil;
+      @last_day_mutex=Mutex.new();
     end
     def update_last_reading(reading)
       raise "Please provide a UTCReading instance" if reading.class != Flukso::UTCReading
@@ -19,5 +23,33 @@ module MSG_Chumby
       end
       return retval
     end
+    def update_last_hour(readings)
+      raise "Please provide an Array instance" if readings.class != Array
+      @last_hour_mutex.synchronize do
+        @last_hour=readings
+      end
+    end
+    def last_hour
+      retval=nil
+      @last_hour_mutex.synchronize do
+        retval=@last_hour
+      end
+      return retval
+    end
+    def update_last_day(readings)
+      raise "Please provide an Array instance" if readings.class != Array
+      @last_day_mutex.synchronize do
+        @last_day=readings
+      end
+    end
+    def last_day
+      retval=nil
+      @last_day_mutex.synchronize do
+        retval=@last_day
+      end
+      return retval
+    end
+
+
   end
 end

data/lib/msg-chumby-daemon/reading-importer.rb

@@ -5,21 +5,65 @@ if __FILE__ == $0
 end
 
 module MSG_Chumby
+  BASE_URL="https://api.mysmartgrid.de/sensor"
   class DemoReadingImporter
     def initialize(reading_cache, max_reading)
       @reading_cache=reading_cache
       @max_reading=max_reading
     end
     def doWork
-        loop do
-          value=rand(@max_reading)
-          reading=Flukso::UTCReading.new(Time.now.to_i, value)
-          #puts "generated random reading #{reading}"
-          @reading_cache.update_last_reading(reading);
-          sleep(3);
-        end
+      value=rand(@max_reading)
+      reading=Flukso::UTCReading.new(Time.now.to_i, value)
+      #puts "generated random reading #{reading}"
+      @reading_cache.update_last_reading(reading);
     end
   end
+  class LastHourImporter
+    def initialize(reading_cache, sensor_id, token)
+      @reading_cache=reading_cache
+      auth=Flukso::TokenAuth.new(token);
+      @api=Flukso::API.new(auth, BASE_URL);
+      @query=Flukso::QueryReadings.new(sensor_id, :hour, :watt)
+    end
+    def doWork
+      begin
+        readings=@query.execute(@api);
+      rescue Exception => e
+        puts "Query failed: #{e}"
+        puts "Used #{BASE_URL} as BASE_URL"
+        exit(-10);
+      end
+      #puts "Got Response:"
+      #readings.each{|reading|
+      #  puts reading
+      #}
+      @reading_cache.update_last_hour(readings);
+    end
+  end
+  class LastDayImporter
+    def initialize(reading_cache, sensor_id, token)
+      @reading_cache=reading_cache
+      auth=Flukso::TokenAuth.new(token);
+      @api=Flukso::API.new(auth, BASE_URL);
+      @query=Flukso::QueryReadings.new(sensor_id, :day, :watt)
+    end
+    def doWork
+      begin
+        readings=@query.execute(@api);
+      rescue Exception => e
+        puts "Query failed: #{e}"
+        puts "Used #{BASE_URL} as BASE_URL"
+        exit(-10);
+      end
+      #puts "Got Response:"
+      #readings.each{|reading|
+      #  puts reading
+      #}
+      @reading_cache.update_last_day(readings);
+    end
+  end
+
+
 end
 
 if __FILE__ == $0

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: msg-chumby-display
 version: !ruby/object:Gem::Version 
-  version: 0.0.2
+  version: 0.1.0
 platform: ruby
 authors: 
 - Mathias Dalheimer
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-06-02 00:00:00 +02:00
+date: 2010-06-08 00:00:00 +02:00
 default_executable: msg-chumby-daemon
 dependencies: 
 - !ruby/object:Gem::Dependency