subduino 0.1.0 → 0.2.0

data/webapp/config.yml

@@ -0,0 +1,20 @@
+---
+log_interval: 60
+inputs:
+  i1:
+    type: Temp
+    name: Cafofo temp
+  i2:
+    type: Temp
+    name: Out temp
+  i3:
+    type: Lux
+    name: Cafofo light
+  # i2:
+  # i3:
+  # i4:
+  # i5:
+outputs:
+  d2:
+    type: door
+    name: Cafofo door

data/webapp/lib/app.rb

@@ -35,7 +35,7 @@ get '/' do
   #   @watches << watch.to_s
   # end
   # @watches = @watches.group_by { |w| @statuses[w][:state].to_s }
-  @sensors = DUINO.sensors
+  @sensors = DUINO.sensors || []
   @host = `hostname`
   @stats = Duino.cpu_status
   @footer = "Subduino www v0.0.1 - #{@host}"
@@ -98,6 +98,6 @@ private
 
 def show(template, title = 'Duino')
   @title = title
-  p request.env['HTTP_XHR']
+  request.env['HTTP_XHR']
   haml(template, :layout => get_layout)
 end

data/webapp/lib/duino.rb

@@ -1,6 +1,7 @@
 
 class Duino
-  Sensors = { :i0 => "Bool", :i1 => "Bool", :temp => "Temp", :lux => "Lux", :knob => "Knob" }
+
+  Config = YAML.load(File.read("config.yml"))
 
   def initialize(config)
     @config = config
@@ -8,22 +9,14 @@ class Duino
   end
 
   def sensors(one=nil)
-    s = one ? Sensors.select { |k,v| k.to_s == one.to_s } : Sensors
-    s.reduce({}) do |h, s|
-      val = @redis.get(s[0]) rescue nil
+    sensors = Config["inputs"]
+    # s = one ? Sensors.select { |k,v| k.to_s == one.to_s } : Sensors
+    sensors.map do |s|
+      p s
+      val = @redis.get(s[0]) #rescue nil
       next unless val
-      k, v = *s
-      sensor = Subduino::Parse.work(v, val)
-      # if v == "Bool"
-      #   info = "#{)} (#{val}~)"
-      #   val = k
-      # else
-      #   info = "#{k.capitalize} (#{val}~)"
-      #   val = Subduino::Parse.work(v, val).to_s
-      # end
-      h.merge!({ k => sensor })
-      h
-    end
+      Subduino::Parse.work(s[1]["type"], val, s[1]["name"])
+    end.reject(&:nil?)
   end
 
   def switch(pins, comm)

data/webapp/public/custom.js

