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

diff --combined app/controllers/diary_entries_controller.rb
index f02f4224f5c458d0713c344dd94e0cbc433fd3fe,121f74723e8f9ce38ae8990ceb57692400bdd0d1..1e113e09f8df406a36473be4b5b281019af044ae
--- 1/app/controllers/diary_entries_controller.rb
--- 2/app/controllers/diary_entries_controller.rb
+++ b/app/controllers/diary_entries_controller.rb
@@@ -8,40 -8,38 +8,40 @@@ class DiaryEntriesController < Applicat
    authorize_resource
  
    before_action :lookup_user, :only => [:show, :comments]
 -  before_action :check_database_writable, :only => [:new, :edit, :comment, :hide, :hidecomment, :subscribe, :unsubscribe]
 -  before_action :allow_thirdparty_images, :only => [:new, :edit, :index, :show, :comments]
 +  before_action :check_database_writable, :only => [:new, :create, :edit, :update, :comment, :hide, :hidecomment, :subscribe, :unsubscribe]
 +  before_action :allow_thirdparty_images, :only => [:new, :create, :edit, :update, :index, :show, :comments]
  
    def new
      @title = t "diary_entries.new.title"
  
 -    if request.post?
 -      @diary_entry = DiaryEntry.new(entry_params)
 -      @diary_entry.user = current_user
 +    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
 +    render :action => "new"
 +  end
  
 -      if @diary_entry.save
 -        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
 -          current_user.preferences.create(:k => "diary.default_language", :v => @diary_entry.language_code)
 -        end
 +  def create
 +    @title = t "diary_entries.new.title"
  
 -        # Subscribe user to diary comments
 -        @diary_entry.subscriptions.create(:user => current_user)
 +    @diary_entry = DiaryEntry.new(entry_params)
 +    @diary_entry.user = current_user
  
 -        redirect_to :action => "index", :display_name => current_user.display_name
 +    if @diary_entry.save
 +      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
 -        render :action => "edit"
 +        current_user.preferences.create(:k => "diary.default_language", :v => @diary_entry.language_code)
        end
 +
 +      # Subscribe user to diary comments
 +      @diary_entry.subscriptions.create(:user => current_user)
 +
 +      redirect_to :action => "index", :display_name => current_user.display_name
      else
 -      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
 -      render :action => "edit"
 +      render :action => "new"
      end
    end
  
@@@ -49,25 -47,13 +49,25 @@@
      @title = t "diary_entries.edit.title"
      @diary_entry = DiaryEntry.find(params[:id])
  
 +    redirect_to diary_entry_path(@diary_entry.user, @diary_entry) if current_user != @diary_entry.user
 +
 +    set_map_location
 +  rescue ActiveRecord::RecordNotFound
 +    render :action => "no_such_entry", :status => :not_found
 +  end
 +
 +  def update
 +    @title = t "diary_entries.edit.title"
 +    @diary_entry = DiaryEntry.find(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)
 +    else
 +      set_map_location
 +      render :action => "edit"
      end
 -
 -    set_map_location
    rescue ActiveRecord::RecordNotFound
      render :action => "no_such_entry", :status => :not_found
    end
@@@ -180,6 -166,10 +180,10 @@@
      else
        @entries = DiaryEntry.joins(:user).where(:users => { :status => %w[active confirmed] })
  
+       # Items can't be flagged as deleted in the RSS format.
+       # For the general feeds, allow a delay before publishing, to help spam fighting
+       @entries = @entries.where("created_at < :time", :time => Settings.diary_feed_delay.hours.ago)
+ 
        if params[:language]
          @entries = @entries.where(:language_code => params[:language])
          @title = t("diary_entries.feed.language.title", :language_name => Language.find(params[:language]).english_name)
@@@ -191,7 -181,6 +195,6 @@@
          @link = url_for :action => "index", :host => Settings.server_url, :protocol => Settings.server_protocol
        end
      end
- 
      @entries = @entries.visible.includes(:user).order("created_at DESC").limit(20)
    end
  

