udongo 7.5.0 → 7.5.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: cc8c7b4bbcf91c6533f4bd2d275a64c63971d114
-  data.tar.gz: b5f234c45d64860b99918f7ae082fe955d3398c5
+  metadata.gz: 4177132fc9f3839266578b24b8bc6fbf4e089668
+  data.tar.gz: c162d73c7d75c2548d75e5f4ea373717427300d9
 SHA512:
-  metadata.gz: 715f1f441cf1f7dcb94b077ad5f4843473e43316bcfa1db370556fd29ca3b1feea01d303cdcebd3f991a5f9024cc53552641fb56ed567b8f01b71212aaa46c2d
-  data.tar.gz: 47edb83449ec1052d115c6a53b5420205454540ed8cd92c8e23ce20107abad3d35ee475bedd9274faac6b703128e9bd389483a5fe902fa7d3c99e7968912d96a
+  metadata.gz: 63a75acceeae182eed74dd8179808ab06eceb45a2087a5efc225688200bba608ff7d6a9e155e5197f2b6880799511133b67210e57000433c710c6c673527008e
+  data.tar.gz: e5ac2f9ccaad7c46a2409cbb57de43eb555c6748bb86806b4709b1e99149bb6e386485edfc3dc2703c37f799011ec00960d6306d9ad39a7e14fbb758e21fb9de

data/app/controllers/backend/search_terms_controller.rb

@@ -0,0 +1,14 @@
+class Backend::SearchTermsController < Backend::BaseController
+  before_action -> { breadcrumb.add t('b.search_terms'), backend_search_terms_path }
+
+  def index
+    @search_terms = ::SearchTerm.select('*, COUNT(1) as total')
+                                .group('locale, term')
+                                .order('COUNT(1) DESC')
+  end
+
+  def destroy_all
+    ::SearchTerm.destroy_all
+    redirect_to backend_search_terms_path, notice: t('b.msg.search_terms.deleted')
+  end
+end

data/app/models/search_module.rb

@@ -5,6 +5,6 @@ class SearchModule < ApplicationRecord
 
   def indices
     SearchIndex.joins('INNER JOIN search_modules ON search_indices.searchable_type = search_modules.name')
-      .where('search_modules.name = ?', name)
+               .where('search_modules.name = ?', name)
   end
 end

data/app/models/search_term.rb

@@ -0,0 +1,3 @@
+class SearchTerm < ApplicationRecord
+  validates :locale, :term, presence: true
+end

data/app/views/backend/search_synonyms/_form.html.erb

@@ -9,13 +9,13 @@
     <div class="card-block">
       <div class="row">
         <div class="col-md-6">
-          <%= f.input :locale, collection: Udongo.config.i18n.cms.interface_locales, include_blank: false %>
+          <%= f.input :locale, collection: Udongo.config.i18n.cms.interface_locales, selected: params[:search_locale], include_blank: false %>
         </div>
       </div>
 
       <div class="row">
         <div class="col-md-6">
-          <%= f.input :term %>
+          <%= f.input :term, input_html: { value: params[:term] } %>
         </div>
 
         <div class="col-md-6">

data/app/views/backend/search_terms/index.html.erb

@@ -0,0 +1,37 @@
+<%= render 'backend/breadcrumbs' %>
+
+<% if @search_terms.any? %>
+  <p>
+    <%= link_to backend_search_terms_path, class: 'btn btn-danger', method: 'delete', data: { confirm: t('b.msg.confirm') } do %>
+      <%= icon :trash %>
+      <%= t('b.msg.search_terms.destroy_all') %>
+    <% end %>
+  </p>
+
+  <table class="table table-hover table-striped">
+    <thead class="thead-inverse">
+      <tr>
+        <th><%= t 'b.locale' %></th>
+        <th><%= t 'b.search_term' %></th>
+        <th><%= t 'b.times_used' %></th>
+        <th>&nbsp;</th>
+      </tr>
+    </thead>
+
+    <tbody>
+      <% @search_terms.each do |s| %>
+        <tr>
+          <td><%= s.locale.upcase %></td>
+          <td><%= s.term %></td>
+          <td><%= s.total %></td>
+          <td class="text-right">
+            <%= link_to icon(:clone), new_backend_search_synonym_path(search_locale: s.locale, term: s.term), title: t('b.msg.search_synonyms.create') %>
+          </td>
+        </tr>
+      <% end %>
+    </tbody>
+  </table>
+
+<% else %>
+  <p><%= t 'b.msg.no_items' %></p>
+<% end %>

