Fixed MR Style

Macartur Sousa
1 parent 19471c06
Showing 19 changed files with 60 additions and 86 deletions Show diff stats
plugins/elasticsearch/Rakefile
plugins/elasticsearch/controllers/elasticsearch_plugin_controller.rb
plugins/elasticsearch/helpers/elasticsearch_helper.rb
plugins/elasticsearch/helpers/elasticsearch_plugin_helper.rb
plugins/elasticsearch/lib/elasticsearch_plugin.rb
plugins/elasticsearch/lib/ext/community.rb
plugins/elasticsearch/lib/ext/person.rb
plugins/elasticsearch/lib/ext/text_article.rb
plugins/elasticsearch/test/unit/community_test.rb
plugins/elasticsearch/test/unit/person_test.rb
plugins/elasticsearch/test/unit/text_article_test.rb
plugins/elasticsearch/views/elasticsearch_plugin/_community_display.html.erb
plugins/elasticsearch/views/elasticsearch_plugin/_event_display.html.erb
plugins/elasticsearch/views/elasticsearch_plugin/_person_display.html.erb
plugins/elasticsearch/views/elasticsearch_plugin/_search_collection.html.erb
plugins/elasticsearch/views/elasticsearch_plugin/_search_filter.html.erb
plugins/elasticsearch/views/elasticsearch_plugin/_search_option.html.erb
plugins/elasticsearch/views/elasticsearch_plugin/_text_article_display.html.erb
plugins/elasticsearch/views/elasticsearch_plugin/_uploaded_file_display.html.erb
@@ -2,10 +2,6 @@
 require 'open-uri'
-def elasticsearch_development
-  return ENV["ELASTICSEARCH_DEVELOPMENT"].nil?
-end
-
 desc "download elasticsearch"
 task :download do
   unless File.exists? '/tmp/elasticsearch.deb'
@@ -27,18 +23,14 @@ task :start do
     Rake::Task['install'].invoke
   end
   puts "Enable Elasticsearch service"
-  if elasticsearch_development
-    sh 'sudo systemctl start elasticsearch >> /dev/null 2>&1'
-    sh 'sudo systemctl enable elasticsearch  >> /dev/null 2>&1'
-    sleep 10
-  end
+  sh 'sudo systemctl start elasticsearch >> /dev/null 2>&1'
+  sh 'sudo systemctl enable elasticsearch  >> /dev/null 2>&1'
+  sleep 10
 end
 desc "stop elasticsearch"
 task :stop do
   puts "Disable elasticsearch service"
-  if elasticsearch_development
-    sh 'sudo systemctl stop elasticsearch >> /dev/null 2>&1'
-    sh 'sudo systemctl disable elasticsearch >> /dev/null 2>&1'
-  end
+  sh 'sudo systemctl stop elasticsearch >> /dev/null 2>&1'
+  sh 'sudo systemctl disable elasticsearch >> /dev/null 2>&1'
 end
@@ -25,7 +25,7 @@ class ElasticsearchPluginController &lt; ApplicationController
   def define_results
     @query = params[:query]
     @results = process_results
-    @hits = ( @results.try(:total) || 0 )
+    @hits = (@results.try(:total) || 0)
   end
   def define_searchable_types
@@ -2,27 +2,27 @@ module ElasticsearchHelper
   def searchable_types
     {
-     :all              => { label: _("All Results")},
-     :text_article     => { label: _("Articles")},
-     :uploaded_file    => { label: _("Files")},
-     :community        => { label: _("Communities")},
-     :event            => { label: _("Events")},
-     :person           => { label: _("People")}
+     :all              =>  _("All Results"),
+     :text_article     =>  _("Articles"),
+     :uploaded_file    =>  _("Files"),
+     :community        =>  _("Communities"),
+     :event            =>  _("Events"),
+     :person           =>  _("People")
     }
   end
   def sort_types
     sorts = {
-     :relevance      => { label: _("Relevance")},
-     :lexical        => { label: _("Alphabetical")},
-     :more_recent    => { label: _("More Recent")},
+     :relevance      => _("Relevance"),
+     :lexical        => _("Alphabetical"),
+     :more_recent    => _("More Recent")
     }
-    selected_type = params[:selected_type] ||  nil
+    selected_type = (params[:selected_type] || nil)
     if selected_type and selected_type.to_sym != :all
       klass = selected_type.to_s.classify.constantize
