Merge branch 'p' of https://github.com/jfirebaugh/openstreetmap-website into jfirebaugh-p

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

diff --git a/app/controllers/changeset_controller.rb b/app/controllers/changeset_controller.rb
index d2740f7f33e13aa3c89605e546535fa0d69b7d16..898afae4a30de945a7d5e338c0b4c93b8c8643b1 100644 (file)
--- a/app/controllers/changeset_controller.rb
+++ b/app/controllers/changeset_controller.rb
@@ -14,8 +14,8 @@ class ChangesetController < ApplicationController
   before_action :check_api_writable, :only => [:create, :update, :delete, :upload, :include, :comment, :subscribe, :unsubscribe, :hide_comment, :unhide_comment]
   before_action :check_api_readable, :except => [:create, :update, :delete, :upload, :download, :query, :list, :feed, :comment, :subscribe, :unsubscribe, :comments_feed]
   before_action(:only => [:list, :feed, :comments_feed]) { |c| c.check_database_readable(true) }
   before_action :check_api_writable, :only => [:create, :update, :delete, :upload, :include, :comment, :subscribe, :unsubscribe, :hide_comment, :unhide_comment]
   before_action :check_api_readable, :except => [:create, :update, :delete, :upload, :download, :query, :list, :feed, :comment, :subscribe, :unsubscribe, :comments_feed]
   before_action(:only => [:list, :feed, :comments_feed]) { |c| c.check_database_readable(true) }

-  after_action :compress_output

   around_action :api_call_handle_error, :except => [:list, :feed, :comments_feed]
   around_action :api_call_handle_error, :except => [:list, :feed, :comments_feed]

+  around_action :api_call_timeout, :except => [:list, :feed, :comments_feed, :upload]

   around_action :web_timeout, :only => [:list, :feed, :comments_feed]
 
   # Helper methods for checking consistency
   around_action :web_timeout, :only => [:list, :feed, :comments_feed]
 
   # Helper methods for checking consistency


@@ -28,13 +28,13 @@ class ChangesetController < ApplicationController
     cs = Changeset.from_xml(request.raw_post, true)
 
     # Assume that Changeset.from_xml has thrown an exception if there is an error parsing the xml
     cs = Changeset.from_xml(request.raw_post, true)
 
     # Assume that Changeset.from_xml has thrown an exception if there is an error parsing the xml

-    cs.user_id = @user.id
+    cs.user = current_user

     cs.save_with_tags!
 
     # Subscribe user to changeset comments
     cs.save_with_tags!
 
     # Subscribe user to changeset comments

-    cs.subscribers << @user
+    cs.subscribers << current_user

 
 

-    render :text => cs.id.to_s, :content_type => "text/plain"
+    render :plain => cs.id.to_s

   end
 
   ##
   end
 
   ##


@@ -43,7 +43,7 @@ class ChangesetController < ApplicationController
   def read
     changeset = Changeset.find(params[:id])
 
   def read
     changeset = Changeset.find(params[:id])
 

-    render :text => changeset.to_xml(params[:include_discussion].presence).to_s, :content_type => "text/xml"
+    render :xml => changeset.to_xml(params[:include_discussion].presence).to_s

   end
 
   ##
   end
 
   ##


@@ -53,7 +53,7 @@ class ChangesetController < ApplicationController
     assert_method :put
 
     changeset = Changeset.find(params[:id])
     assert_method :put
 
     changeset = Changeset.find(params[:id])

-    check_changeset_consistency(changeset, @user)
+    check_changeset_consistency(changeset, current_user)

 
     # to close the changeset, we'll just set its closed_at time to
     # now. this might not be enough if there are concurrency issues,
 
     # to close the changeset, we'll just set its closed_at time to
     # now. this might not be enough if there are concurrency issues,


@@ -61,7 +61,7 @@ class ChangesetController < ApplicationController
     changeset.set_closed_time_now
 
     changeset.save!
     changeset.set_closed_time_now
 
     changeset.save!

-    render :text => ""
+    head :ok

   end
 
   ##
   end
 
   ##


