Rename User#public to User#identifiable

diff --git a/app/controllers/changeset_controller.rb b/app/controllers/changeset_controller.rb
index 735fa73a88c31a1820515aa9e4677011946be8b3..b236ba6b577b9e02a906d9a787ddf6e328f15203 100644 (file)
--- 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
       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
       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 81154fff7ad9dcabed5f7045da7b76b119046e68..010cdf464b3acf9a66858a8a91006e6ddb4720c4 100644 (file)
--- 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 :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",
 
   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 5e03c7e0322c576a76cfa3c8cbe0cf7b78352fa8..93bb348ba361b4e43f3062ab5364b7a5fa2c421d 100644 (file)
--- a/test/models/user_test.rb
+++ b/test/models/user_test.rb
@@ -180,10 +180,10 @@ class UserTest < ActiveSupport::TestCase
     end
   end
 
     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
     assert_raise ActiveRecord::RecordNotFound do

-      User.public.find(users(:normal_user).id)
+      User.identifiable.find(users(:normal_user).id)

     end
   end
 
     end
   end