Eliminate deprecated scope and association arguments

[rails.git] / app / models / trace.rb

diff --git a/app/models/trace.rb b/app/models/trace.rb
index 3f58cee2ef4008c7604ad4f282290a54d0df12d0..5394ca01dca73934fb727d0a20426d47031c1beb 100644 (file)
--- a/app/models/trace.rb
+++ b/app/models/trace.rb
@@ -1,13 +1,14 @@
 class Trace < ActiveRecord::Base
-  set_table_name 'gpx_files'
+  self.table_name = "gpx_files"
 
-  belongs_to :user
+  belongs_to :user, :counter_cache => true
   has_many :tags, :class_name => 'Tracetag', :foreign_key => 'gpx_id', :dependent => :delete_all
   has_many :points, :class_name => 'Tracepoint', :foreign_key => 'gpx_id', :dependent => :delete_all
 
-  scope :visible, where(:visible => true)
-  scope :visible_to, lambda { |u| visible.where("visibility IN ('public', 'identifiable') OR user_id = ?", u) }
-  scope :public, where(:visibility => ["public", "identifiable"])
+  scope :visible, -> { where(:visible => true) }
+  scope :visible_to, ->(u) { visible.where("visibility IN ('public', 'identifiable') OR user_id = ?", u) }
+  scope :public, -> { where(:visibility => ["public", "identifiable"]) }
+  scope :tagged, ->(t) { joins(:tags).where(:gpx_file_tags => { :tag => t }) }
 
   validates_presence_of :user_id, :name, :timestamp
   validates_presence_of :description, :on => :create
@@ -111,7 +112,7 @@ class Trace < ActiveRecord::Base
     elsif zipped
       mimetype = "application/x-zip"
     else
-      mimetype = "text/xml"
+      mimetype = "application/gpx+xml"
     end
 
     return mimetype