Merge remote-tracking branch 'upstream/pull/2009'

[rails.git] / app / controllers / diary_entry_controller.rb

diff --git a/app/controllers/diary_entry_controller.rb b/app/controllers/diary_entry_controller.rb
index 6b8acbe71a335f87a9d6004c0154a93294ef62be..70cb1654da8c9d0f7adf5b56197d482d81d54626 100644 (file)
--- a/app/controllers/diary_entry_controller.rb
+++ b/app/controllers/diary_entry_controller.rb
@@ -1,50 +1,56 @@
 class DiaryEntryController < ApplicationController
 class DiaryEntryController < ApplicationController

-  layout 'site', :except => :rss
+  layout "site", :except => :rss

 
 

-  before_filter :authorize_web
-  before_filter :set_locale
-  before_filter :require_user, :only => [:new, :edit, :comment, :hide, :hidecomment]
-  before_filter :lookup_this_user, :only => [:view, :comments]
-  before_filter :check_database_readable
-  before_filter :check_database_writable, :only => [:new, :edit]
-  before_filter :require_administrator, :only => [:hide, :hidecomment]
+  before_action :authorize_web
+  before_action :set_locale
+
+  authorize_resource
+
+  before_action :lookup_user, :only => [:show, :comments]
+  before_action :check_database_readable
+  before_action :check_database_writable, :only => [:new, :edit, :comment, :hide, :hidecomment, :subscribe, :unsubscribe]
+  before_action :allow_thirdparty_images, :only => [:new, :edit, :index, :show, :comments]

 
   def new
 
   def new

-    @title = t 'diary_entry.new.title'
+    @title = t "diary_entry.new.title"

 
 

-    if params[:diary_entry]
+    if request.post?

       @diary_entry = DiaryEntry.new(entry_params)
       @diary_entry = DiaryEntry.new(entry_params)

-      @diary_entry.user = @user
+      @diary_entry.user = current_user

 
       if @diary_entry.save
 
       if @diary_entry.save

-        default_lang = @user.preferences.where(:k => "diary.default_language").first
+        default_lang = current_user.preferences.where(:k => "diary.default_language").first

         if default_lang
           default_lang.v = @diary_entry.language_code
           default_lang.save!
         else
         if default_lang
           default_lang.v = @diary_entry.language_code
           default_lang.save!
         else

-          @user.preferences.create(:k => "diary.default_language", :v => @diary_entry.language_code)
+          current_user.preferences.create(:k => "diary.default_language", :v => @diary_entry.language_code)

         end
         end

-        redirect_to :controller => 'diary_entry', :action => 'list', :display_name => @user.display_name
+
+        # Subscribe user to diary comments
+        @diary_entry.subscriptions.create(:user => current_user)
+
+        redirect_to :action => "index", :display_name => current_user.display_name

       else
       else

-        render :action => 'edit'
+        render :action => "edit"

       end
     else
       end
     else

-      default_lang = @user.preferences.where(:k => "diary.default_language").first
-      lang_code = default_lang ? default_lang.v : @user.preferred_language
-      @diary_entry = DiaryEntry.new(:language_code => lang_code)
+      default_lang = current_user.preferences.where(:k => "diary.default_language").first
+      lang_code = default_lang ? default_lang.v : current_user.preferred_language
+      @diary_entry = DiaryEntry.new(entry_params.merge(:language_code => lang_code))

       set_map_location
       set_map_location

-      render :action => 'edit'
+      render :action => "edit"

     end
   end
 
   def edit
     end
   end
 
   def edit

-    @title= t 'diary_entry.edit.title'
+    @title = t "diary_entry.edit.title"

     @diary_entry = DiaryEntry.find(params[:id])
 
     @diary_entry = DiaryEntry.find(params[:id])
 

-    if @user != @diary_entry.user
-      redirect_to :controller => 'diary_entry', :action => 'view', :id => params[:id]
-    elsif params[:diary_entry] and @diary_entry.update_attributes(entry_params)
-      redirect_to :controller => 'diary_entry', :action => 'view', :id => params[:id]
+    if current_user != @diary_entry.user
+      redirect_to diary_entry_path(@diary_entry.user, @diary_entry)
+    elsif params[:diary_entry] && @diary_entry.update(entry_params)
+      redirect_to diary_entry_path(@diary_entry.user, @diary_entry)

     end
 
     set_map_location
     end
 
     set_map_location


