tkh_search 0.1 → 0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: bd0571508ddad0d7802c5449bb2a3d5cd1de47b7
-  data.tar.gz: 53ac20d7f786dbb2a33fd46f4719418a46e19383
+  metadata.gz: 1ec2548d73c8962999cf9eb77004b5ab2da38126
+  data.tar.gz: 03f8807ddfca834983c47a36e9012777ec1eda0e
 SHA512:
-  metadata.gz: 907ec49bdefea212c66e917e4ffdedeff0aa9ef6d7f98f3e9bbd3704497925523135a0c49f347241951befce8028137710fd2e09f96c7407afab8a965202a9b5
-  data.tar.gz: cb92a62531f43658a032b6810e606eaa6b217bed9c443279fca0f3a354b2e66db5ef38c170e6dc48b26650ed573be6a40e194b9ec170417b172e9f84fd085e45
+  metadata.gz: 36f41316f96bf10a0ee22e4f088228665031774f6f624d199178207f924802ad98800d20f13d616d3d41f633d7709b1be4124c48c18bb85b9640ce77c4e6f09f
+  data.tar.gz: 7012552fcf9027737a3e89c4b674214ce8e437140a76d40de9da8a9a13bf6be2a759a6e1fb306aa638a264c5eb5ecc5616fa9c9c3f7b18408801126f2a688e99

data/.ruby-version

@@ -1 +1 @@
-2.1.2
+2.1.5

data/CHANGELOG.md

@@ -2,6 +2,12 @@
 
 
 
+## 0.2
+
+* Added search stats section to readme.
+* Debugged the dangerous attributes created by model_name in two models.
+
+
 ## 0.1
 
 * Every user search is logged in the database

data/README.md

@@ -118,6 +118,11 @@ This can also be used for the sake of localization
 <%= render 'search/search_form', models_to_search: 'Event', submit_label: 'find an awesome event' %>
 ```
 
+## Search Stats
+
+Administrators can see the indexing and searching stats at
+
+     /search_stats
 
 ## Missing Features
 

data/app/controllers/search_controller.rb

@@ -12,10 +12,10 @@ class SearchController < ApplicationController
     search_terms.each do |search_term|
       if search_term.tkh_search_instances.any?
         search_term.tkh_search_instances.each do |search_instance|
-          if @models_to_search.include? search_instance.model_name
+          if @models_to_search.include? search_instance.host_model_name
             search_result = TkhSearchResult.find_or_create_by(
                                 token: token,
-                                model_name: search_instance.model_name,
+                                host_model_name: search_instance.host_model_name,
                                 model_record_id: search_instance.model_record_id)
             search_result.rating += search_instance.rating
             search_result.save

data/app/models/tkh_search_instance.rb

@@ -6,7 +6,7 @@ class TkhSearchInstance < ActiveRecord::Base
   scope :by_top_rating, -> { order('rating desc') }
 
   def unique_record_name
-    "#{model_name}-#{model_record_id}"
+    "#{host_model_name}-#{model_record_id}"
   end
 
 end

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

@@ -1,7 +1,7 @@
 <ul class="search-results">
   <% if search_results.any? %>
     <% search_results.each do |result| %>
-      <% record = (Kernel.const_get result.model_name).find(result.model_record_id) %>
+      <% record = (Kernel.const_get result.host_model_name).find(result.model_record_id) %>
       <% if defined? record.name %>
         <% link_label = record.name %>
       <% elsif defined? record.title %>
@@ -10,7 +10,7 @@
         <% link_label = 'no title or name' %>
       <% end %>
       <%= content_tag :li,
-        "<span class='sr-model-name'>#{result.model_name}</span> -
+        "<span class='sr-model-name'>#{result.host_model_name}</span> -
         <span class='sr-record-link'>#{link_to link_label, record}</span> -
         <span class='sr-rating'>#{result.rating}</span>
         ".html_safe

data/lib/generators/tkh_search/create_or_update_migrations/create_or_update_migrations_generator.rb

@@ -22,6 +22,7 @@ module TkhSearch
         migration_template "create_tkh_search_queries.rb", "db/migrate/create_tkh_search_queries.rb"
         migration_template "create_tkh_search_events.rb", "db/migrate/create_tkh_search_events.rb"
         migration_template "create_tkh_search_results.rb", "db/migrate/create_tkh_search_results.rb"
+        migration_template "fix_dangerous_attributes.rb", "db/migrate/fix_dangerous_attributes.rb"
       end
 
     end

data/lib/generators/tkh_search/create_or_update_migrations/templates/fix_dangerous_attributes.rb

@@ -0,0 +1,16 @@
+class FixDangerousAttributes < ActiveRecord::Migration
+
+  # ActiveRecord raises an exception if some model attributes
+  # use the same word as some AR methods or attributes.
+
+  def self.up
+    rename_column :tkh_search_instances, :model_name, :host_model_name
+    rename_column :tkh_search_results, :model_name, :host_model_name
+  end
+
+  def self.down
+    rename_column :tkh_search_instances, :host_model_name, :model_name
+    rename_column :tkh_search_results, :host_model_name, :model_name
+  end
+
+end

data/lib/tkh_search/tkh_searchable.rb

@@ -53,7 +53,7 @@ module TkhSearch
       words.each do |word,strength|
         term = TkhSearchTerm.find_or_create_by( word: word )
         instance = TkhSearchInstance.find_or_create_by(
-                    model_name: self.name,
+                    host_model_name: self.name,
                     model_record_id: record.id,
                     tkh_search_term_id: term.id )
         instance.rating   = strength
@@ -75,7 +75,7 @@ module TkhSearch
       def remove_obsolete_instances
         # after an individual record save and the record has been reindexed
         # we need to remove indexed instances for words which have been deleted
-        obsolete_instances = TkhSearchInstance.where( 'model_name = ? and model_record_id = ?', self.class.name, self.id ).a_bit_old
+        obsolete_instances = TkhSearchInstance.where( 'host_model_name = ? and model_record_id = ?', self.class.name, self.id ).a_bit_old
         obsolete_instances.each do |instance|
           instance.destroy!
         end

data/lib/tkh_search/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: tkh_search
 version: !ruby/object:Gem::Version
-  version: '0.1'
+  version: '0.2'
 platform: ruby
 authors:
 - Swami Atma
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-10-12 00:00:00.000000000 Z
+date: 2014-11-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -101,6 +101,7 @@ files:
 - lib/generators/tkh_search/create_or_update_migrations/templates/create_tkh_search_queries.rb
 - lib/generators/tkh_search/create_or_update_migrations/templates/create_tkh_search_results.rb
 - lib/generators/tkh_search/create_or_update_migrations/templates/create_tkh_search_terms.rb
+- lib/generators/tkh_search/create_or_update_migrations/templates/fix_dangerous_attributes.rb
 - lib/generators/tkh_search/install_initializer/install_initializer_generator.rb
 - lib/generators/tkh_search/install_initializer/templates/tkh_search.rb
 - lib/tasks/tkh_search_tasks.rake
@@ -128,7 +129,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.4.4
 signing_key: 
 specification_version: 4
 summary: Lightweigh Rails search engine