@@ -75,7 +75,7 @@ class ChangesetController < ApplicationController
     assert_method :post
 
     cs = Changeset.find(params[:id])
     assert_method :post
 
     cs = Changeset.find(params[:id])

-    check_changeset_consistency(cs, @user)
+    check_changeset_consistency(cs, current_user)

 
     # keep an array of lons and lats
     lon = []
 
     # keep an array of lons and lats
     lon = []


@@ -83,7 +83,7 @@ class ChangesetController < ApplicationController
 
     # the request is in pseudo-osm format... this is kind-of an
     # abuse, maybe should change to some other format?
 
     # the request is in pseudo-osm format... this is kind-of an
     # abuse, maybe should change to some other format?

-    doc = XML::Parser.string(request.raw_post).parse
+    doc = XML::Parser.string(request.raw_post, :options => XML::Parser::Options::NOERROR).parse

     doc.find("//osm/node").each do |n|
       lon << n["lon"].to_f * GeoRecord::SCALE
       lat << n["lat"].to_f * GeoRecord::SCALE
     doc.find("//osm/node").each do |n|
       lon << n["lon"].to_f * GeoRecord::SCALE
       lat << n["lat"].to_f * GeoRecord::SCALE


@@ -96,13 +96,15 @@ class ChangesetController < ApplicationController
     lat << cs.max_lat unless cs.max_lat.nil?
 
     # collapse the arrays to minimum and maximum
     lat << cs.max_lat unless cs.max_lat.nil?
 
     # collapse the arrays to minimum and maximum

-    cs.min_lon, cs.min_lat, cs.max_lon, cs.max_lat =
-      lon.min, lat.min, lon.max, lat.max
+    cs.min_lon = lon.min
+    cs.min_lat = lat.min
+    cs.max_lon = lon.max
+    cs.max_lat = lat.max

 
     # save the larger bounding box and return the changeset, which
     # will include the bigger bounding box.
     cs.save!
 
     # save the larger bounding box and return the changeset, which
     # will include the bigger bounding box.
     cs.save!

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

   end
 
   ##
   end
 
   ##


@@ -125,12 +127,12 @@ class ChangesetController < ApplicationController
     assert_method :post
 
     changeset = Changeset.find(params[:id])
     assert_method :post
 
     changeset = Changeset.find(params[:id])

-    check_changeset_consistency(changeset, @user)
+    check_changeset_consistency(changeset, current_user)

 
     diff_reader = DiffReader.new(request.raw_post, changeset)
     Changeset.transaction do
       result = diff_reader.commit
 
     diff_reader = DiffReader.new(request.raw_post, changeset)
     Changeset.transaction do
       result = diff_reader.commit

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

     end
   end
 
     end
   end
 


@@ -160,7 +162,7 @@ class ChangesetController < ApplicationController
     # global (SVN-style) versioning were used - then that would be
     # unambiguous.
     elements.sort! do |a, b|
     # global (SVN-style) versioning were used - then that would be
     # unambiguous.
     elements.sort! do |a, b|

-      if (a.timestamp == b.timestamp)
+      if a.timestamp == b.timestamp

         a.version <=> b.version
       else
         a.timestamp <=> b.timestamp
         a.version <=> b.version
       else
         a.timestamp <=> b.timestamp


@@ -180,24 +182,22 @@ class ChangesetController < ApplicationController
     # check these assertions.
     elements.each do |elt|
       result.root <<
     # check these assertions.
     elements.each do |elt|
       result.root <<

-        if (elt.version == 1)
+        if elt.version == 1

           # first version, so it must be newly-created.
           created = XML::Node.new "create"
           created << elt.to_xml_node(changeset_cache, user_display_name_cache)
           # first version, so it must be newly-created.
           created = XML::Node.new "create"
           created << elt.to_xml_node(changeset_cache, user_display_name_cache)

+        elsif elt.visible
+          # must be a modify
+          modified = XML::Node.new "modify"
+          modified << elt.to_xml_node(changeset_cache, user_display_name_cache)

         else
         else