-      sorts.update klass.especific_sort if klass.respond_to? :especific_sort
+      sorts.update klass.specific_sort if klass.respond_to? :specific_sort
     end
     sorts
   end
@@ -36,7 +36,7 @@ module ElasticsearchHelper
   def search_from_all_models
     begin
-      filter = (params[:filter] || "" ).to_sym
+      filter = (params[:filter] || "").to_sym
       query = get_query params[:query], sort_by: get_sort_by(filter), categories: params[:categories]
       Elasticsearch::Model.search(query,searchable_models, size: default_per_page(params[:per_page])).page(params[:page]).records
     rescue
@@ -44,10 +44,10 @@ module ElasticsearchHelper
     end
   end
-  def search_from_model model
+  def search_from_model(model)
     begin
       klass = model.to_s.classify.constantize
-      filter = (params[:filter] || "" ).to_sym
+      filter = (params[:filter] || "").to_sym
       query = get_query params[:query], klass: klass, sort_by: get_sort_by(filter ,klass), categories: params[:categories]
       klass.search(query, size: default_per_page(params[:per_page])).page(params[:page]).records
     rescue
@@ -55,26 +55,26 @@ module ElasticsearchHelper
     end
   end
-  def default_per_page per_page=nil
-    per_page ||= 10
+  def default_per_page(per_page=nil)
+    per_page || 10
   end
-  def get_sort_by sort_by, klass=nil
+  def get_sort_by(sort_by, klass=nil)
     case sort_by
       when :lexical
-        { "name.raw" => {"order" => "asc" }}
+        {"name.raw" => {"order" => "asc"}}
       when :more_recent
-        { "created_at" => {"order" => "desc"}}
+        {"created_at" => {"order" => "desc"}}
       else
-        ( klass and klass.respond_to?(:get_sort_by) ) ? klass.get_sort_by(sort_by) : nil
+        (klass and klass.respond_to?(:get_sort_by)) ? klass.get_sort_by(sort_by) : nil
     end
   end
   def searchable_models
-      searchable_types.except(:all).keys.map { | model | model.to_s.classify.constantize }
+    searchable_types.except(:all).keys.map {|model| model.to_s.classify.constantize}
   end
-  def query_string expression="", models=[]
+  def query_string(expression="", models=[])
     return { match_all: {}  } if not expression
     {
       query_string: {
@@ -87,7 +87,7 @@ module ElasticsearchHelper
   end
-  def query_method expression="", models=[], categories=[]
+  def query_method(expression="", models=[], categories=[])
     query = {}
     query[:query] = {
       filtered: {
@@ -99,7 +99,7 @@ module ElasticsearchHelper
     }
     query[:query][:filtered][:filter][:bool] = {
-      should: models.map {|model| model.filter(environment: @environment.id) }
+      should: models.map {|model| model.filter(environment: @environment.id)}
     }
     unless categories.blank?
@@ -109,7 +109,7 @@ module ElasticsearchHelper
     query
   end
-  def get_query text="", options={}
+  def get_query(text="", options={})
     klass = options[:klass]
     sort_by = options[:sort_by]
     categories = (options[:categories] || "").split(",")
@@ -123,7 +123,7 @@ module ElasticsearchHelper
     query
   end
-  def fields_from_models klasses
+  def fields_from_models(klasses)
     fields = Set.new
     klasses.each do |klass|
       klass::SEARCHABLE_FIELDS.map do |key, value|
 module ElasticsearchPluginHelper
-  def render_categories(collection, selected_collections)
-    content_tag :ul, class: "category-ident" do
-      if collection.respond_to? :each
-        collection.collect do |item|
-          concat ("<li>".html_safe)
-          concat (check_box_tag(item.name, item.id, selected_collections.include?(item.id.to_s)) )
-          concat (label_tag item.name)
-          concat (render_categories(item.children, selected_collections)) if item.children_count > 0
-          concat ("</li>".html_safe)
-        end
-      else
-        check_box_tag collection.name, collection.id, selected_collections.include?(collection.id)
-        label_tag collection.name
-      end
-    end
-  end
-
   def categories_data(collection)
     result = []
     collection.each do | item |
@@ -17,7 +17,7 @@ class ElasticsearchPlugin &lt; Noosfero::Plugin
   end
   def js_files
-    ['categories', 'jstree.min'].map{ |j| "javascripts/#{j}" }
+    ['categories', 'jstree.min'].map{ |file_name| "javascripts/#{file_name}" }
   end
   def search_controller_filters
@@ -23,10 +23,10 @@ class Community
     ]
   end
-  def self.especific_sort
+  def self.specific_sort
     {
-      :more_active  => { label: _("More Active") },
-      :more_popular => { label: _("More Popular") }
+      :more_active  => _("More Active"),
+      :more_popular => _("More Popular")
     }
   end
@@ -24,10 +24,10 @@ class Person
     ]
   end
-  def self.especific_sort
+  def self.specific_sort
     {
-      :more_active  => { label: _("More Active") },
-      :more_popular => { label: _("More Popular") }
+      :more_active  => _("More Active"),
+      :more_popular => _("More Popular")
     }
   end
@@ -34,10 +34,10 @@ class TextArticle
     ]
   end
