コミットを比較
2
コミット
| 作成者 | SHA1 | 日付 | |
|---|---|---|---|
|
|
2d455f6914 | ||
|
|
f0065af00a |
@@ -47,8 +47,8 @@ class PostsController < ApplicationController
|
||||
.preload(tags: { tag_name: :wiki_page })
|
||||
.with_attached_thumbnail
|
||||
|
||||
q = q.where('posts.url LIKE ?', "%#{ url }%") if url
|
||||
q = q.where('posts.title LIKE ?', "%#{ title }%") if title
|
||||
q = q.where('posts.url LIKE ?', "%#{ Post.sanitize_sql_like(url).tr('*?', '%_') }%") if url
|
||||
q = q.where('posts.title LIKE ?', "%#{ Post.sanitize_sql_like(title).tr('*?', '%_') }%") if title
|
||||
if original_created_from
|
||||
q = q.where('posts.original_created_before > ?', original_created_from)
|
||||
end
|
||||
|
||||
@@ -2,8 +2,8 @@ class TagsController < ApplicationController
|
||||
def index
|
||||
post_id = params[:post]
|
||||
|
||||
name = params[:name].presence
|
||||
category = params[:category].presence
|
||||
name = params[:name].to_s.strip.presence
|
||||
category = params[:category].to_s.strip.presence
|
||||
post_count_between = (params[:post_count_gte].presence || -1).to_i,
|
||||
(params[:post_count_lte].presence || -1).to_i
|
||||
post_count_between[0] = nil if post_count_between[0] < 0
|
||||
@@ -36,7 +36,9 @@ class TagsController < ApplicationController
|
||||
.includes(:tag_name, tag_name: :wiki_page)
|
||||
q = q.where(posts: { id: post_id }) if post_id.present?
|
||||
|
||||
q = q.where('tag_names.name LIKE ?', "%#{ name }%") if name
|
||||
if name
|
||||
q = q.where('tag_names.name LIKE ?', "%#{ ActiveRecord::Base.sanitize_sql_like(name) }%")
|
||||
end
|
||||
q = q.where(category: category) if category
|
||||
q = q.where('tags.post_count >= ?', post_count_between[0]) if post_count_between[0]
|
||||
q = q.where('tags.post_count <= ?', post_count_between[1]) if post_count_between[1]
|
||||
@@ -77,7 +79,7 @@ class TagsController < ApplicationController
|
||||
|
||||
alias_rows =
|
||||
TagName
|
||||
.where('name LIKE ?', "#{ q }%")
|
||||
.where('name LIKE ?', "#{ ActiveRecord::Base.sanitize_sql_like(q) }%")
|
||||
.where.not(canonical_id: nil)
|
||||
.pluck(:canonical_id, :name)
|
||||
|
||||
@@ -97,7 +99,8 @@ class TagsController < ApplicationController
|
||||
base
|
||||
.where(((with_nico ? '(tags.category = ? AND tag_names.name LIKE ?) OR ' : '') +
|
||||
'tag_names.name LIKE ?'),
|
||||
*(with_nico ? ['nico', "nico:#{ q }%"] : []), "#{ q }%")
|
||||
*(with_nico ? ['nico', "nico:#{ ActiveRecord::Base.sanitise_sql_like(q) }%"] : []),
|
||||
"#{ ActiveRecord::Base.sanitise_sql_like(q) }%")
|
||||
|
||||
tags =
|
||||
if canonical_ids.present?
|
||||
|
||||
@@ -287,6 +287,35 @@ RSpec.describe 'Posts API', type: :request do
|
||||
end
|
||||
end
|
||||
|
||||
[:title, :url].each do |field|
|
||||
context "when #{field} contains wildcards" do
|
||||
let!(:search_posts) do
|
||||
['needle%25end', 'needleX25end', 'needle_end', 'needleXend', 'needleABend'].map do |value|
|
||||
Post.create!(uploaded_user: user, title: "prefix #{value} suffix",
|
||||
url: "https://example.com/prefix-#{value}-suffix")
|
||||
end
|
||||
end
|
||||
|
||||
{
|
||||
'needle%25end' => [0],
|
||||
'needle_end' => [2],
|
||||
'needle*end' => [0, 1, 2, 3, 4],
|
||||
'needle?end' => [2, 3],
|
||||
'needle%*end' => [0],
|
||||
'needle_?nd' => [2]
|
||||
}.each do |query, expected_indices|
|
||||
it "matches #{query.inspect} using only * and ? as wildcards" do
|
||||
get '/posts', params: { field => query }
|
||||
|
||||
expect(response).to have_http_status(:ok)
|
||||
expected_ids = expected_indices.map { |i| search_posts[i].id }
|
||||
expect(json.fetch('posts').map { |p| p['id'] }).to match_array(expected_ids)
|
||||
expect(json.fetch('count')).to eq(expected_ids.size)
|
||||
end
|
||||
end
|
||||
end
|
||||
end
|
||||
|
||||
context 'when created_from/created_to are provided' do
|
||||
let(:t_created_hit) { Time.zone.local(2010, 1, 5, 12, 0, 0) }
|
||||
let(:t_created_miss) { Time.zone.local(2012, 1, 5, 12, 0, 0) }
|
||||
|
||||
新しいイシューから参照
ユーザーをブロックする