simple_pvr 0.0.2 → 0.0.3

data/public/js/app.js

@@ -1,12 +1,19 @@
 'use strict';
 
-angular.module('simplePvr', ['simplePvrServices']).
-directive('pvrAutocomplete', function() {
-	return function(scope, element, attrs) {
-		element.typeahead({
-			source: scope.autocomplete
-		});
-	}
+angular.module('simplePvr', ['simplePvrServices', 'simplePvrFilters']).
+directive('titleSearch', function() {
+	return {
+		templateUrl: '/app/templates/titleSearch.html',
+		restrict: 'E',
+		replace: true,
+		controller: SearchProgrammesCtrl,
+		link: function(scope, element, attributes, controller) {
+			element.find('input').typeahead({
+				source: scope.autocomplete,
+				updater: scope.updater
+			});
+		}
+	};
 }).
 directive('navbarItem', function($location) {
 	return {
@@ -29,73 +36,6 @@ directive('navbarItem', function($location) {
 		}
 	};
 }).
-filter('chunk', function() {
-  function chunkArray(array, chunkSize) {
-    var result = [];
-	var currentChunk = [];
-	for (var i=0; i<array.length; i++) {
-		currentChunk.push(array[i]);
-		if (currentChunk.length == chunkSize) {
-			result.push(currentChunk);
-			currentChunk = [];
-		}
-	}
-	if (currentChunk.length > 0) {
-		result.push(currentChunk);
-	}
-	return result;
-  }
-
-  function defineHashKeys(array) {
-	for (var i=0; i<array.length; i++) {
-		array[i].$$hashKey = i;
-	}
-  }
-
-  return function(array, chunkSize) {
-	if (!(array instanceof Array)) return array;
-	if (!chunkSize) return array;
-	var result = chunkArray(array, chunkSize);
-	defineHashKeys(result);
-	return result;
-  }
-}).
-filter('formatEpisode', function() {
-    return function(episodeNum) {
-        return episodeNum ? episodeNum.replace(' .', '').replace('. ', '') : "";
-    }
-}).
-filter('filteredWeekdays', function() {
-	return function(schedule) {
-		if (!schedule.filter_by_weekday) {
-			return '';
-		}
-		
-		var selectedWeekdays = [];
-		if (schedule.monday) selectedWeekdays.push('Mondays');
-		if (schedule.tuesday) selectedWeekdays.push('Tuesdays');
-		if (schedule.wednesday) selectedWeekdays.push('Wednesdays');
-		if (schedule.thursday) selectedWeekdays.push('Thursdays');
-		if (schedule.friday) selectedWeekdays.push('Fridays');
-		if (schedule.saturday) selectedWeekdays.push('Saturdays');
-		if (schedule.sunday) selectedWeekdays.push('Sundays');
-
-		var days = '';
-		if (selectedWeekdays.length == 0) {
-			return ''
-		} else if (selectedWeekdays.length == 1) {
-			days = selectedWeekdays[0];
-		} else if (selectedWeekdays.length == 2) {
-			days = selectedWeekdays[0] + ' and ' + selectedWeekdays[1];
-		} else {
-			for (var i=0; i<selectedWeekdays.length - 1; i++) {
-				days += selectedWeekdays[i] + ', ';
-			}
-			days += 'and ' + selectedWeekdays[selectedWeekdays.length - 1];
-		}
-		return '(' + days + ')';
-	}
-}).
 config(function($routeProvider, $locationProvider) {
     $locationProvider.html5Mode(true).hashPrefix('');
 

data/public/js/controllers.js

@@ -137,10 +137,16 @@ function SearchProgrammesCtrl($scope, $http, $location) {
 	$scope.autocomplete = function(query, process) {
 		$http.get('/api/programmes/title_search', {params: {query: query}}).success(process);
 	}
+
+	$scope.updater = function(item) {
+		$scope.$apply(function() {
+			$scope.title = item;
+		});
+		return item;
+	}
 	
 	$scope.search = function() {
-		var query = $("#programme-search-query").val();
-		$location.path('/search').search({query: query});
+		$location.path('/search').search({query: $scope.title});
 	}
 }
 

data/public/js/filters.js

@@ -0,0 +1,101 @@
+'use strict';
+
+angular.module('simplePvrFilters', []).
+filter('chunk', function() {
+  function chunkArray(array, chunkSize) {
+    var result = [];
+	var currentChunk = [];
+	for (var i=0; i<array.length; i++) {
+		currentChunk.push(array[i]);
+		if (currentChunk.length == chunkSize) {
+			result.push(currentChunk);
+			currentChunk = [];
+		}
+	}
+	if (currentChunk.length > 0) {
+		result.push(currentChunk);
+	}
+	return result;
+  }
+
+  function defineHashKeys(array) {
+	for (var i=0; i<array.length; i++) {
+		array[i].$$hashKey = i;
+	}
+  }
+
+  return function(array, chunkSize) {
+	if (!(array instanceof Array)) return array;
+	if (!chunkSize) return array;
+	var result = chunkArray(array, chunkSize);
+	defineHashKeys(result);
+	return result;
+  }
+}).
+filter('formatEpisode', function() {
+    return function(episodeNum) {
+        return episodeNum ? episodeNum.replace(' .', '').replace('. ', '') : '';
+    }
+}).
+filter('filteredWeekdays', function() {
+	return function(schedule) {
+		if (!schedule.filter_by_weekday) {
+			return '';
+		}
+		
+		var selectedWeekdays = [];
+		if (schedule.monday) selectedWeekdays.push('Mondays');
+		if (schedule.tuesday) selectedWeekdays.push('Tuesdays');
+		if (schedule.wednesday) selectedWeekdays.push('Wednesdays');
+		if (schedule.thursday) selectedWeekdays.push('Thursdays');
+		if (schedule.friday) selectedWeekdays.push('Fridays');
+		if (schedule.saturday) selectedWeekdays.push('Saturdays');
+		if (schedule.sunday) selectedWeekdays.push('Sundays');
+
+		var days = '';
+		if (selectedWeekdays.length == 0) {
+			return ''
+		} else if (selectedWeekdays.length == 1) {
+			days = selectedWeekdays[0];
+		} else if (selectedWeekdays.length == 2) {
+			days = selectedWeekdays[0] + ' and ' + selectedWeekdays[1];
+		} else {
+			for (var i=0; i<selectedWeekdays.length - 1; i++) {
+				days += selectedWeekdays[i] + ', ';
+			}
+			days += 'and ' + selectedWeekdays[selectedWeekdays.length - 1];
+		}
+		return '(' + days + ')';
+	}
+}).
+filter('timeOfDay', function() {
+	return function(schedule) {
+		if (!schedule.filter_by_time_of_day) {
+			return '';
+		}
+		if (schedule.from_time_of_day && schedule.to_time_of_day) {
+			return '(between ' + schedule.from_time_of_day + ' and ' + schedule.to_time_of_day + ')';
+		}
+		if (schedule.from_time_of_day) {
+			return '(after ' + schedule.from_time_of_day + ')';
+		}
+		if (schedule.to_time_of_day) {
+			return '(before ' + schedule.to_time_of_day + ')';
+		}
+	}
+}).
+filter('startEarlyEndLate', function() {
+	return function(schedule) {
+		var sentences = [];
+		if (schedule.custom_start_early_minutes) {
+			sentences.push('starts ' + schedule.custom_start_early_minutes + ' minutes early');
+		}
+		if (schedule.custom_end_late_minutes) {
+			sentences.push('ends ' + schedule.custom_end_late_minutes + ' minutes late');
+		}
+		if (sentences.length > 0) {
+			return '(' + sentences.join(', ') + ')';
+		}
+		return '';
+	}
+});

data/public/partials/programme.html

@@ -13,7 +13,7 @@
 			<p>
 				<button class="btn btn-primary" type="button" ng-click="recordOnThisChannel()">Record on this channel</button>
 				<button class="btn btn-primary" type="button" ng-click="recordOnAnyChannel()">Record on any channel</button>
-				<button class="btn btn-primary" type="button" ng-click="recordJustThisProgramme()">Record just this programme</button>
+				<button ng-hide="programme.is_outdated" class="btn btn-primary" type="button" ng-click="recordJustThisProgramme()">Record just this programme</button>
 			</p>
 		</div>
 	</div>

data/public/partials/schedule.html

@@ -1,5 +1,5 @@
-<div class="row">
-	<form class="form-horizontal">
+<div class="row" ng-show="schedule">
+	<form class="form-horizontal" name="scheduleForm">
 		<div class="control-group">
 			<label class="control-label" for="showName">Name of show</label>
 			<div class="controls">
@@ -14,65 +14,105 @@
 				</select>
 			</div>
 		</div>
+
+		<div class="control-group" ng-class="{error: scheduleForm.startEarly.$invalid}">
+			<label class="control-label" for="startEarly">Start early</label>
+			<div class="controls">
+				<div class="input-append">
+					<input type="text" class="input-mini" style="text-align: right" ng-model="schedule.custom_start_early_minutes" ng-pattern="/^[0-9]*$/" name="startEarly" id="startEarly" placeholder="2">
+					<span class="add-on">minutes</span>
+				</div>
+			</div>
+		</div>
+		<div class="control-group" ng-class="{error: scheduleForm.endLate.$invalid}">
+			<label class="control-label" for="endLate">End late</label>
+			<div class="controls">
+				<div class="input-append">
+					<input type="text" class="input-mini" style="text-align: right" ng-model="schedule.custom_end_late_minutes" ng-pattern="/^[0-9]*$/" name="endLate" id="endLate" placeholder="5">
+					<span class="add-on">minutes</span>
+				</div>
+			</div>
+		</div>
+
+		<div class="control-group">
+			<div class="controls">
+				<label class="checkbox" for="filterByTimeOfDay">
+					<input type="checkbox" id="filterByTimeOfDay" ng-model="schedule.filter_by_time_of_day">Filter by time of day
+				</label>
+			</div>
+		</div>
+		<div class="control-group" ng-show="schedule.filter_by_time_of_day" ng-class="{error: scheduleForm.startTime.$invalid}">
+			<label class="control-label" for="startTime">From</label>
+			<div class="controls">
+				<input type="text" class="input-mini" style="text-align: right" ng-model="schedule.from_time_of_day" ng-pattern="/^([0-1]?[0-9]|2[0-3]):[0-5][0-9]$/" name="startTime" id="startTime" placeholder="00:00">
+			</div>
+		</div>
+		<div class="control-group" ng-show="schedule.filter_by_time_of_day">
+			<label class="control-label" for="endTime">To</label>
+			<div class="controls">
+				<input type="text" class="input-mini" style="text-align: right" ng-model="schedule.to_time_of_day" ng-pattern="/^([0-1]?[0-9]|2[0-3]):[0-5][0-9]$/" id="endTime" placeholder="00:00">
+			</div>
+		</div>
+
 		<div class="control-group">
 			<div class="controls">
 				<label class="checkbox" for="filterByWeekday">
-					<input type="checkbox" ng-model="schedule.filter_by_weekday">Filter by weekday
+					<input type="checkbox" id="filterByWeekday" ng-model="schedule.filter_by_weekday">Filter by weekday
 				</label>
 			</div>
 		</div>
 		<div class="control-group" ng-show="schedule.filter_by_weekday">
 			<div class="controls">
 				<label class="checkbox" for="recordMondays">
-					<input type="checkbox" ng-model="schedule.monday">Record Mondays
+					<input type="checkbox" id="recordMondays" ng-model="schedule.monday">Record Mondays
 				</label>
 			</div>
 		</div>
 		<div class="control-group" ng-show="schedule.filter_by_weekday">
 			<div class="controls">
 				<label class="checkbox" for="recordTuesdays">
-					<input type="checkbox" ng-model="schedule.tuesday">Record Tuesdays
+					<input type="checkbox" id="recordTuesdays" ng-model="schedule.tuesday">Record Tuesdays
 				</label>
 			</div>
 		</div>
 		<div class="control-group" ng-show="schedule.filter_by_weekday">
 			<div class="controls">
 				<label class="checkbox" for="recordWednesdays">
-					<input type="checkbox" ng-model="schedule.wednesday">Record Wednesdays
+					<input type="checkbox" id="recordWednesdays" ng-model="schedule.wednesday">Record Wednesdays
 				</label>
 			</div>
 		</div>
 		<div class="control-group" ng-show="schedule.filter_by_weekday">
 			<div class="controls">
 				<label class="checkbox" for="recordThursdays">
-					<input type="checkbox" ng-model="schedule.thursday">Record Thursdays
+					<input type="checkbox" id="recordThursdays" ng-model="schedule.thursday">Record Thursdays
 				</label>
 			</div>
 		</div>
 		<div class="control-group" ng-show="schedule.filter_by_weekday">
 			<div class="controls">
 				<label class="checkbox" for="recordFridays">
-					<input type="checkbox" ng-model="schedule.friday">Record Fridays
+					<input type="checkbox" id="recordFridays" ng-model="schedule.friday">Record Fridays
 				</label>
 			</div>
 		</div>
 		<div class="control-group" ng-show="schedule.filter_by_weekday">
 			<div class="controls">
 				<label class="checkbox" for="recordSaturdays">
-					<input type="checkbox" ng-model="schedule.saturday">Record Saturdays
+					<input type="checkbox" id="recordSaturdays" ng-model="schedule.saturday">Record Saturdays
 				</label>
 			</div>
 		</div>
 		<div class="control-group" ng-show="schedule.filter_by_weekday">
 			<div class="controls">
 				<label class="checkbox" for="recordSundays">
-					<input type="checkbox" ng-model="schedule.sunday">Record Sundays
+					<input type="checkbox" id="recordSundays" ng-model="schedule.sunday">Record Sundays
 				</label>
 			</div>
 		</div>
 		<div class="control-group">
 			<div class="controls">
-				<button type="submit" class="btn btn-primary" ng-click="update()">Update</button>
+				<button type="submit" class="btn btn-primary" ng-class="{disabled: scheduleForm.$invalid}" ng-click="update()" ng-disabled="scheduleForm.$invalid">Update</button>
 				<a ng-href="/schedules" class="btn">Cancel</a>
 			</div>
 		</div>

data/public/partials/schedules.html

@@ -6,7 +6,7 @@
 				<p><span ng-show="schedule.is_exception">Exception:</span> {{schedule.title}}
 					<span ng-show="schedule.channel">on {{schedule.channel.name}}</span>
 					<span ng-show="schedule.start_time">{{schedule.start_time | date:'fullDate'}} at {{schedule.start_time | date:'HH:mm'}}</span>
-					{{schedule | filteredWeekdays}}
+					{{schedule | filteredWeekdays}} {{schedule | timeOfDay}} {{schedule | startEarlyEndLate}}
 				</p>
 				<p>
 					<a ng-href="/schedules/{{schedule.id}}" class="btn">Edit</a>

data/public/templates/titleSearch.html

@@ -0,0 +1,4 @@
+<form class="navbar-form pull-right" ng-submit="search()">
+  <input class="span2" name="programme-search-query" type="text" ng-model="title" placeholder="Search programmes...">
+  <button type="submit" class="btn">Search</button>
+</form>

data/simple_pvr.gemspec

@@ -22,6 +22,7 @@ Gem::Specification.new do |gem|
   gem.add_dependency 'data_mapper', '~> 1.2'
   gem.add_dependency 'dm-sqlite-adapter', '~> 1.2'
   gem.add_dependency 'sinatra', '~> 1.3'
+  gem.add_dependency 'puma', '~> 1.6'
 
   gem.add_development_dependency 'rake', '>= 10.0.0'
   gem.add_development_dependency 'rspec', '~> 2.11'

data/spec/simple_pvr/model/programme_spec.rb

@@ -15,6 +15,17 @@ describe SimplePvr::Model::Programme do
     @dr_1 = Channel.add('DR 1', 23000000, 1098)
     @dr_2 = Channel.add('DR 2', 24000000, 1099)
   end
+
+  it 'knows its end time' do
+    programme = Programme.new(start_time: Time.local(2012, 7, 17, 20, 30), duration: 50.minutes)
+
+    programme.end_time.should == Time.local(2012, 7, 17, 21, 20)
+  end
+
+  it 'knows when it is outdated' do
+    Programme.new(start_time: 10.minutes.ago, duration: 9.minutes).should be_outdated
+    Programme.new(start_time: 10.minutes.ago, duration: 11.minutes).should_not be_outdated
+  end
   
   it 'can insert programmes' do
     3.times { Programme.add(@dr_1, 'Title', 'Subtitle', 'Description', Time.local(2012, 7, 17, 20, 30), 50.minutes, ' .4/12. ') }

data/spec/simple_pvr/model/schedule_spec.rb

@@ -13,7 +13,7 @@ describe SimplePvr::Model::Schedule do
   end
   
   it 'can save a schedule with a title' do
-    Schedule.add_specification(:title => 'Sports')
+    Schedule.add_specification(title: 'Sports')
     
     schedules = Schedule.all
     schedules.length.should == 1
@@ -23,7 +23,7 @@ describe SimplePvr::Model::Schedule do
   end
   
   it 'can save a schedule with a title and a channel' do
-    Schedule.add_specification(:title => 'Sports', :channel => @dr_1)
+    Schedule.add_specification(title: 'Sports', channel: @dr_1)
     
     schedules = Schedule.all
     schedules.length.should == 1
@@ -42,6 +42,37 @@ describe SimplePvr::Model::Schedule do
     schedules[0].title.should == 'Sports'
     schedules[0].channel.name.should == 'DR 1'
     schedules[0].start_time.should == start_time
+  end
+
+  it 'starts 2 minutes early and 5 minutes late by default' do
+    schedule = Schedule.new
+
+    schedule.custom_start_early_minutes.should be_nil
+    schedule.custom_end_late_minutes.should be_nil
+    schedule.start_early_minutes.should == 2
+    schedule.end_late_minutes.should == 5
+  end
+
+  it 'can have custom start early and end late intervals' do
+    schedule = Schedule.new(custom_start_early_minutes: 5, custom_end_late_minutes: 10)
+
+    schedule.custom_start_early_minutes.should == 5
+    schedule.custom_end_late_minutes.should == 10
+    schedule.start_early_minutes.should == 5
+    schedule.end_late_minutes.should == 10
+  end
+
+  it 'can clean up schedules that are out of date' do
+    Schedule.add_specification(title: 'Old Sports News', start_time: 60.minutes.ago, end_time: 10.minutes.ago)
+    Schedule.add_specification(title: 'Current Sports News', start_time: 5.minutes.ago, end_time: 10.minutes.from_now)
+    Schedule.add_specification(title: 'Upcoming Sports News', start_time: 1.hour.from_now, end_time: 2.hours.from_now)
+    Schedule.add_specification(title: 'Great movies')
 
+    Schedule.cleanup
+    remaining_names = Schedule.all.collect {|s| s.title }
+    remaining_names.should include('Current Sports News')
+    remaining_names.should include('Upcoming Sports News')
+    remaining_names.should include('Great movies')
+    remaining_names.should_not include('Old Sports News')
   end
 end