-          if elt.visible
-            # must be a modify
-            modified = XML::Node.new "modify"
-            modified << elt.to_xml_node(changeset_cache, user_display_name_cache)
-          else
-            # if the element isn't visible then it must have been deleted
-            deleted = XML::Node.new "delete"
-            deleted << elt.to_xml_node(changeset_cache, user_display_name_cache)
-          end
+          # if the element isn't visible then it must have been deleted
+          deleted = XML::Node.new "delete"
+          deleted << elt.to_xml_node(changeset_cache, user_display_name_cache)

         end
     end
 
         end
     end
 

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

   end
 
   ##
   end
 
   ##


@@ -224,7 +224,7 @@ class ChangesetController < ApplicationController
       results.root << cs.to_xml_node
     end
 
       results.root << cs.to_xml_node
     end
 

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

   end
 
   ##
   end
 
   ##


@@ -242,61 +242,59 @@ class ChangesetController < ApplicationController
     changeset = Changeset.find(params[:id])
     new_changeset = Changeset.from_xml(request.raw_post)
 
     changeset = Changeset.find(params[:id])
     new_changeset = Changeset.from_xml(request.raw_post)
 

-    if new_changeset.nil?
-      render :text => "", :status => :bad_request
-    else
-      check_changeset_consistency(changeset, @user)
-      changeset.update_from(new_changeset, @user)
-      render :text => changeset.to_xml, :mime_type => "text/xml"
-    end
+    check_changeset_consistency(changeset, current_user)
+    changeset.update_from(new_changeset, current_user)
+    render :xml => changeset.to_xml.to_s

   end
 
   ##
   end
 
   ##

-  # list edits (open changesets) in reverse chronological order
+  # list non-empty changesets in reverse chronological order

   def list
   def list

-    if request.format == :atom && params[:max_id]
-      redirect_to params.merge(:max_id => nil), :status => :moved_permanently
+    @params = params.permit(:display_name, :bbox, :friends, :nearby, :max_id, :list)
+
+    if request.format == :atom && @params[:max_id]
+      redirect_to url_for(@params.merge(:max_id => nil)), :status => :moved_permanently

       return
     end
 
       return
     end
 

-    if params[:display_name]
-      user = User.find_by_display_name(params[:display_name])
+    if @params[:display_name]
+      user = User.find_by(:display_name => @params[:display_name])

       if !user || !user.active?
       if !user || !user.active?

-        render_unknown_user params[:display_name]
+        render_unknown_user @params[:display_name]

         return
       end
     end
 
         return
       end
     end
 

-    if (params[:friends] || params[:nearby]) && !@user && request.format == :html
+    if (@params[:friends] || @params[:nearby]) && !current_user

       require_user
       return
     end
 
       require_user
       return
     end
 

-    if request.format == :html && !params[:list]
+    if request.format == :html && !@params[:list]

       require_oauth
       render :action => :history, :layout => map_layout
     else
       changesets = conditions_nonempty(Changeset.all)
 
       require_oauth
       render :action => :history, :layout => map_layout
     else
       changesets = conditions_nonempty(Changeset.all)
 

-      if params[:display_name]
-        if user.data_public? || user == @user
-          changesets = changesets.where(:user_id => user.id)
-        else
-          changesets = changesets.where("false")
-        end
-      elsif params[:bbox]
+      if @params[:display_name]
+        changesets = if user.data_public? || user == current_user
+                       changesets.where(:user_id => user.id)
+                     else
+                       changesets.where("false")
+                     end
+      elsif @params[:bbox]

         changesets = conditions_bbox(changesets, BoundingBox.from_bbox_params(params))
         changesets = conditions_bbox(changesets, BoundingBox.from_bbox_params(params))

-      elsif params[:friends] && @user
-        changesets = changesets.where(:user_id => @user.friend_users.identifiable)
-      elsif params[:nearby] && @user
-        changesets = changesets.where(:user_id => @user.nearby)
+      elsif @params[:friends] && current_user
+        changesets = changesets.where(:user_id => current_user.friend_users.identifiable)
+      elsif @params[:nearby] && current_user
+        changesets = changesets.where(:user_id => current_user.nearby)

       end
 
       end
 

