Covering the case of an entry not being found. More diary entry tests.

[rails.git] / app / controllers / way_controller.rb

diff --git a/app/controllers/way_controller.rb b/app/controllers/way_controller.rb
index dca9241a698e490ba2d497bddbff54a5f880d237..5b0a632f75091a37bef05e2e95e6272351027da3 100644 (file)
--- a/app/controllers/way_controller.rb
+++ b/app/controllers/way_controller.rb
@@ -1,154 +1,145 @@
 class WayController < ApplicationController
   require 'xml/libxml'
 
 class WayController < ApplicationController
   require 'xml/libxml'
 

-  before_filter :authorize
+  session :off
+  before_filter :authorize, :only => [:create, :update, :delete]
+  before_filter :check_write_availability, :only => [:create, :update, :delete]
+  before_filter :check_read_availability, :except => [:create, :update, :delete]

   after_filter :compress_output
 
   def create
   after_filter :compress_output
 
   def create

-    response.headers["Content-Type"] = 'text/xml'
-    if request.put?
-      way = Way.from_xml(request.raw_post, true)
+    begin
+      if request.put?
+        way = Way.from_xml(request.raw_post, true)

 
 

-      if way
-        way.user_id = @user.id
-
-        unless way.preconditions_ok? # are the segments (and their nodes) visible?
-          render :nothing => true, :status => HTTP_PRECONDITION_FAILED
-          return
-        end
-
-        if way.save_with_history
-          render :text => way.id.to_s
+        if way
+          way.create_with_history @user
+          render :text => way.id.to_s, :content_type => "text/plain"

         else
         else

-          render :nothing => true, :status => 500
+          render :nothing => true, :status => :bad_request

         end
         end

-        return

       else
       else

-        render :nothing => true, :status => 400 # if we got here the doc didnt parse
-        return
+        render :nothing => true, :status => :method_not_allowed

       end
       end

+    rescue OSM::APIError => ex
+      render ex.render_opts

     end
     end

-
-    render :nothing => true, :status => 500 # something went very wrong

   end
 
   end
 

-  def full
-    unless Way.exists?(params[:id])
-      render :nothing => true, :status => 404
-      return
-    end
+  def read
+    begin
+      way = Way.find(params[:id])

 
 

-    way = Way.find(params[:id])
+      response.headers['Last-Modified'] = way.timestamp.rfc822

 
 

-    unless way.visible
-      render :nothing => true, :status => 410
-      return
+      if way.visible
+        render :text => way.to_xml.to_s, :content_type => "text/xml"
+      else
+        render :text => "", :status => :gone
+      end
+    rescue OSM::APIError => ex
+      render ex.render_opts
+    rescue ActiveRecord::RecordNotFound
+      render :nothing => true, :status => :not_found

     end
     end

+  end

 
 

-    # In future, we might want to do all the data fetch in one step
-    seg_ids = way.segs + [-1]
-    segments = Segment.find_by_sql "select * from current_segments where visible = 1 and id IN (#{seg_ids.join(',')})"
-
-    node_ids = segments.collect {|segment| segment.node_a }
-    node_ids += segments.collect {|segment| segment.node_b }
-    node_ids += [-1]
-    nodes = Node.find(:all, :conditions => "visible = 1 AND id IN (#{node_ids.join(',')})")
+  def update
+    begin
+      way = Way.find(params[:id])
+      new_way = Way.from_xml(request.raw_post)

 
 

-    # Render
-    doc = OSM::API.new.get_xml_doc
-    nodes.each do |node|
-      doc.root << node.to_xml_node()
-    end
-    segments.each do |segment|
-      doc.root << segment.to_xml_node()
+      if new_way and new_way.id == way.id
+        way.update_from(new_way, @user)
+        render :text => way.version.to_s, :content_type => "text/plain"
+      else
+        render :nothing => true, :status => :bad_request
+      end
+    rescue OSM::APIError => ex
+      render ex.render_opts
+    rescue ActiveRecord::RecordNotFound
+      render :nothing => true, :status => :not_found

     end
     end

-    doc.root << way.to_xml_node()
-
-    render :text => doc.to_s

   end
 
   end
 

