Converted invalid_chars validator to use locale

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

diff --git a/app/models/trace.rb b/app/models/trace.rb
index 214b0b6470aacc20fbe1262d2b553778b55bf729..0e81805509aea9ad62a3abe88de54f557bdb0f47 100644 (file)
--- a/app/models/trace.rb
+++ b/app/models/trace.rb
@@ -2,17 +2,18 @@
 #
 # Table name: gpx_files
 #
-#  id          :integer          not null, primary key
-#  user_id     :integer          not null
+#  id          :bigint(8)        not null, primary key
+#  user_id     :bigint(8)        not null
 #  visible     :boolean          default(TRUE), not null
 #  name        :string           default(""), not null
-#  size        :integer
+#  size        :bigint(8)
 #  latitude    :float
 #  longitude   :float
 #  timestamp   :datetime         not null
 #  description :string           default(""), not null
 #  inserted    :boolean          not null
 #  visibility  :enum             default("public"), not null
+#  length      :bigint(8)
 #
 # Indexes
 #
@@ -39,6 +40,7 @@ class Trace < ActiveRecord::Base
 
   validates :user, :presence => true, :associated => true
   validates :name, :presence => true, :length => 1..255
+  validates :name, :description, :invalid_chars => true
   validates :description, :presence => { :on => :create }, :length => 1..255
   validates :timestamp, :presence => true
   validates :visibility, :inclusion => %w[private public trackable identifiable]
@@ -214,10 +216,12 @@ class Trace < ActiveRecord::Base
 
   def update_from_xml_node(pt, create = false)
     raise OSM::APIBadXMLError.new("trace", pt, "visibility missing") if pt["visibility"].nil?
+
     self.visibility = pt["visibility"]
 
     unless create
       raise OSM::APIBadXMLError.new("trace", pt, "ID is required when updating.") if pt["id"].nil?
+
       id = pt["id"].to_i
       # .to_i will return 0 if there is no number that can be parsed.
       # We want to make sure that there is no id with zero anyway
@@ -232,6 +236,7 @@ class Trace < ActiveRecord::Base
 
     description = pt.find("description").first
     raise OSM::APIBadXMLError.new("trace", pt, "description missing") if description.nil?
+
     self.description = description.content
 
     self.tags = pt.find("tag").collect do |tag|
@@ -303,7 +308,7 @@ class Trace < ActiveRecord::Base
       tp.save!
     end
 
-    if gpx.actual_points > 0
+    if gpx.actual_points.positive?
       max_lat = Tracepoint.where(:gpx_id => id).maximum(:latitude)
       min_lat = Tracepoint.where(:gpx_id => id).minimum(:latitude)
       max_lon = Tracepoint.where(:gpx_id => id).maximum(:longitude)