Merge commit 'a11449523b164132e8063e1e7db21d6cc0e75902'

Author: globalspin

app/controllers/outlets_controller.rb

@@ -1,7 +1,12 @@
 class OutletsController < ApplicationController
   respond_to :html, :xml, :json
+  respond_to :atom, :only => :list
   before_filter :check_auth, :except => [:verify, :show, :list]
 
+  def default_url_options
+    {:host => ENV['RINGSAIL_API_HOST']}
+  end
+  
   def add
     @outlet = Outlet.resolve(params[:service_url])
 
@@ -84,7 +89,7 @@ def update
       if request.format == :html
         flash[:shortnotice] = "Thank you!"
         flash[:notice] = "The entry for #{ @outlet.service_info.display_name} has been #{action_performed}. #{somebody_was_notified}" 
-        redirect_to :action => "verify", :service_url => @outlet.service_url, :auth_token => @current_token.token
+        redirect_to :action => "verify", :service_url => @outlet.service_url, :auth_token => @current_token.token, :only_path => true
       else
         respond_with(XBoxer.new(:result, {:status => "success"}))
       end
@@ -157,7 +162,7 @@ def remove
     if request.format == :html
       flash[:shortnotice] = "Thank you!"
       flash[:notice] = "The entry for #{outlet_name} has been removed from the registry."
-      redirect_to :action => "verify", :service_url => service_url, :auth_token => @current_token.token
+      redirect_to :action => "verify", :service_url => service_url, :auth_token => @current_token.token, :only_path => true
     else
       respond_with(XBoxer.new(:result, {:status => "success"}))
     end
@@ -167,7 +172,14 @@ def list
     @page_title = "Accounts"
     # @keywords = params[:q] || params[:keywords]
 
-    @outlets = Outlet.includes(:agencies).order('account, service')
+    @outlets = Outlet.includes(:agencies)
+    
+    if request.format == :atom
+      @outlets = @outlets.order('outlets.updated_at DESC')
+      @per_page = 20
+    else
+      @outlets = @outlets.order('account, service')
+    end
 
     if params[:service_id] and !params[:service_id].empty?
       @outlets = @outlets.where(:service => params[:service_id])
@@ -179,7 +191,7 @@ def list
       @outlets = @outlets.tagged_with(params[:tag])
     end
 
-    @outlets = @outlets.page(params[:page_number])
+    @outlets = @outlets.page(params[:page_number]).per(@per_page)
 
     respond_with(XBoxer.new(:result, Boxer.ship(:outlets, @outlets) ))
   end

app/views/embed/verify.html.erb

@@ -138,7 +138,7 @@
 			Many people now use tools like Twitter, Facebook and YouTube to receive news and information. This registry identifies social media accounts managed by the federal government, to help the public know which accounts they can trust to provide factual government information.
 		</p>
 		<p>
-			If you work for the U.S. federal government and have a .gov or .mil email address, use this tool to register social media accounts managed by federal agencies (including accounts for elected officials, heads of agencies or Cabinet members). Any registered accounts should have been created under federal-compatible <a href="http://www.howto.gov/web-content/resources/tools/terms-of-service-agreements">Terms of Service (TOS)</a>. If they weren&rsquo;t, contact your agency <a href="http://www.howto.gov/web-content/resources/tools/terms-of-service-agreements/agency-points-of-contact">Point of Contact</a>, who can help you to bring these accounts into compliance with federal law.
+			If you work for the U.S. federal government and have a .gov or .mil email address, use this tool to register social media accounts managed by federal agencies (including accounts for elected officials, heads of agencies or Cabinet members). Any registered accounts should have been created under federal-compatible <a href="http://www.howto.gov/web-content/resources/tools/terms-of-service-agreements" target="_top">Terms of Service (TOS)</a>. If they weren&rsquo;t, contact your agency <a href="http://www.howto.gov/web-content/resources/tools/terms-of-service-agreements/agency-points-of-contact" target="_top">Point of Contact</a>, who can help you to bring these accounts into compliance with federal law.
 		</p>
 		<p>
 To register an account, enter the account URL in the field below and click &ldquo;Look Up&rdquo;

app/views/outlets/list.atom.builder

@@ -0,0 +1,28 @@
+atom_feed(:root_url => list_outlets_url) do |feed|
+  feed.title "U.S. Government Social Media Registry Accounts"
+
+  last_account = @outlets.first
+  feed.updated( last_account && last_account.updated_at )
+
+  @outlets.each do |outlet|
+    feed.entry(outlet, :url => howto_find_outlet_url(:service_url => outlet.service_url, :host => ENV['RINGSAIL_HOST']) ) do |entry|
+      if outlet.updated_at == outlet.created_at
+        entry.title "New #{outlet.service} account: #{outlet.account} (#{outlet.agencies.join("/")})"
+      else
+        entry.title "Updated #{outlet.service} account: #{outlet.account} (#{outlet.agencies.join("/")})"
+      end
+      
+      entry.summary type: 'xhtml' do |xhtml|
+        if outlet.updated_at == outlet.created_at
+          xhtml.p "New account posted to the registry on: "  + outlet.updated_at.to_s(:human)
+        else
+          xhtml.p "Account updated in the registry on: " + outlet.updated_at.to_s(:human)
+        end
+        xhtml.p "By: " + outlet.updated_by.gsub(/(\w)\w+@/, '\1*****@')
+      end
+      entry.author do |author|
+        author.name outlet.updated_by.gsub(/(\w)\w+@/, '\1*****@')
+      end
+    end
+  end
+end

config/too_many_secrets.example.rb

@@ -5,4 +5,5 @@
 ENV['RAILS_COOKIE_TOKEN'] = 'at least 30 random hex digits'
 ENV['EMAIL_BYPASS_USER'] = 'a developer email to use in development'
 ENV['RINGSAIL_HOST'] = 'hostname where ringsail is installed'
+ENV['RINGSAIL_API_HOST'] = 'hostname where the API is accessed'
 ENV['REGISTRY_DOCS_URL'] = 'redirect default requests to this URL'

lib/boxer/outlet_boxes.rb

@@ -10,7 +10,7 @@
   box.view(:brief, :extends => :base) do
     if outlet.verified?
       {
-        :details_url  => show_outlet_path(:service => outlet.service, :account => outlet.account),
+        :details_url  => show_outlet_url(:service => outlet.service, :account => outlet.account, :host => ENV['RINGSAIL_API_HOST']),
         :agencies     => outlet.agencies.map { |agency| Boxer.ship(:agency, agency) },
         :organization => outlet.organization,
       }