Elasticsearch: Extract load_models to ext

Signed-off-by: Macartur Sousa <macartur.sc@gmail.com>

Elasticsearch: Extract load_models to ext
Signed-off-by: Macartur Sousa <macartur.sc@gmail.com>
Macartur Sousa
1 parent 4de4089a
Showing 14 changed files with 136 additions and 62 deletions Show diff stats
plugins/elasticsearch/lib/elasticsearch_helper.rb
plugins/elasticsearch/lib/elasticsearch_plugin.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
plugins/elasticsearch/lib/load_models.rb
@@ -0,0 +1,31 @@
+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
+
@@ -8,7 +8,4 @@ class ElasticsearchPlugin &lt; Noosfero::Plugin
     _("This plugin is used to communicate a elasticsearch to privide a search.")
   end
  
-  # load all models to provide searchable fields
-  require_relative "load_models"
-
 end
@@ -0,0 +1,15 @@
+require_dependency 'article'
+require_relative '../elasticsearch_helper'
+
+class Article
+  include INDEXED_MODEL
+
+  def self.control_fields
+      %w(advertise published).map{ |e| e.to_sym }
+  end
+
+  def self.indexable_fields
+    SEARCHABLE_FIELDS.keys + self.control_fields 
+  end
+
+end
@@ -0,0 +1,9 @@
+require_dependency 'category'
+
+class Category
+  def self.control_fields
+      %w()
+  end
+
+  require_relative '../elasticsearch_helper'
+end
@@ -0,0 +1,9 @@
+require_dependency 'certifier'
+
+class Certifier
+  def self.control_fields
+      %w()
+  end
+
+  require_relative '../elasticsearch_helper'
+end
@@ -0,0 +1,9 @@
+require_dependency 'comment'
+
+class Comment
+  def self.control_fields
+      %w()
+  end
+
+  require_relative '../elasticsearch_helper'
+end
@@ -0,0 +1,9 @@
+require_dependency 'license.rb'
+
+class License
+  def self.control_fields
+    %w()
+  end
+
+  require_relative '../elasticsearch_helper'
+end
@@ -0,0 +1,9 @@
+require_dependency 'national_region'
+
+class NationalRegion
+  def self.control_fields
+      %w()
+  end
+
+  require_relative '../elasticsearch_helper'
+end
@@ -0,0 +1,9 @@
+require_dependency 'product'
+
+class Product
+  def self.control_fields
+     %w() 
+  end
+
+  require_relative '../elasticsearch_helper'
+end
@@ -0,0 +1,9 @@
+require_dependency 'profile'
+
+class Profile
+  def self.control_fields
+    %w( visible public_profile )
+  end
+
+  require_relative '../elasticsearch_helper'
+end
@@ -0,0 +1,9 @@
+require_dependency 'qualifier'
+
+class Qualifier
+  def self.control_fields
+      %w()
+  end
+
+  require_relative '../elasticsearch_helper'
+end
@@ -0,0 +1,9 @@
+require_dependency 'scrap'
+
+class Scrap
+  def self.control_fields
+      %w(advertise published)
+  end
+
+  require_relative '../elasticsearch_helper'
+end
@@ -0,0 +1,9 @@
+require_dependency 'user'
+
+class User
+  def self.control_fields
+      %w()
+  end
+
+  require_relative '../elasticsearch_helper'
+end
@@ -1,59 +0,0 @@
-Noosfero::Application.class_eval do
-
-  config.after_initialize do
-    Rails.application.eager_load! #TODO: REMOVE THIS LINE
-    indeces_models searchables_models
-  end
-
-  def searchables_models
-    ActiveRecord::Base.descendants.select do |model|
-        model.const_defined?("SEARCHABLE_FIELDS")
-    end
-  end
-
-  def indeces_models models
-    indexed_models = Array.new
-    models.each do |model|
-        next if indexed_models.include? model
-
-        create_searchable_model model
-        indexed_models.push model
-
-        if model.descendants.count > 0
-            model.descendants.each { | descendant_model| 
-                indexed_models.push descendant_model
-                create_searchable_model descendant_model
-            }
-        end
-
-    end
-
-  end
-
-  def create_searchable_model model
-      model.class_eval do
-        include Elasticsearch::Model
-        include Elasticsearch::Model::Callbacks
-        settings index: { number_of_shards: 1 } do
-          mappings dynamic: 'false' do
-            model::SEARCHABLE_FIELDS.each do |field, value|
-              indexes field
-            end
-          end
-
-          model.__elasticsearch__.client.indices.delete \
-            index: model.index_name rescue nil
-
-          model.__elasticsearch__.client.indices.create \
-            index: model.index_name,
-            body: {
-                settings: model.settings.to_hash,
-                mappings: model.mappings.to_hash
-            }
-
-          model.import
-        end
-      end
-  end
-
-end
...	...	@@ -0,0 +1,31 @@
	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	+
...	...
...	...	@@ -8,7 +8,4 @@ class ElasticsearchPlugin < Noosfero::Plugin
8	8	_("This plugin is used to communicate a elasticsearch to privide a search.")
9	9	end
10	10
11		- # load all models to provide searchable fields
12		- require_relative "load_models"
13		-
14	11	end
...	...
...	...	@@ -0,0 +1,15 @@
	1	+require_dependency 'article'
	2	+require_relative '../elasticsearch_helper'
	3	+
	4	+class Article
	5	+ include INDEXED_MODEL
	6	+
	7	+ def self.control_fields
	8	+ %w(advertise published).map{ \|e\| e.to_sym }
	9	+ end
	10	+
	11	+ def self.indexable_fields
	12	+ SEARCHABLE_FIELDS.keys + self.control_fields
	13	+ end
	14	+
	15	+end
...	...
...	...	@@ -0,0 +1,9 @@
	1	+require_dependency 'category'
	2	+
	3	+class Category
	4	+ def self.control_fields
	5	+ %w()
	6	+ end
	7	+
	8	+ require_relative '../elasticsearch_helper'
	9	+end
...	...
...	...	@@ -0,0 +1,9 @@
	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
...	...
...	...	@@ -0,0 +1,9 @@
	1	+require_dependency 'comment'
	2	+
	3	+class Comment
	4	+ def self.control_fields
	5	+ %w()
	6	+ end
	7	+
	8	+ require_relative '../elasticsearch_helper'
	9	+end
...	...
...	...	@@ -0,0 +1,9 @@
	1	+require_dependency 'license.rb'
	2	+
	3	+class License
	4	+ def self.control_fields
	5	+ %w()
	6	+ end
	7	+
	8	+ require_relative '../elasticsearch_helper'
	9	+end
...	...
...	...	@@ -0,0 +1,9 @@
	1	+require_dependency 'national_region'
	2	+
	3	+class NationalRegion
	4	+ def self.control_fields
	5	+ %w()
	6	+ end
	7	+
	8	+ require_relative '../elasticsearch_helper'
	9	+end
...	...
...	...	@@ -0,0 +1,9 @@
	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
...	...
...	...	@@ -0,0 +1,9 @@
	1	+require_dependency 'profile'
	2	+
	3	+class Profile
	4	+ def self.control_fields
	5	+ %w( visible public_profile )
	6	+ end
	7	+
	8	+ require_relative '../elasticsearch_helper'
	9	+end
...	...