Merge pull request #663 from alphagov/update-map-link

Update map link and add additional ones

Author: pixeltrix

app/controllers/petitions_controller.rb

@@ -3,6 +3,7 @@
 class PetitionsController < ApplicationController
   before_action :redirect_to_valid_state, only: [:index]
   before_action :do_not_cache, except: [:index, :show]
+  before_action :set_cors_headers, only: [:index, :show, :count], if: :json_request?
 
   before_action :redirect_to_home_page_if_dissolved, only: [:new, :check, :check_results, :create]
   before_action :redirect_to_home_page_unless_opened, only: [:index, :new, :check, :check_results, :create]
@@ -17,7 +18,6 @@ class PetitionsController < ApplicationController
   before_action :redirect_to_moderation_info_url, if: :in_moderation?, only: [:gathering_support, :show]
   before_action :redirect_to_petition_url, if: :moderated?, only: [:gathering_support, :moderation_info]
 
-  before_action :set_cors_headers, only: [:index, :show, :count], if: :json_request?
   after_action :set_content_disposition, if: :csv_request?, only: [:index]
 
   def index
@@ -95,9 +95,13 @@ def redirect_to_home_page_unless_opened
     redirect_to home_url unless Parliament.opened?
   end
 
+  def request_format
+    request.format.json? ? :json : nil
+  end
+
   def redirect_to_archived_petition_if_archived
     if petition = Archived::Petition.find_by(id: petition_id)
-      redirect_to archived_petition_url(petition_id) if petition.parliament.archived?
+      redirect_to archived_petition_url(petition_id, format: request_format) if petition.parliament.archived?
     end
   end
 

app/models/archived/petition.rb

@@ -59,6 +59,7 @@ class Petition < ActiveRecord::Base
     default_scope { preload(:parliament) }
 
     delegate :threshold_for_response, :threshold_for_debate, to: :parliament
+    delegate :show_on_a_map?, to: :parliament
 
     with_options allow_nil: true, prefix: true do
       delegate :name, :email, to: :creator

app/models/parliament.rb

@@ -3,6 +3,8 @@
 class Parliament < ActiveRecord::Base
   include ActiveSupport::NumberHelper
 
+  CUTOFF_DATE = Date.civil(2015, 5, 7)
+
   has_many :petitions, inverse_of: :parliament, class_name: "Archived::Petition"
 
   class << self
@@ -184,4 +186,8 @@ def formatted_threshold_for_response
   def formatted_threshold_for_debate
     number_to_delimited(threshold_for_debate)
   end
+
+  def show_on_a_map?
+    opening_at > CUTOFF_DATE
+  end
 end

app/views/archived/petitions/show.html.erb

@@ -66,6 +66,11 @@
       <div class="signature-count-graph" aria-hidden="true">
         <span class="signature-count-current" style="width: <%= archived_threshold_percentage(@petition) %>"></span>
       </div>
+      <% if @petition.show_on_a_map? %>
+        <p class="signatures-on-a-map">
+          <a href="https://petitionmap.unboxedconsulting.com/?petition=<%= @petition.id %>">Show on a map</a>
+        </p>
+      <% end %>
       <p class="signature-count-goal">
         <%= number_with_delimiter(archived_threshold(@petition)) %>
       </p>

app/views/petitions/_closed_petition_show.html.erb

@@ -33,6 +33,9 @@
     <div class="signature-count-graph" aria-hidden="true">
       <span class="signature-count-current" style="width: <%= signatures_threshold_percentage(petition) %>"></span>
     </div>
+    <p class="signatures-on-a-map">
+      <a href="https://petitionmap.unboxedconsulting.com/?petition=<%= petition.id %>">Show on a map</a>
+    </p>
     <p class="signature-count-goal">
       <%= number_with_delimiter(current_threshold(petition)) %>
     </p>

app/views/petitions/_open_petition_show.html.erb

@@ -22,7 +22,7 @@
       <span class="signature-count-current" style="width: <%= signatures_threshold_percentage(petition) %>"></span>
     </div>
     <p class="signatures-on-a-map">
-      <a href="http://petitionmap.unboxedconsulting.com/?petition=<%= petition.id %>">Show on a map</a>
+      <a href="https://petitionmap.unboxedconsulting.com/?petition=<%= petition.id %>">Show on a map</a>
     </p>
     <p class="signature-count-goal">
       <%= number_with_delimiter(current_threshold(petition)) %>

spec/requests/archived_petition_show_spec.rb

@@ -27,6 +27,19 @@
       get "/archived/petitions/#{petition.id}.xml"
       expect(response.status).to eq(406)
     end
+
+    context "when accessing the old url" do
+      before do
+        get "/petitions/#{petition.id}.json"
+      end
+
+      it "redirects to the archive url" do
+        expect(response).to redirect_to("/archived/petitions/#{petition.id}.json")
+        expect(access_control_allow_origin).to eq('*')
+        expect(access_control_allow_methods).to eq('GET')
+        expect(access_control_allow_headers).to eq('Origin, X-Requested-With, Content-Type, Accept')
+      end
+    end
   end
 
   describe "links" do