-  def self.especific_sort
+  def self.specific_sort
     {
-      :more_popular   => { label: _("More Viewed") },
-      :more_comments  => { label: _("Most Commented") }
+      :more_popular   => _("More Viewed"),
+      :more_comments  => _("Most Commented")
     }
   end
@@ -25,11 +25,11 @@ class CommunityTest &lt; ActiveSupport::TestCase
     assert Community.respond_to? :should
   end
-  should 'respond with especific sort' do
-    assert Community.respond_to? :especific_sort
+  should 'respond with specific sort' do
+    assert Community.respond_to? :specific_sort
   end
-  should 'respond with get_sort_by to order especific sort' do
+  should 'respond with get_sort_by to order specific sort' do
     assert Community.respond_to? :get_sort_by
   end
@@ -25,11 +25,11 @@ class PersonTest &lt; ActionController::TestCase
     assert Person.respond_to? :should
   end
-  should 'respond with especific sort' do
-    assert Person.respond_to? :especific_sort
+  should 'respond with specific sort' do
+    assert Person.respond_to? :specific_sort
   end
-  should 'respond with get_sort_by to order especific sort' do
+  should 'respond with get_sort_by to order specific sort' do
     assert Person.respond_to? :get_sort_by
   end
@@ -26,11 +26,11 @@ class TextArticleTest &lt; ActionController::TestCase
     assert TextArticle.respond_to? :should
   end
-  should 'respond with especific sort' do
-    assert TextArticle.respond_to? :especific_sort
+  should 'respond with specific sort' do
+    assert TextArticle.respond_to? :specific_sort
   end
-  should 'respond with get_sort_by to order especific sort' do
+  should 'respond with get_sort_by to order specific sort' do
     assert TextArticle.respond_to? :get_sort_by
   end
 <div class="community-header">
-  <%= community.created_at.strftime("%d %B %Y at %H:%M") %> - <span class="model-label"><%= _("Community") %></span>
+  <%= show_time(community.created_at) %> - <span class="model-label"><%= model_label.singularize %></span>
 </div>
 <div class="body">
   <h2><%= link_to community.name, community.url %></h2>
 <div class="event-header">
-  <%= event.created_at.strftime("%d %B %Y at %H:%M") %> - <span class="model-label"><%= _("Event") %></span>
+  <%= show_time(event.created_at) %> - <span class="model-label"><%= model_label.singularize %></span>
 </div>
 <div class="body">
@@ -3,7 +3,7 @@
     <%= profile_image person %>
   </div>
   <div class="right-side">
-    <%= person.created_at.strftime("%d %B %Y at %H:%M") %> - <span class="model-label"><%= _("Person") %></span>
+    <%= show_time(person.created_at) %> - <span class="model-label"><%= model_label.singularize %></span>
     <div class="body">
       <h2><%= link_to person.name, person.url %></h2>
       <p><%= person.description %></p>
 <% for result in @results.to_a %>
-  <% for klass in @searchable_types.keys %>
-    <% next if klass.to_s.include? "all" %>
+  <% for klass, model_label in @searchable_types.except(:all) %>
     <% if result.is_a? klass.to_s.classify.constantize %>
       <div class="search-item">
-        <%= render partial: "#{klass}_display", :locals => { klass => result} %>
+        <%= render partial: "#{klass}_display", :locals => { klass => result, :model_label => model_label} %>
       </div>
       <% break %>
     <% end %>
