network_executive 0.0.3 → 0.0.4

data/app/assets/javascripts/network_executive/osd.js

@@ -13,13 +13,29 @@
   document.addEventListener('mousemove', function(e) {
     clearTimeout( autoHideTimer );
 
-    if( !osd.contains('active') ) {
+    if( !osd.classList.contains('active') ) {
       osd.classList.add('active');
+
+      renderGuide();
     }
 
     autoHideTimer = setTimeout(autoHide, 1000);
   });
 
+  // Fetch and display Guide Data
+  function renderGuide() {
+    var xhr = new XMLHttpRequest();
+
+    xhr.addEventListener('readystatechange', function(e) {
+      if( xhr.readyState == 4 && xhr.status == 200) {
+        document.getElementById('lineup').innerHTML = xhr.responseText;
+      }
+    });
+
+    xhr.open('GET', 'lineup.html', true);
+    xhr.send();
+  }
+
   // Update the timestamp
   var months = 'January February March April May June July August September October November December'.split(' ');
   setInterval(function() {

data/app/assets/javascripts/network_executive/set_top_box.js

@@ -8,7 +8,7 @@
 
     document.getElementById('smpte_message').innerHTML = 'Establishing uplink...';
 
-    var source = new EventSource('../tune_in/' + channel);
+    var source = new EventSource('tune_in/' + channel);
 
     source.addEventListener('open', function(e) {
       document.getElementById('smpte_message').innerHTML = 'Awaiting transmission...';

data/app/assets/stylesheets/network_executive/osd.css

@@ -30,4 +30,33 @@
 }
 .osd-now-date {
   display: block;
+}
+
+#osd table {
+  width: 100%;
+  border-spacing: .25em;
+  border-collapse: separate;
+  font-size: 1.5em;
+}
+#osd td,
+#osd th {
+  height: 1em;
+  padding: 0 .25em;
+  overflow: hidden;
+  text-overflow: ellipsis;
+  white-space: nowrap;
+}
+.guide-time {
+  text-align: left;
+}
+.guide-channel {
+  text-align: right;
+  text-transform: capitalize;
+}
+.guide-program {
+  background: rgba(0,0,0,.33);
+}
+#osd a {
+  color: #fff;
+  text-decoration: none;
 }

data/app/controllers/network_executive/lineup_controller.rb

@@ -0,0 +1,11 @@
+module NetworkExecutive
+  class LineupController < NetworkExecutive::ApplicationController
+
+    respond_to :html, :json
+
+    def index
+      respond_with @lineup = Lineup.new
+    end
+
+  end
+end

data/app/controllers/network_executive/network_controller.rb

@@ -1,9 +1,4 @@
 module NetworkExecutive
   class NetworkController < NetworkExecutive::ApplicationController
-
-    def index
-      @channels = NetworkExecutive::Network.channels
-    end
-
   end
 end

data/app/models/network_executive/lineup.rb

@@ -1,6 +1,7 @@
 # Represents a channel's programming line up for a given time span.
 module NetworkExecutive
   # TODO: Why does this subclass Hash?
+  # TODO: This is an ugly data structure. Refactor.
   class Lineup < Hash
 
     Interval = 15  # In minutes.
@@ -16,10 +17,8 @@ module NetworkExecutive
     def generate
       with_each_channel do |channel, lineup|
         lineup << {
-          name:     channel.display_name,
-          schedule: whats_on?( channel ) do |show|
-            show.program_name.titleize
-          end
+          channel:  channel,
+          schedule: whats_on?( channel )
         }
       end
     end
@@ -40,6 +39,11 @@ module NetworkExecutive
       @stop_time
     end
 
+    # TODO: Add test
+    def times
+      self[:channels].first[:schedule].collect { |s| s[:time] }
+    end
+
   private
 
     # Rounds the specific time to the nearest interval
@@ -59,7 +63,11 @@ module NetworkExecutive
     # TODO: Decouple
     def whats_on?( channel )
       channel.whats_on?( start_time, stop_time, interval:Interval ) do |show|
-        yield show
+        if block_given?
+          yield show
+        else
+          show
+        end
       end
     end
   end

data/app/views/network_executive/lineup/index.html.erb

@@ -0,0 +1,26 @@
+<table>
+  <thead>
+    <tr>
+      <td></td>
+      <% @lineup.times.each do |t| %>
+        <th class="guide-time">
+          <%= t.strftime '%l:%M' %>
+        </th>
+      <% end %>
+    </tr>
+  </thead>
+  <tbody>
+    <% @lineup[:channels].each do |ch| %>
+      <tr>
+        <th class="guide-channel">
+          <%= link_to ch[:channel], channel_path(ch[:channel]) %>
+        </th>
+        <% ch[:schedule].each do |sch| %>
+          <td class="guide-program">
+            <%= sch[:program].program_name.titleize %>
+          </td>
+        <% end %>
+      </tr>
+    <% end %>
+  </tbody>
+</table>

data/app/views/network_executive/network/index.html.erb

@@ -6,6 +6,7 @@
     <title>Network Executive: <%= network_name %></title>
     <link href='//fonts.googleapis.com/css?family=Lekton:400,700|Quicksand:300,400,700' rel='stylesheet' type='text/css'>
     <%= stylesheet_link_tag 'network_executive/application', media:'all' %>
+    <base href="<%= network_executive.root_url %>"/>
   </head>
   <body>
     <iframe id="program" class="gui-comp"></iframe>
@@ -27,11 +28,7 @@
           </aside>
         </h1>
       </header>
-      <article>
-        <% @channels.each do |channel| %>
-          <a href="channels/<%= channel.name %>" class="channel"><%= channel.display_name %></a>
-        <% end %>
-      </article>
+      <article id="lineup"></article>
     </div>
 
     <%= javascript_include_tag 'application' %>

data/config/routes.rb

@@ -1,7 +1,9 @@
 NetworkExecutive::Engine.routes.draw do
   mount NetworkExecutive::Station => '/tune_in', as:'station'
 
-  match 'channels/:channel_name' => 'network#index'
+  match 'channels/:channel_name' => 'network#index', as: :channel
+
+  match 'lineup' => 'lineup#index', as: :lineup
 
   root to:'network#index'
 end

data/lib/network_executive/version.rb

@@ -1,3 +1,3 @@
 module NetworkExecutive
-  VERSION = '0.0.3'
+  VERSION = '0.0.4'
 end

data/network_executive.gemspec

@@ -20,7 +20,8 @@ Gem::Specification.new do |gem|
   gem.add_dependency             'activesupport',   '~> 3.2.0'
   gem.add_dependency             'faye-websocket',  '~> 0.4.6'
 
-  gem.add_runtime_dependency     'sass-rails',      '~> 3.2'
+  gem.add_runtime_dependency     'sass-rails'
+  gem.add_runtime_dependency     'uglifier'
 
   gem.add_development_dependency 'awesome_print'
   gem.add_development_dependency 'rails',           '~> 3.2.8'

data/spec/models/lineup_spec.rb

@@ -69,20 +69,14 @@ describe NetworkExecutive::Lineup do
 
     it { should be_an Array }
 
-    it 'should contain a channel name' do
-      subject.first[:name].should == 'channel a'
+    it 'should contain a channel' do
+      subject.first[:channel].should == channel
     end
 
     it 'should contain an array of scheduled programs' do
       subject.first[:schedule].should be_an Array
     end
 
-    it 'should transform the program name' do
-      show.should_receive :program_name
-
-      subject
-    end
-
     it 'should ask the channel what is on' do
       args = [ Time.now, 1.5.hours.from_now, kind_of(Hash) ]
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: network_executive
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.4
   prerelease: 
 platform: ruby
 authors:
@@ -13,7 +13,7 @@ date: 2012-09-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
-  requirement: &2164453740 !ruby/object:Gem::Requirement
+  requirement: &2164741200 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,10 +21,10 @@ dependencies:
         version: 3.2.0
   type: :runtime
   prerelease: false
-  version_requirements: *2164453740
+  version_requirements: *2164741200
 - !ruby/object:Gem::Dependency
   name: faye-websocket
-  requirement: &2164451980 !ruby/object:Gem::Requirement
+  requirement: &2164740660 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -32,21 +32,32 @@ dependencies:
         version: 0.4.6
   type: :runtime
   prerelease: false
-  version_requirements: *2164451980
+  version_requirements: *2164740660
 - !ruby/object:Gem::Dependency
   name: sass-rails
-  requirement: &2164470220 !ruby/object:Gem::Requirement
+  requirement: &2164740240 !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ~>
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: '3.2'
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: *2164740240
+- !ruby/object:Gem::Dependency
+  name: uglifier
+  requirement: &2164739680 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2164470220
+  version_requirements: *2164739680
 - !ruby/object:Gem::Dependency
   name: awesome_print
-  requirement: &2164469320 !ruby/object:Gem::Requirement
+  requirement: &2164739000 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +65,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2164469320
+  version_requirements: *2164739000
 - !ruby/object:Gem::Dependency
   name: rails
-  requirement: &2164467640 !ruby/object:Gem::Requirement
+  requirement: &2164737960 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -65,10 +76,10 @@ dependencies:
         version: 3.2.8
   type: :development
   prerelease: false
-  version_requirements: *2164467640
+  version_requirements: *2164737960
 - !ruby/object:Gem::Dependency
   name: rspec-rails
-  requirement: &2152099960 !ruby/object:Gem::Requirement
+  requirement: &2164736120 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -76,10 +87,10 @@ dependencies:
         version: '2.11'
   type: :development
   prerelease: false
-  version_requirements: *2152099960
+  version_requirements: *2164736120
 - !ruby/object:Gem::Dependency
   name: fakefs
-  requirement: &2152096360 !ruby/object:Gem::Requirement
+  requirement: &2164734300 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -87,10 +98,10 @@ dependencies:
         version: 0.4.0
   type: :development
   prerelease: false
-  version_requirements: *2152096360
+  version_requirements: *2164734300
 - !ruby/object:Gem::Dependency
   name: timecop
-  requirement: &2152095400 !ruby/object:Gem::Requirement
+  requirement: &2164749660 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -98,7 +109,7 @@ dependencies:
         version: 0.4.5
   type: :development
   prerelease: false
-  version_requirements: *2152095400
+  version_requirements: *2164749660
 description: An experimental application used to drive displays hung around an office.
 email:
 - dlindahl@customink.com
@@ -123,6 +134,7 @@ files:
 - app/assets/stylesheets/network_executive/osd.css
 - app/assets/stylesheets/network_executive/smpte.css
 - app/controllers/network_executive/application_controller.rb
+- app/controllers/network_executive/lineup_controller.rb
 - app/controllers/network_executive/network_controller.rb
 - app/helpers/network_executive/network_helper.rb
 - app/models/network_executive/channel.rb
@@ -133,6 +145,7 @@ files:
 - app/models/network_executive/program.rb
 - app/models/network_executive/program_schedule.rb
 - app/models/network_executive/viewer.rb
+- app/views/network_executive/lineup/index.html.erb
 - app/views/network_executive/network/index.html.erb
 - bin/net_exec
 - config/routes.rb
@@ -218,7 +231,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -2613508738067958450
+      hash: 240315876043303011
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.10