Merge pull request #39 from it3s/refactoring

Refactoring

app/controllers/concerns/contributions.rb

@@ -0,0 +1,11 @@
+module Contributions
+  extend ActiveSupport::Concern
+
+  def contributions
+    respond_to do |format|
+      format.html { render :layout => !request.xhr? }
+      format.js
+    end
+  end
+
+end

app/controllers/users_controller.rb

@@ -1,4 +1,5 @@
 class UsersController < ApplicationController
+  include Contributions
   include PasswordResets
 
   before_action :require_login,   :only => [:edit, :update]
@@ -49,13 +50,6 @@ def update
     end
   end
 
-  def contributions
-    respond_to do |format|
-      format.html { render :layout => !request.xhr? }
-      format.js
-    end
-  end
-
   private
 
   def user_params

app/helpers/application_helper.rb

@@ -1,18 +1,6 @@
 module ApplicationHelper
   include Concerns::ContactsHelper
-
-  def i18n_language_names
-    {
-      :en      => 'English',
-      :'pt-BR' => 'Português'
-    }
-  end
-
-  def current_translations
-    I18n.backend.send(:init_translations) unless I18n.backend.initialized?
-    @translations ||= I18n.backend.send(:translations)
-    (@translations[I18n.locale] || {}).with_indifferent_access
-  end
+  include Concerns::I18nHelper
 
   def javascript_exists?(script)
     script = "#{Rails.root}/app/assets/javascripts/#{script}.js"

app/helpers/concerns/i18n_helper.rb

@@ -0,0 +1,18 @@
+module Concerns
+  module I18nHelper
+    extend ActiveSupport::Concern
+
+    def i18n_language_names
+      {
+        :en      => 'English',
+        :'pt-BR' => 'Português'
+      }
+    end
+
+    def current_translations
+      I18n.backend.send(:init_translations) unless I18n.backend.initialized?
+      @translations ||= I18n.backend.send(:translations)
+      (@translations[I18n.locale] || {}).with_indifferent_access
+    end
+  end
+end

app/models/concerns/contributable.rb

@@ -0,0 +1,8 @@
+module Contributable
+  extend ActiveSupport::Concern
+
+  def contributors_count
+    #TODO return a real value
+    0
+  end
+end

app/models/concerns/contributor.rb

@@ -0,0 +1,8 @@
+module Contributor
+  extend ActiveSupport::Concern
+
+  def contributions_count
+    #TODO return a real value
+    0
+  end
+end

app/models/concerns/followable.rb

@@ -0,0 +1,8 @@
+module Followable
+  extend ActiveSupport::Concern
+
+  def followers_count
+    #TODO return a real value
+    0
+  end
+end

app/models/geo_data.rb

@@ -2,6 +2,8 @@ class GeoData < ActiveRecord::Base
   include Contacts
   include Geometry
   include Taggable
+  include Followable
+  include Contributable
 
   geojson_field :location
   searchable_tags :tags
@@ -16,14 +18,4 @@ def maps_count
     #TODO refactor to concern
     0
   end
-
-  def followers_count
-    #TODO refactor to concern
-    0
-  end
-
-  def contributors_count
-    #TODO refactor to concern
-    0
-  end
 end

app/models/user.rb

@@ -1,7 +1,9 @@
 class User < ActiveRecord::Base
   include Contacts
+  include Contributor
   include Geometry
   include Taggable
+  include Followable
 
   authenticates_with_sorcery! do |config|
     config.authentications_class = Authentication
@@ -39,11 +41,6 @@ def geojson_properties
     {:name => name, :id => id}
   end
 
-  def followers_count
-    #TODO refactor to concern
-    0
-  end
-
   def maps_count
     #TODO refactor to concern
     0

app/views/shared/header/_menu.html.erb

@@ -5,7 +5,7 @@
     </a>
   </div>
   <div class="menu-item data <%= 'active' if params[:controller] == 'geo_data' %>">
-    <a href="<%= url_for :controller => 'geo_data'  %>">
+    <a href="<%= geo_data_path  %>">
       <%= icon "map-marker", t('header.menu.data') %>
     </a>
   </div>