@@ -55,58 +61,85 @@ class DiaryEntryController < ApplicationController
   def comment
     @entry = DiaryEntry.find(params[:id])
     @diary_comment = @entry.comments.build(comment_params)
   def comment
     @entry = DiaryEntry.find(params[:id])
     @diary_comment = @entry.comments.build(comment_params)

-    @diary_comment.user = @user
+    @diary_comment.user = current_user

     if @diary_comment.save
     if @diary_comment.save

-      if @diary_comment.user != @entry.user
-        Notifier.diary_comment_notification(@diary_comment).deliver
+
+      # Notify current subscribers of the new comment
+      @entry.subscribers.visible.each do |user|
+        Notifier.diary_comment_notification(@diary_comment, user).deliver_later if current_user != user

       end
 
       end
 

-      redirect_to :controller => 'diary_entry', :action => 'view', :display_name => @entry.user.display_name, :id => @entry.id
+      # Add the commenter to the subscribers if necessary
+      @entry.subscriptions.create(:user => current_user) unless @entry.subscribers.exists?(current_user.id)
+
+      redirect_to diary_entry_path(@entry.user, @entry)

     else
     else

-      render :action => 'view'
+      render :action => "show"

     end
   rescue ActiveRecord::RecordNotFound
     render :action => "no_such_entry", :status => :not_found
   end
 
     end
   rescue ActiveRecord::RecordNotFound
     render :action => "no_such_entry", :status => :not_found
   end
 

-  def list
+  def subscribe
+    diary_entry = DiaryEntry.find(params[:id])
+
+    diary_entry.subscriptions.create(:user => current_user) unless diary_entry.subscribers.exists?(current_user.id)
+
+    redirect_to diary_entry_path(diary_entry.user, diary_entry)
+  rescue ActiveRecord::RecordNotFound
+    render :action => "no_such_entry", :status => :not_found
+  end
+
+  def unsubscribe
+    diary_entry = DiaryEntry.find(params[:id])
+
+    diary_entry.subscriptions.where(:user => current_user).delete_all if diary_entry.subscribers.exists?(current_user.id)
+
+    redirect_to diary_entry_path(diary_entry.user, diary_entry)
+  rescue ActiveRecord::RecordNotFound
+    render :action => "no_such_entry", :status => :not_found
+  end
+
+  def index

     if params[:display_name]
     if params[:display_name]

-      @this_user = User.active.find_by_display_name(params[:display_name])
+      @user = User.active.find_by(:display_name => params[:display_name])

 
 

-      if @this_user
-        @title = t 'diary_entry.list.user_title', :user => @this_user.display_name
-        @entries = @this_user.diary_entries
+      if @user
+        @title = t "diary_entry.index.user_title", :user => @user.display_name
+        @entries = @user.diary_entries

       else
         render_unknown_user params[:display_name]
         return
       end
     elsif params[:friends]
       else
         render_unknown_user params[:display_name]
         return
       end
     elsif params[:friends]

-      if @user
-        @title = t 'diary_entry.list.title_friends'
-        @entries = DiaryEntry.where(:user_id => @user.friend_users)
+      if current_user
+        @title = t "diary_entry.index.title_friends"
+        @entries = DiaryEntry.where(:user_id => current_user.friend_users)

       else
       else

-          require_user
-          return
+        require_user
+        return

       end
     elsif params[:nearby]
       end
     elsif params[:nearby]

-      if @user
-        @title = t 'diary_entry.list.title_nearby'
-        @entries = DiaryEntry.where(:user_id => @user.nearby)
+      if current_user
+        @title = t "diary_entry.index.title_nearby"
+        @entries = DiaryEntry.where(:user_id => current_user.nearby)

       else
       else

-          require_user
-          return
+        require_user
+        return

       end
     else
       end
     else

-      @entries = DiaryEntry.joins(:user).where(:users => { :status => ["active", "confirmed"] })
-      
+      @entries = DiaryEntry.joins(:user).where(:users => { :status => %w[active confirmed] })
+

       if params[:language]
       if params[:language]

