Elasticsearch: Refactored models

redirect index -> search action removing models extensions that are removed from core renaming elasticsearch helper to a better name (now, working as well) model extensions working with the new helper name check :weight exists refactoring models extensions

Elasticsearch: Refactored models
redirect index -> search action removing models extensions that are removed from core renaming elasticsearch helper to a better name (now, working as well) model extensions working with the new helper name check :weight exists refactoring models extensions
Joenio Costa · Macartur Sousa
1 parent 002cf525
Showing 14 changed files with 85 additions and 87 deletions Show diff stats
plugins/elasticsearch/controllers/elasticsearch_plugin_controller.rb
plugins/elasticsearch/lib/elasticsearch_helper.rb
plugins/elasticsearch/lib/elasticsearch_indexed_model.rb
plugins/elasticsearch/lib/ext/article.rb
plugins/elasticsearch/lib/ext/category.rb
plugins/elasticsearch/lib/ext/certifier.rb
plugins/elasticsearch/lib/ext/comment.rb
plugins/elasticsearch/lib/ext/license.rb
plugins/elasticsearch/lib/ext/national_region.rb
plugins/elasticsearch/lib/ext/product.rb
plugins/elasticsearch/lib/ext/profile.rb
plugins/elasticsearch/lib/ext/qualifier.rb
plugins/elasticsearch/lib/ext/scrap.rb
plugins/elasticsearch/lib/ext/user.rb
 class ElasticsearchPluginController < ApplicationController
   no_design_blocks
+  def index
+    search()
+    render :action => 'search'
+  end
+
   def search
     @results = []
     @query = params[:q]
@@ -23,7 +28,13 @@ class ElasticsearchPluginController &lt; ApplicationController
     query = {}
     unless text.blank?