diff --combined test/controllers/diary_entries_controller_test.rb
index 88a67ef1214a36b28bd67565874be57bef41747f,6d7ca304aa3f6da83224aba7333db3c254694dad..71684c65e74366e8235010b6ba1504f479f6abee
--- 1/test/controllers/diary_entries_controller_test.rb
--- 2/test/controllers/diary_entries_controller_test.rb
+++ b/test/controllers/diary_entries_controller_test.rb
@@@ -62,8 -62,8 +62,8 @@@ class DiaryEntriesControllerTest < Acti
        { :controller => "diary_entries", :action => "new" }
      )
      assert_routing(
 -      { :path => "/diary/new", :method => :post },
 -      { :controller => "diary_entries", :action => "new" }
 +      { :path => "/diary", :method => :post },
 +      { :controller => "diary_entries", :action => "create" }
      )
      assert_routing(
        { :path => "/user/username/diary/1", :method => :get },
@@@ -74,8 -74,8 +74,8 @@@
        { :controller => "diary_entries", :action => "edit", :display_name => "username", :id => "1" }
      )
      assert_routing(
 -      { :path => "/user/username/diary/1/edit", :method => :post },
 -      { :controller => "diary_entries", :action => "edit", :display_name => "username", :id => "1" }
 +      { :path => "/user/username/diary/1", :method => :put },
 +      { :controller => "diary_entries", :action => "update", :display_name => "username", :id => "1" }
      )
      assert_routing(
        { :path => "/user/username/diary/1/newcomment", :method => :post },
@@@ -116,7 -116,7 +116,7 @@@
        assert_select "h1", :text => /New Diary Entry/, :count => 1
      end
      assert_select "div#content", :count => 1 do
 -      assert_select "form[action='/diary/new'][method=post]", :count => 1 do
 +      assert_select "form[action='/diary'][method=post]", :count => 1 do
          assert_select "input#diary_entry_title[name='diary_entry[title]']", :count => 1
          assert_select "textarea#diary_entry_body[name='diary_entry[body]']", :text => "", :count => 1
          assert_select "select#diary_entry_language_code", :count => 1
@@@ -140,30 -140,30 +140,30 @@@
            :session => { :user => create(:user).id }
      end
      assert_response :success
 -    assert_template :edit
 +    assert_template :new
    end
  
 -  def test_new_no_body
 +  def test_create_no_body
      # Now try creating a invalid diary entry with an empty body
      user = create(:user)
      assert_no_difference "DiaryEntry.count" do
 -      post :new,
 +      post :create,
             :params => { :commit => "save",
                          :diary_entry => { :title => "New Title", :body => "", :latitude => "1.1",
                                            :longitude => "2.2", :language_code => "en" } },
             :session => { :user => user.id }
      end
      assert_response :success
 -    assert_template :edit
 +    assert_template :new
  
      assert_nil UserPreference.where(:user_id => user.id, :k => "diary.default_language").first
    end
  
 -  def test_new_post
 +  def test_create
      # Now try creating a diary entry
      user = create(:user)
      assert_difference "DiaryEntry.count", 1 do
 -      post :new,
 +      post :create,
             :params => { :commit => "save",
                          :diary_entry => { :title => "New Title", :body => "This is a new body for the diary entry", :latitude => "1.1",
                                            :longitude => "2.2", :language_code => "en" } },
@@@ -185,13 -185,13 +185,13 @@@
      assert_equal "en", UserPreference.where(:user_id => user.id, :k => "diary.default_language").first.v
    end
  
 -  def test_new_german
 +  def test_create_german
      create(:language, :code => "de")
      user = create(:user)
  
      # Now try creating a diary entry in a different language
      assert_difference "DiaryEntry.count", 1 do
 -      post :new,
 +      post :create,
             :params => { :commit => "save",
                          :diary_entry => { :title => "New Title", :body => "This is a new body for the diary entry", :latitude => "1.1",
                                            :longitude => "2.2", :language_code => "de" } },
@@@ -221,7 -221,7 +221,7 @@@
  
      # Try creating a spammy diary entry
      assert_difference "DiaryEntry.count", 1 do
 -      post :new,
 +      post :create,
             :params => { :commit => "save",
                          :diary_entry => { :title => spammy_title, :body => spammy_body, :language_code => "en" } },
             :session => { :user => user.id }
@@@ -279,21 -279,21 +279,21 @@@
          :params => { :display_name => entry.user.display_name, :id => entry.id },
          :session => { :user => entry.user }
      assert_response :success
 -    assert_select "title", :text => /Edit diary entry/, :count => 1
 +    assert_select "title", :text => /Edit Diary Entry/, :count => 1
      assert_select "div.content-heading", :count => 1 do
 -      assert_select "h1", :text => /Edit diary entry/, :count => 1
 +      assert_select "h1", :text => /Edit Diary Entry/, :count => 1
      end
      assert_select "div#content", :count => 1 do
 -      assert_select "form[action='/user/#{ERB::Util.u(entry.user.display_name)}/diary/#{entry.id}/edit'][method=post]", :count => 1 do
 +      assert_select "form[action='/user/#{ERB::Util.u(entry.user.display_name)}/diary/#{entry.id}'][method=post]", :count => 1 do
          assert_select "input#diary_entry_title[name='diary_entry[title]'][value='#{entry.title}']", :count => 1
          assert_select "textarea#diary_entry_body[name='diary_entry[body]']", :text => entry.body, :count => 1
          assert_select "select#diary_entry_language_code", :count => 1
          assert_select "input#latitude[name='diary_entry[latitude]']", :count => 1
          assert_select "input#longitude[name='diary_entry[longitude]']", :count => 1
 -        assert_select "input[name=commit][type=submit][value=Save]", :count => 1
 +        assert_select "input[name=commit][type=submit][value=Update]", :count => 1
          assert_select "input[name=commit][type=submit][value=Edit]", :count => 1
          assert_select "input[name=commit][type=submit][value=Preview]", :count => 1
 -        assert_select "input", :count => 7
 +        assert_select "input", :count => 8
        end
      end
  
@@@ -303,11 -303,11 +303,11 @@@
      new_latitude = "1.1"
      new_longitude = "2.2"
      new_language_code = "en"
 -    post :edit,
 -         :params => { :display_name => entry.user.display_name, :id => entry.id, :commit => "save",
 -                      :diary_entry => { :title => new_title, :body => new_body, :latitude => new_latitude,
 -                                        :longitude => new_longitude, :language_code => new_language_code } },
 -         :session => { :user => entry.user.id }
 +    put :update,
 +        :params => { :display_name => entry.user.display_name, :id => entry.id, :commit => "save",
 +                     :diary_entry => { :title => new_title, :body => new_body, :latitude => new_latitude,
 +                                       :longitude => new_longitude, :language_code => new_language_code } },
 +        :session => { :user => entry.user.id }
      assert_response :redirect
      assert_redirected_to :action => :show, :display_name => entry.user.display_name, :id => entry.id
  
@@@ -664,6 -664,18 +664,18 @@@
      assert_match "<title>&lt;script&gt;</title>", response.body
    end
  
+   def test_feed_delay
+     create(:diary_entry, :created_at => 7.hours.ago)
+     create(:diary_entry, :created_at => 5.hours.ago)
+     get :rss, :params => { :format => :rss }
+     assert_select "rss>channel>item", :count => 2
+ 
+     with_diary_feed_delay(6) do
+       get :rss, :params => { :format => :rss }
+       assert_select "rss>channel>item", :count => 1
+     end
+   end
+ 
    def test_show
      user = create(:user)
      suspended_user = create(:user, :suspended)
@@@ -897,4 -909,13 +909,13 @@@
        assert_select "a[href=?]", "/user/#{ERB::Util.u(entry.user.display_name)}/diary/#{entry.id}"
      end
    end
+ 
+   def with_diary_feed_delay(value)
+     diary_feed_delay = Settings.diary_feed_delay
+     Settings.diary_feed_delay = value
+ 
+     yield
+ 
+     Settings.diary_feed_delay = diary_feed_delay
+   end
  end