From db645e8da8f3ead4ace1d5cc51b29d7fc835309d Mon Sep 17 00:00:00 2001
From: danielgrippi <danielgrippi@gmail.com>
Date: Wed, 10 Aug 2011 17:25:10 -0700
Subject: [PATCH] merged publics/show and posts/show

---
 app/controllers/posts_controller.rb           |  34 ++++--
 app/controllers/publics_controller.rb         |  33 ------
 app/controllers/status_messages_controller.rb |   2 +-
 app/helpers/people_helper.rb                  |   1 -
 app/views/comments/_comment.html.haml         |   2 +-
 app/views/comments/_comments.haml             |   2 +-
 app/views/posts/_photo.html.haml              |  21 ++++
 app/views/posts/show.html.haml                |   6 +-
 app/views/publics/activity_streams/photo.haml |  17 ---
 app/views/publics/photo.haml                  |  36 ------
 app/views/publics/status_message.haml         |  21 ----
 app/views/shared/_stream_element.html.haml    |  32 ++---
 .../status_messages/_status_message.haml      |   3 +-
 config/locales/diaspora/en.yml                |   3 +-
 config/routes.rb                              |   2 +-
 lib/diaspora/user/querying.rb                 |   7 +-
 public/stylesheets/sass/application.sass      |   3 -
 spec/controllers/posts_controller_spec.rb     | 112 +++++++++++++-----
 spec/controllers/publics_controller_spec.rb   |  56 ---------
 spec/models/reshare_spec.rb                   |   4 +-
 20 files changed, 163 insertions(+), 234 deletions(-)
 create mode 100644 app/views/posts/_photo.html.haml
 delete mode 100644 app/views/publics/activity_streams/photo.haml
 delete mode 100644 app/views/publics/photo.haml
 delete mode 100644 app/views/publics/status_message.haml

diff --git a/app/controllers/posts_controller.rb b/app/controllers/posts_controller.rb
index a65f4eee9..c0bca6d06 100644
--- a/app/controllers/posts_controller.rb
+++ b/app/controllers/posts_controller.rb
@@ -3,23 +3,37 @@
 #   the COPYRIGHT file.
 
 class PostsController < ApplicationController
-  before_filter :authenticate_user!
-  respond_to :html
-  respond_to :mobile
-  respond_to :json
-  def show
-    @post = current_user.find_visible_post_by_id params[:id]
-    if @post
+  before_filter :authenticate_user!, :except => :show
 
+  respond_to :html,
+             :mobile,
+             :json,
+             :xml
+
+  def show
+    key = params[:id].to_s.length <= 8 ? :id : :guid
+
+    if user_signed_in?
+      @post = current_user.find_visible_post_by_id(params[:id], :key => key)
+    else
+      @post = Post.where(key => params[:id], :public => true).includes(:author, :comments => :author).first
+    end
+
+    if @post
       # mark corresponding notification as read
-      if notification = Notification.where(:recipient_id => current_user.id, :target_id => @post.id).first
+      if user_signed_in? && notification = Notification.where(:recipient_id => current_user.id, :target_id => @post.id).first
         notification.unread = false
         notification.save
       end
 
-      respond_with @post
+      respond_to do |format|
+        format.all{ }
+        format.xml{ render :xml => @post.to_diaspora_xml }
+      end
+
     else
-      Rails.logger.info(:event => :link_to_nonexistent_post, :ref => request.env['HTTP_REFERER'], :user_id => current_user.id, :post_id => params[:id])
+      user_id = (user_signed_in? ? current_user : nil)
+      Rails.logger.info(:event => :link_to_nonexistent_post, :ref => request.env['HTTP_REFERER'], :user_id => user_id, :post_id => params[:id])
       flash[:error] = I18n.t('posts.show.not_found')
       redirect_to :back
     end
diff --git a/app/controllers/publics_controller.rb b/app/controllers/publics_controller.rb
index 4468fd349..3a9cc2290 100644
--- a/app/controllers/publics_controller.rb
+++ b/app/controllers/publics_controller.rb
@@ -66,37 +66,4 @@ class PublicsController < ApplicationController
 
     render :nothing => true, :status => 202
   end
