tkh_search 0.2 → 0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1ec2548d73c8962999cf9eb77004b5ab2da38126
-  data.tar.gz: 03f8807ddfca834983c47a36e9012777ec1eda0e
+  metadata.gz: e46f0c7ae302f4b399f6585ff098de3e4db77678
+  data.tar.gz: 0a274e2a010c2e15f9ae13a614fc61bddfac6a22
 SHA512:
-  metadata.gz: 36f41316f96bf10a0ee22e4f088228665031774f6f624d199178207f924802ad98800d20f13d616d3d41f633d7709b1be4124c48c18bb85b9640ce77c4e6f09f
-  data.tar.gz: 7012552fcf9027737a3e89c4b674214ce8e437140a76d40de9da8a9a13bf6be2a759a6e1fb306aa638a264c5eb5ecc5616fa9c9c3f7b18408801126f2a688e99
+  metadata.gz: f540f7810be0a1e3ca547d67446dd8d20980308f5b8cb8f138fca30284e5aeb61c18ff51d1e7ed781c6e79ecee5c044f711ec5e185487b4dc25381f60585d9be
+  data.tar.gz: c0c0b950ff96a9bd20a820dfbb311ab4d27d4e89250b9c78a3d6b02ccf46bdedc4ef19a79f69ea2abc51d978666af0711560e5a63894d05cbf15ce9906324b13

data/CHANGELOG.md

@@ -2,6 +2,12 @@
 
 
 
+## 0.3
+
+* Added internationalization of queries
+* Little aesthetic improvement in search stats
+
+
 ## 0.2
 
 * Added search stats section to readme.

data/app/controllers/search_controller.rb

@@ -4,14 +4,16 @@ class SearchController < ApplicationController
     @query = params[:query].downcase.strip
     @models_to_search = params[:models_to_search].split
     @results_css_class = params[:results_css_class] || 'js-search-results'
+    current_locale = @cl
+    @the_current_locale = I18n.locale
     token = SecureRandom.base64
     search_terms = []
     @query.split.each do |query_word|
-      search_terms << TkhSearchTerm.includes(:tkh_search_instances).find_or_create_by( word: query_word )
+      search_terms << TkhSearchTerm.find_or_create_by( word: query_word )
     end
     search_terms.each do |search_term|
-      if search_term.tkh_search_instances.any?
-        search_term.tkh_search_instances.each do |search_instance|
+      if search_term.tkh_search_instances.for_locale(current_locale).any?
+        search_term.tkh_search_instances.for_locale(current_locale).each do |search_instance|
           if @models_to_search.include? search_instance.host_model_name
             search_result = TkhSearchResult.find_or_create_by(
                                 token: token,

data/app/controllers/search_stats_controller.rb

@@ -4,7 +4,7 @@ class SearchStatsController < ApplicationController
   before_filter :authenticate_with_admin
 
   def index
-    switch_to_admin_layout
+    render :layout => 'admin'
   end
 
 end

data/app/models/tkh_search_instance.rb

@@ -4,6 +4,7 @@ class TkhSearchInstance < ActiveRecord::Base
 
   scope :a_bit_old, -> { where('updated_at <= ?', ( Time.now - 2.minutes )) }
   scope :by_top_rating, -> { order('rating desc') }
+  scope :for_locale, ->(loc) { where('language = ?', loc) }
 
   def unique_record_name
     "#{host_model_name}-#{model_record_id}"

data/app/views/search/_search_results.html.erb

@@ -20,3 +20,5 @@
     <li>There are no page results corresponding to this query.</li>
   <% end %>
 </ul>
+<p>The current locale in the controller is: <%= @the_current_locale %></p>
+<p>The current locale in the view is: <%= I18n.locale %></p>

data/app/views/search_stats/index.html.erb

@@ -28,7 +28,7 @@
 
 <ul>
   <% TkhSearchEvent.last_month.group(:tkh_search_query_id).order('COUNT(tkh_search_query_id) desc').limit(50).each do |event| %>
-    <li><%= "#{event.tkh_search_query.string} #{TkhSearchEvent.last_month.where(tkh_search_query_id: event.tkh_search_query_id).count}" %></li>
+    <li><%= "#{event.tkh_search_query.string}&nbsp;&nbsp;<span class=\"badge\">#{TkhSearchEvent.last_month.where(tkh_search_query_id: event.tkh_search_query_id).count}</span>".html_safe %></li>
   <% end %>
 </ul>
 

data/config/routes.rb

@@ -1,7 +1,18 @@
 Rails.application.routes.draw do
-  scope "(:locale)", locale: /#{I18n.available_locales.join("|")}/ do
-    post 'search' => 'search#index'
-    get 'index_all_models' => 'search#index_all_models'
-    get 'search_stats' => 'search_stats#index'
+
+  # The yoga center madrid site uses a different internationalization system :-(
+  unless request.domain == 'yogacentersc.es'
+    localized do
+      post 'search' => 'search#index'
+      get 'index_all_models' => 'search#index_all_models'
+      get 'search_stats' => 'search_stats#index'
+    end
+  else
+    scope "(:locale)", locale: /#{I18n.available_locales.join("|")}/ do
+      post 'search' => 'search#index'
+      get 'index_all_models' => 'search#index_all_models'
+      get 'search_stats' => 'search_stats#index'
+    end
   end
+
 end

data/lib/tkh_search/version.rb

@@ -1,3 +1,3 @@
 module TkhSearch
-  VERSION = "0.2"
+  VERSION = "0.3"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: tkh_search
 version: !ruby/object:Gem::Version
-  version: '0.2'
+  version: '0.3'
 platform: ruby
 authors:
 - Swami Atma
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-11-17 00:00:00.000000000 Z
+date: 2015-03-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -129,7 +129,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.4
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: Lightweigh Rails search engine