-        @title = t 'diary_entry.list.in_language_title', :language => Language.find(params[:language]).english_name
+        @title = t "diary_entry.index.in_language_title", :language => Language.find(params[:language]).english_name

         @entries = @entries.where(:language_code => params[:language])
       else
         @entries = @entries.where(:language_code => params[:language])
       else

-        @title = t 'diary_entry.list.title'
+        @title = t "diary_entry.index.title"

       end
     end
 
       end
     end
 

+    @params = params.permit(:display_name, :friends, :nearby, :language)
+

     @page = (params[:page] || 1).to_i
     @page_size = 20
 
     @page = (params[:page] || 1).to_i
     @page_size = 20
 


@@ -119,72 +152,92 @@ class DiaryEntryController < ApplicationController
 
   def rss
     if params[:display_name]
 
   def rss
     if params[:display_name]

-      user = User.active.find_by_display_name(params[:display_name])
+      user = User.active.find_by(:display_name => params[:display_name])

 
       if user
         @entries = user.diary_entries
 
       if user
         @entries = user.diary_entries

-        @title = I18n.t('diary_entry.feed.user.title', :user => user.display_name)
-        @description = I18n.t('diary_entry.feed.user.description', :user => user.display_name)
-        @link = "http://#{SERVER_URL}/user/#{user.display_name}/diary"
+        @title = t("diary_entry.feed.user.title", :user => user.display_name)
+        @description = t("diary_entry.feed.user.description", :user => user.display_name)
+        @link = url_for :controller => "diary_entry", :action => "index", :display_name => user.display_name, :host => SERVER_URL, :protocol => SERVER_PROTOCOL

       else
       else

-        render :text => "", :status => :not_found
+        head :not_found

         return
       end
     else
         return
       end
     else

-      @entries = DiaryEntry.joins(:user).where(:users => { :status => ["active", "confirmed"] })
+      @entries = DiaryEntry.joins(:user).where(:users => { :status => %w[active confirmed] })

 
       if params[:language]
         @entries = @entries.where(:language_code => params[:language])
 
       if params[:language]
         @entries = @entries.where(:language_code => params[:language])

-        @title = I18n.t('diary_entry.feed.language.title', :language_name => Language.find(params[:language]).english_name)
-        @description = I18n.t('diary_entry.feed.language.description', :language_name => Language.find(params[:language]).english_name)
-        @link = "http://#{SERVER_URL}/diary/#{params[:language]}"
+        @title = t("diary_entry.feed.language.title", :language_name => Language.find(params[:language]).english_name)
+        @description = t("diary_entry.feed.language.description", :language_name => Language.find(params[:language]).english_name)
+        @link = url_for :controller => "diary_entry", :action => "index", :language => params[:language], :host => SERVER_URL, :protocol => SERVER_PROTOCOL

       else
       else

-        @title = I18n.t('diary_entry.feed.all.title')
-        @description = I18n.t('diary_entry.feed.all.description')
-        @link = "http://#{SERVER_URL}/diary"
+        @title = t("diary_entry.feed.all.title")
+        @description = t("diary_entry.feed.all.description")
+        @link = url_for :controller => "diary_entry", :action => "index", :host => SERVER_URL, :protocol => SERVER_PROTOCOL

       end
     end
 
     @entries = @entries.visible.includes(:user).order("created_at DESC").limit(20)
   end
 
       end
     end
 
     @entries = @entries.visible.includes(:user).order("created_at DESC").limit(20)
   end
 

-  def view
-    @entry = @this_user.diary_entries.visible.where(:id => params[:id]).first
+  def show
+    @entry = @user.diary_entries.visible.where(:id => params[:id]).first

     if @entry
     if @entry

-      @title = t 'diary_entry.view.title', :user => params[:display_name], :title => @entry.title
+      @title = t "diary_entry.show.title", :user => params[:display_name], :title => @entry.title

     else
     else

-      @title = t 'diary_entry.no_such_entry.title', :id => params[:id]
-      render :action => 'no_such_entry', :status => :not_found
+      @title = t "diary_entry.no_such_entry.title", :id => params[:id]
+      render :action => "no_such_entry", :status => :not_found

     end
   end
 
   def hide
     entry = DiaryEntry.find(params[:id])
     end
   end
 
   def hide
     entry = DiaryEntry.find(params[:id])