-
-  def post
-
-    if params[:guid].to_s.length <= 8
-      @post = Post.where(:id => params[:guid], :public => true).includes(:author, :comments => :author).first
-    else
-      @post = Post.where(:guid => params[:guid], :public => true).includes(:author, :comments => :author).first
-    end
-
-    if @post
-      #hax to upgrade logged in users who can comment
-      if user_signed_in? && current_user.find_visible_post_by_id(@post.id)
-        redirect_to post_path(@post)
-      else
-        @landing_page = true
-        @person = @post.author
-        if @person.owner_id
-          I18n.locale = @person.owner.language
-
-          respond_to do |format|
-            format.xml{ render :xml => @post.to_diaspora_xml }
-            format.any{ render "publics/#{@post.class.to_s.underscore}", :layout => 'application'}
-          end
-        else
-          flash[:error] = I18n.t('posts.show.not_found')
-          redirect_to root_url
-        end
-      end
-    else
-      flash[:error] = I18n.t('posts.show.not_found')
-      redirect_to root_url
-    end
-  end
 end
diff --git a/app/controllers/status_messages_controller.rb b/app/controllers/status_messages_controller.rb
index 6735a9abd..fbe07f57d 100644
--- a/app/controllers/status_messages_controller.rb
+++ b/app/controllers/status_messages_controller.rb
@@ -51,7 +51,7 @@ class StatusMessagesController < ApplicationController
       aspects = current_user.aspects_from_ids(params[:aspect_ids])
       current_user.add_to_streams(@status_message, aspects)
       receiving_services = current_user.services.where( :type => params[:services].map{|s| "Services::"+s.titleize}) if params[:services]
-      current_user.dispatch_post(@status_message, :url => public_post_path(:guid => @status_message.guid), :services => receiving_services)
+      current_user.dispatch_post(@status_message, :url => short_post_url(@status_message.guid), :services => receiving_services)
 
 
       if request.env['HTTP_REFERER'].include?("people") # if this is a post coming from a profile page
diff --git a/app/helpers/people_helper.rb b/app/helpers/people_helper.rb
index 41397bada..906bf5d88 100644
--- a/app/helpers/people_helper.rb
+++ b/app/helpers/people_helper.rb
@@ -38,7 +38,6 @@ module PeopleHelper
       "<a href='#{remote_or_hovercard_link}' data-hovercard='#{remote_or_hovercard_link}' class='#{opts[:class]}' >#{h(person.name)}</a>".html_safe
     end
   end
-
     
   def person_image_tag(person, size=nil)
     size ||= :thumb_small
diff --git a/app/views/comments/_comment.html.haml b/app/views/comments/_comment.html.haml
index 482c31b3c..30f49dae5 100644
--- a/app/views/comments/_comment.html.haml
+++ b/app/views/comments/_comment.html.haml
@@ -23,7 +23,7 @@
       .likes
         = render "likes/likes_container", :target_id => comment.id, :likes_count => comment.likes_count, :target_type => "Comment"
 
-      - unless (defined?(@commenting_disabled) && @commenting_disabled)
+      - unless !user_signed_in? || @commenting_disabled
         %span.like_action
           = like_action(comment, current_user)
 
diff --git a/app/views/comments/_comments.haml b/app/views/comments/_comments.haml
index 136cebf34..48e88a985 100644
--- a/app/views/comments/_comments.haml
+++ b/app/views/comments/_comments.haml
@@ -12,6 +12,6 @@
   -else
     = render :partial => 'comments/comment', :collection => post.comments, :locals => {:post => post}
 
-- unless @commenting_disabled
+- unless !user_signed_in? || @commenting_disabled
   .new_comment_form_wrapper{:class => comment_form_wrapper_class(post)}
     = new_comment_form(post.id, current_user)
