# Configuration parameters: CountComments, ExcludedMethods.
# ExcludedMethods: refine
Metrics/BlockLength:
- Max: 262
+ Max: 263
# Offense count: 11
# Configuration parameters: CountBlocks.
if Settings.status != "database_offline"
can [:index, :new, :create, :show, :edit, :update, :destroy], ClientApplication
- can [:create, :edit, :comment, :subscribe, :unsubscribe], DiaryEntry
+ can [:new, :create, :edit, :update, :comment, :subscribe, :unsubscribe], DiaryEntry
can [:new, :create, :reply, :show, :inbox, :outbox, :mark, :destroy], Message
can [:close, :reopen], Note
can [:new, :create], Report
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
@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
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)
@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
#
# Table name: acls
#
-# id :integer not null, primary key
+# id :bigint(8) not null, primary key
# address :inet
# k :string not null
# v :string
#
# Table name: changesets
#
-# id :integer not null, primary key
-# user_id :integer not null
+# id :bigint(8) not null, primary key
+# user_id :bigint(8) not null
# created_at :datetime not null
# min_lat :integer
# max_lat :integer
#
# Indexes
#
-# changesets_bbox_idx (min_lat,max_lat,min_lon,max_lon)
+# changesets_bbox_idx (min_lat,max_lat,min_lon,max_lon) USING gist
# changesets_closed_at_idx (closed_at)
# changesets_created_at_idx (created_at)
# changesets_user_id_created_at_idx (user_id,created_at)
# Table name: changeset_comments
#
# id :integer not null, primary key
-# changeset_id :integer not null
-# author_id :integer not null
+# changeset_id :bigint(8) not null
+# author_id :bigint(8) not null
# body :text not null
# created_at :datetime not null
# visible :boolean not null
#
# Table name: changeset_tags
#
-# changeset_id :integer not null, primary key
+# changeset_id :bigint(8) not null, primary key
# k :string default(""), not null, primary key
# v :string default(""), not null
#
#
# Table name: diary_comments
#
-# id :integer not null, primary key
-# diary_entry_id :integer not null
-# user_id :integer not null
+# id :bigint(8) not null, primary key
+# diary_entry_id :bigint(8) not null
+# user_id :bigint(8) not null
# body :text not null
# created_at :datetime not null
# updated_at :datetime not null
#
# Table name: diary_entries
#
-# id :integer not null, primary key
-# user_id :integer not null
+# id :bigint(8) not null, primary key
+# user_id :bigint(8) not null
# title :string not null
# body :text not null
# created_at :datetime not null
#
# Table name: diary_entry_subscriptions
#
-# user_id :integer not null, primary key
-# diary_entry_id :integer not null, primary key
+# user_id :bigint(8) not null, primary key
+# diary_entry_id :bigint(8) not null, primary key
#
# Indexes
#
#
# Table name: friends
#
-# id :integer not null, primary key
-# user_id :integer not null
-# friend_user_id :integer not null
+# id :bigint(8) not null, primary key
+# user_id :bigint(8) not null
+# friend_user_id :bigint(8) not null
#
# Indexes
#
#
# Table name: messages
#
-# id :integer not null, primary key
-# from_user_id :integer not null
+# id :bigint(8) not null, primary key
+# from_user_id :bigint(8) not null
# title :string not null
# body :text not null
# sent_on :datetime not null
# message_read :boolean default(FALSE), not null
-# to_user_id :integer not null
+# to_user_id :bigint(8) not null
# to_user_visible :boolean default(TRUE), not null
# from_user_visible :boolean default(TRUE), not null
# body_format :enum default("markdown"), not null
#
# Table name: current_nodes
#
-# id :integer not null, primary key
+# id :bigint(8) not null, primary key
# latitude :integer not null
# longitude :integer not null
-# changeset_id :integer not null
+# changeset_id :bigint(8) not null
# visible :boolean not null
# timestamp :datetime not null
-# tile :integer not null
-# version :integer not null
+# tile :bigint(8) not null
+# version :bigint(8) not null
#
# Indexes
#
#
# Table name: current_node_tags
#
-# node_id :integer not null, primary key
+# node_id :bigint(8) not null, primary key
# k :string default(""), not null, primary key
# v :string default(""), not null
#
#
# Table name: notes
#
-# id :integer not null, primary key
+# id :bigint(8) not null, primary key
# latitude :integer not null
# longitude :integer not null
-# tile :integer not null
+# tile :bigint(8) not null
# updated_at :datetime not null
# created_at :datetime not null
# status :enum not null
#
# Table name: note_comments
#
-# id :integer not null, primary key
-# note_id :integer not null
+# id :bigint(8) not null, primary key
+# note_id :bigint(8) not null
# visible :boolean not null
# created_at :datetime not null
# author_ip :inet
-# author_id :integer
+# author_id :bigint(8)
# body :text
# event :enum
#
# Indexes
#
-# index_note_comments_on_body (to_tsvector('english'::regconfig, body))
+# index_note_comments_on_body (to_tsvector('english'::regconfig, body)) USING gin
# index_note_comments_on_created_at (created_at)
# note_comments_note_id_idx (note_id)
#
#
# Table name: nodes
#
-# node_id :integer not null, primary key
+# node_id :bigint(8) not null, primary key
# latitude :integer not null
# longitude :integer not null
-# changeset_id :integer not null
+# changeset_id :bigint(8) not null
# visible :boolean not null
# timestamp :datetime not null
-# tile :integer not null
-# version :integer not null, primary key
+# tile :bigint(8) not null
+# version :bigint(8) not null, primary key
# redaction_id :integer
#
# Indexes
#
# Table name: node_tags
#
-# node_id :integer not null, primary key
-# version :integer not null, primary key
+# node_id :bigint(8) not null, primary key
+# version :bigint(8) not null, primary key
# k :string default(""), not null, primary key
# v :string default(""), not null
#
#
# Table name: relations
#
-# relation_id :integer default(0), not null, primary key
-# changeset_id :integer not null
+# relation_id :bigint(8) default(0), not null, primary key
+# changeset_id :bigint(8) not null
# timestamp :datetime not null
-# version :integer not null, primary key
+# version :bigint(8) not null, primary key
# visible :boolean default(TRUE), not null
# redaction_id :integer
#
#
# Table name: relation_members
#
-# relation_id :integer default(0), not null, primary key
+# relation_id :bigint(8) default(0), not null, primary key
# member_type :enum not null
-# member_id :integer not null
+# member_id :bigint(8) not null
# member_role :string not null
-# version :integer default(0), not null, primary key
+# version :bigint(8) default(0), not null, primary key
# sequence_id :integer default(0), not null, primary key
#
# Indexes
#
# Table name: relation_tags
#
-# relation_id :integer default(0), not null, primary key
+# relation_id :bigint(8) default(0), not null, primary key
# k :string default(""), not null, primary key
# v :string default(""), not null
-# version :integer not null, primary key
+# version :bigint(8) not null, primary key
#
# Foreign Keys
#
#
# Table name: ways
#
-# way_id :integer default(0), not null, primary key
-# changeset_id :integer not null
+# way_id :bigint(8) default(0), not null, primary key
+# changeset_id :bigint(8) not null
# timestamp :datetime not null
-# version :integer not null, primary key
+# version :bigint(8) not null, primary key
# visible :boolean default(TRUE), not null
# redaction_id :integer
#
#
# Table name: way_nodes
#
-# way_id :integer not null, primary key
-# node_id :integer not null
-# version :integer not null, primary key
-# sequence_id :integer not null, primary key
+# way_id :bigint(8) not null, primary key
+# node_id :bigint(8) not null
+# version :bigint(8) not null, primary key
+# sequence_id :bigint(8) not null, primary key
#
# Indexes
#
#
# Table name: way_tags
#
-# way_id :integer default(0), not null, primary key
+# way_id :bigint(8) default(0), not null, primary key
# k :string not null, primary key
# v :string not null
-# version :integer not null, primary key
+# version :bigint(8) not null, primary key
#
# Foreign Keys
#
# description :text
# created_at :datetime
# updated_at :datetime
-# user_id :integer not null
+# user_id :bigint(8) not null
# description_format :enum default("markdown"), not null
#
# Foreign Keys
#
# Table name: current_relations
#
-# id :integer not null, primary key
-# changeset_id :integer not null
+# id :bigint(8) not null, primary key
+# changeset_id :bigint(8) not null
# timestamp :datetime not null
# visible :boolean not null
-# version :integer not null
+# version :bigint(8) not null
#
# Indexes
#
#
# Table name: current_relation_members
#
-# relation_id :integer not null, primary key
+# relation_id :bigint(8) not null, primary key
# member_type :enum not null
-# member_id :integer not null
+# member_id :bigint(8) not null
# member_role :string not null
# sequence_id :integer default(0), not null, primary key
#
#
# Table name: current_relation_tags
#
-# relation_id :integer not null, primary key
+# relation_id :bigint(8) not null, primary key
# k :string default(""), not null, primary key
# v :string default(""), not null
#
#
# Table name: gpx_files
#
-# id :integer not null, primary key
-# user_id :integer not null
+# id :bigint(8) not null, primary key
+# user_id :bigint(8) not null
# visible :boolean default(TRUE), not null
# name :string default(""), not null
-# size :integer
+# size :bigint(8)
# latitude :float
# longitude :float
# timestamp :datetime not null
# trackid :integer not null
# latitude :integer not null
# longitude :integer not null
-# gpx_id :integer not null
+# gpx_id :bigint(8) not null
# timestamp :datetime
-# tile :integer
+# tile :bigint(8)
#
# Indexes
#
#
# Table name: gpx_file_tags
#
-# gpx_id :integer default(0), not null
+# gpx_id :bigint(8) default(0), not null
# tag :string not null
-# id :integer not null, primary key
+# id :bigint(8) not null, primary key
#
# Indexes
#
# Table name: users
#
# email :string not null
-# id :integer not null, primary key
+# id :bigint(8) not null, primary key
# pass_crypt :string not null
# creation_time :datetime not null
# display_name :string default(""), not null
# image_use_gravatar :boolean default(FALSE), not null
# image_content_type :string
# auth_provider :string
-# home_tile :integer
+# home_tile :bigint(8)
# tou_agreed :datetime
#
# Indexes
# Table name: user_blocks
#
# id :integer not null, primary key
-# user_id :integer not null
-# creator_id :integer not null
+# user_id :bigint(8) not null
+# creator_id :bigint(8) not null
# reason :text not null
# ends_at :datetime not null
# needs_view :boolean default(FALSE), not null
-# revoker_id :integer
+# revoker_id :bigint(8)
# created_at :datetime
# updated_at :datetime
# reason_format :enum default("markdown"), not null
#
# Table name: user_preferences
#
-# user_id :integer not null, primary key
+# user_id :bigint(8) not null, primary key
# k :string not null, primary key
# v :string not null
#
# Table name: user_roles
#
# id :integer not null, primary key
-# user_id :integer not null
+# user_id :bigint(8) not null
# role :enum not null
# created_at :datetime
# updated_at :datetime
-# granter_id :integer not null
+# granter_id :bigint(8) not null
#
# Indexes
#
#
# Table name: user_tokens
#
-# id :integer not null, primary key
-# user_id :integer not null
+# id :bigint(8) not null, primary key
+# user_id :bigint(8) not null
# token :string not null
# expiry :datetime not null
# referer :text
#
# Table name: current_ways
#
-# id :integer not null, primary key
-# changeset_id :integer not null
+# id :bigint(8) not null, primary key
+# changeset_id :bigint(8) not null
# timestamp :datetime not null
# visible :boolean not null
-# version :integer not null
+# version :bigint(8) not null
#
# Indexes
#
#
# Table name: current_way_nodes
#
-# way_id :integer not null, primary key
-# node_id :integer not null
-# sequence_id :integer not null, primary key
+# way_id :bigint(8) not null, primary key
+# node_id :bigint(8) not null
+# sequence_id :bigint(8) not null, primary key
#
# Indexes
#
#
# Table name: current_way_tags
#
-# way_id :integer not null, primary key
+# way_id :bigint(8) not null, primary key
# k :string default(""), not null, primary key
# v :string default(""), not null
#
--- /dev/null
+<div class="diary_entry standard-form">
+ <fieldset>
+ <div class='form-row'>
+ <label class="standard-label"><%= t ".subject" -%></label>
+ <%= f.text_field :title, :class => "richtext_title" %>
+ </div>
+ <div class='form-row'>
+ <label class="standard-label"><%= t ".body" -%></label>
+ <%= richtext_area :diary_entry, :body, :cols => 80, :rows => 20, :format => @diary_entry.body_format %>
+ </div>
+ <div class='form-row'>
+ <label class="standard-label"><%= t ".language" -%></label>
+ <%= f.collection_select :language_code, Language.order(:english_name), :code, :name %>
+ </div>
+ </fieldset>
+ <fieldset class='location'>
+ <label class="standard-label"><%= t ".location" -%></label>
+ <%= content_tag "div", "", :id => "map", :data => { :lat => @lat, :lon => @lon, :zoom => @zoom } %>
+ <div class='form-row clearfix'>
+ <div class='form-column'>
+ <label class="secondary standard-label"><%= t ".latitude" -%></label>
+ <%= f.text_field :latitude, :size => 20, :id => "latitude" %>
+ </div>
+ <div class='form-column'>
+ <label class="secondary standard-label"><%= t ".longitude" -%></label>
+ <%= f.text_field :longitude, :size => 20, :id => "longitude" %>
+ </div>
+ <div class='form-column'>
+ <a href="#" id="usemap"><%= t ".use_map_link" -%></a>
+ </div>
+ </div>
+ </fieldset>
+
+ <%= f.submit %>
+</div>
<%= error_messages_for "diary_entry" %>
-<%= form_for :diary_entry do |f| %>
- <div class="diary_entry standard-form">
- <fieldset>
- <div class='form-row'>
- <label class="standard-label"><%= t ".subject" -%></label>
- <%= f.text_field :title, :class => "richtext_title" %>
- </div>
- <div class='form-row'>
- <label class="standard-label"><%= t ".body" -%></label>
- <%= richtext_area :diary_entry, :body, :cols => 80, :rows => 20, :format => @diary_entry.body_format %>
- </div>
- <div class='form-row'>
- <label class="standard-label"><%= t ".language" -%></label>
- <%= f.collection_select :language_code, Language.order(:english_name), :code, :name %>
- </div>
- </fieldset>
- <fieldset class='location'>
- <label class="standard-label"><%= t ".location" -%></label>
- <%= content_tag "div", "", :id => "map", :data => { :lat => @lat, :lon => @lon, :zoom => @zoom } %>
- <div class='form-row clearfix'>
- <div class='form-column'>
- <label class="secondary standard-label"><%= t ".latitude" -%></label>
- <%= f.text_field :latitude, :size => 20, :id => "latitude" %>
- </div>
- <div class='form-column'>
- <label class="secondary standard-label"><%= t ".longitude" -%></label>
- <%= f.text_field :longitude, :size => 20, :id => "longitude" %>
- </div>
- <div class='form-column'>
- <a href="#" id="usemap"><%= t ".use_map_link" -%></a>
- </div>
- </div>
- </fieldset>
-
- <% if action_name == 'new' %>
- <%= submit_tag t("diary_entries.new.publish_button") %>
- <% else %>
- <%= submit_tag t(".save_button") %>
- <% end %>
- </div>
+<%= form_for @diary_entry, :url => diary_entry_path(current_user, @diary_entry), :html => { :method => :put } do |f| %>
+ <%= render :partial => "form", :locals => { :f => f } %>
<% end %>
<% if @user %>
<% if @user == current_user %>
<div>
- <li><%= link_to image_tag("new.png", :class => "small_icon", :border => 0) + t(".new"), diary_new_path, :title => t(".new_title") %></li>
+ <li><%= link_to image_tag("new.png", :class => "small_icon", :border => 0) + t(".new"), new_diary_entry_path, :title => t(".new_title") %></li>
</div>
<% end %>
<% else %>
<% if current_user %>
<div>
- <li><%= link_to image_tag("new.png", :class => "small_icon", :border => 0) + t(".new"), diary_new_path, :title => t(".new_title") %></li>
+ <li><%= link_to image_tag("new.png", :class => "small_icon", :border => 0) + t(".new"), new_diary_entry_path, :title => t(".new_title") %></li>
</div>
<% end %>
<% end %>
--- /dev/null
+<% content_for :head do %>
+ <%= javascript_include_tag "diary_entry" %>
+<% end %>
+
+<% content_for :heading do %>
+ <h1><%= @title %></h1>
+<% end %>
+
+<%= error_messages_for "diary_entry" %>
+
+<%= form_for @diary_entry do |f| %>
+ <%= render :partial => "form", :locals => { :f => f } %>
+<% end %>
</li>
<% end %>
<li class="compact-hide <%= current_page_class(traces_path) %>"><%= link_to t("layouts.gps_traces"), traces_path %></li>
- <li class="compact-hide <%= current_page_class(diary_path) %>"><%= link_to t("layouts.user_diaries"), diary_path %></li>
+ <li class="compact-hide <%= current_page_class(diary_entries_path) %>"><%= link_to t("layouts.user_diaries"), diary_entries_path %></li>
<li class="compact-hide <%= current_page_class(copyright_path) %>"><%= link_to t("layouts.copyright"), copyright_path %></li>
<li class="compact-hide <%= current_page_class(help_path) %>"><%= link_to t("layouts.help"), help_path %></li>
<li class="compact-hide <%= current_page_class(about_path) %>"><%= link_to t("layouts.about"), about_path %></li>
</li>
<% end %>
<li class="<%= current_page_class(traces_path) %>"><%= link_to t("layouts.gps_traces"), traces_path %></li>
- <li class="<%= current_page_class(diary_path) %>"><%= link_to t("layouts.user_diaries"), diary_path %></li>
+ <li class="<%= current_page_class(diary_entries_path) %>"><%= link_to t("layouts.user_diaries"), diary_entries_path %></li>
<li class="<%= current_page_class(copyright_path) %>"><%= link_to t("layouts.copyright"), copyright_path %></li>
<li class="<%= current_page_class(help_path) %>"><%= link_to t("layouts.help"), help_path %></li>
<li class="<%= current_page_class(about_path) %>"><%= link_to t("layouts.about"), about_path %></li>
<div class='section'>
<h2><div class='icon community'></div><%= t ".community_driven_title" %></h2>
- <p><%= t ".community_driven_html", :diary_path => diary_path %></p>
+ <p><%= t ".community_driven_html", :diary_path => diary_entries_path %></p>
</div>
<div class='section' id='open-data'>
<% else %>
<ul class='secondary-actions clearfix'>
<li><%= link_to t(".friends_changesets"), friend_changesets_path %></li>
- <li><%= link_to t(".friends_diaries"), friend_diaries_path %></li>
+ <li><%= link_to t(".friends_diaries"), friends_diary_entries_path %></li>
</ul>
<div id="friends-container">
<%= render :partial => "contact", :collection => friends, :locals => { :type => "friend" } %>
<% else %>
<ul class='secondary-actions clearfix'>
<li><%= link_to t(".nearby_changesets"), nearby_changesets_path %></li>
- <li><%= link_to t(".nearby_diaries"), nearby_diaries_path %></li>
+ <li><%= link_to t(".nearby_diaries"), nearby_diary_entries_path %></li>
</ul>
<div id="nearbyusers">
<%= render :partial => "contact", :collection => nearby, :locals => { :type => "nearby mapper" } %>
formats:
friendly: "%e %B %Y at %H:%M"
blog: "%e %B %Y"
+ helpers:
+ submit:
+ diary_entry:
+ create: "Publish"
+ update: "Update"
activerecord:
errors:
messages:
diary_entries:
new:
title: New Diary Entry
- publish_button: "Publish"
+ form:
+ subject: "Subject:"
+ body: "Body:"
+ language: "Language:"
+ location: "Location:"
+ latitude: "Latitude:"
+ longitude: "Longitude:"
+ use_map_link: "use map"
index:
title: "Users' diaries"
title_friends: "Friends' diaries"
older_entries: Older Entries
newer_entries: Newer Entries
edit:
- title: "Edit diary entry"
- subject: "Subject:"
- body: "Body:"
- language: "Language:"
- location: "Location:"
- latitude: "Latitude:"
- longitude: "Longitude:"
- use_map_link: "use map"
- save_button: "Save"
+ title: Edit Diary Entry
marker_text: Diary entry location
show:
title: "%{user}'s diary | %{title}"
post "/trace/:id/delete" => "traces#delete", :id => /\d+/
# diary pages
- match "/diary/new" => "diary_entries#new", :via => [:get, :post]
- get "/diary/friends" => "diary_entries#index", :friends => true, :as => "friend_diaries"
- get "/diary/nearby" => "diary_entries#index", :nearby => true, :as => "nearby_diaries"
+ resources :diary_entries, :path => "diary", :only => [:new, :create, :index] do
+ collection do
+ get "friends" => "diary_entries#index", :friends => true
+ get "nearby" => "diary_entries#index", :nearby => true
+ end
+ end
get "/user/:display_name/diary/rss" => "diary_entries#rss", :defaults => { :format => :rss }
get "/diary/:language/rss" => "diary_entries#rss", :defaults => { :format => :rss }
get "/diary/rss" => "diary_entries#rss", :defaults => { :format => :rss }
get "/user/:display_name/diary/comments/" => "diary_entries#comments"
get "/user/:display_name/diary" => "diary_entries#index"
get "/diary/:language" => "diary_entries#index"
- get "/diary" => "diary_entries#index"
- get "/user/:display_name/diary/:id" => "diary_entries#show", :id => /\d+/, :as => :diary_entry
+ scope "/user/:display_name" do
+ resources :diary_entries, :path => "diary", :only => [:edit, :update, :show]
+ end
post "/user/:display_name/diary/:id/newcomment" => "diary_entries#comment", :id => /\d+/
- match "/user/:display_name/diary/:id/edit" => "diary_entries#edit", :via => [:get, :post], :id => /\d+/
post "/user/:display_name/diary/:id/hide" => "diary_entries#hide", :id => /\d+/, :as => :hide_diary_entry
post "/user/:display_name/diary/:id/hidecomment/:comment" => "diary_entries#hidecomment", :id => /\d+/, :comment => /\d+/, :as => :hide_diary_comment
post "/user/:display_name/diary/:id/subscribe" => "diary_entries#subscribe", :as => :diary_entry_subscribe, :id => /\d+/
nearby_radius: 50
# Spam threshold
spam_threshold: 50
+# Delay diary entries from appearing in the feed for this many hours
+diary_feed_delay: 0
# Default legale (jurisdiction location) for contributor terms
default_legale: GB
# Use the built-in jobs queue for importing traces
# Trace directories for testing
gpx_trace_dir: <%= Rails.root.join("test", "gpx", "traces") %>
gpx_image_dir: <%= Rails.root.join("test", "gpx", "images") %>
+# Ignore the diary feed delay unless we're specifically testing it
+diary_feed_delay: 0
# Geonames credentials for testing
geonames_username: "dummy"
# External authentication credentials for testing
{ :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 },
{ :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 },
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
: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" } },
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" } },
# 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 }
: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
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
assert_match "<title><script></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)
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
def test_confirm_success_no_token_with_referer
user = create(:user, :pending)
stub_gravatar_request(user.email)
- confirm_string = user.tokens.create(:referer => diary_new_path).token
+ confirm_string = user.tokens.create(:referer => new_diary_entry_path).token
@request.cookies["_osm_session"] = user.display_name
post :confirm, :params => { :display_name => user.display_name, :confirm_string => confirm_string }
- assert_redirected_to login_path(:referer => diary_new_path)
+ assert_redirected_to login_path(:referer => new_diary_entry_path)
assert_match(/Confirmed your account/, flash[:notice])
end
def test_confirm_success_good_token_with_referer
user = create(:user, :pending)
stub_gravatar_request(user.email)
- confirm_string = user.tokens.create(:referer => diary_new_path).token
+ confirm_string = user.tokens.create(:referer => new_diary_entry_path).token
token = user.tokens.create.token
@request.cookies["_osm_session"] = user.display_name
post :confirm, :params => { :display_name => user.display_name, :confirm_string => confirm_string }, :session => { :token => token }
- assert_redirected_to diary_new_path
+ assert_redirected_to new_diary_entry_path
end
def test_confirm_success_bad_token_with_referer
user = create(:user, :pending)
stub_gravatar_request(user.email)
- confirm_string = user.tokens.create(:referer => diary_new_path).token
+ confirm_string = user.tokens.create(:referer => new_diary_entry_path).token
token = create(:user).tokens.create.token
@request.cookies["_osm_session"] = user.display_name
post :confirm, :params => { :display_name => user.display_name, :confirm_string => confirm_string }, :session => { :token => token }
- assert_redirected_to login_path(:referer => diary_new_path)
+ assert_redirected_to login_path(:referer => new_diary_entry_path)
assert_match(/Confirmed your account/, flash[:notice])
end
def test_confirm_already_confirmed
user = create(:user)
- confirm_string = user.tokens.create(:referer => diary_new_path).token
+ confirm_string = user.tokens.create(:referer => new_diary_entry_path).token
@request.cookies["_osm_session"] = user.display_name
post :confirm, :params => { :display_name => user.display_name, :confirm_string => confirm_string }
follow_redirect!
assert_response :success
- assert_template "diary_entries/edit"
+ assert_template "diary_entries/new"
# print @response.body
# print @html_document.to_yaml
assert_select "h1", "New Diary Entry"
end
assert_select "div#content" do
- assert_select "form[action='/diary/new']" do
+ assert_select "form[action='/diary']" do
assert_select "input[id=diary_entry_title]"
end
end
test "reply to diary entry should prefill the message subject" do
sign_in_as(create(:user))
- visit diary_path
+ visit diary_entries_path
click_on "Reply to this entry"
projects / rails.git / commitdiff