@@ -2,7 +2,7 @@
 <ul>
 <% for type, value in @sort_types %>
   <li class="select-search-type <%= "active" if type == @selected_sort %>">
-    <%= link_to value[:label], "?selected_type=#{@selected_type}&query=#{@query}&filter=#{type}&categories=#{@selected_categories.join(',')}" %>
+    <%= link_to value, "?selected_type=#{@selected_type}&query=#{@query}&filter=#{type}&categories=#{@selected_categories.join(',')}" %>
   </li>
 <% end %>
 </ul>
 <ul>
   <% for type,value in @searchable_types %>
     <li class="select-search-type <%= "active" if type == @selected_type %>">
-      <%= link_to value[:label], "?selected_type=#{type}&query=#{@query}&categories=#{@selected_categories.join(',')}"%>
+      <%= link_to value, "?selected_type=#{type}&query=#{@query}&categories=#{@selected_categories.join(',')}"%>
     </li>
   <% end %>
 </ul>
 <div class="text_article-header">
-  <%= text_article.created_at.strftime("%d %B %Y at %H:%M") %> - <%= "#{text_article.author.name} -" if text_article.author %> <span class="model-label"><%= _("Article") %></span>
+  <%= show_time(text_article.created_at) %> - <%= "#{text_article.author.name} -" if text_article.author %> <span class="model-label"><%= model_label.singularize %></span>
 </div>
 <div class="body">
   <h2><%= link_to text_article.name, text_article.url %></h2>
 <div class="uploaded_file-header">
-  <%= uploaded_file.created_at.strftime("%d %B %Y at %H:%M") %> - <%= "#{uploaded_file.author.name} -" if uploaded_file.author %><span class="model-label"><%= _("Files") %></span>
+  <%= show_time(uploaded_file.created_at) %> - <%= "#{uploaded_file.author.name} -" if uploaded_file.author %><span class="model-label"><%= model_label.singularize %></span>
 </div>
 <div class="body">
   <h2><%= link_to uploaded_file.name, uploaded_file.url %></h2>
	@@ -25,7 +25,7 @@ class ElasticsearchPluginController < ApplicationController		@@ -25,7 +25,7 @@ class ElasticsearchPluginController < ApplicationController
25	def define_results	25	def define_results
26	@query = params[:query]	26	@query = params[:query]
27	@results = process_results	27	@results = process_results
28	- @hits = ( @results.try(:total) \|\| 0 )	28	+ @hits = (@results.try(:total) \|\| 0)
29	end	29	end
30		30
31	def define_searchable_types	31	def define_searchable_types
1	module ElasticsearchPluginHelper	1	module ElasticsearchPluginHelper
2		2
3	- def render_categories(collection, selected_collections)
4	- content_tag :ul, class: "category-ident" do
5	- if collection.respond_to? :each
6	- collection.collect do \|item\|
7	- concat ("<li>".html_safe)
8	- concat (check_box_tag(item.name, item.id, selected_collections.include?(item.id.to_s)) )
9	- concat (label_tag item.name)
10	- concat (render_categories(item.children, selected_collections)) if item.children_count > 0
11	- concat ("</li>".html_safe)
12	- end
13	- else
14	- check_box_tag collection.name, collection.id, selected_collections.include?(collection.id)
15	- label_tag collection.name
16	- end
17	- end
18	- end
19	-
20	def categories_data(collection)	3	def categories_data(collection)
21	result = []	4	result = []
22	collection.each do \| item \|	5	collection.each do \| item \|
	@@ -17,7 +17,7 @@ class ElasticsearchPlugin < Noosfero::Plugin		@@ -17,7 +17,7 @@ class ElasticsearchPlugin < Noosfero::Plugin