diff --git a/app/views/posts/_photo.html.haml b/app/views/posts/_photo.html.haml
new file mode 100644
index 000000000..e356bb416
--- /dev/null
+++ b/app/views/posts/_photo.html.haml
@@ -0,0 +1,21 @@
+-#   Copyright (c) 2010, Diaspora Inc.  This file is
+-#   licensed under the Affero General Public License version 3 or later.  See
+-#   the COPYRIGHT file.
+
+- content_for :head do
+  = include_javascripts :photos
+
+#author_info
+  = person_image_link(post.author)
+  .from
+    %h2
+      = post.author.name
+
+#show_photo{:data=>{:guid=>post.id}}
+  = image_tag post.url(:scaled_full)
+
+  #caption
+    = post.text
+
+%br
+= link_to t('photos.show.show_original_post'), post_path(post.status_message)
diff --git a/app/views/posts/show.html.haml b/app/views/posts/show.html.haml
index 716a1fd64..717b93f2e 100644
--- a/app/views/posts/show.html.haml
+++ b/app/views/posts/show.html.haml
@@ -3,8 +3,12 @@
 -#   the COPYRIGHT file.
 
 .span-20.append-2.prepend-2.last
+
   #main_stream.stream.status_message_show
-    = render 'shared/stream_element', :post => @post, :commenting_disabled => defined?(@commenting_disabled)
+    - if @post.is_a?(Photo)
+      = render 'posts/photo', :post => @post
+    - else
+      = render 'shared/stream_element', :post => @post, :commenting_disabled => defined?(@commenting_disabled)
   %br
   %br
   %br
diff --git a/app/views/publics/activity_streams/photo.haml b/app/views/publics/activity_streams/photo.haml
deleted file mode 100644
index 50c7121f2..000000000
--- a/app/views/publics/activity_streams/photo.haml
+++ /dev/null
@@ -1,17 +0,0 @@
--#   Copyright (c) 2010, Diaspora Inc.  This file is
--#   licensed under the Affero General Public License version 3 or later.  See
--#   the COPYRIGHT file.
-
-#author_info
-  = person_image_link(@person)
-  .from
-    %h2
-      = @person.name
-
-.span-14.append-1.last
-  #show_text
-    = link_to image_tag(@post.image_url, 'data-small-photo' => @post.image_url, 'data-full-photo' => @post.image_url, :class => 'stream-photo'), @post.object_url, :class => "stream-photo-link"
-
-  .time
-    = how_long_ago(@post)
-  = link_to t('posts.show.permalink'), public_post_path(@post)
diff --git a/app/views/publics/photo.haml b/app/views/publics/photo.haml
deleted file mode 100644
index b8e2f7123..000000000
--- a/app/views/publics/photo.haml
+++ /dev/null
@@ -1,36 +0,0 @@
--#   Copyright (c) 2010, Diaspora Inc.  This file is
--#   licensed under the Affero General Public License version 3 or later.  See
--#   the COPYRIGHT file.
-
-- content_for :head do
-  = include_javascripts :photos
-
-#author_info
-  = person_image_link(@person)
-  .from
-    %h2
-      = @person.name
-.span-14.append-1.last
-  #show_photo{:data=>{:guid=>@post.id}}
-    = image_tag @post.url(:scaled_full)
-
-    #caption
-      = @post.text
-
-  %br
-
-.span-9.last
-  - if @post.status_message_guid
-    #original_post_info
-      %h4{:style=>"position:relative;"}
-        = t('photos.show.original_post')
-        = link_to t('photos.show.view'), public_post_path(@post.status_message)
-
-      %p
-        = @post.status_message.text
-
-      %p
-        - for photo in @post.status_message.photos
-          .thumb_small= link_to (image_tag photo.url(:thumb_small)), public_post_path(photo)
-      %p
-        = link_to t('posts.show.permalink'), public_post_path(@post)
diff --git a/app/views/publics/status_message.haml b/app/views/publics/status_message.haml
deleted file mode 100644
index a12003d78..000000000
--- a/app/views/publics/status_message.haml
+++ /dev/null
@@ -1,21 +0,0 @@
--#   Copyright (c) 2010, Diaspora Inc.  This file is
--#   licensed under the Affero General Public License version 3 or later.  See
--#   the COPYRIGHT file.
-
-#author_info
-  = person_image_link(@person)
-  .from
-    %h2
-      = @person.name
-
-.span-14.append-1.last
-  #show_text
-    %p
-      = markdownify(@post.text, :youtube_maps => @post[:youtube_titles])
-
-    - for photo in @post.photos
-      .thumb_small= link_to (image_tag photo.url(:thumb_small)), public_post_path(photo)
-
-  .time
-    = how_long_ago(@post)
-  = link_to t('posts.show.permalink'), public_post_path(@post)
diff --git a/app/views/shared/_stream_element.html.haml b/app/views/shared/_stream_element.html.haml
index e5751f2ee..a33a26908 100644
--- a/app/views/shared/_stream_element.html.haml
+++ b/app/views/shared/_stream_element.html.haml
@@ -3,13 +3,14 @@
 -#   the COPYRIGHT file.
 
 .stream_element{:id => post.guid}
