From: Tom Hughes <tom@compton.nu>
Date: Thu, 24 Apr 2014 23:16:35 +0000 (+0100)
Subject: Rename User#public to User#identifiable
X-Git-Tag: live~4355^2~8
X-Git-Url: https://git.openstreetmap.org/rails.git/commitdiff_plain/56d39b06f2173c753a06fa64db8be1abdc43d01e

Rename User#public to User#identifiable
---

diff --git a/app/controllers/changeset_controller.rb b/app/controllers/changeset_controller.rb
index 735fa73a8..b236ba6b5 100644
--- a/app/controllers/changeset_controller.rb
+++ b/app/controllers/changeset_controller.rb
@@ -284,7 +284,7 @@ class ChangesetController < ApplicationController
       elsif params[:bbox]
         changesets = conditions_bbox(changesets, BoundingBox.from_bbox_params(params))
       elsif params[:friends] && @user
-        changesets = changesets.where(:user_id => @user.friend_users.public)
+        changesets = changesets.where(:user_id => @user.friend_users.identifiable)
       elsif params[:nearby] && @user
         changesets = changesets.where(:user_id => @user.nearby)
       end
diff --git a/app/models/user.rb b/app/models/user.rb
index 81154fff7..010cdf464 100644
--- a/app/models/user.rb
+++ b/app/models/user.rb
@@ -26,7 +26,7 @@ class User < ActiveRecord::Base
 
   scope :visible, -> { where(:status => ["pending", "active", "confirmed"]) }
   scope :active, -> { where(:status => ["active", "confirmed"]) }
-  scope :public, -> { where(:data_public => true) }
+  scope :identifiable, -> { where(:data_public => true) }
 
   has_attached_file :image,
     :default_url => "/assets/:class/:attachment/:style.png",
diff --git a/test/models/user_test.rb b/test/models/user_test.rb
index 5e03c7e03..93bb348ba 100644
--- a/test/models/user_test.rb
+++ b/test/models/user_test.rb
@@ -180,10 +180,10 @@ class UserTest < ActiveSupport::TestCase
     end
   end
 
-  def test_public
-    assert_equal 16, User.public.count
+  def test_identifiable
+    assert_equal 16, User.identifiable.count
     assert_raise ActiveRecord::RecordNotFound do
-      User.public.find(users(:normal_user).id)
+      User.identifiable.find(users(:normal_user).id)
     end
   end