Merge pull request #13 from christopherjkim/streams

Fixed stream embed code.

app/helpers/application_helper.rb

@@ -154,22 +154,22 @@ def time_stamp(time, short = false)
   end
 
   def justintv_embed(stream)
-    '<object type="application/x-shockwave-flash" height="528" width="938" data="http://www.twitch.tv/widgets/live_embed_player.swf?channel=<%= stream.identifier %>" bgcolor="#000000" id="live_embed_player_flash" class="videoplayer">
+    %Q{<object type="application/x-shockwave-flash" height="528" width="938" data="http://www.twitch.tv/widgets/live_embed_player.swf?channel=#{stream.identifier}" bgcolor="#000000" id="live_embed_player_flash" class="videoplayer">
       <param name="allowFullScreen" value="true" />
       <param name="allowScriptAccess" value="always" />
       <param name="allowNetworking" value="all" />
       <param name="movie" value="http://www.twitch.tv/widgets/live_embed_player.swf" />
-      <param name="flashvars" value="hostname=www.twitch.tv&channel=<%= stream.identifier %>&auto_play=true&start_volume=50" />
-    </object>'.html_safe
+      <param name="flashvars" value="hostname=www.twitch.tv&channel=#{stream.identifier}&auto_play=true&start_volume=50" />
+    </object>}.html_safe
   end
 
   def own3dtv_embed(stream)
-    '<object width="938" height="528">
-      <param name="movie" value="http://www.own3d.tv/livestream/<%= stream.identifier %>;autoplay=true" />
+    %Q{<object width="938" height="528">
+      <param name="movie" value="http://www.own3d.tv/livestream/#{ stream.identifier };autoplay=true" />
       <param name="allowscriptaccess" value="always" />
       <param name="allowfullscreen" value="true" />
       <param name="wmode" value="transparent" />
-      <embed src="http://www.own3d.tv/livestream/<%= stream.identifier %>;autoplay=true" type="application/x-shockwave-flash" allowfullscreen="true" allowscriptaccess="always" width="938" height="528" wmode="transparent"></embed>
-    </object>'.html_safe
+      <embed src="http://www.own3d.tv/livestream/#{ stream.identifier };autoplay=true" type="application/x-shockwave-flash" allowfullscreen="true" allowscriptaccess="always" width="938" height="528" wmode="transparent"></embed>
+    </object>}.html_safe
   end
 end

lib/tasks/scheduler.rake

@@ -0,0 +1,9 @@
+desc "This task is called by the Heroku scheduler add-on"
+task :update_streams => :environment do
+	puts "Updating streams..."
+	@streams = Stream.all
+	@streams.each do |s|
+		s.update_status
+	end
+	puts "done."
+end