-  - if current_user && post.author.owner_id == current_user.id
-    .right.controls
-      = link_to image_tag('deletelabel.png'), post_path(post), :confirm => t('are_you_sure'), :method => :delete, :remote => true, :class => "delete stream_element_delete", :title => t('delete')
+  - if user_signed_in?
+    - if  post.author.owner_id == current_user.id
+      .right.controls
+        = link_to image_tag('deletelabel.png'), post_path(post), :confirm => t('are_you_sure'), :method => :delete, :remote => true, :class => "delete stream_element_delete", :title => t('delete')
 
-  - else
-    .right.controls
-      = link_to image_tag('deletelabel.png'), post_visibility_path(:id => "42", :post_id => post.id), :method => :put, :remote => true, :class => "delete stream_element_delete", :title => t('hide')
+    - else
+      .right.controls
+        = link_to image_tag('deletelabel.png'), post_visibility_path(:id => "42", :post_id => post.id), :method => :put, :remote => true, :class => "delete stream_element_delete", :title => t('hide')
 
   .undo_text.hidden
     = t('post_visibilites.update.post_hidden', :name => post.author.name)
@@ -41,7 +42,7 @@
             = t('public')
             ·
         - else
-          - if post.author.owner_id == current_user.id
+          - if user_signed_in? && post.author.owner_id == current_user.id
             - aspects = aspects_with_post(all_aspects, post)
             %span.post_scope{:title => t('.shared_with', :aspect_names => aspects.map!{|a| a.name}.join(', '))}
               - if aspects.size == 1
@@ -59,17 +60,18 @@
             = t('.via', :link => link_to("#{post.provider_display_name}", post.actor_url)).html_safe
             ·
 
-        - unless @commenting_disabled
-          %span.like_action
-            = like_action(post, current_user)
+        - if user_signed_in?
+          - unless @commenting_disabled
+            %span.like_action
+              = like_action(post, current_user)
 
-          - if (post.author_id != current_user.person.id) && (post.public?)
+            - if (post.author_id != current_user.person.id) && (post.public?)
+              ·
+              %span.reshare_action
+                = reshare_link(post)
             ·
-            %span.reshare_action
-              = reshare_link(post)
-          ·
 
-          = link_to t('comments.new_comment.comment'), '#', :class => 'focus_comment_textarea'
+            = link_to t('comments.new_comment.comment'), '#', :class => 'focus_comment_textarea'
 
       .likes.on_post
         = render "likes/likes_container", :target_id => post.id, :likes_count => post.likes_count, :current_user => current_user, :target_type => "Post"
diff --git a/app/views/status_messages/_status_message.haml b/app/views/status_messages/_status_message.haml
index 5dcce8a85..133cde0b5 100644
--- a/app/views/status_messages/_status_message.haml
+++ b/app/views/status_messages/_status_message.haml
@@ -5,7 +5,8 @@
 
 - if photos.size > 0
   .photo_attachments