-      if params[:max_id]
-        changesets = changesets.where("changesets.id <= ?", params[:max_id])
+      if @params[:max_id]
+        changesets = changesets.where("changesets.id <= ?", @params[:max_id])

       end
 
       end
 

-      @edits = changesets.order("changesets.id DESC").limit(20).preload(:user, :changeset_tags)
+      @edits = changesets.order("changesets.id DESC").limit(20).preload(:user, :changeset_tags, :comments)

 
       render :action => :list, :layout => false
     end
 
       render :action => :list, :layout => false
     end


@@ -312,8 +310,8 @@ class ChangesetController < ApplicationController
   # Add a comment to a changeset
   def comment
     # Check the arguments are sane
   # Add a comment to a changeset
   def comment
     # Check the arguments are sane

-    fail OSM::APIBadUserInput.new("No id was given") unless params[:id]
-    fail OSM::APIBadUserInput.new("No text was given") if params[:text].blank?
+    raise OSM::APIBadUserInput, "No id was given" unless params[:id]
+    raise OSM::APIBadUserInput, "No text was given" if params[:text].blank?

 
     # Extract the arguments
     id = params[:id].to_i
 
     # Extract the arguments
     id = params[:id].to_i


@@ -321,74 +319,74 @@ class ChangesetController < ApplicationController
 
     # Find the changeset and check it is valid
     changeset = Changeset.find(id)
 
     # Find the changeset and check it is valid
     changeset = Changeset.find(id)

-    fail OSM::APIChangesetNotYetClosedError.new(changeset) if changeset.is_open?
+    raise OSM::APIChangesetNotYetClosedError, changeset if changeset.is_open?

 
     # Add a comment to the changeset
     comment = changeset.comments.create(:changeset => changeset,
                                         :body => body,
 
     # Add a comment to the changeset
     comment = changeset.comments.create(:changeset => changeset,
                                         :body => body,

-                                        :author => @user)
+                                        :author => current_user)

 
     # Notify current subscribers of the new comment
 
     # Notify current subscribers of the new comment

-    changeset.subscribers.each do |user|
-      if @user != user
+    changeset.subscribers.visible.each do |user|
+      if current_user != user

         Notifier.changeset_comment_notification(comment, user).deliver_now
       end
     end
 
     # Add the commenter to the subscribers if necessary
         Notifier.changeset_comment_notification(comment, user).deliver_now
       end
     end
 
     # Add the commenter to the subscribers if necessary

-    changeset.subscribers << @user unless changeset.subscribers.exists?(@user.id)
+    changeset.subscribers << current_user unless changeset.subscribers.exists?(current_user.id)

 
     # Return a copy of the updated changeset
 
     # Return a copy of the updated changeset

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

   end
 
   ##
   # Adds a subscriber to the changeset
   def subscribe
     # Check the arguments are sane
   end
 
   ##
   # Adds a subscriber to the changeset
   def subscribe
     # Check the arguments are sane

-    fail OSM::APIBadUserInput.new("No id was given") unless params[:id]
+    raise OSM::APIBadUserInput, "No id was given" unless params[:id]

 
     # Extract the arguments
     id = params[:id].to_i
 
     # Find the changeset and check it is valid
     changeset = Changeset.find(id)
 
     # Extract the arguments
     id = params[:id].to_i
 
     # Find the changeset and check it is valid
     changeset = Changeset.find(id)

-    fail OSM::APIChangesetNotYetClosedError.new(changeset) if changeset.is_open?
-    fail OSM::APIChangesetAlreadySubscribedError.new(changeset) if changeset.subscribers.exists?(@user.id)
+    raise OSM::APIChangesetNotYetClosedError, changeset if changeset.is_open?
+    raise OSM::APIChangesetAlreadySubscribedError, changeset if changeset.subscribers.exists?(current_user.id)

 
     # Add the subscriber
 
     # Add the subscriber

