refactoring models extensions

Joenio Costa
1 parent 70d116cf
Showing 9 changed files with 36 additions and 12 deletions Show diff stats
plugins/elasticsearch/lib/elasticsearch_indexed_model.rb
plugins/elasticsearch/lib/ext/article.rb
plugins/elasticsearch/lib/ext/category.rb
plugins/elasticsearch/lib/ext/comment.rb
plugins/elasticsearch/lib/ext/license.rb
plugins/elasticsearch/lib/ext/national_region.rb
plugins/elasticsearch/lib/ext/profile.rb
plugins/elasticsearch/lib/ext/scrap.rb
plugins/elasticsearch/lib/ext/user.rb
@@ -7,6 +7,7 @@ module ElasticsearchIndexedModel
         mappings dynamic: 'false' do
           base::SEARCHABLE_FIELDS.each do |field, value|
             indexes field
+            print '.'
           end
         end
         base.__elasticsearch__.client.indices.delete \
@@ -19,7 +20,14 @@ module ElasticsearchIndexedModel
           }
       end
     end
+    base.extend ClassMethods
     base.send :import
   end
  
+  module ClassMethods
+    def indexable_fields
+      self::SEARCHABLE_FIELDS.keys + self.control_fields
+    end
+  end
+
 end
@@ -10,9 +10,4 @@ class Article
       :published,
     ]
   end
-
-  def self.indexable_fields
-    SEARCHABLE_FIELDS.keys + self.control_fields 
-  end
-
 end
@@ -2,7 +2,10 @@ require_dependency &#39;category&#39;
 require_relative '../elasticsearch_indexed_model'
  
 class Category
+  include ElasticsearchIndexedModel
+
   def self.control_fields
-      %w()
+    []
   end
+
 end
@@ -2,7 +2,9 @@ require_dependency &#39;comment&#39;
 require_relative '../elasticsearch_indexed_model'
  
 class Comment
+  include ElasticsearchIndexedModel
+
   def self.control_fields
-    %w()
+    []
   end
 end
@@ -2,7 +2,9 @@ require_dependency &#39;license.rb&#39;
 require_relative '../elasticsearch_indexed_model'
  
 class License
+  include ElasticsearchIndexedModel
+
   def self.control_fields
-    %w()
+    []
   end
 end
@@ -2,7 +2,9 @@ require_dependency &#39;national_region&#39;
 require_relative '../elasticsearch_indexed_model'
  
 class NationalRegion
+  include ElasticsearchIndexedModel
+
   def self.control_fields
-      %w()
+    []
   end
 end
@@ -2,7 +2,12 @@ require_dependency &#39;profile&#39;
 require_relative '../elasticsearch_indexed_model'
  
 class Profile
+  include ElasticsearchIndexedModel
+
   def self.control_fields
-    %w( visible public_profile )
+    [
+      :visible,
+      :public_profile,
+    ]
   end
 end
@@ -2,7 +2,12 @@ require_dependency &#39;scrap&#39;
 require_relative '../elasticsearch_indexed_model'
  
 class Scrap
+  include ElasticsearchIndexedModel
+
   def self.control_fields
-    %w(advertise published)
+    [
+      :advertise,
+      :published,
+    ]
   end
 end
@@ -2,7 +2,9 @@ require_dependency &#39;user&#39;
 require_relative '../elasticsearch_indexed_model'
  
 class User
+  include ElasticsearchIndexedModel
+
   def self.control_fields
-    %w()
+    []
   end
 end
...	...	@@ -7,6 +7,7 @@ module ElasticsearchIndexedModel
7	7	mappings dynamic: 'false' do
8	8	base::SEARCHABLE_FIELDS.each do \|field, value\|
9	9	indexes field
	10	+ print '.'
10	11	end
11	12	end
12	13	base.__elasticsearch__.client.indices.delete \
...	...	@@ -19,7 +20,14 @@ module ElasticsearchIndexedModel
19	20	}
20	21	end
21	22	end
	23	+ base.extend ClassMethods
22	24	base.send :import
23	25	end
24	26
	27	+ module ClassMethods
	28	+ def indexable_fields
	29	+ self::SEARCHABLE_FIELDS.keys + self.control_fields
	30	+ end
	31	+ end
	32	+
25	33	end
...	...
...	...	@@ -10,9 +10,4 @@ class Article
10	10	:published,
11	11	]
12	12	end
13		-
14		- def self.indexable_fields
15		- SEARCHABLE_FIELDS.keys + self.control_fields
16		- end
17		-
18	13	end
...	...
...	...	@@ -2,7 +2,10 @@ require_dependency 'category'
2	2	require_relative '../elasticsearch_indexed_model'
3	3
4	4	class Category
	5	+ include ElasticsearchIndexedModel
	6	+
5	7	def self.control_fields
6		- %w()
	8	+ []
7	9	end
	10	+
8	11	end
...	...
...	...	@@ -2,7 +2,9 @@ require_dependency 'comment'
2	2	require_relative '../elasticsearch_indexed_model'
3	3
4	4	class Comment
	5	+ include ElasticsearchIndexedModel
	6	+
5	7	def self.control_fields
6		- %w()
	8	+ []
7	9	end
8	10	end
...	...
...	...	@@ -2,7 +2,9 @@ require_dependency 'license.rb'
2	2	require_relative '../elasticsearch_indexed_model'
3	3
4	4	class License
	5	+ include ElasticsearchIndexedModel
	6	+
5	7	def self.control_fields
6		- %w()
	8	+ []
7	9	end
8	10	end
...	...
...	...	@@ -2,7 +2,9 @@ require_dependency 'national_region'
2	2	require_relative '../elasticsearch_indexed_model'
3	3
4	4	class NationalRegion
	5	+ include ElasticsearchIndexedModel
	6	+
5	7	def self.control_fields
6		- %w()
	8	+ []
7	9	end
8	10	end
...	...
...	...	@@ -2,7 +2,12 @@ require_dependency 'profile'
2	2	require_relative '../elasticsearch_indexed_model'
3	3
4	4	class Profile
	5	+ include ElasticsearchIndexedModel
	6	+
5	7	def self.control_fields
6		- %w( visible public_profile )
	8	+ [
	9	+ :visible,
	10	+ :public_profile,
	11	+ ]
7	12	end
8	13	end
...	...
...	...	@@ -2,7 +2,12 @@ require_dependency 'scrap'
2	2	require_relative '../elasticsearch_indexed_model'
3	3
4	4	class Scrap
	5	+ include ElasticsearchIndexedModel
	6	+
5	7	def self.control_fields
6		- %w(advertise published)
	8	+ [
	9	+ :advertise,
	10	+ :published,
	11	+ ]
7	12	end
8	13	end
...	...
...	...	@@ -2,7 +2,9 @@ require_dependency 'user'
2	2	require_relative '../elasticsearch_indexed_model'
3	3
4	4	class User
	5	+ include ElasticsearchIndexedModel
	6	+
5	7	def self.control_fields
6		- %w()
	8	+ []
7	9	end
8	10	end
...	...