Merge branch 'integration' of github.com:munen/voicerepublic_dev into…

… integration

app/models/talk.rb

@@ -65,6 +65,11 @@ class Talk < ActiveRecord::Base
     end
     event :archive, timestamp: :processed_at do
       transitions from: :processing, to: :archived
+      # in rare case we might to override a talk
+      # which has never been postprocessed
+      transitions from: :postlive, to: :archived
+      # or which has never even happended
+      transitions from: :prelive, to: :archived
     end
   end
 
@@ -412,6 +417,8 @@ def process_override!(uat=false)
     chain ||= Setting.get('audio.override_chain')
     chain = chain.split(/\s+/)
     run_chain! chain, uat
+
+    archive! unless archived?
   end
 
   def run_chain!(chain, uat=false)

app/views/shared/_podcast.rss.builder

@@ -38,7 +38,7 @@ xml.rss namespaces.merge(version: '2.0') do
     # title
     xml.title { xml.cdata! @podcast.title }
     xml.dc(:title) { xml.cdata! @podcast.title }
-    
+
     xml.description do
       xml.cdata! @podcast.description
     end
@@ -54,7 +54,7 @@ xml.rss namespaces.merge(version: '2.0') do
 
     # http://validator.w3.org/feed/docs/warning/MissingAtomSelfLink.html
     xml.tag! 'atom:link', rel: 'self',
-             type: 'application/rss+xml', 
+             type: 'application/rss+xml',
              href: request.url
 
     xml.itunes :image, href: @podcast.image_url
@@ -68,8 +68,8 @@ xml.rss namespaces.merge(version: '2.0') do
     # author
     xml.itunes :author, @podcast.author
     xml.dc :creator, @podcast.author
-    
-    xml.itunes :owner do 
+
+    xml.itunes :owner do
       xml.itunes :name, 'VoiceRepublic Service'
       xml.itunes :email, '[email protected]'
     end
@@ -78,7 +78,7 @@ xml.rss namespaces.merge(version: '2.0') do
     talks.each do |talk|
       # skip talks where media is missing for whatever reason
       next unless talk.podcast_file
-      
+
       xml.item do
         xml.title h talk.title
 
@@ -91,7 +91,7 @@ xml.rss namespaces.merge(version: '2.0') do
         xml.itunes :duration, talk.podcast_file[:duration]
         xml.itunes :explicit, 'no'
         xml.itunes :image, href: talk.image.thumb('1400x1400#').url
-        xml.pubDate talk.processed_at.to_s(:rfc822)
+        xml.pubDate talk.processed_at.try(:to_s, :rfc822)
         xml.link venue_talk_url(talk.venue, talk)
         xml.guid venue_talk_url(talk.venue, talk), isPermaLink: true
         xml.enclosure url: vrmedia_url(talk),

app/views/users/show.html.haml

@@ -26,11 +26,11 @@
   .row.collapse-large-only
     .large-12.columns.text-center
       %dl.tabs.vr-tabs(data-tab='true')
-        %dd.text-center.active
+        %dd.text-center
           %a(href="#about")
             %span.icon-description
             = t('.about')
-        %dd.text-center
+        %dd.text-center.active
           %a(href="#venues")
             %span.icon-guide
             = t('.venues')
@@ -44,10 +44,10 @@
 
 .row.collapse-large-only
   .large-12.columns.tabs-content
-    #about.about-content.content.active
+    #about.about-content.content
       = raw @user.about
 
-    #venues.venues-content.content
+    #venues.venues-content.content.active
       = render partial: 'shared/venue_medium_box', collection: @user.venues
 
     #schedule.content TODO

config/schedule.rb

@@ -43,3 +43,4 @@
 #every 1.hour, roles: [:app] do
 #  rake 'sync:rp14'
 #end
+

lib/tasks/cleanup.rake

@@ -59,18 +59,4 @@ namespace :cleanup do
       talk.update_attribute :description, '<i>blank description</i>'
     end
   end
-
-  # TODO this task is to be removed after transition to s3
-  task move_to_s3_step2: :environment do
-    # delete symlinks
-    path = File.expand_path('public/system/audio', Rails.root)
-    FileUtils.rm_rf(path, verbose: true)
-
-    # delete archive and archive_raw
-    path = File.expand_path(Settings.rtmp.archive_path, Rails.root)
-    FileUtils.rm_rf(path, verbose: true)
-    path = File.expand_path(Settings.rtmp.archive_raw_path, Rails.root)
-    FileUtils.rm_rf(path, verbose: true)
-  end
-
 end