-    changeset.subscribers << @user
+    changeset.subscribers << current_user

 
     # Return a copy of the updated changeset
 
     # Return a copy of the updated changeset

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

   end
 
   ##
   # Removes a subscriber from the changeset
   def unsubscribe
     # Check the arguments are sane
   end
 
   ##
   # Removes a subscriber from the changeset
   def unsubscribe
     # Check the arguments are sane

-    fail OSM::APIBadUserInput.new("No id was given") unless params[:id]
+    raise OSM::APIBadUserInput, "No id was given" unless params[:id]

 
     # Extract the arguments
     id = params[:id].to_i
 
     # Find the changeset and check it is valid
     changeset = Changeset.find(id)
 
     # Extract the arguments
     id = params[:id].to_i
 
     # Find the changeset and check it is valid
     changeset = Changeset.find(id)

-    fail OSM::APIChangesetNotYetClosedError.new(changeset) if changeset.is_open?
-    fail OSM::APIChangesetNotSubscribedError.new(changeset) unless changeset.subscribers.exists?(@user.id)
+    raise OSM::APIChangesetNotYetClosedError, changeset if changeset.is_open?
+    raise OSM::APIChangesetNotSubscribedError, changeset unless changeset.subscribers.exists?(current_user.id)

 
     # Remove the subscriber
 
     # Remove the subscriber

-    changeset.subscribers.delete(@user)
+    changeset.subscribers.delete(current_user)

 
     # Return a copy of the updated changeset
 
     # Return a copy of the updated changeset

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

   end
 
   ##
   # Sets visible flag on comment to false
   def hide_comment
     # Check the arguments are sane
   end
 
   ##
   # Sets visible flag on comment to false
   def hide_comment
     # Check the arguments are sane

-    fail OSM::APIBadUserInput.new("No id was given") unless params[:id]
+    raise OSM::APIBadUserInput, "No id was given" unless params[:id]

 
     # Extract the arguments
     id = params[:id].to_i
 
     # Extract the arguments
     id = params[:id].to_i


@@ -400,14 +398,14 @@ class ChangesetController < ApplicationController
     comment.update(:visible => false)
 
     # Return a copy of the updated changeset
     comment.update(:visible => false)
 
     # Return a copy of the updated changeset

-    render :text => comment.changeset.to_xml.to_s, :content_type => "text/xml"
+    render :xml => comment.changeset.to_xml.to_s

   end
 
   ##
   # Sets visible flag on comment to true
   def unhide_comment
     # Check the arguments are sane
   end
 
   ##
   # Sets visible flag on comment to true
   def unhide_comment
     # Check the arguments are sane

-    fail OSM::APIBadUserInput.new("No id was given") unless params[:id]
+    raise OSM::APIBadUserInput, "No id was given" unless params[:id]

 
     # Extract the arguments
     id = params[:id].to_i
 
     # Extract the arguments
     id = params[:id].to_i


@@ -419,7 +417,7 @@ class ChangesetController < ApplicationController
     comment.update(:visible => true)
 
     # Return a copy of the updated changeset
     comment.update(:visible => true)
 
     # Return a copy of the updated changeset

-    render :text => comment.changeset.to_xml.to_s, :content_type => "text/xml"
+    render :xml => comment.changeset.to_xml.to_s

   end
 
   ##
   end
 
   ##


@@ -436,13 +434,15 @@ class ChangesetController < ApplicationController
       @comments = changeset.comments.includes(:author, :changeset).limit(comments_limit)
     else
       # Return comments
       @comments = changeset.comments.includes(:author, :changeset).limit(comments_limit)
     else
       # Return comments

-      @comments = ChangesetComment.includes(:author, :changeset).where(:visible => :true).order("created_at DESC").limit(comments_limit).preload(:changeset)
+      @comments = ChangesetComment.includes(:author, :changeset).where(:visible => true).order("created_at DESC").limit(comments_limit).preload(:changeset)

     end
 
     # Render the result
     respond_to do |format|
       format.rss
     end
     end
 
     # Render the result
     respond_to do |format|
       format.rss
     end

+  rescue OSM::APIBadUserInput
+    head :bad_request

   end
 
   private
   end
 
   private