-       fields = klass::SEARCHABLE_FIELDS.map {|k, v|  "#{k}^#{v[:weight]}"}
+       fields = klass.indexable_fields.map do |key, value|
+         if value[:weight]
+           "#{k}^#{v[:weight]}"
+         else
+           "#{k}"
+         end
+       end
        query = {
            query: {
@@ -1,31 +0,0 @@
-module INDEXED_MODEL
-  include Elasticsearch::Model
-  include Elasticsearch::Model::Callbacks
-
-  def self.included base
-    base.extend ClassMethods
-  end
-
-  module ClassMethods
-#	  settings index: { number_of_shards: 1 } do
-#		mappings dynamic: 'false' do
-#		  self::SEARCHABLE_FIELDS.each do |field, value|
-#			indexes field
-#		  end
-#		end
-#	 
-#		self.__elasticsearch__.client.indices.delete \
-#		  index: self.index_name rescue nil
-#	 
-#		self.__elasticsearch__.client.indices.create \
-#		  index: self.index_name,
-#		  body: {
-#			  settings: self.settings.to_hash,
-#			  mappings: self.mappings.to_hash
-#		  }
-#	 
-#		self.import
-#	  end
-  end
-end
-
@@ -0,0 +1,33 @@
+module ElasticsearchIndexedModel
+
+  def self.included base
+    base.send :include, Elasticsearch::Model
+    base.class_eval do
+      settings index: { number_of_shards: 1 } do
+        mappings dynamic: 'false' do
+          base::SEARCHABLE_FIELDS.each do |field, value|
+            indexes field
+            print '.'
+          end
+        end
+        base.__elasticsearch__.client.indices.delete \
+          index: base.index_name rescue nil
+        base.__elasticsearch__.client.indices.create \
+          index: base.index_name,
+          body: {
+            settings: base.settings.to_hash,
+            mappings: base.mappings.to_hash
+          }
+      end
+    end
+    base.extend ClassMethods
+    base.send :import
+  end
+
+  module ClassMethods
+    def indexable_fields
+      self::SEARCHABLE_FIELDS.keys + self.control_fields
+    end
+  end
+
+end
 require_dependency 'article'
-require_relative '../elasticsearch_helper'
+require_relative '../elasticsearch_indexed_model'
 class Article
-  include INDEXED_MODEL
+  include ElasticsearchIndexedModel
   def self.control_fields
-      %w(advertise published).map{ |e| e.to_sym }
+    [
+      :advertise,
+      :published,
+    ]
   end
-
-  def self.indexable_fields
-    SEARCHABLE_FIELDS.keys + self.control_fields 
-  end
-
 end
 require_dependency 'category'
+require_relative '../elasticsearch_indexed_model'
 class Category
+  include ElasticsearchIndexedModel
+
   def self.control_fields
-      %w()
+    []
   end
-  require_relative '../elasticsearch_helper'
 end
@@ -1,9 +0,0 @@
-require_dependency 'certifier'
-
-class Certifier
-  def self.control_fields
-      %w()
-  end
-
-  require_relative '../elasticsearch_helper'
-end
 require_dependency 'comment'
+require_relative '../elasticsearch_indexed_model'
 class Comment
+  include ElasticsearchIndexedModel
+
   def self.control_fields
-      %w()
+    []
   end
-
-  require_relative '../elasticsearch_helper'
 end
 require_dependency 'license.rb'
+require_relative '../elasticsearch_indexed_model'
 class License
+  include ElasticsearchIndexedModel
+
   def self.control_fields
-    %w()
+    []
   end
-
-  require_relative '../elasticsearch_helper'
 end
 require_dependency 'national_region'
+require_relative '../elasticsearch_indexed_model'
 class NationalRegion
+  include ElasticsearchIndexedModel
+
   def self.control_fields
-      %w()
+    []
   end
-
-  require_relative '../elasticsearch_helper'
 end
@@ -1,9 +0,0 @@
-require_dependency 'product'
-
-class Product
-  def self.control_fields
-     %w() 
-  end
-
-  require_relative '../elasticsearch_helper'
-end
 require_dependency 'profile'
+require_relative '../elasticsearch_indexed_model'
 class Profile
+  include ElasticsearchIndexedModel
+
   def self.control_fields
-    %w( visible public_profile )
+    [
+      :visible,
+      :public_profile,
+    ]
   end
-
-  require_relative '../elasticsearch_helper'
 end
@@ -1,9 +0,0 @@
-require_dependency 'qualifier'
-
-class Qualifier
-  def self.control_fields
-      %w()
-  end
-
-  require_relative '../elasticsearch_helper'
-end
 require_dependency 'scrap'
+require_relative '../elasticsearch_indexed_model'
 class Scrap
+  include ElasticsearchIndexedModel
+
   def self.control_fields
-      %w(advertise published)
+    [
+      :advertise,
+      :published,
+    ]
   end
-
-  require_relative '../elasticsearch_helper'
 end
 require_dependency 'user'
+require_relative '../elasticsearch_indexed_model'
 class User
+  include ElasticsearchIndexedModel
+
   def self.control_fields
-      %w()
+    []
   end
-
-  require_relative '../elasticsearch_helper'
 end
	@@ -1,31 +0,0 @@	@@ -1,31 +0,0 @@
1	-module INDEXED_MODEL
2	- include Elasticsearch::Model
3	- include Elasticsearch::Model::Callbacks
4	-
5	- def self.included base
6	- base.extend ClassMethods
7	- end
8	-
9	- module ClassMethods
10	-# settings index: { number_of_shards: 1 } do
11	-# mappings dynamic: 'false' do
12	-# self::SEARCHABLE_FIELDS.each do \|field, value\|
13	-# indexes field
14	-# end
15	-# end
16	-#
17	-# self.__elasticsearch__.client.indices.delete \
18	-# index: self.index_name rescue nil
19	-#
20	-# self.__elasticsearch__.client.indices.create \
21	-# index: self.index_name,
22	-# body: {
23	-# settings: self.settings.to_hash,
24	-# mappings: self.mappings.to_hash
25	-# }
26	-#
27	-# self.import
28	-# end
29	- end
30	-end
31	-
@@ -0,0 +1,33 @@		@@ -0,0 +1,33 @@
	1	+module ElasticsearchIndexedModel
	2	+
	3	+ def self.included base
	4	+ base.send :include, Elasticsearch::Model
	5	+ base.class_eval do
	6	+ settings index: { number_of_shards: 1 } do
	7	+ mappings dynamic: 'false' do
	8	+ base::SEARCHABLE_FIELDS.each do \|field, value\|
	9	+ indexes field
	10	+ print '.'
	11	+ end
	12	+ end
	13	+ base.__elasticsearch__.client.indices.delete \
	14	+ index: base.index_name rescue nil
	15	+ base.__elasticsearch__.client.indices.create \
	16	+ index: base.index_name,
	17	+ body: {
	18	+ settings: base.settings.to_hash,
	19	+ mappings: base.mappings.to_hash
	20	+ }
	21	+ end
	22	+ end
	23	+ base.extend ClassMethods
	24	+ base.send :import
	25	+ end
	26	+
	27	+ module ClassMethods
	28	+ def indexable_fields
	29	+ self::SEARCHABLE_FIELDS.keys + self.control_fields
	30	+ end
	31	+ end
	32	+
	33	+end
	@@ -1,9 +0,0 @@	@@ -1,9 +0,0 @@
1	-require_dependency 'certifier'
2	-
3	-class Certifier
4	- def self.control_fields
5	- %w()
6	- end
7	-
8	- require_relative '../elasticsearch_helper'
9	-end
	@@ -1,9 +0,0 @@	@@ -1,9 +0,0 @@
1	-require_dependency 'product'
2	-
3	-class Product
4	- def self.control_fields
5	- %w()
6	- end
7	-
8	- require_relative '../elasticsearch_helper'
9	-end
	@@ -1,9 +0,0 @@	@@ -1,9 +0,0 @@
1	-require_dependency 'qualifier'
2	-
3	-class Qualifier
4	- def self.control_fields
5	- %w()
6	- end
7	-
8	- require_relative '../elasticsearch_helper'
9	-end