data/app/views/layouts/backend/_top_navigation.html.erb

@@ -29,6 +29,7 @@
     <li class="nav-item dropdown">
       <a class="nav-link dropdown-toggle" data-toggle="dropdown" href="#" role="button" aria-haspopup="true" aria-expanded="false"><%= icon(:search, t('b.search')) %></a>
       <div class="dropdown-menu">
+        <%= link_to t('b.search_terms'), backend_search_terms_path, class: 'dropdown-item' %>
         <%= link_to t('b.synonyms'), backend_search_synonyms_path, class: 'dropdown-item' %>
       </div>
     </li>

data/changelog.md

@@ -1,3 +1,9 @@
+7.5.1 - 2018-07-26
+--
+* Let Udongo search ignore diacritics in search terms.
+* Adds an overview of used search terms to the backend.
+
+
 7.5.0 - 2018-06-13
 --
 * Make it possible to mark a content picture to be used in the background with a

data/config/locales/en_backend.yml

@@ -76,6 +76,7 @@ en:
     save: Save
     search: Search
     search_term: Search term
+    search_terms: Used search terms
     search_synonym: Search synonym
     search_synonyms: Search synonyms
     sender: Sender
@@ -94,6 +95,7 @@ en:
     tag: Tag
     tags: Tags
     telephone: Telephone
+    times_used: Times used
     title: Title
     to: To
     type: Type
@@ -175,6 +177,11 @@ en:
         invisible: Deze pagina is niet zichtbaar op de website.
       please_select_a_valid_image: Please select a valid image and try again.
       saved: '%{actor} was saved.'
+      search_terms:
+        deleted: The list with used search terms was cleared.
+        destroy_all: Delete all used search terms
+      search_synonyms:
+        create: Create a search synonym based on this search term
       seo: SEO
       something_went_wrong: Something went wrong!
       status_codes:

data/config/locales/nl_backend.yml

@@ -78,6 +78,7 @@ nl:
     save: Opslaan
     search: Zoeken
     search_term: Zoekterm
+    search_terms: Gebruikte zoektermen
     search_synonym: Zoekterm synoniem
     search_synonyms: Zoekterm synoniemen
     sender: Afzender
@@ -96,6 +97,7 @@ nl:
     tag: Tag
     tags: Tags
     telephone: Telefoonnummer
+    times_used: Aantal keer gebruikt
     title: Titel
     to: Naar
     type: Type
@@ -177,6 +179,11 @@ nl:
         invisible: Deze pagina is niet zichtbaar op de website.
       please_select_a_valid_image: Gelieve een geldige afbeelding te selecteren en opnieuw te proberen.
       saved: '%{actor} werd bewaard.'
+      search_terms:
+        deleted: De lijst met gebruikte zoektermen werd gewist
+        destroy_all: Verwijder alle gebruikte zoektermen
+      search_synonyms:
+        create: Maak zoeksyniem aan op basis van deze term
       seo: SEO
       something_went_wrong: Er liep iets fout!
       status_codes:

data/config/routes.rb

@@ -19,6 +19,9 @@ Rails.application.routes.draw do
 
     resources :sessions, only: [:new, :create, :destroy]
     resources :admins
+    resources :search_terms, only: [:index] do
+      collection { delete '/', action: 'destroy_all' }
+    end
     resources :users
     resources :redirects, except: :show
     resources :search_synonyms, except: :show

data/db/migrate/20180719160953_create_searches.rb

@@ -0,0 +1,10 @@
+class CreateSearches < ActiveRecord::Migration[5.0]
+  def change
+    create_table :searches do |t|
+      t.string :locale
+      t.string :term
+
+      t.timestamps
+    end
+  end
+end