@@ -456,14 +456,15 @@ class ChangesetController < ApplicationController
   # restrict changesets to those enclosed by a bounding box
   # we need to return both the changesets and the bounding box
   def conditions_bbox(changesets, bbox)
   # restrict changesets to those enclosed by a bounding box
   # we need to return both the changesets and the bounding box
   def conditions_bbox(changesets, bbox)

-    if  bbox
+    if bbox

       bbox.check_boundaries
       bbox = bbox.to_scaled
       bbox.check_boundaries
       bbox = bbox.to_scaled

-      return changesets.where("min_lon < ? and max_lon > ? and min_lat < ? and max_lat > ?",
-                              bbox.max_lon.to_i, bbox.min_lon.to_i,
-                              bbox.max_lat.to_i, bbox.min_lat.to_i)
+
+      changesets.where("min_lon < ? and max_lon > ? and min_lat < ? and max_lat > ?",
+                       bbox.max_lon.to_i, bbox.min_lon.to_i,
+                       bbox.max_lat.to_i, bbox.min_lat.to_i)

     else
     else

-      return changesets
+      changesets

     end
   end
 
     end
   end
 


@@ -471,22 +472,22 @@ class ChangesetController < ApplicationController
   # restrict changesets to those by a particular user
   def conditions_user(changesets, user, name)
     if user.nil? && name.nil?
   # restrict changesets to those by a particular user
   def conditions_user(changesets, user, name)
     if user.nil? && name.nil?

-      return changesets
+      changesets

     else
       # shouldn't provide both name and UID
     else
       # shouldn't provide both name and UID

-      fail OSM::APIBadUserInput.new("provide either the user ID or display name, but not both") if user && name
+      raise OSM::APIBadUserInput, "provide either the user ID or display name, but not both" if user && name

 
       # use either the name or the UID to find the user which we're selecting on.
       u = if name.nil?
             # user input checking, we don't have any UIDs < 1
 
       # use either the name or the UID to find the user which we're selecting on.
       u = if name.nil?
             # user input checking, we don't have any UIDs < 1

-            fail OSM::APIBadUserInput.new("invalid user ID") if user.to_i < 1
+            raise OSM::APIBadUserInput, "invalid user ID" if user.to_i < 1

             u = User.find(user.to_i)
           else
             u = User.find(user.to_i)
           else

-            u = User.find_by_display_name(name)
+            u = User.find_by(:display_name => name)

           end
 
       # make sure we found a user
           end
 
       # make sure we found a user

-      fail OSM::APINotFoundError.new if u.nil?
+      raise OSM::APINotFoundError if u.nil?

 
       # should be able to get changesets of public users only, or
       # our own changesets regardless of public-ness.
 
       # should be able to get changesets of public users only, or
       # our own changesets regardless of public-ness.


@@ -495,9 +496,10 @@ class ChangesetController < ApplicationController
         # changesets if they're non-public
         setup_user_auth
 
         # changesets if they're non-public
         setup_user_auth
 

-        fail OSM::APINotFoundError if @user.nil? || @user.id != u.id
+        raise OSM::APINotFoundError if current_user.nil? || current_user != u

       end
       end

-      return changesets.where(:user_id => u.id)
+
+      changesets.where(:user_id => u.id)

     end
   end
 
     end
   end
 


@@ -506,27 +508,26 @@ class ChangesetController < ApplicationController
   def conditions_time(changesets, time)
     if time.nil?
       return changesets
   def conditions_time(changesets, time)
     if time.nil?
       return changesets

-    else
+    elsif time.count(",") == 1

       # if there is a range, i.e: comma separated, then the first is
       # low, second is high - same as with bounding boxes.
       # if there is a range, i.e: comma separated, then the first is
       # low, second is high - same as with bounding boxes.

-      if time.count(",") == 1
-        # check that we actually have 2 elements in the array
-        times = time.split(/,/)
-        fail OSM::APIBadUserInput.new("bad time range") if times.size != 2

 
 