@@ -0,0 +1,187 @@
+$(function () {
+
+  // Preload images
+  $.preloadCssImages();
+
+
+  // CSS tweaks
+  $('#header #nav li:last').addClass('nobg');
+  $('.block_head ul').each(function() { $('li:first', this).addClass('nobg'); });
+  $('.block form input[type=file]').addClass('file');
+
+
+  // Web stats
+  $('table.stats').each(function() {
+
+    if($(this).attr('rel')) { var statsType = $(this).attr('rel'); }
+    else { var statsType = 'area'; }
+
+    var chart_width = ($(this).parent('.block_content').width()) - 60;
+
+    $(this).hide().visualize({
+      type: statsType,  // 'bar', 'area', 'pie', 'line'
+      width: chart_width,
+      height: '240px',
+      colors: ['#6fb9e8', '#ec8526', '#9dc453', '#ddd74c']
+    });
+  });
+
+
+  // Sort table
+  $("table.sortable").tablesorter({
+    headers: { 0: { sorter: false}, 5: {sorter: false} },   // Disabled on the 1st and 6th columns
+    widgets: ['zebra']
+  });
+
+  $('.block table tr th.header').css('cursor', 'pointer');
+
+
+  // Check / uncheck all checkboxes
+  $('.check_all').click(function() {
+    $(this).parents('form').find('input:checkbox').attr('checked', $(this).is(':checked'));
+  });
+
+
+  // Set WYSIWYG editor
+  // $('.wysiwyg').wysiwyg({css: "css/wysiwyg.css"});
+
+
+  // Modal boxes - to all links with rel="facebox"
+  $('a[rel*=facebox]').facebox()
+
+
+  // Messages
+  $('.block .message').hide().append('<span class="close" title="Dismiss"></span>').fadeIn('slow');
+  $('.block .message .close').hover(
+    function() { $(this).addClass('hover'); },
+    function() { $(this).removeClass('hover'); }
+  );
+
+  $('.block .message .close').click(function() {
+    $(this).parent().fadeOut('slow', function() { $(this).remove(); });
+  });
+
+
+  // Form select styling
+  //  $("form select.styled").select_skin();
+
+
+  // Tabs
+  $(".tab_content").hide();
+  $("ul.tabs li:first-child").addClass("active").show();
+  $(".block").find(".tab_content:first").show();
+
+  $("ul.tabs li").click(function() {
+    $(this).parent().find('li').removeClass("active");
+    $(this).addClass("active");
+    $(this).parents('.block').find(".tab_content").hide();
+
+    var activeTab = $(this).find("a").attr("href");
+    $(activeTab).show();
+    return false;
+  });
+
+
+
+  // Sidebar Tabs
+  $(".sidebar_content").hide();
+
+  if(window.location.hash && window.location.hash.match('sb')) {
+
+    $("ul.sidemenu li a[href="+window.location.hash+"]").parent().addClass("active").show();
+    $(".block .sidebar_content#"+window.location.hash).show();
+  } else {
+
+    $("ul.sidemenu li:first-child").addClass("active").show();
+    $(".block .sidebar_content:first").show();
+  }
+
+  $("ul.sidemenu li").click(function() {
+
+    var activeTab = $(this).find("a").attr("href");
+    window.location.hash = activeTab;
+
+    $(this).parent().find('li').removeClass("active");
+    $(this).addClass("active");
+    $(this).parents('.block').find(".sidebar_content").hide();
+    $(activeTab).show();
+    return false;
+  });
+
+
+
+  // Block search
+  $('.block .block_head form .text').bind('click', function() { $(this).attr('value', ''); });
+
+
+  // Image actions menu
+  $('ul.imglist li').hover(
+    function() { $(this).find('ul').css('display', 'none').fadeIn('fast').css('display', 'block'); },
+    function() { $(this).find('ul').fadeOut(100); }
+  );
+
+
+  // Image delete confirmation
+  $('ul.imglist .delete a').click(function() {
+    if (confirm("Are you sure you want to delete this image?")) {
+      return true;
+    } else {
+      return false;
+    }
+  });
+
+
+  // Style file input
+  // $("input[type=file]").filestyle({
+  //     image: "images/upload.gif",
+  //     imageheight : 30,
+  //     imagewidth : 80,
+  //     width : 250
+  // });
+
+
+  // File upload
+  if ($('#fileupload').length) {
+    new AjaxUpload('fileupload', {
+      action: 'upload-handler.php',
+      autoSubmit: true,
+      name: 'userfile',
+      responseType: 'text/html',
+      onSubmit : function(file , ext) {
+          $('.fileupload #uploadmsg').addClass('loading').text('Uploading...');
+          this.disable();
+        },
+      onComplete : function(file, response) {
+          $('.fileupload #uploadmsg').removeClass('loading').text(response);
+          this.enable();
+        }
+    });
+  }
+
+
+
+  // Date picker
+  //  $('input.date_picker').date_input();
+
+
+  // Navigation dropdown fix for IE6
+  if(jQuery.browser.version.substr(0,1) < 7) {
+    $('#header #nav li').hover(
+      function() { $(this).addClass('iehover'); },
+      function() { $(this).removeClass('iehover'); }
+    );
+  }
+
+  // IE6 PNG fix
+  //$(document).pngFix();
+
+  // Sparklines
+  $('.sparklines').sparkline('html',
+                             {'width': "70px",
+                              'height': "27px",
+                              'lineColor': "#666",
+                              'fillColor': "#ccc"});
+
+  //  #i1graph
+
+});

data/webapp/public/date_input.css