-    entry.update_attributes(:visible => false)
-    redirect_to :action => "list", :display_name => entry.user.display_name
+    entry.update(:visible => false)
+    redirect_to :action => "index", :display_name => entry.user.display_name

   end
 
   def hidecomment
     comment = DiaryComment.find(params[:comment])
   end
 
   def hidecomment
     comment = DiaryComment.find(params[:comment])

-    comment.update_attributes(:visible => false)
-    redirect_to :action => "view", :display_name => comment.diary_entry.user.display_name, :id => comment.diary_entry.id
+    comment.update(:visible => false)
+    redirect_to diary_entry_path(comment.diary_entry.user, comment.diary_entry)

   end
 
   def comments
     @comment_pages, @comments = paginate(:diary_comments,
                                          :conditions => {
   end
 
   def comments
     @comment_pages, @comments = paginate(:diary_comments,
                                          :conditions => {

-                                           :user_id => @this_user,
+                                           :user_id => @user,

                                            :visible => true
                                          },
                                            :visible => true
                                          },

-                                         :order => 'created_at DESC',
+                                         :order => "created_at DESC",

                                          :per_page => 20)
     @page = (params[:page] || 1).to_i
   end
                                          :per_page => 20)
     @page = (params[:page] || 1).to_i
   end

-private
+
+  private
+
+  # This is required because, being a default-deny system, cancancan
+  # _cannot_ tell you the reason you were denied access; and so
+  # the "nice" feedback presenting next steps can't be gleaned from
+  # the exception
+  ##
+  # for the hide actions, require that the user is a administrator, or fill out
+  # a helpful error message and return them to the user page.
+  def deny_access(exception)
+    if current_user && exception.action.in?([:hide, :hidecomment])
+      flash[:error] = t("users.filter.not_an_administrator")
+      redirect_to :action => "show"
+    else
+      super
+    end
+  end
+

   ##
   # return permitted diary entry parameters
   def entry_params
     params.require(:diary_entry).permit(:title, :body, :language_code, :latitude, :longitude)
   ##
   # return permitted diary entry parameters
   def entry_params
     params.require(:diary_entry).permit(:title, :body, :language_code, :latitude, :longitude)

+  rescue ActionController::ParameterMissing
+    ActionController::Parameters.new.permit(:title, :body, :language_code, :latitude, :longitude)

   end
 
   ##
   end
 
   ##


@@ -193,36 +246,20 @@ private
     params.require(:diary_comment).permit(:body)
   end
 
     params.require(:diary_comment).permit(:body)
   end
 

-  ##
-  # require that the user is a administrator, or fill out a helpful error message
-  # and return them to the user page.
-  def require_administrator
-    unless @user.administrator?
-      flash[:error] = t('user.filter.not_an_administrator')
-      redirect_to :controller => 'diary_entry', :action => 'view', :display_name => params[:id]
-    end
-  end
-
-  ##
-  # is this list user specific?
-  def user_specific_list?
-    params[:friends] or params[:nearby]
-  end
-

   ##
   # decide on a location for the diary entry map
   def set_map_location
   ##
   # decide on a location for the diary entry map
   def set_map_location

-    if @diary_entry.latitude and @diary_entry.longitude
+    if @diary_entry.latitude && @diary_entry.longitude

       @lon = @diary_entry.longitude
       @lat = @diary_entry.latitude
       @zoom = 12
       @lon = @diary_entry.longitude
       @lat = @diary_entry.latitude
       @zoom = 12

-    elsif @user.home_lat.nil? or @user.home_lon.nil?
+    elsif current_user.home_lat.nil? || current_user.home_lon.nil?

       @lon = params[:lon] || -0.1
       @lat = params[:lat] || 51.5
       @zoom = params[:zoom] || 4
     else
       @lon = params[:lon] || -0.1
       @lat = params[:lat] || 51.5
       @zoom = params[:zoom] || 4
     else

-      @lon = @user.home_lon
-      @lat = @user.home_lat
+      @lon = current_user.home_lon
+      @lat = current_user.home_lat

       @zoom = 12
     end
   end
       @zoom = 12
     end
   end