-        from, to = times.collect { |t| DateTime.parse(t) }
-        return changesets.where("closed_at >= ? and created_at <= ?", from, to)
-      else
-        # if there is no comma, assume its a lower limit on time
-        return changesets.where("closed_at >= ?", DateTime.parse(time))
-      end
+      # check that we actually have 2 elements in the array
+      times = time.split(/,/)
+      raise OSM::APIBadUserInput, "bad time range" if times.size != 2
+
+      from, to = times.collect { |t| Time.parse(t) }
+      return changesets.where("closed_at >= ? and created_at <= ?", from, to)
+    else
+      # if there is no comma, assume its a lower limit on time
+      return changesets.where("closed_at >= ?", Time.parse(time))

     end
     end

-    # stupid DateTime seems to throw both of these for bad parsing, so
+    # stupid Time seems to throw both of these for bad parsing, so

     # we have to catch both and ensure the correct code path is taken.
   rescue ArgumentError => ex
     # we have to catch both and ensure the correct code path is taken.
   rescue ArgumentError => ex

-    raise OSM::APIBadUserInput.new(ex.message.to_s)
+    raise OSM::APIBadUserInput, ex.message.to_s

   rescue RuntimeError => ex
   rescue RuntimeError => ex

-    raise OSM::APIBadUserInput.new(ex.message.to_s)
+    raise OSM::APIBadUserInput, ex.message.to_s

   end
 
   ##
   end
 
   ##


@@ -536,10 +537,10 @@ class ChangesetController < ApplicationController
   # if parameter 'open' is nill then open and closed changesets are returned
   def conditions_open(changesets, open)
     if open.nil?
   # if parameter 'open' is nill then open and closed changesets are returned
   def conditions_open(changesets, open)
     if open.nil?

-      return changesets
+      changesets

     else
     else

-      return changesets.where("closed_at >= ? and num_changes <= ?",
-                              Time.now.getutc, Changeset::MAX_ELEMENTS)
+      changesets.where("closed_at >= ? and num_changes <= ?",
+                       Time.now.getutc, Changeset::MAX_ELEMENTS)

     end
   end
 
     end
   end
 


@@ -548,10 +549,10 @@ class ChangesetController < ApplicationController
   # ('closed at' time has passed or changes limit is hit)
   def conditions_closed(changesets, closed)
     if closed.nil?
   # ('closed at' time has passed or changes limit is hit)
   def conditions_closed(changesets, closed)
     if closed.nil?

-      return changesets
+      changesets

     else
     else

-      return changesets.where("closed_at < ? or num_changes > ?",
-                              Time.now.getutc, Changeset::MAX_ELEMENTS)
+      changesets.where("closed_at < ? or num_changes > ?",
+                       Time.now.getutc, Changeset::MAX_ELEMENTS)

     end
   end
 
     end
   end
 


@@ -560,12 +561,12 @@ class ChangesetController < ApplicationController
   # (either specified as array or comma-separated string)
   def conditions_ids(changesets, ids)
     if ids.nil?
   # (either specified as array or comma-separated string)
   def conditions_ids(changesets, ids)
     if ids.nil?

-      return changesets
+      changesets

     elsif ids.empty?
     elsif ids.empty?

-      fail OSM::APIBadUserInput.new("No changesets were given to search for")
+      raise OSM::APIBadUserInput, "No changesets were given to search for"

     else
       ids = ids.split(",").collect(&:to_i)
     else
       ids = ids.split(",").collect(&:to_i)

-      return changesets.where(:id => ids)
+      changesets.where(:id => ids)

     end
   end
 
     end
   end
 


@@ -583,7 +584,7 @@ class ChangesetController < ApplicationController
       if params[:limit].to_i > 0 && params[:limit].to_i <= 10000
         params[:limit].to_i
       else
       if params[:limit].to_i > 0 && params[:limit].to_i <= 10000
         params[:limit].to_i
       else

-        fail OSM::APIBadUserInput.new("Comments limit must be between 1 and 10000")
+        raise OSM::APIBadUserInput, "Comments limit must be between 1 and 10000"

       end
     else
       100
       end
     else
       100