Joenio Costa · Joenio Costa · Joenio Costa
Showing 13 changed files Show diff stats
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
@@ -0,0 +1,25 @@
+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
+          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.send :import
+  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
 require_dependency 'category'
+require_relative '../elasticsearch_indexed_model'
  
 class Category
   def self.control_fields
       %w()
   end
-
-  require_relative '../elasticsearch_helper'
 end
 require_dependency 'comment'
+require_relative '../elasticsearch_indexed_model'
  
 class Comment
   def self.control_fields
-      %w()
+    %w()
   end
-
-  require_relative '../elasticsearch_helper'
 end
 require_dependency 'license.rb'
+require_relative '../elasticsearch_indexed_model'
  
 class License
   def self.control_fields
     %w()
   end
-
-  require_relative '../elasticsearch_helper'
 end
 require_dependency 'national_region'
+require_relative '../elasticsearch_indexed_model'
  
 class NationalRegion
   def self.control_fields
       %w()
   end
-
-  require_relative '../elasticsearch_helper'
 end
 require_dependency 'profile'
+require_relative '../elasticsearch_indexed_model'
  
 class Profile
   def self.control_fields
     %w( visible public_profile )
   end
-
-  require_relative '../elasticsearch_helper'
 end
 require_dependency 'scrap'
+require_relative '../elasticsearch_indexed_model'
  
 class Scrap
   def self.control_fields
-      %w(advertise published)
+    %w(advertise published)
   end
-
-  require_relative '../elasticsearch_helper'
 end
 require_dependency 'user'
+require_relative '../elasticsearch_indexed_model'
  
 class User
   def self.control_fields
-      %w()
+    %w()
   end
-
-  require_relative '../elasticsearch_helper'
 end
...	...	@@ -0,0 +1,25 @@
	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	+ end
	11	+ end
	12	+ base.__elasticsearch__.client.indices.delete \
	13	+ index: base.index_name rescue nil
	14	+ base.__elasticsearch__.client.indices.create \
	15	+ index: base.index_name,
	16	+ body: {
	17	+ settings: base.settings.to_hash,
	18	+ mappings: base.mappings.to_hash
	19	+ }
	20	+ end
	21	+ end
	22	+ base.send :import
	23	+ end
	24	+
	25	+end
...	...
1	1	require_dependency 'article'
2		-require_relative '../elasticsearch_helper'
	2	+require_relative '../elasticsearch_indexed_model'
3	3
4	4	class Article
5		- include INDEXED_MODEL
	5	+ include ElasticsearchIndexedModel
6	6
7	7	def self.control_fields
8		- %w(advertise published).map{ \|e\| e.to_sym }
	8	+ [
	9	+ :advertise,
	10	+ :published,
	11	+ ]
9	12	end
10	13
11	14	def self.indexable_fields
...	...
1	1	require_dependency 'category'
	2	+require_relative '../elasticsearch_indexed_model'
2	3
3	4	class Category
4	5	def self.control_fields
5	6	%w()
6	7	end
7		-
8		- require_relative '../elasticsearch_helper'
9	8	end
...	...
1	1	require_dependency 'comment'
	2	+require_relative '../elasticsearch_indexed_model'
2	3
3	4	class Comment
4	5	def self.control_fields
5		- %w()
	6	+ %w()
6	7	end
7		-
8		- require_relative '../elasticsearch_helper'
9	8	end
...	...
1	1	require_dependency 'license.rb'
	2	+require_relative '../elasticsearch_indexed_model'
2	3
3	4	class License
4	5	def self.control_fields
5	6	%w()
6	7	end
7		-
8		- require_relative '../elasticsearch_helper'
9	8	end
...	...
1	1	require_dependency 'national_region'
	2	+require_relative '../elasticsearch_indexed_model'
2	3
3	4	class NationalRegion
4	5	def self.control_fields
5	6	%w()
6	7	end
7		-
8		- require_relative '../elasticsearch_helper'
9	8	end
...	...
1	1	require_dependency 'profile'
	2	+require_relative '../elasticsearch_indexed_model'
2	3
3	4	class Profile
4	5	def self.control_fields
5	6	%w( visible public_profile )
6	7	end
7		-
8		- require_relative '../elasticsearch_helper'
9	8	end
...	...
1	1	require_dependency 'scrap'
	2	+require_relative '../elasticsearch_indexed_model'
2	3
3	4	class Scrap
4	5	def self.control_fields
5		- %w(advertise published)
	6	+ %w(advertise published)
6	7	end
7		-
8		- require_relative '../elasticsearch_helper'
9	8	end
...	...
1	1	require_dependency 'user'
	2	+require_relative '../elasticsearch_indexed_model'
2	3
3	4	class User
4	5	def self.control_fields
5		- %w()
	6	+ %w()
6	7	end
7		-
8		- require_relative '../elasticsearch_helper'
9	8	end
...	...