From b6b9d543acd0dfc39f69242e82c60d5a25021f79 Mon Sep 17 00:00:00 2001 From: Tom Hughes Date: Sun, 29 Oct 2017 19:43:02 +0000 Subject: [PATCH] Fix rubocop warnings --- app/controllers/amf_controller.rb | 40 ++++++++++----------- app/controllers/changeset_controller.rb | 6 ++-- app/helpers/changeset_helper.rb | 2 +- app/models/client_application.rb | 2 +- lib/classic_pagination/pagination_helper.rb | 6 ++-- lib/gpx.rb | 2 +- test/helpers/browse_helper_test.rb | 2 -- test/lib/utf8_test.rb | 1 - test/models/changeset_comment_test.rb | 1 - test/models/message_test.rb | 1 - test/models/note_comment_test.rb | 1 - test/models/note_test.rb | 1 - test/models/user_test.rb | 1 - 13 files changed, 29 insertions(+), 37 deletions(-) diff --git a/app/controllers/amf_controller.rb b/app/controllers/amf_controller.rb index 679e137d9..5181280d9 100644 --- a/app/controllers/amf_controller.rb +++ b/app/controllers/amf_controller.rb @@ -186,7 +186,7 @@ class AmfController < ApplicationController # Return presets (default tags, localisation etc.): # uses POTLATCH_PRESETS global, set up in OSM::Potlatch. - def getpresets(usertoken, lang) #:doc: + def getpresets(usertoken, _lang) user = getuser(usertoken) langs = if user && !user.languages.empty? @@ -253,7 +253,7 @@ class AmfController < ApplicationController # nodes in the bbox, nodes are any visible nodes in the bbox but not # used in any way, rel is any relation which refers to either a way # or node that we're returning. - def whichways(xmin, ymin, xmax, ymax) #:doc: + def whichways(xmin, ymin, xmax, ymax) amf_handle_error_with_timeout("'whichways'", nil, nil) do enlarge = [(xmax - xmin) / 8, 0.01].min xmin -= enlarge @@ -297,7 +297,7 @@ class AmfController < ApplicationController # Find deleted ways in current bounding box (similar to whichways, but ways # with a deleted node only - not POIs or relations). - def whichways_deleted(xmin, ymin, xmax, ymax) #:doc: + def whichways_deleted(xmin, ymin, xmax, ymax) amf_handle_error_with_timeout("'whichways_deleted'", nil, nil) do enlarge = [(xmax - xmin) / 8, 0.01].min xmin -= enlarge @@ -321,7 +321,7 @@ class AmfController < ApplicationController # Get a way including nodes and tags. # Returns the way id, a Potlatch-style array of points, a hash of tags, the version number, and the user ID. - def getway(wayid) #:doc: + def getway(wayid) amf_handle_error_with_timeout("'getway' #{wayid}", "way", wayid) do if POTLATCH_USE_SQL points = sql_get_nodes_in_way(wayid) @@ -366,7 +366,7 @@ class AmfController < ApplicationController # 4. version, # 5. is this the current, visible version? (boolean) - def getway_old(id, timestamp) #:doc: + def getway_old(id, timestamp) amf_handle_error_with_timeout("'getway_old' #{id}, #{timestamp}", "way", id) do if timestamp == "" # undelete @@ -375,7 +375,7 @@ class AmfController < ApplicationController else begin # revert - timestamp = DateTime.strptime(timestamp.to_s, "%d %b %Y, %H:%M:%S") + timestamp = Time.strptime(timestamp.to_s, "%d %b %Y, %H:%M:%S") old_way = OldWay.where("way_id = ? AND timestamp <= ?", id, timestamp).unredacted.order("timestamp DESC").first unless old_way.nil? if old_way.visible @@ -411,7 +411,7 @@ class AmfController < ApplicationController # sort and collapse list (to within 2 seconds); trim all dates before the # start date of the way. - def getway_history(wayid) #:doc: + def getway_history(wayid) revdates = [] revusers = {} Way.find(wayid).old_ways.unredacted.collect do |a| @@ -444,7 +444,7 @@ class AmfController < ApplicationController # Find history of a node. Returns 'node', id, and an array of previous versions as above. - def getnode_history(nodeid) #:doc: + def getnode_history(nodeid) history = Node.find(nodeid).old_nodes.unredacted.reverse.collect do |old_node| [(old_node.timestamp + 1).strftime("%d %b %Y, %H:%M:%S")] + change_user(old_node) end @@ -492,7 +492,7 @@ class AmfController < ApplicationController # 4. list of members, # 5. version. - def getrelation(relid) #:doc: + def getrelation(relid) amf_handle_error("'getrelation' #{relid}", "relation", relid) do rel = Relation.where(:id => relid).first @@ -528,7 +528,7 @@ class AmfController < ApplicationController # 2. new relation id, # 3. version. - def putrelation(renumberednodes, renumberedways, usertoken, changeset_id, version, relid, tags, members, visible) #:doc: + def putrelation(renumberednodes, renumberedways, usertoken, changeset_id, version, relid, tags, members, visible) amf_handle_error("'putrelation' #{relid}", "relation", relid) do user = getuser(usertoken) @@ -582,7 +582,7 @@ class AmfController < ApplicationController new_relation.id = relid relation.delete_with_history!(new_relation, user) end - end # transaction + end if relid <= 0 return [0, "", relid, new_relation.id, new_relation.version] @@ -616,7 +616,7 @@ class AmfController < ApplicationController # 6. hash of changed node versions (node=>version) # 7. hash of deleted node versions (node=>version) - def putway(renumberednodes, usertoken, changeset_id, wayversion, originalway, pointlist, attributes, nodes, deletednodes) #:doc: + def putway(renumberednodes, usertoken, changeset_id, wayversion, originalway, pointlist, attributes, nodes, deletednodes) amf_handle_error("'putway' #{originalway}", "way", originalway) do # -- Initialise @@ -679,7 +679,7 @@ class AmfController < ApplicationController pointlist.collect! do |a| renumberednodes[a] ? renumberednodes[a] : a - end # renumber nodes + end new_way = Way.new new_way.tags = attributes new_way.nds = pointlist @@ -711,7 +711,7 @@ class AmfController < ApplicationController # and we don't want to delete it end end - end # transaction + end [0, "", originalway, way.id, renumberednodes, way.version, nodeversions, deletednodes] end @@ -726,7 +726,7 @@ class AmfController < ApplicationController # 3. new node id, # 4. version. - def putpoi(usertoken, changeset_id, version, id, lon, lat, tags, visible) #:doc: + def putpoi(usertoken, changeset_id, version, id, lon, lat, tags, visible) amf_handle_error("'putpoi' #{id}", "node", id) do user = getuser(usertoken) return -1, "You are not logged in, so the point could not be saved." unless user @@ -772,7 +772,7 @@ class AmfController < ApplicationController new_node.id = id node.delete_with_history!(new_node, user) end - end # transaction + end if id <= 0 return [0, "", id, new_node.id, new_node.version] @@ -787,7 +787,7 @@ class AmfController < ApplicationController # # Returns array of id, long, lat, hash of tags, (current) version. - def getpoi(id, timestamp) #:doc: + def getpoi(id, timestamp) amf_handle_error("'getpoi' #{id}", "node", id) do id = id.to_i n = Node.where(:id => id).first @@ -816,7 +816,7 @@ class AmfController < ApplicationController # of the nodes have been changed by someone else then, there is a problem! # Returns 0 (success), unchanged way id, new way version, new node versions. - def deleteway(usertoken, changeset_id, way_id, way_version, deletednodes) #:doc: + def deleteway(usertoken, changeset_id, way_id, way_version, deletednodes) amf_handle_error("'deleteway' #{way_id}", "way", way_id) do user = getuser(usertoken) return -1, "You are not logged in, so the way could not be deleted." unless user @@ -853,7 +853,7 @@ class AmfController < ApplicationController # elsewhere and we don't want to delete it end end - end # transaction + end [0, "", way_id, old_way.version, nodeversions] end end @@ -866,7 +866,7 @@ class AmfController < ApplicationController # When we are writing to the api, we need the actual user model, # not just the id, hence this abstraction - def getuser(token) #:doc: + def getuser(token) if token =~ /^(.+)\:(.+)$/ User.authenticate(:username => Regexp.last_match(1), :password => Regexp.last_match(2)) else diff --git a/app/controllers/changeset_controller.rb b/app/controllers/changeset_controller.rb index fbd4417d0..898afae4a 100644 --- a/app/controllers/changeset_controller.rb +++ b/app/controllers/changeset_controller.rb @@ -516,13 +516,13 @@ class ChangesetController < ApplicationController times = time.split(/,/) raise OSM::APIBadUserInput, "bad time range" if times.size != 2 - from, to = times.collect { |t| DateTime.parse(t) } + 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 >= ?", DateTime.parse(time)) + return changesets.where("closed_at >= ?", Time.parse(time)) 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 raise OSM::APIBadUserInput, ex.message.to_s diff --git a/app/helpers/changeset_helper.rb b/app/helpers/changeset_helper.rb index cc008aab7..7eb389023 100644 --- a/app/helpers/changeset_helper.rb +++ b/app/helpers/changeset_helper.rb @@ -10,7 +10,7 @@ module ChangesetHelper end def changeset_details(changeset) - if changeset.closed_at > DateTime.now + if changeset.closed_at > Time.now action = :created time = distance_of_time_in_words_to_now(changeset.created_at) title = l(changeset.created_at) diff --git a/app/models/client_application.rb b/app/models/client_application.rb index 90523a265..67b86417a 100644 --- a/app/models/client_application.rb +++ b/app/models/client_application.rb @@ -75,7 +75,7 @@ class ClientApplication < ActiveRecord::Base @oauth_client ||= OAuth::Consumer.new(key, secret) end - def create_request_token(params = {}) + def create_request_token(_params = {}) params = { :client_application => self, :callback_url => token_callback_url } permissions.each do |p| params[p] = true diff --git a/lib/classic_pagination/pagination_helper.rb b/lib/classic_pagination/pagination_helper.rb index 18decb119..3ff3c3b95 100644 --- a/lib/classic_pagination/pagination_helper.rb +++ b/lib/classic_pagination/pagination_helper.rb @@ -130,6 +130,6 @@ module ActionView html end - end # PaginationHelper - end # Helpers -end # ActionView + end + end +end diff --git a/lib/gpx.rb b/lib/gpx.rb index 3ec11c5c4..ee9d53afa 100644 --- a/lib/gpx.rb +++ b/lib/gpx.rb @@ -31,7 +31,7 @@ module GPX elsif reader.name == "ele" && point point.altitude = reader.read_string.to_f elsif reader.name == "time" && point - point.timestamp = DateTime.parse(reader.read_string) + point.timestamp = Time.parse(reader.read_string) end elsif reader.node_type == XML::Reader::TYPE_END_ELEMENT if reader.name == "trkpt" && point && point.valid? diff --git a/test/helpers/browse_helper_test.rb b/test/helpers/browse_helper_test.rb index 277433356..13f65c976 100644 --- a/test/helpers/browse_helper_test.rb +++ b/test/helpers/browse_helper_test.rb @@ -1,5 +1,3 @@ -# -*- coding: utf-8 -*- - require "test_helper" class BrowseHelperTest < ActionView::TestCase diff --git a/test/lib/utf8_test.rb b/test/lib/utf8_test.rb index 5762a83eb..4ad6f0c9e 100644 --- a/test/lib/utf8_test.rb +++ b/test/lib/utf8_test.rb @@ -1,4 +1,3 @@ -# -*- coding: utf-8 -*- require "test_helper" class UTF8Test < ActiveSupport::TestCase diff --git a/test/models/changeset_comment_test.rb b/test/models/changeset_comment_test.rb index a7eafbef5..8e8d0cd70 100644 --- a/test/models/changeset_comment_test.rb +++ b/test/models/changeset_comment_test.rb @@ -1,4 +1,3 @@ -# -*- coding: utf-8 -*- require "test_helper" class ChangesetCommentTest < ActiveSupport::TestCase diff --git a/test/models/message_test.rb b/test/models/message_test.rb index 0c0f0e3eb..285222f1e 100644 --- a/test/models/message_test.rb +++ b/test/models/message_test.rb @@ -1,4 +1,3 @@ -# -*- coding: utf-8 -*- require "test_helper" class MessageTest < ActiveSupport::TestCase diff --git a/test/models/note_comment_test.rb b/test/models/note_comment_test.rb index 6bda0ee7d..21d67dc67 100644 --- a/test/models/note_comment_test.rb +++ b/test/models/note_comment_test.rb @@ -1,4 +1,3 @@ -# -*- coding: utf-8 -*- require "test_helper" class NoteCommentTest < ActiveSupport::TestCase diff --git a/test/models/note_test.rb b/test/models/note_test.rb index 77ed7f1b2..369ff1083 100644 --- a/test/models/note_test.rb +++ b/test/models/note_test.rb @@ -1,4 +1,3 @@ -# -*- coding: utf-8 -*- require "test_helper" class NoteTest < ActiveSupport::TestCase diff --git a/test/models/user_test.rb b/test/models/user_test.rb index 57c136475..8af701ca0 100644 --- a/test/models/user_test.rb +++ b/test/models/user_test.rb @@ -1,4 +1,3 @@ -# -*- coding: utf-8 -*- require "test_helper" class UserTest < ActiveSupport::TestCase -- 2.39.5