Make error messages more helpful

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

diff --git a/app/models/changeset.rb b/app/models/changeset.rb
index f67d2118d4382215c7b28460a993a6153f7de98e..fa2d556b10c00195a20d5f8670224a22475ebb7b 100644 (file)
--- a/app/models/changeset.rb
+++ b/app/models/changeset.rb
@@ -12,20 +12,26 @@ class Changeset < ActiveRecord::Base
   has_many :old_ways
   has_many :old_relations
   
   has_many :old_ways
   has_many :old_relations
   

-  validates_presence_of :user_id, :created_at, :closed_at
-  
+  validates_presence_of :id, :on => :update
+  validates_presence_of :user_id, :created_at, :closed_at, :num_changes
+  validates_uniqueness_of :id
+  validates_numericality_of :id, :on => :update, :integer_only => true
+  validates_numericality_of :min_lat, :max_lat, :min_lon, :max_lat, :allow_nil => true, :integer_only => true
+  validates_numericality_of :user_id,  :integer_only => true
+  validates_numericality_of :num_changes, :integer_only => true, :greater_than_or_equal_to => 0
+  validates_associated :user
+

   # over-expansion factor to use when updating the bounding box
   EXPAND = 0.1
 
   # maximum number of elements allowed in a changeset
   MAX_ELEMENTS = 50000
 
   # over-expansion factor to use when updating the bounding box
   EXPAND = 0.1
 
   # maximum number of elements allowed in a changeset
   MAX_ELEMENTS = 50000
 

-  # maximum time a changeset is allowed to be open for (note that this
-  # is in days - so one hour is Rational(1,24)).
-  MAX_TIME_OPEN = 1
+  # maximum time a changeset is allowed to be open for.
+  MAX_TIME_OPEN = 1.day

 
 

-  # idle timeout increment, one hour as a rational number of days.
-  IDLE_TIMEOUT = Rational(1,24)
+  # idle timeout increment, one hour seems reasonable.
+  IDLE_TIMEOUT = 1.hour

 
   # Use a method like this, so that we can easily change how we
   # determine whether a changeset is open, without breaking code in at 
 
   # Use a method like this, so that we can easily change how we
   # determine whether a changeset is open, without breaking code in at 


@@ -36,23 +42,28 @@ class Changeset < ActiveRecord::Base
     # note that this may not be a hard limit - due to timing changes and
     # concurrency it is possible that some changesets may be slightly 
     # longer than strictly allowed or have slightly more changes in them.
     # note that this may not be a hard limit - due to timing changes and
     # concurrency it is possible that some changesets may be slightly 
     # longer than strictly allowed or have slightly more changes in them.

-    return ((closed_at > DateTime.now) and (num_changes <= MAX_ELEMENTS))
+    return ((closed_at > Time.now.getutc) and (num_changes <= MAX_ELEMENTS))

   end
 
   end
 

+  def set_closed_time_now
+    if is_open?
+      self.closed_at = Time.now.getutc
+    end
+  end
+  

   def self.from_xml(xml, create=false)
     begin
   def self.from_xml(xml, create=false)
     begin

-      p = XML::Parser.new
-      p.string = xml
+      p = XML::Parser.string(xml)

       doc = p.parse
 
       cs = Changeset.new
 
       doc.find('//osm/changeset').each do |pt|
         if create
       doc = p.parse
 
       cs = Changeset.new
 
       doc.find('//osm/changeset').each do |pt|
         if create

-          cs.created_at = Time.now
+          cs.created_at = Time.now.getutc

           # initial close time is 1h ahead, but will be increased on each
           # modification.
           # initial close time is 1h ahead, but will be increased on each
           # modification.

-          cs.closed_at = Time.now + IDLE_TIMEOUT
+          cs.closed_at = cs.created_at + IDLE_TIMEOUT

           # initially we have no changes in a changeset
           cs.num_changes = 0
         end
           # initially we have no changes in a changeset
           cs.num_changes = 0
         end


@@ -74,6 +85,10 @@ class Changeset < ActiveRecord::Base
   def bbox
     @bbox ||= [ min_lon, min_lat, max_lon, max_lat ]
   end
   def bbox
     @bbox ||= [ min_lon, min_lat, max_lon, max_lat ]
   end

+  
+  def has_valid_bbox?
+    not bbox.include? nil
+  end

 
   ##
   # expand the bounding box to include the given bounding box. also, 
 
   ##
   # expand the bounding box to include the given bounding box. also, 


@@ -129,7 +144,7 @@ class Changeset < ActiveRecord::Base
   end
 
   def save_with_tags!
   end
 
   def save_with_tags!

-    t = Time.now
+    t = Time.now.getutc

 
     # do the changeset update and the changeset tags update in the
     # same transaction to ensure consistency.
 
     # do the changeset update and the changeset tags update in the
     # same transaction to ensure consistency.


@@ -140,7 +155,7 @@ class Changeset < ActiveRecord::Base
       if (closed_at - created_at) > (MAX_TIME_OPEN - IDLE_TIMEOUT)
         self.closed_at = created_at + MAX_TIME_OPEN
       else
       if (closed_at - created_at) > (MAX_TIME_OPEN - IDLE_TIMEOUT)
         self.closed_at = created_at + MAX_TIME_OPEN
       else

-        self.closed_at = DateTime.now + IDLE_TIMEOUT
+        self.closed_at = Time.now.getutc + IDLE_TIMEOUT

       end
       self.save!
 
       end
       self.save!
 


@@ -210,12 +225,12 @@ class Changeset < ActiveRecord::Base
   def update_from(other, user)
     # ensure that only the user who opened the changeset may modify it.
     unless user.id == self.user_id 
   def update_from(other, user)
     # ensure that only the user who opened the changeset may modify it.
     unless user.id == self.user_id 

-      raise OSM::APIUserChangesetMismatchError 
+      raise OSM::APIUserChangesetMismatchError.new

     end
     
     # can't change a closed changeset
     unless is_open?
     end
     
     # can't change a closed changeset
     unless is_open?

-      raise OSM::APIChangesetAlreadyClosedError
+      raise OSM::APIChangesetAlreadyClosedError.new(self)

     end
 
     # copy the other's tags
     end
 
     # copy the other's tags