lightwaverf 0.5.0 → 0.6.0

data/app/views/_graphs.ejs

@@ -71,9 +71,17 @@
       return false;
     } );
     $('a.ajax').click( function ( ) {
-      $a = $(this);
-      $.get( $a.attr('href'), function ( js ) {
-        alert( js.result || $a.text( ));
+      var $a = $(this);
+      var status = $a.data( 'status' ) == 'on' ? 'off' : 'on';
+      $.ajax( {
+        url: $a.attr('href') + '?status=' + status,
+        type: 'PUT',
+        success: function( js ) {
+          $a.data( 'status', status );
+          $a.removeClass( status === 'on' ? 'off' : 'on' );
+          $a.addClass( status );
+          alert( js.result || $a.text( ));
+        }
       } );
       return false;
     } );

data/lib/lightwaverf.rb

@@ -4,7 +4,6 @@
 # Get rid of references in yaml cache file - use dup more? Or does it not matter?
 # Cope with events that start and end in the same run?
 # Add info about states to timer log
-# Consider adding a 'random' time shift modifier to make holiday security lights more 'realistic'
 # Build / update cron job automatically
 
 
@@ -310,8 +309,6 @@ class LightWaveRF
           m += 1
         end
       end
-      # add 'all off' special mood
-      rooms[room['name']]['mood']['alloff'] = 'Fa'
       r += 1
     end
     rooms
@@ -322,7 +319,6 @@ class LightWaveRF
   # Example:
   #   >> LightWaveRF.new.state 'on' # 'F1'
   #   >> LightWaveRF.new.state 'off' # 'F0'
-  #   >> LightWaveRF.new.state 'alloff' # 'Fa'
   #
   # Arguments:
   #   state: (String)
@@ -333,11 +329,10 @@ class LightWaveRF
     case state
       when 'off'
         state = 'F0'
-      when 'alloff'
-        state = 'Fa'
+      when 0
+        state = 'F0'
       when 'on'
         state = 'F1'
-      # preset dim levels
       when 'low'
         state = 'FdP8'
       when 'mid'
@@ -396,6 +391,9 @@ class LightWaveRF
   #   >> LightWaveRF.new.send 'our', 'light', 'on'
   #   >> LightWaveRF.new.send 'our', '', 'off'
   #
+  # This method was too confusing, got rid of "alloff"
+  # it can be done with "[room] all off" anyway
+  #
   # Arguments:
   #   room: (String)
   #   device: (String)
@@ -404,9 +402,9 @@ class LightWaveRF
     success = false
     debug and ( p 'Executing send on device: ' + device + ' in room: ' + room + ' with state: ' + state )
     rooms = self.class.get_rooms self.get_config, debug
-    state = 'alloff' if ( device.empty? and state == 'off' )
 
     unless rooms[room] and state
+      debug and ( p 'Missing room (' + room.to_s + ') or state (' + state.to_s + ')' );
       STDERR.puts self.usage( room );
     else
       # support for setting state for all devices in the room (recursive)
@@ -419,7 +417,7 @@ class LightWaveRF
         end
         success = true
       # process single device
-      elsif state == 'alloff' || (device and rooms[room]['device'][device])
+      elsif device and rooms[room]['device'][device]
         state = self.class.get_state state
         command = self.command rooms[room], device, state
         debug and ( p 'command is ' + command )
@@ -546,10 +544,14 @@ class LightWaveRF
         data['message']['annotation'] = { 'title' => title.to_s, 'text' => note.to_s }
       end
       debug and ( p data )
-      File.open( self.get_log_file, 'a' ) do | f |
-        f.write( data.to_json + "\n" )
+      begin
+      	File.open( self.get_log_file, 'a' ) do | f |
+          f.write( data.to_json + "\n" )
+      	end
+      	data['message']
+      rescue
+	puts 'error writing to log'
       end
-      data['message']
     end
   end
 
@@ -689,8 +691,8 @@ class LightWaveRF
           time_modifier = 0
           if command_length > modifier_start
             debug and ( p "May have modifiers..." )
-            when_modifiers = Array.new
-            unless_modifiers = Array.new
+            when_modifiers = [ ]
+            unless_modifiers = [ ]
             modifier_count = command_length - modifier_start
             debug and ( p "Count of modifiers is " + modifier_count.to_s )
             for i in modifier_start..(command_length-1)
@@ -715,7 +717,6 @@ class LightWaveRF
           end
 
           # parse the date string
-          debug and ( p "Time string is: " + e.elements['summary'].text)
           event_time = /When: ([\w ]+) (\d\d:\d\d) to ([\w ]+)?(\d\d:\d\d)&nbsp;\n(.*)<br>(.*)/.match e.elements['summary'].text
           debug and ( p "Event times are: " + event_time.to_s )
           start_date = event_time[1].to_s
@@ -726,11 +727,14 @@ class LightWaveRF
           if end_date == '' or end_date.nil? # copy start date to end date if it wasn't given (as the same date)
             end_date = start_date
           end
-          debug and ( p "Start date: " + start_date)
-          debug and ( p "Start time: " + start_time)
-          debug and ( p "End date: " + end_date)
-          debug and ( p "End time: " + end_time)
-          debug and ( p "Timezone: " + timezone)
+
+          time_modifier += self.class.variance e.elements['title'].text
+
+          debug and ( p 'Start date: ' + start_date )
+          debug and ( p 'Start time: ' + start_time )
+          debug and ( p 'End date: ' + end_date )
+          debug and ( p 'End time: ' + end_time )
+          debug and ( p 'Timezone: ' + timezone )
 
           # convert to datetimes
           start_dt = DateTime.parse( start_date.strip + ' ' + start_time.strip + ' ' + timezone.strip )
@@ -738,19 +742,19 @@ class LightWaveRF
 
           # apply time modifier if it exists
           if time_modifier != 0
-            debug and ( p "Adjusting timings by: " + time_modifier.to_s )
+            debug and ( p 'Adjusting timings by: ' + time_modifier.to_s )
             start_dt = (( start_dt.to_time ) + time_modifier * 60 ).to_datetime
             end_dt = (( end_dt.to_time ) + time_modifier * 60 ).to_datetime
           end
 
-          debug and ( p "Start datetime: " + start_dt.to_s )
-          debug and ( p "End datetime: " + end_dt.to_s )
+          debug and ( p 'Start datetime: ' + start_dt.to_s )
+          debug and ( p 'End datetime: ' + end_dt.to_s )
 
           # populate the dates
           event['date'] = start_dt
           # handle device entries without explicit on/off state
           if event['type'] == 'device' and ( event['state'].nil? or ( event['state'] != 'on' and event['state'] != 'off' ))
-            debug and ( p "Duplicating event without explicit on/off state..." )
+            debug and ( p 'Duplicating event without explicit on/off state...' )
             # if not state was given, assume we meant 'on'
             if event['state'].nil?
               event['state'] = 'on'
@@ -762,7 +766,7 @@ class LightWaveRF
             events.push end_event
           # create state plus start and end events if a state
           elsif event['type'] == 'state'
-            debug and ( p "Processing state : " + event['state'])
+            debug and ( p 'Processing state : ' + event['state'] )
             # create state
             state = Hash.new
             state['name'] = event['state']
@@ -805,10 +809,22 @@ class LightWaveRF
       self.log_timer_event 'update', nil, nil, nil, true
 
     else
-        self.log_timer_event 'update', nil, nil, nil, false
+      self.log_timer_event 'update', nil, nil, nil, false
     end
   end
 
+  # Return the randomness value that may be in the event title
+  def self.variance title = '', debug = nil
+    randomness = /random\w* (\d+)/.match title
+    if randomness
+      n = randomness[1].to_i
+      debug and ( p 'randomness is ' + n.to_s )
+      return rand( n ) - ( n / 2 )
+    end
+    debug and ( p 'no randomness return 0' )
+    return 0
+  end
+
   # Convert a string to seconds, assume it is in minutes
   def self.to_seconds interval = 0
     match = /^(\d+)([shd])$/.match( interval.to_s )
@@ -827,7 +843,7 @@ class LightWaveRF
 
   def run_timers interval = 5, debug = false
     p '----------------'
-    p "Running timers..."
+    p 'Running timers...'
     get_timer_cache
     debug and ( p 'Timer list is: ' + YAML.dump( @timers ))
 
@@ -871,7 +887,7 @@ class LightWaveRF
           debug and ( p 'Event has when modifiers. Checking they are all met...')
 
           # determine which states apply at the time of the event
-          applicable_states = Array.new
+          applicable_states = [ ]
           @timers['states'].each do | state |
             if event['date'] >= state['start'] and event['date'] < state['end']
               applicable_states.push state['name']
@@ -939,7 +955,7 @@ class LightWaveRF
     if triggered.length > 0
       debug and ( p triggered.length.to_s + ' events so annotating energy log too...' )
       title = 'timer'
-      text = triggered.map { | e | e.join " " }.join ", "
+      text = triggered.map { | e | e.join ' ' }.join ', '
     end
     self.energy title, text, debug
 
@@ -947,23 +963,27 @@ class LightWaveRF
   end
 
   def self.get_contents file
-    file = File.open file, 'r'
-    content = file.read
-    file.close
-    content
+    begin
+      file = File.open file, 'r'
+      content = file.read
+      file.close
+    rescue
+      STDERR.puts 'cannot open ' + file
+    end
+    content.to_s
   end
 
   def build_web_page debug = nil
 
     rooms = self.class.get_rooms self.get_config
     list = '<dl>'
-    config = 'usage: lightwaverf ' + rooms.values.first['name'] + ' ' + rooms.values.first['device'].keys.first.to_s + ' on # where "' + rooms.keys.first + '" is a room in ' + self.get_config_file
     rooms.each do | name, room |
       debug and ( puts name + ' is ' + room.to_s )
-      list += '<dt>' + name + '</dt><dd><ul>'
+      list += '<dt><a>' + name + '</a></dt><dd><ul>'
       room['device'].each do | device |
-      	debug and ( puts 'device is ' + device.to_s )
-      	list += '<li>' + room['name'].to_s + ' ' + device.first.to_s + '</li>'
+	      # link ideally relative to avoid cross domain issues
+	      link = '/room/' + room['name'].to_s + '/' + device.first.to_s
+      	list += '<li><a class="ajax off" href="' + link + '">' + room['name'].to_s + ' ' + device.first.to_s + '</a></li>'
       end
       list += '</ul></dd>'
     end
@@ -974,41 +994,49 @@ class LightWaveRF
     date = Time.new.to_s
     title = self.get_config.has_key?('title') ? self.get_config['title'] : ( 'Lightwaverf energy stats ' + date )
     intro = <<-end
-        Sample page generated #{date} with <code>lightwaverf web</code>.
-        Check out <a href="https://github.com/pauly/lightwaverf">the new simplified repo</a> for details
-        or <a href="https://rubygems.org/gems/lightwaverf">gem install lightwaverf && lightwaverf web</a>...
-        <br />@todo make a decent, useful, simple, configurable web page...
+      Sample page generated #{date} with <code>lightwaverf web</code>.
+      Check out <a href="https://github.com/pauly/lightwaverf">the new simplified repo</a> for details
+      or <a href="https://rubygems.org/gems/lightwaverf">gem install lightwaverf && lightwaverf web</a>...
+      <br />@todo make a decent, useful, simple, configurable web page...
     end
     help = list
     html = <<-end
       <html>
         <head>
           <title>#{title}</title>
-	  <style type="text/css">
-	    body { font-family: arial, verdana, sans-serif; }
-	    div#energy_chart { width: 800px; height: 600px; }
-	    div#gauge_div { width: 100px; height: 100px; }
-	  </style>
-	</head>
+	        <style type="text/css">
+	          body { font-family: arial, verdana, sans-serif; }
+	          div#energy_chart { width: 800px; height: 600px; }
+	          div#gauge_div { width: 100px; height: 100px; }
+	          dd { display: none; }
+	          .off, .on:hover { padding-right: 18px; background: url(lightning_delete.png) no-repeat top right; }
+	          .on, .off:hover { padding-right: 18px; background: url(lightning_add.png) no-repeat top right; }
+	        </style>
+	      </head>
         <body>
           <div class="container">
             <div class="row">
               <div class="col">
-	        <h1>#{title}</h1>
-	        <p class="intro">#{intro}</p>
-                <div id="energy_chart"></div>
-		<h2>Rooms and devices</h2>
-		<p>@todo make these links to control the devices...</p>
-	        <p class="help">#{help}</p>
-	        #{js}
-	      </div>
+	              <h1>#{title}</h1>
+	              <p class="intro">#{intro}</p>
+                <div id="energy_chart">
+                  Not seeing an energy chart here?
+                  Maybe not working in your device yet, sorry.
+                  This uses google chart api which may generate FLASH :-(
+                  Try in a web browser.
+                </div>
+		            <h2>Rooms and devices</h2>
+		            <p>@todo make these links to control the devices...</p>
+	              <p class="help">#{help}</p>
+	              #{js}
+	            </div>
               <div class="col">
                 <div class="col" id="gauge_div"></div>
-	      </div>
-	    </div>
-	  </div>
-	  <p>By <a href="http://www.clarkeology.com/blog/">Paul Clarke</a>, a work in progress.</p>
-	</body>
+	            </div>
+	          </div>
+	        </div>
+	        <p>By <a href="http://www.clarkeology.com/blog/">Paul Clarke</a>, a work in progress.</p>
+	      </body>
       </html>
     end
   end
@@ -1023,32 +1051,35 @@ class LightWaveRF
     File.open( self.get_log_file, 'r' ).each_line do | line |
       line = JSON.parse( line )
       if line and line['timestamp']
-	new_line = []
-	d = line['timestamp'][2..3] + line['timestamp'][5..6] + line['timestamp'][8..9] # compact version of date
-	ts = Time.parse( line['timestamp'] ).strftime '%s'
-	ts = ts.to_i
-	if start_date > 0
-	  ts = ts - start_date
-	else
-	  start_date = ts
-	end
-	new_line << ts
-	new_line << line['message']['usage'].to_i / 10
-	if line['message']['annotation'] and line['message']['annotation']['title'] and line['message']['annotation']['text']
-	  new_line << line['message']['annotation']['title']
-	  new_line << line['message']['annotation']['text']
-	end
-	data << new_line
-	if line['message']['today'] > daily[d]['today']
+	      new_line = []
+	      d = line['timestamp'][2..3] + line['timestamp'][5..6] + line['timestamp'][8..9] # compact version of date
+	      ts = Time.parse( line['timestamp'] ).strftime '%s'
+	      ts = ts.to_i
+	      if start_date > 0
+	        ts = ts - start_date
+	      else
+	        start_date = ts
+	      end
+	      new_line << ts
+	      new_line << line['message']['usage'].to_i / 10
+	      if line['message']['annotation'] and line['message']['annotation']['title'] and line['message']['annotation']['text']
+	        new_line << line['message']['annotation']['title']
+	        new_line << line['message']['annotation']['text']
+	      end
+	      data << new_line
+	      if ( ! daily[d] or line['message']['today'] > daily[d]['today'] )
           daily[d] = line['message']
-	end
+	      end
       end
     end
     debug and ( puts 'got ' + data.length.to_s + ' lines in the log' )
     data = data.last( 60 * 24 * days )
     debug and ( puts 'now got ' + data.length.to_s + ' lines in the log ( 60 * 24 * ' + days.to_s + ' = ' + ( 60 * 24 * days ).to_s + ' )' )
-    if data[0][0] != start_date
-      data[0][0] += start_date
+    if data and data[0]
+      debug and ( puts 'data[0] is ' + data[0].to_s )
+      if data[0][0] != start_date
+        data[0][0] += start_date
+      end
     end
     summary_file = self.get_summary_file
     File.open( summary_file, 'w' ) do |file|
@@ -1064,4 +1095,3 @@ class LightWaveRF
   end
 
 end
-

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: lightwaverf
 version: !ruby/object:Gem::Version
-  version: 0.5.0
+  version: 0.6.0
   prerelease: 
 platform: ruby
 authors:
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-07-04 00:00:00.000000000 Z
+date: 2013-07-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: htmlentities