Refactor where (public: true) into scope (#280)

* add are_public scope to user

* add user model scope spec

Author: lislis

app/controllers/application_controller.rb

@@ -28,7 +28,7 @@ def visible_users
     if signed_in?
       current_user.visible_for_signed_in_users
     else
-     User.where(public: true).sort_by { |x| x.transliterate_last_name }
+     User.are_public.sort_by { |x| x.transliterate_last_name }
    end
   end
 

app/controllers/maps_controller.rb

@@ -10,7 +10,8 @@ class MapsController < ApplicationController
 
   def show
     if ["de", "at", "ch"].include?(map_params[:country])
-      @users = User.where(public: true, country: map_params[:country])
+      @users = User.are_public
+                 .where(country: map_params[:country])
                  .sort_by { |x| x.city }
       @center = CENTERS[map_params[:country]]
       @zoom = ZOOMS[map_params[:country]]

app/controllers/users_controller.rb

@@ -30,7 +30,7 @@ def index
     if current_user
       @users = current_user.visible_for_signed_in_users
     else
-      @users = User.where(public: true).order("upper(name) ASC")
+      @users = User.are_public.order("upper(name) ASC")
     end
   end
 

app/models/user.rb

@@ -76,6 +76,7 @@ class User < ActiveRecord::Base
 
   scope :alphas, -> { where(alpha: true) }
   scope :admin, -> { where(admin: true) }
+  scope :are_public, -> { where(public: true) }
 
   def self.sort_by_name(users)
     users.sort { |a, b| a.last_name <=> b.last_name }
@@ -87,7 +88,7 @@ def visible_for_signed_in_users
       User.all.sort_by { |x| x.transliterate_last_name }
     else
       # Adds the user's id to the array of public ids
-      visible_ids = User.where(public: true).pluck(:id) << id
+      visible_ids = User.are_public.pluck(:id) << id
       User.where(id: visible_ids).sort_by { |x| x.transliterate_last_name }
     end
   end

spec/models/user_spec.rb

@@ -20,7 +20,6 @@ def make_user(attributes = {})
   end
 
   describe "sorting by user name" do
-
     it "can sort users with only one name" do
       user1 = make_user(name: "Eva", email: "eva@email.com")
       user2 = make_user(name: "Sabine Sauer", email: "sabine@email.com")
@@ -51,4 +50,16 @@ def make_user(attributes = {})
       expect(users[2]).to eq user2
     end
   end
+
+  describe "are_public scope" do
+    it "includes public users" do
+      user1 = make_user(name: "Eva Maria Mahler",email: "evamaria@email.com", public: true)
+      expect(User.are_public).to include(user1)
+    end
+
+    it "excludes non-pub users" do
+      user1 = make_user(name: "Eva Maria Mahler",email: "evamaria@email.com", public: false)
+      expect(User.are_public).to_not include(user1)
+    end
+  end
 end