-    = link_to (image_tag photos.first.url(:scaled_full), :class => "stream-photo", 'data-small-photo' => photos.first.url(:thumb_medium), 'data-full-photo' => photos.first.url), photo_path(photos.first), :class => "stream-photo-link big_stream_photo"
+    .big_stream_photo
+      = link_to (image_tag photos.first.url(:scaled_full), :class => "stream-photo", 'data-small-photo' => photos.first.url(:thumb_medium), 'data-full-photo' => photos.first.url), photo_path(photos.first), :class => "stream-photo-link"
     - if photos.size > 1
       - if photos.size >= 8
         - for photo in photos[1..8]
diff --git a/config/locales/diaspora/en.yml b/config/locales/diaspora/en.yml
index 976ce02ae..453c80f75 100644
--- a/config/locales/diaspora/en.yml
+++ b/config/locales/diaspora/en.yml
@@ -505,11 +505,10 @@ en:
       delete_photo: "Delete Photo"
       make_profile_photo: "make profile photo"
       update_photo: "Update Photo"
-      view: "view"
       edit: "edit"
       edit_delete_photo: "Edit photo description / delete photo"
       collection_permalink: "collection permalink"
-      original_post: "Original Post"
+      show_original_post: "Show original post"
     edit:
       editing: "Editing"
     photo:
diff --git a/config/routes.rb b/config/routes.rb
index 70a1fc3ce..49ef87a95 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -18,7 +18,7 @@ Diaspora::Application.routes.draw do
     resources :likes, :only => [:create, :destroy, :index]
     resources :comments, :only => [:create, :destroy, :index]
   end
-  get 'p/:guid' => 'publics#post', :as => 'public_post'
+  get 'p/:id' => 'posts#show', :as => 'short_post'
 
   # roll up likes into a nested resource above
   resources :comments, :only => [:create, :destroy] do
diff --git a/lib/diaspora/user/querying.rb b/lib/diaspora/user/querying.rb
index 71210e0ce..7e0f6ef45 100644
--- a/lib/diaspora/user/querying.rb
+++ b/lib/diaspora/user/querying.rb
@@ -7,9 +7,10 @@ module Diaspora
     module Querying
 
       def find_visible_post_by_id( id, opts={} )
-        post = Post.where(:id => id).joins(:contacts).where(:contacts => {:user_id => self.id}).where(opts).select("posts.*").first
-        post ||= Post.where(:id => id, :author_id => self.person.id).where(opts).first
-        post ||= Post.where(:id => id, :public => true).where(opts).first
+        key = opts.delete(:key) || :id
+        post = Post.where(key => id).joins(:contacts).where(:contacts => {:user_id => self.id}).where(opts).select("posts.*").first
+        post ||= Post.where(key => id, :author_id => self.person.id).where(opts).first
+        post ||= Post.where(key => id, :public => true).where(opts).first
       end
 
       def visible_posts(opts = {})
diff --git a/public/stylesheets/sass/application.sass b/public/stylesheets/sass/application.sass
index 26cd10827..ffc8da7b1 100644
--- a/public/stylesheets/sass/application.sass
+++ b/public/stylesheets/sass/application.sass
@@ -3065,9 +3065,6 @@ ul.left_nav
   :position absolute
   :left 0
 
-.big_stream_photo
-  :display block
-
 #view_all_notifications
   :float right
   :margin
diff --git a/spec/controllers/posts_controller_spec.rb b/spec/controllers/posts_controller_spec.rb
index 928d129a0..2efaad4f9 100644
--- a/spec/controllers/posts_controller_spec.rb
+++ b/spec/controllers/posts_controller_spec.rb
@@ -6,7 +6,6 @@ require 'spec_helper'
 
 describe PostsController do
   before do
-    sign_in alice
     aspect = alice.aspects.first
     @message = alice.build_post :status_message, :text => "ohai", :to => aspect.id
     @message.save!
