From 755ef3bca203b3d17ae84e81f73bf783aee34689 Mon Sep 17 00:00:00 2001
From: Joenio Costa <joenio@joenio.me>
Date: Mon, 23 May 2016 19:59:58 -0300
Subject: [PATCH] model extensions working with the new helper name

---
 plugins/elasticsearch/lib/ext/article.rb         |  9 ++++++---
 plugins/elasticsearch/lib/ext/category.rb        |  3 +--
 plugins/elasticsearch/lib/ext/comment.rb         |  5 ++---
 plugins/elasticsearch/lib/ext/license.rb         |  3 +--
 plugins/elasticsearch/lib/ext/national_region.rb |  3 +--
 plugins/elasticsearch/lib/ext/profile.rb         |  3 +--
 plugins/elasticsearch/lib/ext/scrap.rb           |  5 ++---
 plugins/elasticsearch/lib/ext/user.rb            |  5 ++---
 8 files changed, 16 insertions(+), 20 deletions(-)

diff --git a/plugins/elasticsearch/lib/ext/article.rb b/plugins/elasticsearch/lib/ext/article.rb
index 7398f9a..d94c873 100644
--- a/plugins/elasticsearch/lib/ext/article.rb
+++ b/plugins/elasticsearch/lib/ext/article.rb
@@ -1,11 +1,14 @@
 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
diff --git a/plugins/elasticsearch/lib/ext/category.rb b/plugins/elasticsearch/lib/ext/category.rb
index 0fb6e6f..15c01bc 100644
--- a/plugins/elasticsearch/lib/ext/category.rb
+++ b/plugins/elasticsearch/lib/ext/category.rb
@@ -1,9 +1,8 @@
 require_dependency 'category'
+require_relative '../elasticsearch_indexed_model'
 
 class Category
   def self.control_fields
       %w()
   end
-
-  require_relative '../elasticsearch_helper'
 end
diff --git a/plugins/elasticsearch/lib/ext/comment.rb b/plugins/elasticsearch/lib/ext/comment.rb
index 4834c68..d810eb0 100644
--- a/plugins/elasticsearch/lib/ext/comment.rb
+++ b/plugins/elasticsearch/lib/ext/comment.rb
@@ -1,9 +1,8 @@
 require_dependency 'comment'
+require_relative '../elasticsearch_indexed_model'
 
 class Comment
   def self.control_fields
-      %w()
+    %w()
   end
-
-  require_relative '../elasticsearch_helper'
 end
diff --git a/plugins/elasticsearch/lib/ext/license.rb b/plugins/elasticsearch/lib/ext/license.rb
index 1504e5d..37dc289 100644
--- a/plugins/elasticsearch/lib/ext/license.rb
+++ b/plugins/elasticsearch/lib/ext/license.rb
@@ -1,9 +1,8 @@
 require_dependency 'license.rb'
+require_relative '../elasticsearch_indexed_model'
 
 class License
   def self.control_fields
     %w()
   end
-
-  require_relative '../elasticsearch_helper'
 end
diff --git a/plugins/elasticsearch/lib/ext/national_region.rb b/plugins/elasticsearch/lib/ext/national_region.rb
index d13637c..fe46418 100644
--- a/plugins/elasticsearch/lib/ext/national_region.rb
+++ b/plugins/elasticsearch/lib/ext/national_region.rb
@@ -1,9 +1,8 @@
 require_dependency 'national_region'
+require_relative '../elasticsearch_indexed_model'
 
 class NationalRegion
   def self.control_fields
       %w()
   end
-
-  require_relative '../elasticsearch_helper'
 end
diff --git a/plugins/elasticsearch/lib/ext/profile.rb b/plugins/elasticsearch/lib/ext/profile.rb
index e21c36f..c472c12 100644
--- a/plugins/elasticsearch/lib/ext/profile.rb
+++ b/plugins/elasticsearch/lib/ext/profile.rb
@@ -1,9 +1,8 @@
 require_dependency 'profile'
+require_relative '../elasticsearch_indexed_model'
 
 class Profile
   def self.control_fields
     %w( visible public_profile )
   end
-
-  require_relative '../elasticsearch_helper'
 end
diff --git a/plugins/elasticsearch/lib/ext/scrap.rb b/plugins/elasticsearch/lib/ext/scrap.rb
index e9bc012..a67de9e 100644
--- a/plugins/elasticsearch/lib/ext/scrap.rb
+++ b/plugins/elasticsearch/lib/ext/scrap.rb
@@ -1,9 +1,8 @@
 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
diff --git a/plugins/elasticsearch/lib/ext/user.rb b/plugins/elasticsearch/lib/ext/user.rb
index da99985..09acee7 100644
--- a/plugins/elasticsearch/lib/ext/user.rb
+++ b/plugins/elasticsearch/lib/ext/user.rb
@@ -1,9 +1,8 @@
 require_dependency 'user'
+require_relative '../elasticsearch_indexed_model'
 
 class User
   def self.control_fields
-      %w()
+    %w()
   end
-
-  require_relative '../elasticsearch_helper'
 end
--
libgit2 0.21.2