17	end	17	end
18		18
19	def js_files	19	def js_files
20	- ['categories', 'jstree.min'].map{ \|j\| "javascripts/#{j}" }	20	+ ['categories', 'jstree.min'].map{ \|file_name\| "javascripts/#{file_name}" }
21	end	21	end
22		22
23	def search_controller_filters	23	def search_controller_filters
1	<div class="community-header">	1	<div class="community-header">
2	- <%= community.created_at.strftime("%d %B %Y at %H:%M") %> - <span class="model-label"><%= _("Community") %></span>	2	+ <%= show_time(community.created_at) %> - <span class="model-label"><%= model_label.singularize %></span>
3	</div>	3	</div>
4	<div class="body">	4	<div class="body">
5	<h2><%= link_to community.name, community.url %></h2>	5	<h2><%= link_to community.name, community.url %></h2>
1	<div class="event-header">	1	<div class="event-header">
2	- <%= event.created_at.strftime("%d %B %Y at %H:%M") %> - <span class="model-label"><%= _("Event") %></span>	2	+ <%= show_time(event.created_at) %> - <span class="model-label"><%= model_label.singularize %></span>
3	</div>	3	</div>
4		4
5	<div class="body">	5	<div class="body">
	@@ -3,7 +3,7 @@		@@ -3,7 +3,7 @@
3	<%= profile_image person %>	3	<%= profile_image person %>
4	</div>	4	</div>
5	<div class="right-side">	5	<div class="right-side">
6	- <%= person.created_at.strftime("%d %B %Y at %H:%M") %> - <span class="model-label"><%= _("Person") %></span>	6	+ <%= show_time(person.created_at) %> - <span class="model-label"><%= model_label.singularize %></span>
7	<div class="body">	7	<div class="body">
8	<h2><%= link_to person.name, person.url %></h2>	8	<h2><%= link_to person.name, person.url %></h2>
9	<p><%= person.description %></p>	9	<p><%= person.description %></p>
	@@ -2,7 +2,7 @@		@@ -2,7 +2,7 @@
2	<ul>	2	<ul>
3	<% for type, value in @sort_types %>	3	<% for type, value in @sort_types %>
4	<li class="select-search-type <%= "active" if type == @selected_sort %>">	4	<li class="select-search-type <%= "active" if type == @selected_sort %>">
5	- <%= link_to value[:label], "?selected_type=#{@selected_type}&query=#{@query}&filter=#{type}&categories=#{@selected_categories.join(',')}" %>	5	+ <%= link_to value, "?selected_type=#{@selected_type}&query=#{@query}&filter=#{type}&categories=#{@selected_categories.join(',')}" %>
6	</li>	6	</li>
7	<% end %>	7	<% end %>
8	</ul>	8	</ul>
1	<ul>	1	<ul>
2	<% for type,value in @searchable_types %>	2	<% for type,value in @searchable_types %>
3	<li class="select-search-type <%= "active" if type == @selected_type %>">	3	<li class="select-search-type <%= "active" if type == @selected_type %>">
4	- <%= link_to value[:label], "?selected_type=#{type}&query=#{@query}&categories=#{@selected_categories.join(',')}"%>	4	+ <%= link_to value, "?selected_type=#{type}&query=#{@query}&categories=#{@selected_categories.join(',')}"%>
5	</li>	5	</li>
6	<% end %>	6	<% end %>
7	</ul>	7	</ul>
1	<div class="text_article-header">	1	<div class="text_article-header">
2	- <%= text_article.created_at.strftime("%d %B %Y at %H:%M") %> - <%= "#{text_article.author.name} -" if text_article.author %> <span class="model-label"><%= _("Article") %></span>	2	+ <%= show_time(text_article.created_at) %> - <%= "#{text_article.author.name} -" if text_article.author %> <span class="model-label"><%= model_label.singularize %></span>
3	</div>	3	</div>
4	<div class="body">	4	<div class="body">
5	<h2><%= link_to text_article.name, text_article.url %></h2>	5	<h2><%= link_to text_article.name, text_article.url %></h2>
1	<div class="uploaded_file-header">	1	<div class="uploaded_file-header">
2	- <%= uploaded_file.created_at.strftime("%d %B %Y at %H:%M") %> - <%= "#{uploaded_file.author.name} -" if uploaded_file.author %><span class="model-label"><%= _("Files") %></span>	2	+ <%= show_time(uploaded_file.created_at) %> - <%= "#{uploaded_file.author.name} -" if uploaded_file.author %><span class="model-label"><%= model_label.singularize %></span>
3	</div>	3	</div>
4	<div class="body">	4	<div class="body">
5	<h2><%= link_to uploaded_file.name, uploaded_file.url %></h2>	5	<h2><%= link_to uploaded_file.name, uploaded_file.url %></h2>