@@ -16,43 +15,98 @@ describe PostsController do
   end
 
   describe '#show' do
-    it 'succeeds' do
-      get :show, "id" => @message.id.to_s
-      response.should be_success
+    context 'user signed in' do
+      before do
+        sign_in alice
+      end
+
+      it 'succeeds' do
+        get :show, "id" => @message.id
+        response.should be_success
+      end
+
+      it 'succeeds on mobile' do
+        get :show, "id" => @message.id
+        response.should be_success
+      end
+
+      it 'succeeds on mobile with a reshare' do
+        get :show, "id" => Factory(:reshare, :author => alice.person).id, :format => :mobile
+        response.should be_success
+      end
+
+      it 'marks a corresponding notification as read' do
+        alice.comment("comment after me", :post => @message)
+        bob.comment("here you go", :post => @message)
+        note = Notification.where(:recipient_id => alice.id, :target_id => @message.id).first
+        lambda{
+          get :show, :id => @message.id
+          note.reload
+        }.should change(note, :unread).from(true).to(false)
+      end
+
+      it 'succeeds with a AS/photo' do
+        photo = Factory(:activity_streams_photo, :author => bob.person)
+        get :show, :id => photo.id
+        response.should be_success
+      end
     end
 
-    it 'succeeds on mobile' do
-      get :show, "id" => @message.id.to_s, :format => :mobile
-      response.should be_success
-    end
+    context 'user not signed in' do
+      it 'shows a public post' do
+        status = alice.post(:status_message, :text => "hello", :public => true, :to => 'all')
 
-    it 'succeeds on mobile with a reshare' do
-      get :show, "id" => Factory(:reshare, :author => alice.person), :format => :mobile
-      response.should be_success
-    end
+        get :show, :id => status.id
+        response.status.should == 200
+      end
 
-    it 'marks a corresponding notification as read' do
-      alice.comment("comment after me", :post => @message)
-      bob.comment("here you go", :post => @message)
-      note = Notification.where(:recipient_id => alice.id, :target_id => @message.id).first
-      lambda{
-        get :show, :id => @message.id
-        note.reload
-      }.should change(note, :unread).from(true).to(false)
-    end
+      it 'shows a public photo' do
+        pending
+        status = Factory(:status_message_with_photo, :public => true, :author => alice.person)
+        photo = status.photos.first
+        get :show, :id => photo.id
+        response.status.should == 200
+      end
 
-    it 'redirects to back if there is no status message' do
-      get :show, :id => 2345
-      response.status.should == 302
-    end
+      it 'does not show a private post' do
+        status = alice.post(:status_message, :text => "hello", :public => false, :to => 'all')
+        get :show, :id => status.id
+        response.status = 302
+      end
 
-    it 'succeeds with a AS/photo' do
-      photo = Factory(:activity_streams_photo, :author => bob.person)
-      get :show, :id => photo.id
-      response.should be_success
+      it 'responds with diaspora xml if format is xml' do
+        status = alice.post(:status_message, :text => "hello", :public => true, :to => 'all')
+        get :show, :id => status.guid, :format => :xml
+        response.body.should == status.to_diaspora_xml
+      end
+
+      # We want to be using guids from now on for this post route, but do not want to break
+      # pre-exisiting permalinks.  We can assume a guid is 8 characters long as we have
+      # guids set to hex(8) since we started using them.
+      context 'id/guid switch' do
+        before do
+          @status = alice.post(:status_message, :text => "hello", :public => true, :to => 'all')
+        end
+
+        it 'assumes guids less than 8 chars are ids and not guids' do
+          Post.should_receive(:where).with(hash_including(:id => @status.id)).and_return(Post)
+          get :show, :id => @status.id
+          response.status= 200
+        end
+
+        it 'assumes guids more than (or equal to) 8 chars are actually guids' do
+          Post.should_receive(:where).with(hash_including(:guid => @status.guid)).and_return(Post)
+          get :show, :id => @status.guid
+          response.status= 200
+        end
+      end
     end
   end
