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
	@@ -10,9 +10,4 @@ class Article		@@ -10,9 +10,4 @@ class Article
10	:published,	10	:published,
11	]	11	]
12	end	12	end
13	-
14	- def self.indexable_fields
15	- SEARCHABLE_FIELDS.keys + self.control_fields
16	- end
17	-
18	end	13	end