data/db/migrate/20180719164016_rename_search_to_search_terms.rb

@@ -0,0 +1,5 @@
+class RenameSearchToSearchTerms < ActiveRecord::Migration[5.0]
+  def change
+    rename_table :searches, :search_terms
+  end
+end

data/lib/udongo/assets/resizer.rb

@@ -14,7 +14,6 @@ module Udongo
         background = options[:background].to_s.parameterize
 
         str = action.to_s.split('_').last
-        # TODO: rekening houden met asset updated_at
         str << "-q#{quality}" if quality.present?
         str << "-g#{gravity}" if gravity.present?
         str << "-b#{background}" if background.present?

data/lib/udongo/search/base.rb

@@ -47,7 +47,7 @@ module Udongo::Search
         # a searchable result. Otherwise matches from both an indexed
         # Page#title and Page#description would be in the result set.
         stack << m.indices
-                  .where('search_indices.value REGEXP ?', term.value)
+                  .where('search_indices.value LIKE ?', "%#{term.value}%")
                   .group([:searchable_type, :searchable_id])
       end.flatten
     end

data/lib/udongo/search/frontend.rb

@@ -16,6 +16,8 @@ module Udongo::Search
     # If you return nil in the #url method of a result object, the item
     # will get filtered out of the search results.
     def search
+      ::SearchTerm.create!(locale: controller.locale, term: term.value) if term
+
       indices.map do |index|
         result = result_object(index)
         next if result.hidden? || result.unpublished? || result.url.nil?

data/lib/udongo/version.rb

@@ -1,3 +1,3 @@
 module Udongo
-  VERSION = '7.5.0'
+  VERSION = '7.5.1'
 end

data/spec/factories/search_terms.rb

@@ -0,0 +1,6 @@
+FactoryGirl.define do
+  factory :search_term do
+    locale 'nl'
+    term 'foo'
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: udongo
 version: !ruby/object:Gem::Version
-  version: 7.5.0
+  version: 7.5.1
 platform: ruby
 authors:
 - Davy Hellemans
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-06-13 00:00:00.000000000 Z
+date: 2018-07-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -489,6 +489,7 @@ files:
 - app/controllers/backend/redirects_controller.rb
 - app/controllers/backend/search_controller.rb
 - app/controllers/backend/search_synonyms_controller.rb
+- app/controllers/backend/search_terms_controller.rb
 - app/controllers/backend/seo_controller.rb
 - app/controllers/backend/sessions_controller.rb
 - app/controllers/backend/snippets_controller.rb
@@ -600,6 +601,7 @@ files:
 - app/models/search_index.rb
 - app/models/search_module.rb
 - app/models/search_synonym.rb
+- app/models/search_term.rb
 - app/models/setting.rb
 - app/models/snippet.rb
 - app/models/store.rb
@@ -713,6 +715,7 @@ files:
 - app/views/backend/search_synonyms/edit.html.erb
 - app/views/backend/search_synonyms/index.html.erb
 - app/views/backend/search_synonyms/new.html.erb
+- app/views/backend/search_terms/index.html.erb
 - app/views/backend/sessions/new.html.erb
 - app/views/backend/snippets/_form.html.erb
 - app/views/backend/snippets/_tabs.html.erb
@@ -868,6 +871,8 @@ files:
 - db/migrate/20180427144338_add_missing_seo_fields_to_tags.rb
 - db/migrate/20180427150844_remove_locales_and_seo_locales_from_tags.rb
 - db/migrate/20180613113816_add_content_picture_bg_image_fields.rb
+- db/migrate/20180719160953_create_searches.rb
+- db/migrate/20180719164016_rename_search_to_search_terms.rb
 - lib/tasks/task_extras.rb
 - lib/tasks/udongo_tasks.rake
 - lib/udongo.rb
@@ -947,6 +952,7 @@ files:
 - spec/factories/search_indices.rb
 - spec/factories/search_modules.rb
 - spec/factories/search_synonyms.rb
+- spec/factories/search_terms.rb
 - spec/factories/settings.rb
 - spec/factories/snippets.rb
 - spec/factories/stores.rb