-  def rest
-    response.headers["Content-Type"] = 'text/xml'
-    unless Way.exists?(params[:id])
-      render :nothing => true, :status => 404
-      return
-    end
-
-    way = Way.find(params[:id])
-
-    case request.method
-
-    when :get
-      unless way.visible
-        render :nothing => true, :status => 410
-        return
-      end
-      render :text => way.to_xml.to_s
+  # This is the API call to delete a way
+  def delete
+    begin
+      way = Way.find(params[:id])
+      new_way = Way.from_xml(request.raw_post)

 
 

-    when :delete
-      if way.visible
-        way.user_id = @user.id
-        way.visible = false
-        way.save_with_history
-        render :nothing => true
+      if new_way and new_way.id == way.id
+        way.delete_with_history!(new_way, @user)
+        render :text => way.version.to_s, :content_type => "text/plain"

       else
       else

-        render :nothing => true, :status => 410
+        render :nothing => true, :status => :bad_request

       end
       end

+    rescue OSM::APIError => ex
+      render ex.render_opts
+    rescue ActiveRecord::RecordNotFound
+      render :nothing => true, :status => :not_found
+    end
+  end

 
 

-    when :put
-      new_way = Way.from_xml(request.raw_post)
-
-      if new_way
-        unless new_way.preconditions_ok? # are the segments (and their nodes) visible?
-          render :nothing => true, :status => HTTP_PRECONDITION_FAILED
-          return
-        end
+  def full
+    begin
+      way = Way.find(params[:id])

 
 

-        way.user_id = @user.id
-        way.tags = new_way.tags
-        way.segs = new_way.segs
-        way.timestamp = new_way.timestamp
-        way.visible = true
+      if way.visible
+        nd_ids = way.nds + [-1]
+        nodes = Node.find(:all, :conditions => ["visible = ? AND id IN (#{nd_ids.join(',')})", true])

 
 

-        if way.id == new_way.id and way.save_with_history
-          render :nothing => true
-        else
-          render :nothing => true, :status => 500
+        # Render
+        doc = OSM::API.new.get_xml_doc
+        nodes.each do |node|
+          doc.root << node.to_xml_node()

         end
         end

+        doc.root << way.to_xml_node()
+
+        render :text => doc.to_s, :content_type => "text/xml"

       else
       else

-        render :nothing => true, :status => 400 # if we got here the doc didnt parse
+        render :text => "", :status => :gone

       end
       end

+    rescue ActiveRecord::RecordNotFound
+      render :nothing => true, :status => :not_found

     end
   end
 
   def ways
     end
   end
 
   def ways

-    response.headers["Content-Type"] = 'text/xml'
-    ids = params['ways'].split(',').collect {|w| w.to_i }
+    begin
+      ids = params['ways'].split(',').collect { |w| w.to_i }
+    rescue
+      ids = []
+    end
+

     if ids.length > 0
     if ids.length > 0

-      waylist = Way.find(ids)

       doc = OSM::API.new.get_xml_doc
       doc = OSM::API.new.get_xml_doc

-      waylist.each do |way|
+
+      Way.find(ids).each do |way|

         doc.root << way.to_xml_node
       end
         doc.root << way.to_xml_node
       end

-      render :text => doc.to_s
+
+      render :text => doc.to_s, :content_type => "text/xml"

     else
     else

-      render :nothing => true, :status => 400
+      render :nothing => true, :status => :bad_request

     end
   end
 
     end
   end
 

-  def ways_for_segment
-    response.headers["Content-Type"] = 'text/xml'
-    wayids = WaySegment.find(:all, :conditions => ['segment_id = ?', params[:id]]).collect { |ws| ws.id }.uniq
-    if wayids.length > 0
-      waylist = Way.find(wayids)
-      doc = OSM::API.new.get_xml_doc
-      waylist.each do |way|
-        doc.root << way.to_xml_node
-      end
-      render :text => doc.to_s
-    else
-      render :nothing => true, :status => 400
+  ##
+  # returns all the ways which are currently using the node given in the 
+  # :id parameter. note that this used to return deleted ways as well, but
+  # this seemed not to be the expected behaviour, so it was removed.
+  def ways_for_node
+    wayids = WayNode.find(:all, 
+                          :conditions => ['node_id = ?', params[:id]]
+                          ).collect { |ws| ws.id[0] }.uniq
+
+    doc = OSM::API.new.get_xml_doc
+
+    Way.find(wayids).each do |way|
+      doc.root << way.to_xml_node if way.visible

     end
     end

-  end

 
 

+    render :text => doc.to_s, :content_type => "text/xml"
+  end

 end
 end