+
   describe '#destroy' do
+    before do
+      sign_in alice
+    end
 
     it 'let a user delete his message' do
       message = alice.post(:status_message, :text => "hey", :to => alice.aspects.first.id)
diff --git a/spec/controllers/publics_controller_spec.rb b/spec/controllers/publics_controller_spec.rb
index 483206ba6..8783c0fad 100644
--- a/spec/controllers/publics_controller_spec.rb
+++ b/spec/controllers/publics_controller_spec.rb
@@ -61,62 +61,6 @@ describe PublicsController do
     end
   end
 
-  describe '#post' do
-    it 'shows a public post' do
-      status = alice.post(:status_message, :text => "hello", :public => true, :to => 'all')
-
-      get :post, :guid => status.id
-      response.status.should == 200
-    end
-
-    it 'shows a public photo' do
-      status = Factory(:status_message_with_photo, :public => true, :author => alice.person)
-      photo = status.photos.first
-      get :post, :guid => photo.id
-      response.status.should == 200
-    end
-
-    it 'does not show a private post' do
-      status = alice.post(:status_message, :text => "hello", :public => false, :to => 'all')
-      get :post, :guid => status.id
-      response.status = 302
-    end
-
-    it 'redirects to the proper show page if the user has visibility of the post' do
-      status = alice.post(:status_message, :text => "hello", :public => true, :to => 'all')
-      sign_in bob
-      get :post, :guid => status.id
-      response.should be_redirect
-    end
-
-    it 'responds with diaspora xml if format is xml' do
-      status = alice.post(:status_message, :text => "hello", :public => true, :to => 'all')
-      get :post, :guid => status.guid, :format => :xml
-      response.body.should == status.to_diaspora_xml
-    end
-
-    # We want to be using guids from now on for this post route, but do not want to break
-    # preexisiting permalinks.  We can assume a guid is 8 characters long as we have
-    # guids set to hex(8) since we started using them.
-    context 'id/guid switch' do
-      before do
-        @status = alice.post(:status_message, :text => "hello", :public => true, :to => 'all')
-      end
-
-      it 'assumes guids less than 8 chars are ids and not guids' do
-        Post.should_receive(:where).with(hash_including(:id => @status.id)).and_return(Post)
-        get :post, :guid => @status.id
-        response.status= 200
-      end
-
-      it 'assumes guids more than (or equal to) 8 chars are actually guids' do
-        Post.should_receive(:where).with(hash_including(:guid => @status.guid)).and_return(Post)
-        get :post, :guid => @status.guid
-        response.status= 200
-      end
-    end
-  end
-
   describe '#hcard' do
     it "succeeds", :fixture => true do
       post :hcard, "guid" => @user.person.guid.to_s
diff --git a/spec/models/reshare_spec.rb b/spec/models/reshare_spec.rb
index 1839cc363..b9c075ddd 100644
--- a/spec/models/reshare_spec.rb
+++ b/spec/models/reshare_spec.rb
@@ -100,7 +100,7 @@ describe Reshare do
           response = mock
           response.stub(:body).and_return(@root_object.to_diaspora_xml)
 
-          Faraday.default_connection.should_receive(:get).with(@original_author.url + public_post_path(:guid => @root_object.guid, :format => "xml")).and_return(response)
+          Faraday.default_connection.should_receive(:get).with(@original_author.url + short_post_path(@root_object.guid, :format => "xml")).and_return(response)
           Reshare.from_xml(@xml)
         end
 
@@ -108,7 +108,7 @@ describe Reshare do
           before do
             response = mock
             response.stub(:body).and_return(@root_object.to_diaspora_xml)
-            Faraday.default_connection.stub(:get).with(@reshare.root.author.url + public_post_path(:guid => @root_object.guid, :format => "xml")).and_return(response)
+            Faraday.default_connection.stub(:get).with(@reshare.root.author.url + short_post_path(@root_object.guid, :format => "xml")).and_return(response)
           end
 
           it 'fetches the root post from root_guid' do