api06: Move version-checking into the models, raising an exception on mismatch

(still not implemented for delete requests though.)

diff --git a/app/controllers/node_controller.rb b/app/controllers/node_controller.rb
index fa6759c3b5debb59e601a7bd519d401ac352dfd9..379ee77c9c3f83d44068989c163d70360779f95a 100644 (file)
--- a/app/controllers/node_controller.rb
+++ b/app/controllers/node_controller.rb
@@ -49,10 +49,6 @@ class NodeController < ApplicationController
     begin
       node = Node.find(params[:id])
       new_node = Node.from_xml(request.raw_post)
-      if new_node.version != node.version
-        render :text => "Version mismatch: Provided " + new_node.version.to_s + ", server had: " + node.version.to_s, :status => :bad_request
-        return
-      end  
 
       if new_node and new_node.id == node.id
         node.update_from(new_node, @user)
@@ -60,6 +56,9 @@ class NodeController < ApplicationController
       else
         render :nothing => true, :status => :bad_request
       end
+    rescue OSM::APIVersionMismatchError ex
+      render :text => "Version mismatch: Provided " + ex.provided.to_s +
+       ", server had: " + ex.latest.to_s, :status => :bad_request
     rescue ActiveRecord::RecordNotFound
       render :nothing => true, :status => :not_found
     end

diff --git a/app/controllers/relation_controller.rb b/app/controllers/relation_controller.rb
index d7b9de13cb6589cad3589e68396648ca7193b001..dabf6eaa8bef7fbe2a1e9710b32c230ca8d7fa2e 100644 (file)
--- a/app/controllers/relation_controller.rb
+++ b/app/controllers/relation_controller.rb
@@ -64,6 +64,9 @@ class RelationController < ApplicationController
       render :nothing => true, :status => :not_found
     rescue OSM::APIPreconditionFailedError
       render :text => "", :status => :precondition_failed
+    rescue OSM::APIVersionMismatchError => ex
+      render :text => "Version mismatch: Provided " + ex.provided.to_s +
+       ", server had: " + ex.latest.to_s, :status => :bad_request
     rescue
       render :nothing => true, :status => :internal_server_error
     end

diff --git a/app/controllers/way_controller.rb b/app/controllers/way_controller.rb
index d3a1b039f557b2afc129f050106b5282db23b897..b22d35d0bfdb393f9bd7d5a854d181b1646bf761 100644 (file)
--- a/app/controllers/way_controller.rb
+++ b/app/controllers/way_controller.rb
@@ -49,11 +49,6 @@ class WayController < ApplicationController
     begin
       way = Way.find(params[:id])
       new_way = Way.from_xml(request.raw_post)
-      if new_way.version != way.version
-        render :text => "Version mismatch: Provided " + new_way.version.to_s + ", server had: " + way.version.to_s, :status => :bad_request
-        return
-      end  
-        
 
       if new_way and new_way.id == way.id
         way.update_from(new_way, @user)
@@ -63,6 +58,9 @@ class WayController < ApplicationController
       end
     rescue OSM::APIPreconditionFailedError
       render :text => "", :status => :precondition_failed
+    rescue OSM::APIVersionMismatchError => ex
+      render :text => "Version mismatch: Provided " + ex.provided.to_s +
+       ", server had: " + ex.latest.to_s, :status => :bad_request
     rescue ActiveRecord::RecordNotFound
       render :nothing => true, :status => :not_found
     end

diff --git a/app/models/node.rb b/app/models/node.rb
index 5f41338198f8c7a75d1fd58d1904534b184edfba..b027f2fd49f47bfacab2e9581fa0761c676626d2 100644 (file)
--- a/app/models/node.rb
+++ b/app/models/node.rb
@@ -140,6 +140,10 @@ class Node < GeoRecord
   end
 
   def update_from(new_node, user)
+    if new_node.version != version
+      raise OSM::APIVersionMismatchError.new(new_node.version, version)
+    end
+
     self.user_id = user.id
     self.latitude = new_node.latitude 
     self.longitude = new_node.longitude

diff --git a/app/models/relation.rb b/app/models/relation.rb
index b7cb0f15bc43d35bf00703d3c7ddb8881f29e0bc..984732c71c98f6b0bc9c1463029135fb2345f64a 100644 (file)
--- a/app/models/relation.rb
+++ b/app/models/relation.rb
@@ -224,6 +224,8 @@ class Relation < ActiveRecord::Base
   def update_from(new_relation, user)
     if !new_relation.preconditions_ok?
       raise OSM::APIPreconditionFailedError.new
+    elsif new_relation.version != version
+      raise OSM::APIVersionMismatchError.new(new_relation.version, version)
     else
       self.user_id = user.id
       self.tags = new_relation.tags

diff --git a/app/models/way.rb b/app/models/way.rb
index de69f7565c6493fa27ab466008bd24f78cf62c77..a6192e2d735e7ce128096a84cd32780da23db9d2 100644 (file)
--- a/app/models/way.rb
+++ b/app/models/way.rb
@@ -199,6 +199,8 @@ class Way < ActiveRecord::Base
   def update_from(new_way, user)
     if !new_way.preconditions_ok?
       raise OSM::APIPreconditionFailedError.new
+    elsif new_way.version != version
+      raise OSM::APIVersionMismatchError.new(new_way.version, version)
     else
       self.user_id = user.id
       self.tags = new_way.tags

diff --git a/lib/osm.rb b/lib/osm.rb
index bd935102658576295b2670ca46a8b28de89e94b4..a8cb103d2f829540bf06f69ae0437f3c3029b11e 100644 (file)
--- a/lib/osm.rb
+++ b/lib/osm.rb
@@ -24,6 +24,15 @@ module OSM
   class APIAlreadyDeletedError < APIError
   end
 
+  # Raised when the provided version is not equal to the latest in the db.
+  class APIVersionMismatchError < APIError
+    def initialize(provided, latest)
+      @provided, @latest = provided, latest
+    end
+
+    attr_reader :provided, :latest
+  end
+
   # Helper methods for going to/from mercator and lat/lng.
   class Mercator
     include Math