@@ -0,0 +1,149 @@
+/* Some resets for compatibility with existing CSS */
+.date_selector, .date_selector * {
+	width: auto;
+	height: auto;
+	border: none;
+	background: none;
+	margin: 0;
+	padding: 0;
+	text-align: left;
+	text-decoration: none;
+	}
+	
+.date_selector {
+	background: #fbfbfb;
+	border: 1px solid #ccc;
+	padding: 10px;
+	margin: 0;
+	margin-top: -1px;
+	position: absolute;
+	z-index: 100000;
+	display: none;
+	-webkit-border-radius: 3px;
+	-moz-border-radius: 3px;
+	border-radius: 3px;
+	box-shadow: 0 0 5px #aaa;
+	-moz-box-shadow: 0 0 5px #aaa;
+	-webkit-box-shadow: 0 0 5px #aaa;
+	}
+	
+.date_selector_ieframe {
+	position: absolute;
+	z-index: 99999;
+	display: none;
+	}
+	
+.date_selector .nav {
+	width: 17.5em; /* 7 * 2.5em */
+	}
+
+.date_selector .nav p { clear: none; }
+	
+.date_selector .month_nav, .date_selector .year_nav {
+	margin: 0 0 3px 0;
+	padding: 0;
+	display: block;
+	position: relative;
+	text-align: center;
+	}
+	
+.date_selector .month_nav {
+	float: left;
+	width: 55%;
+	}
+	
+.date_selector .year_nav {
+	float: right;
+	width: 42%;
+	margin-right: -8px; /* Compensates for cell borders */
+	}
+	
+.date_selector .month_name, .date_selector .year_name {
+	font-weight: bold;
+	line-height: 20px;
+	}
+	
+.date_selector .button {
+	display: block;
+	position: absolute;
+	top: 0;
+	width: 18px;
+	height: 18px;
+	line-height: 16px;
+	font-weight: bold;
+	color: #008ee8;
+	text-align: center;
+	font-size: 12px;
+	overflow: hidden;
+	border: 1px solid #ccc;
+	-webkit-border-radius: 2px;
+	-moz-border-radius: 2px;
+	border-radius: 2px;
+	}
+	
+.date_selector .button:hover, .date_selector .button.hover {
+	background: #ed9c35;
+	color: #fff;
+	cursor: pointer;
+	border-color: #d77011;
+	}
+	
+.date_selector .prev {
+	left: 0;
+	}
+	
+.date_selector .next {
+	right: 0;
+	}
+	
+.date_selector table {
+	border-spacing: 0;
+	border-collapse: collapse;
+	clear: both;
+	margin: 0;
+	}
+	
+.date_selector th, .date_selector td {
+	width: 2.5em;
+	height: 2em;
+	padding: 0 !important;
+	text-align: center !important;
+	color: #666;
+	font-weight: normal;
+	}
+	
+.date_selector th {
+	font-size: 11px;
+	}	
+
+.date_selector td {
+	border: 1px solid #ccc;
+	line-height: 2em;
+	text-align: center;
+	white-space: nowrap;
+	color: #008ee8;
+	background: #fff;
+	}
+	
+.date_selector td.today {
+	background: #eee;
+	}
+	
+.date_selector td.unselected_month {
+	color: #ccc;
+	}
+	
+.date_selector td.selectable_day {
+	cursor: pointer;
+	}
+	
+.date_selector td.selected {
+	background: #008ee8;
+	color: #fff;
+	font-weight: bold;
+	}
+	
+.date_selector td.selectable_day:hover, .date_selector td.selectable_day.hover {
+	background: #ec8526;
+	color: #fff;
+	}

data/webapp/public/facebox.css

@@ -0,0 +1,83 @@
+#facebox .b { background:url(b.png); }
+#facebox .tl { background:url(tl.png); }
+#facebox .tr { background:url(tr.png); }
+#facebox .bl { background:url(bl.png); }
+#facebox .br { background:url(br.png); }
+
+#facebox {
+	position: absolute;
+	top: 0;
+	left: 0;
+	z-index: 100;
+	text-align: left;
+	}
+
+#facebox .popup {
+	position: relative;
+	}
+
+#facebox table {
+	border-collapse: collapse;
+	}
+
+#facebox td {
+	border-bottom: 0;
+	padding: 0;
+	}
+
+#facebox .body {
+	padding: 10px;
+	background: #fff;
+	width: auto !important
+	width: 400px;
+	min-width: 400px;
+	}
+
+#facebox .loading {
+	text-align: center;
+	}
+
+#facebox .image {
+	text-align: center;
+	}
+
+#facebox img {
+	border: 0;
+	margin: 0;
+	}
+
+#facebox .footer {
+	border-top: 1px solid #DDDDDD;
+	padding-top: 5px;
+	margin-top: 10px;
+	text-align: right;
+	}
+
+#facebox .tl, #facebox .tr, #facebox .bl, #facebox .br {
+	height: 10px;
+	width: 10px;
+	overflow: hidden;
+	padding: 0;
+	}
+
+#facebox_overlay {
+	position: fixed;
+	top: 0px;
+	left: 0px;
+	height:100%;
+	width:100%;
+	}
+
+.facebox_hide {
+	z-index:-100;
+	}
+
+.facebox_overlayBG {
+	background-color: #000;
+	z-index: 99;
+	}
+
+* html #facebox_overlay { /* ie6 hack */
+	position: absolute;
+	height: expression(document.body.scrollHeight > document.body.offsetHeight ? document.body.scrollHeight : document.body.offsetHeight + 'px');
+	}