Fix rubocop lint issues

diff --git a/.rubocop_todo.yml b/.rubocop_todo.yml
index 75f088e1ac6638eeb40711cfa9a83fe139f3fb70..b857f54953fc6c7c1522cef1a3800f8678f14524 100644 (file)
--- a/.rubocop_todo.yml
+++ b/.rubocop_todo.yml
@@ -18,52 +18,14 @@ Lint/AmbiguousRegexpLiteral:
 Lint/AssignmentInCondition:
   Enabled: false
 
 Lint/AssignmentInCondition:
   Enabled: false
 

-# Offense count: 1
-# Configuration parameters: AlignWith, SupportedStyles.
-Lint/DefEndAlignment:
-  Enabled: false
-
-# Offense count: 2
-Lint/DuplicateMethods:
-  Enabled: false
-

 # Offense count: 5
 # Offense count: 5

-# Configuration parameters: AlignWith, SupportedStyles.
-Lint/EndAlignment:
-  Enabled: false
-
-# Offense count: 8

 Lint/HandleExceptions:
   Enabled: false
 
 Lint/HandleExceptions:
   Enabled: false
 

-# Offense count: 1
-Lint/LiteralInCondition:
-  Enabled: false
-

 # Offense count: 8
 Lint/ParenthesesAsGroupedExpression:
   Enabled: false
 
 # Offense count: 8
 Lint/ParenthesesAsGroupedExpression:
   Enabled: false
 

-# Offense count: 18
-Lint/RescueException:
-  Enabled: false
-
-# Offense count: 3
-Lint/ShadowingOuterLocalVariable:
-  Enabled: false
-
-# Offense count: 2
-Lint/UselessAccessModifier:
-  Enabled: false
-
-# Offense count: 48
-Lint/UselessAssignment:
-  Enabled: false
-
-# Offense count: 2
-Lint/Void:
-  Enabled: false
-

 # Offense count: 546
 Metrics/AbcSize:
   Max: 194
 # Offense count: 546
 Metrics/AbcSize:
   Max: 194

diff --git a/app/controllers/amf_controller.rb b/app/controllers/amf_controller.rb
index 75dc1645851877ff397d3aa0c628ee5cebb521f9..aa2156e8e07e86c2d1507fe307d88561e6cbbb68 100644 (file)
--- a/app/controllers/amf_controller.rb
+++ b/app/controllers/amf_controller.rb
@@ -114,7 +114,7 @@ class AmfController < ApplicationController
     return [-2, "Sorry - I can't get the map for that area. The server said: #{ex}"]
   rescue OSM::APIError => ex
     return [-1, ex.to_s]
     return [-2, "Sorry - I can't get the map for that area. The server said: #{ex}"]
   rescue OSM::APIError => ex
     return [-1, ex.to_s]

-  rescue Exception => ex
+  rescue StandardError => ex

     return [-2, "An unusual error happened (in #{call}). The server said: #{ex}"]
   end
 
     return [-2, "An unusual error happened (in #{call}). The server said: #{ex}"]
   end
 


@@ -375,6 +375,7 @@ class AmfController < ApplicationController
         rescue ArgumentError
           # thrown by date parsing method. leave old_way as nil for
           # the error handler below.
         rescue ArgumentError
           # thrown by date parsing method. leave old_way as nil for
           # the error handler below.

+          old_way = nil

         end
       end
 
         end
       end
 


@@ -691,7 +692,7 @@ class AmfController < ApplicationController
           new_node.id = id.to_i
           begin
             node.delete_with_history!(new_node, user)
           new_node.id = id.to_i
           begin
             node.delete_with_history!(new_node, user)

-          rescue OSM::APIPreconditionFailedError => ex
+          rescue OSM::APIPreconditionFailedError

             # We don't do anything here as the node is being used elsewhere
             # and we don't want to delete it
           end
             # We don't do anything here as the node is being used elsewhere
             # and we don't want to delete it
           end


@@ -827,7 +828,7 @@ class AmfController < ApplicationController
           begin
             node.delete_with_history!(new_node, user)
             nodeversions[node.id] = node.version
           begin
             node.delete_with_history!(new_node, user)
             nodeversions[node.id] = node.version

-          rescue OSM::APIPreconditionFailedError => ex
+          rescue OSM::APIPreconditionFailedError

             # We don't do anything with the exception as the node is in use
             # elsewhere and we don't want to delete it
           end
             # We don't do anything with the exception as the node is in use
             # elsewhere and we don't want to delete it
           end

diff --git a/app/controllers/api_controller.rb b/app/controllers/api_controller.rb
index 1b9a1ad6994e9ce9b59fe723a8f62957169cef63..659d35477773df771928cd4c4b4e0666888bf1d5 100644 (file)
--- a/app/controllers/api_controller.rb
+++ b/app/controllers/api_controller.rb
@@ -25,7 +25,7 @@ class ApiController < ApplicationController
       bbox = BoundingBox.from_bbox_params(params)
       bbox.check_boundaries
       bbox.check_size
       bbox = BoundingBox.from_bbox_params(params)
       bbox.check_boundaries
       bbox.check_size

-    rescue Exception => err
+    rescue StandardError => err

       report_error(err.message)
       return
     end
       report_error(err.message)
       return
     end


@@ -121,7 +121,7 @@ class ApiController < ApplicationController
       bbox = BoundingBox.from_bbox_params(params)
       bbox.check_boundaries
       bbox.check_size
       bbox = BoundingBox.from_bbox_params(params)
       bbox.check_boundaries
       bbox.check_size

-    rescue Exception => err
+    rescue StandardError => err

       report_error(err.message)
       return
     end
       report_error(err.message)
       return
     end

diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb
index e3f0391d14717e03dc4c78a63ac28010df2d1daf..5ef50eb3f1d0bd34d6fdbee8ce6f3f735f3af693 100644 (file)
--- a/app/controllers/application_controller.rb
+++ b/app/controllers/application_controller.rb
@@ -24,13 +24,13 @@ class ApplicationController < ActionController::Base
         else
           redirect_to :controller => "user", :action => "terms", :referer => request.fullpath
         end
         else
           redirect_to :controller => "user", :action => "terms", :referer => request.fullpath
         end

-        end
+      end

     elsif session[:token]
       if @user = User.authenticate(:token => session[:token])
         session[:user] = @user.id
       end
     end
     elsif session[:token]
       if @user = User.authenticate(:token => session[:token])
         session[:user] = @user.id
       end
     end

-  rescue Exception => ex
+  rescue StandardError => ex

     logger.info("Exception authorizing user: #{ex}")
     reset_session
     @user = nil
     logger.info("Exception authorizing user: #{ex}")
     reset_session
     @user = nil


@@ -345,7 +345,7 @@ class ApplicationController < ActionController::Base
     report_error ex.message, ex.status
   rescue AbstractController::ActionNotFound => ex
     raise
     report_error ex.message, ex.status
   rescue AbstractController::ActionNotFound => ex
     raise

-  rescue Exception => ex
+  rescue StandardError => ex

     logger.info("API threw unexpected #{ex.class} exception: #{ex.message}")
     ex.backtrace.each { |l| logger.info(l) }
     report_error "#{ex.class}: #{ex.message}", :internal_server_error
     logger.info("API threw unexpected #{ex.class} exception: #{ex.message}")
     ex.backtrace.each { |l| logger.info(l) }
     report_error "#{ex.class}: #{ex.message}", :internal_server_error


@@ -441,7 +441,7 @@ class ApplicationController < ActionController::Base
                @user.preferred_editor
              else
                DEFAULT_EDITOR
                @user.preferred_editor
              else
                DEFAULT_EDITOR

-    end
+             end

 
     if request.env['HTTP_USER_AGENT'] =~ /MSIE|Trident/ && editor == 'id'
       editor = 'potlatch2'
 
     if request.env['HTTP_USER_AGENT'] =~ /MSIE|Trident/ && editor == 'id'
       editor = 'potlatch2'

diff --git a/app/controllers/geocoder_controller.rb b/app/controllers/geocoder_controller.rb
index 25042c4744b3f8309a1115d317cdb6862a0b562a..0d39cdf0a877bdd76a653b1555e361d28e2a33e5 100644 (file)
--- a/app/controllers/geocoder_controller.rb
+++ b/app/controllers/geocoder_controller.rb
@@ -73,7 +73,7 @@ class GeocoderController < ApplicationController
     end
 
     render :action => "results"
     end
 
     render :action => "results"

-  rescue Exception => ex
+  rescue StandardError => ex

     @error = "Error contacting rpc.geocoder.us: #{ex}"
     render :action => "error"
   end
     @error = "Error contacting rpc.geocoder.us: #{ex}"
     render :action => "error"
   end


@@ -99,7 +99,7 @@ class GeocoderController < ApplicationController
     end
 
     render :action => "results"
     end
 
     render :action => "results"

-  rescue Exception => ex
+  rescue StandardError => ex

     @error = "Error contacting www.npemap.org.uk: #{ex}"
     render :action => "error"
   end
     @error = "Error contacting www.npemap.org.uk: #{ex}"
     render :action => "error"
   end


@@ -121,7 +121,7 @@ class GeocoderController < ApplicationController
     end
 
     render :action => "results"
     end
 
     render :action => "results"

-  rescue Exception => ex
+  rescue StandardError => ex

     @error = "Error contacting geocoder.ca: #{ex}"
     render :action => "error"
   end
     @error = "Error contacting geocoder.ca: #{ex}"
     render :action => "error"
   end


@@ -188,7 +188,7 @@ class GeocoderController < ApplicationController
     end
 
     render :action => "results"
     end
 
     render :action => "results"

-    #  rescue Exception => ex
+    #  rescue StandardError => ex

     #    @error = "Error contacting nominatim.openstreetmap.org: #{ex.to_s}"
     #    render :action => "error"
   end
     #    @error = "Error contacting nominatim.openstreetmap.org: #{ex.to_s}"
     #    render :action => "error"
   end


@@ -219,7 +219,7 @@ class GeocoderController < ApplicationController
     end
 
     render :action => "results"
     end
 
     render :action => "results"

-  rescue Exception => ex
+  rescue StandardError => ex

     @error = "Error contacting ws.geonames.org: #{ex}"
     render :action => "error"
   end
     @error = "Error contacting ws.geonames.org: #{ex}"
     render :action => "error"
   end


@@ -251,7 +251,7 @@ class GeocoderController < ApplicationController
     end
 
     render :action => "results"
     end
 
     render :action => "results"

-  rescue Exception => ex
+  rescue StandardError => ex

     @error = "Error contacting nominatim.openstreetmap.org: #{ex}"
     render :action => "error"
   end
     @error = "Error contacting nominatim.openstreetmap.org: #{ex}"
     render :action => "error"
   end


@@ -281,7 +281,7 @@ class GeocoderController < ApplicationController
     end
 
     render :action => "results"
     end
 
     render :action => "results"

-  rescue Exception => ex
+  rescue StandardError => ex

     @error = "Error contacting ws.geonames.org: #{ex}"
     render :action => "error"
   end
     @error = "Error contacting ws.geonames.org: #{ex}"
     render :action => "error"
   end

diff --git a/app/controllers/swf_controller.rb b/app/controllers/swf_controller.rb
index 541185d031ffe62a87563263dda45fa28658b670..92a70457e669a9848e9b1e78c1054d31ef5e42ea 100644 (file)
--- a/app/controllers/swf_controller.rb
+++ b/app/controllers/swf_controller.rb
@@ -102,10 +102,10 @@ class SwfController < ApplicationController
   # Line-drawing
 
   def startShape
   # Line-drawing
 
   def startShape

-    s = 0.chr                                                                          # No fill styles
-    s += 2.chr                                                                         # Two line styles
-    s += packUI16(0) + 0.chr + 255.chr + 255.chr               # Width 5, RGB #00FFFF
-    s += packUI16(0) + 255.chr + 0.chr + 255.chr               # Width 5, RGB #FF00FF
+    s = 0.chr                                          # No fill styles
+    s += 2.chr                                         # Two line styles
+    s += packUI16(0) + 0.chr + 255.chr + 255.chr       # Width 5, RGB #00FFFF
+    s += packUI16(0) + 255.chr + 0.chr + 255.chr       # Width 5, RGB #FF00FF

     s += 34.chr                                                                                # 2 fill, 2 line index bits
     s
   end
     s += 34.chr                                                                                # 2 fill, 2 line index bits
     s
   end


@@ -115,10 +115,11 @@ class SwfController < ApplicationController
   end
 
   def startAndMove(x, y, col)
   end
 
   def startAndMove(x, y, col)

-    d = '001001'                                                                               # Line style change, moveTo
+    d = '001001'                                       # Line style change, moveTo

     l = [lengthSB(x), lengthSB(y)].max
     d += sprintf("%05b%0#{l}b%0#{l}b", l, x, y)
     l = [lengthSB(x), lengthSB(y)].max
     d += sprintf("%05b%0#{l}b%0#{l}b", l, x, y)

-    d += col                                                                                   # Select line style
+    d += col                                           # Select line style
+    d

   end
 
   def drawTo(absx, absy, x, y)
   end
 
   def drawTo(absx, absy, x, y)


@@ -131,7 +132,7 @@ class SwfController < ApplicationController
     xstep = dx / mstep
     ystep = dy / mstep
     d = ''
     xstep = dx / mstep
     ystep = dy / mstep
     d = ''

-    for i in (1..mstep)
+    1.upto(mstep).each do

       d += drawSection(x, y, x + xstep, y + ystep)
       x += xstep
       y += ystep
       d += drawSection(x, y, x + xstep, y + ystep)
       x += xstep
       y += ystep


@@ -147,6 +148,7 @@ class SwfController < ApplicationController
     d += sprintf("%04b", l - 2)
     d += '1'                                                                                   # GeneralLine
     d += sprintf("%0#{l}b%0#{l}b", dx, dy)
     d += sprintf("%04b", l - 2)
     d += '1'                                                                                   # GeneralLine
     d += sprintf("%0#{l}b%0#{l}b", dx, dy)

+    d

   end
 
   # -----------------------------------------------------------------------
   end
 
   # -----------------------------------------------------------------------

diff --git a/app/controllers/trace_controller.rb b/app/controllers/trace_controller.rb
index 251c92a684bc4f36e8703aa723c753c3c0994270..1b3f6355c09890ea02860350aaa096fd49e7ad03 100644 (file)
--- a/app/controllers/trace_controller.rb
+++ b/app/controllers/trace_controller.rb
@@ -372,7 +372,7 @@ class TraceController < ApplicationController
 
         # Rename the temporary file to the final name
         FileUtils.mv(filename, @trace.trace_name)
 
         # Rename the temporary file to the final name
         FileUtils.mv(filename, @trace.trace_name)

-      rescue Exception => ex
+      rescue StandardError

         # Remove the file as we have failed to update the database
         FileUtils.rm_f(filename)
 
         # Remove the file as we have failed to update the database
         FileUtils.rm_f(filename)
 


@@ -384,7 +384,7 @@ class TraceController < ApplicationController
         # Clear the inserted flag to make the import daemon load the trace
         @trace.inserted = false
         @trace.save!
         # Clear the inserted flag to make the import daemon load the trace
         @trace.inserted = false
         @trace.save!

-      rescue Exception => ex
+      rescue StandardError

         # Remove the file as we have failed to update the database
         FileUtils.rm_f(@trace.trace_name)
 
         # Remove the file as we have failed to update the database
         FileUtils.rm_f(@trace.trace_name)
 

diff --git a/app/helpers/user_helper.rb b/app/helpers/user_helper.rb
index b5bf30645232dec056fb0790f7c2d51ba2616a5b..51978307ab28bea94d8d900509d2be8a9b8b860a 100644 (file)
--- a/app/helpers/user_helper.rb
+++ b/app/helpers/user_helper.rb
@@ -64,7 +64,7 @@ module UserHelper
     size = options[:size] || 100
     hash = Digest::MD5.hexdigest(user.email.downcase)
     default_image_url = image_url("users/images/large.png")
     size = options[:size] || 100
     hash = Digest::MD5.hexdigest(user.email.downcase)
     default_image_url = image_url("users/images/large.png")

-    url = "#{request.protocol}www.gravatar.com/avatar/#{hash}.jpg?s=#{size}&d=#{u(default_image_url)}"
+    "#{request.protocol}www.gravatar.com/avatar/#{hash}.jpg?s=#{size}&d=#{u(default_image_url)}"

   end
 
   def user_gravatar_tag(user, options = {})
   end
 
   def user_gravatar_tag(user, options = {})

diff --git a/app/models/acl.rb b/app/models/acl.rb
index 0c89968289e60e78d806230f9851535d795c6115..8bb4ae4b9dd8ebf294419aa141ebeaea5f4d7994 100644 (file)
--- a/app/models/acl.rb
+++ b/app/models/acl.rb
@@ -1,9 +1,9 @@
 class Acl < ActiveRecord::Base
   def self.match(address, domain = nil)
     if domain
 class Acl < ActiveRecord::Base
   def self.match(address, domain = nil)
     if domain

-      condition = Acl.where("address >>= ? OR domain = ?", address, domain)
+      Acl.where("address >>= ? OR domain = ?", address, domain)

     else
     else

-      condition = Acl.where("address >>= ?", address)
+      Acl.where("address >>= ?", address)

     end
   end
 
     end
   end
 

diff --git a/app/models/client_application.rb b/app/models/client_application.rb
index 6195dfc2eb318df0f848c3daa44cec4446dcee93..b1d3d945e2e79146a079daaf4004c53dcdf35696 100644 (file)
--- a/app/models/client_application.rb
+++ b/app/models/client_application.rb
@@ -31,7 +31,7 @@ class ClientApplication < ActiveRecord::Base
     return false unless OauthNonce.remember(signature.request.nonce, signature.request.timestamp)
     value = signature.verify
     value
     return false unless OauthNonce.remember(signature.request.nonce, signature.request.timestamp)
     value = signature.verify
     value

-  rescue OAuth::Signature::UnknownSignatureMethod => e
+  rescue OAuth::Signature::UnknownSignatureMethod

     false
   end
 
     false
   end
 

diff --git a/app/models/message.rb b/app/models/message.rb
index 8ca1dc5bc581b38cccefbebda82335f02a04822f..65c2d29eddc9cafc9792ebb4dd385c0e44e2022b 100644 (file)
--- a/app/models/message.rb
+++ b/app/models/message.rb
@@ -22,7 +22,7 @@ class Message < ActiveRecord::Base
       body = mail.decoded
     end
 
       body = mail.decoded
     end
 

-    message = Message.new(
+    Message.new(

       :sender => from,
       :recipient => to,
       :sent_on => mail.date.new_offset(0),
       :sender => from,
       :recipient => to,
       :sent_on => mail.date.new_offset(0),

diff --git a/app/models/relation.rb b/app/models/relation.rb
index c59ae47d16adf1d319097322cecdf1d0f51c9a05..8f2d8b2418dc72f53f7af648a2bec12940e0b36d 100644 (file)
--- a/app/models/relation.rb
+++ b/app/models/relation.rb
@@ -129,7 +129,7 @@ class Relation < ActiveRecord::Base
         member_el['ref'] = member.member_id.to_s
         member_el['role'] = member.member_role
         el << member_el
         member_el['ref'] = member.member_id.to_s
         member_el['role'] = member.member_role
         el << member_el

-       end
+      end

     end
 
     add_tags_to_xml_node(el, relation_tags)
     end
 
     add_tags_to_xml_node(el, relation_tags)

diff --git a/app/models/user.rb b/app/models/user.rb
index 12afbb24b5327d722c67c91c354431169a93163f..f6d7ee78d0364137bfad79f429d265076aa9fdb8 100644 (file)
--- a/app/models/user.rb
+++ b/app/models/user.rb
@@ -138,7 +138,6 @@ class User < ActiveRecord::Base
   def nearby(radius = NEARBY_RADIUS, num = NEARBY_USERS)
     if home_lon && home_lat
       gc = OSM::GreatCircle.new(home_lat, home_lon)
   def nearby(radius = NEARBY_RADIUS, num = NEARBY_USERS)
     if home_lon && home_lat
       gc = OSM::GreatCircle.new(home_lat, home_lon)

-      bounds = gc.bounds(radius)

       sql_for_distance = gc.sql_for_distance("home_lat", "home_lon")
       nearby = User.where("id != ? AND status IN (\'active\', \'confirmed\') AND data_public = ? AND #{sql_for_distance} <= ?", id, true, radius).order(sql_for_distance).limit(num)
     else
       sql_for_distance = gc.sql_for_distance("home_lat", "home_lon")
       nearby = User.where("id != ? AND status IN (\'active\', \'confirmed\') AND data_public = ? AND #{sql_for_distance} <= ?", id, true, radius).order(sql_for_distance).limit(num)
     else


@@ -212,8 +211,8 @@ class User < ActiveRecord::Base
   def spam_score
     changeset_score = changesets.size * 50
     trace_score = traces.size * 50
   def spam_score
     changeset_score = changesets.size * 50
     trace_score = traces.size * 50

-    diary_entry_score = diary_entries.inject(0) { |s, e| s += e.body.spam_score }
-    diary_comment_score = diary_comments.inject(0) { |s, c| s += c.body.spam_score }
+    diary_entry_score = diary_entries.inject(0) { |s, e| s + e.body.spam_score }
+    diary_comment_score = diary_comments.inject(0) { |s, c| s + c.body.spam_score }

 
     score = description.spam_score / 4.0
     score += diary_entries.where("created_at > ?", 1.day.ago).count * 10
 
     score = description.spam_score / 4.0
     score += diary_entries.where("created_at > ?", 1.day.ago).count * 10

diff --git a/app/models/way.rb b/app/models/way.rb
index 96422a8f6e91f5cc487577efe30951936113f5cb..e61661a70e72d1febd16d1b6685d724d1afe97c7 100644 (file)
--- a/app/models/way.rb
+++ b/app/models/way.rb
@@ -86,9 +86,9 @@ class Way < ActiveRecord::Base
 
   # You can't pull in all the tags too unless we put a sequence_id on the way_tags table and have a multipart key
   def self.find_eager(id)
 
   # You can't pull in all the tags too unless we put a sequence_id on the way_tags table and have a multipart key
   def self.find_eager(id)

-    way = Way.find(id, :include => { :way_nodes => :node })
+    Way.find(id, :include => { :way_nodes => :node })

     # If waytag had a multipart key that was real, you could do this:
     # If waytag had a multipart key that was real, you could do this:

-    # way = Way.find(id, :include => [:way_tags, {:way_nodes => :node}])
+    # Way.find(id, :include => [:way_tags, {:way_nodes => :node}])

   end
 
   # Find a way given it's ID, and in a single SQL call also grab its nodes and tags
   end
 
   # Find a way given it's ID, and in a single SQL call also grab its nodes and tags

diff --git a/db/migrate/020_populate_node_tags_and_remove.rb b/db/migrate/020_populate_node_tags_and_remove.rb
index 8315cb14375fe2bb4539019607d80f8c10939fe4..6aa0bc44b7ff317133bbc6ea187b145392d256ed 100644 (file)
--- a/db/migrate/020_populate_node_tags_and_remove.rb
+++ b/db/migrate/020_populate_node_tags_and_remove.rb
@@ -48,6 +48,7 @@ class PopulateNodeTagsAndRemove < ActiveRecord::Migration
     if have_nodes
       execute "LOAD DATA INFILE '#{nodes}' INTO TABLE nodes #{csvopts} (id, latitude, longitude, user_id, visible, timestamp, tile, version)"
       execute "LOAD DATA INFILE '#{node_tags}' INTO TABLE node_tags #{csvopts} (id, version, k, v)"
     if have_nodes
       execute "LOAD DATA INFILE '#{nodes}' INTO TABLE nodes #{csvopts} (id, latitude, longitude, user_id, visible, timestamp, tile, version)"
       execute "LOAD DATA INFILE '#{node_tags}' INTO TABLE node_tags #{csvopts} (id, version, k, v)"

+      execute "LOAD DATA INFILE '#{current_nodes}' INTO TABLE current_nodes #{csvopts} (id, latitude, longitude, user_id, visible, timestamp, tile)"

       execute "LOAD DATA INFILE '#{current_node_tags}' INTO TABLE current_node_tags #{csvopts} (id, k, v)"
     end
 
       execute "LOAD DATA INFILE '#{current_node_tags}' INTO TABLE current_node_tags #{csvopts} (id, k, v)"
     end
 

diff --git a/lib/bounding_box.rb b/lib/bounding_box.rb
index 282a6a840288f36305dabb98c74d9b0aa8b398f7..e784342639c50c57056d5fac45dee8f989464345 100644 (file)
--- a/lib/bounding_box.rb
+++ b/lib/bounding_box.rb
@@ -1,8 +1,6 @@
 class BoundingBox
   attr_reader :min_lon, :min_lat, :max_lon, :max_lat
 
 class BoundingBox
   attr_reader :min_lon, :min_lat, :max_lon, :max_lat
 

-  private
-

   LON_LIMIT = 180.0
   LAT_LIMIT = 90.0
   SCALED_LON_LIMIT = LON_LIMIT *  GeoRecord::SCALE
   LON_LIMIT = 180.0
   LAT_LIMIT = 90.0
   SCALED_LON_LIMIT = LON_LIMIT *  GeoRecord::SCALE

diff --git a/lib/country.rb b/lib/country.rb
index 41e36ccecfcbf8b9322fcf71298bef05ba801523..16eec1a36af22352230a93fc0b7701cce54ed51d 100644 (file)
--- a/lib/country.rb
+++ b/lib/country.rb
@@ -13,8 +13,6 @@ class Country
     countries[code]
   end
 
     countries[code]
   end
 

-  private
-

   def self.countries
     @@countries ||= load_countries
   end
   def self.countries
     @@countries ||= load_countries
   end

diff --git a/lib/daemons/gpx_import.rb b/lib/daemons/gpx_import.rb
index c257c1bfcab1c443ec96c6917a4f1324e46f4fd9..3679aa448b9bdd2bcb52b0e84b342c3e8810e7f1 100755 (executable)
--- a/lib/daemons/gpx_import.rb
+++ b/lib/daemons/gpx_import.rb
@@ -26,7 +26,7 @@ loop do
         Notifier.gpx_failure(trace, '0 points parsed ok. Do they all have lat,lng,alt,timestamp?').deliver
         trace.destroy
       end
         Notifier.gpx_failure(trace, '0 points parsed ok. Do they all have lat,lng,alt,timestamp?').deliver
         trace.destroy
       end

-    rescue Exception => ex
+    rescue StandardError => ex

       logger.info ex.to_s
       ex.backtrace.each { |l| logger.info l }
       Notifier.gpx_failure(trace, ex.to_s + "\n" + ex.backtrace.join("\n")).deliver
       logger.info ex.to_s
       ex.backtrace.each { |l| logger.info l }
       Notifier.gpx_failure(trace, ex.to_s + "\n" + ex.backtrace.join("\n")).deliver


@@ -45,7 +45,7 @@ loop do
 
     begin
       trace.destroy
 
     begin
       trace.destroy

-    rescue Exception => ex
+    rescue StandardError => ex

       logger.info ex.to_s
       ex.backtrace.each { |l| logger.info l }
     end
       logger.info ex.to_s
       ex.backtrace.each { |l| logger.info l }
     end

diff --git a/lib/diff_reader.rb b/lib/diff_reader.rb
index 89e34550f92b9a9fa67d5b04c086dc90c24bb984..be6fee7bb16700f9cadd81909dd9c74186e303fc 100644 (file)
--- a/lib/diff_reader.rb
+++ b/lib/diff_reader.rb
@@ -238,7 +238,7 @@ class DiffReader
           if action_attributes["if-unused"]
             begin
               old.delete_with_history!(new, @changeset.user)
           if action_attributes["if-unused"]
             begin
               old.delete_with_history!(new, @changeset.user)

-            rescue OSM::APIAlreadyDeletedError, OSM::APIPreconditionFailedError => ex
+            rescue OSM::APIAlreadyDeletedError, OSM::APIPreconditionFailedError

               xml_result["new_id"] = old.id.to_s
               xml_result["new_version"] = old.version.to_s
             end
               xml_result["new_id"] = old.id.to_s
               xml_result["new_version"] = old.version.to_s
             end

diff --git a/lib/gpx.rb b/lib/gpx.rb
index 0a7a88c105fec08fbedf61513f873a8600dc6cee..ae9af0d46f1139e02dde2123acc690d49abe13e8 100644 (file)
--- a/lib/gpx.rb
+++ b/lib/gpx.rb
@@ -63,22 +63,16 @@ module GPX
       highlightgc.stroke('#000000')
       highlightgc.fill('#000000')
 
       highlightgc.stroke('#000000')
       highlightgc.fill('#000000')
 

-      images = []
-
-      frames.times do
-        image = Magick::Image.new(width, height) do |image|
+      images = frames.times.collect do
+        Magick::Image.new(width, height) do |image|

           image.background_color = 'white'
           image.format = 'GIF'
         end
           image.background_color = 'white'
           image.format = 'GIF'
         end

-
-        images << image

       end
 
       oldpx = 0.0
       oldpy = 0.0
 
       end
 
       oldpx = 0.0
       oldpy = 0.0
 

-      first = true
-

       m = 0
       mm = 0
       points do |p|
       m = 0
       mm = 0
       points do |p|


@@ -131,9 +125,9 @@ module GPX
       gc.stroke('#000000')
       gc.fill('#000000')
 
       gc.stroke('#000000')
       gc.fill('#000000')
 

-      image = Magick::Image.new(width, height) do |image|
-        image.background_color = 'white'
-        image.format = 'GIF'
+      image = Magick::Image.new(width, height) do |i|
+        i.background_color = 'white'
+        i.format = 'GIF'

       end
 
       oldpx = 0.0
       end
 
       oldpx = 0.0

diff --git a/lib/nominatim.rb b/lib/nominatim.rb
index 10eac78e5db335d2d2fe43a3f6514821c20de4d5..c5d60cebd5fdea15555dd0e826764b61a0b02d20 100644 (file)
--- a/lib/nominatim.rb
+++ b/lib/nominatim.rb
@@ -12,7 +12,7 @@ module Nominatim
         response = OSM::Timer.timeout(4) do
           REXML::Document.new(Net::HTTP.get(URI.parse(url)))
         end
         response = OSM::Timer.timeout(4) do
           REXML::Document.new(Net::HTTP.get(URI.parse(url)))
         end

-      rescue Exception
+      rescue StandardError

         response = nil
       end
 
         response = nil
       end
 

diff --git a/lib/osm.rb b/lib/osm.rb
index 1d08964171f3782d095da64ae65ab5c035f40539..6a41a57b623ff7f7030d8248bd2d94db8681f25b 100644 (file)
--- a/lib/osm.rb
+++ b/lib/osm.rb
@@ -510,7 +510,7 @@ module OSM
     end
 
     return nil
     end
 
     return nil

-  rescue Exception
+  rescue StandardError

     return nil
   end
 
     return nil
   end
 

diff --git a/lib/potlatch.rb b/lib/potlatch.rb
index 29cc9343053552de413f712002e65165aa936ded..80d4d722553094488056b0110b2db0df42229be0 100644 (file)
--- a/lib/potlatch.rb
+++ b/lib/potlatch.rb
@@ -71,6 +71,7 @@ module Potlatch
       d += encodestring("null")
       d += [-1].pack("N")
       d += encodevalue(n)
       d += encodestring("null")
       d += [-1].pack("N")
       d += encodevalue(n)

+      d

     end
 
     # Pack variables as AMF
     end
 
     # Pack variables as AMF


@@ -154,7 +155,7 @@ module Potlatch
       bodies.times do                     # Read each body
         name = AMF.getstring(@request)    #  | get message name
         index = AMF.getstring(@request)   #  | get index in response sequence
       bodies.times do                     # Read each body
         name = AMF.getstring(@request)    #  | get message name
         index = AMF.getstring(@request)   #  | get index in response sequence

-        bytes = AMF.getlong(@request)     #  | get total size in bytes
+        AMF.getlong(@request)             #  | get total size in bytes

         args = AMF.getvalue(@request)     #  | get response (probably an array)
 
         result = @dispatch.call(name, *args)
         args = AMF.getvalue(@request)     #  | get response (probably an array)
 
         result = @dispatch.call(name, *args)


@@ -247,8 +248,11 @@ module Potlatch
           t = line.chomp
           if t =~ /^([\w:]+)\/(\w+)\s+(.+)$/
             tag = $1; type = $2; values = $3
           t = line.chomp
           if t =~ /^([\w:]+)\/(\w+)\s+(.+)$/
             tag = $1; type = $2; values = $3

-            if values == '-' then autotags[type][tag] = []
-            else autotags[type][tag] = values.split(',').sort.reverse end
+            if values == '-'
+              autotags[type][tag] = []
+            else
+              autotags[type][tag] = values.split(',').sort.reverse
+            end

           end
         end
       end
           end
         end
       end

diff --git a/script/locale/yaml2po b/script/locale/yaml2po
index 22d3e78dbd7a9ccb81a9149f8177854e13ad08dc..2753d69b70f921729d5d9c502e9057e839f4e690 100755 (executable)
--- a/script/locale/yaml2po
+++ b/script/locale/yaml2po
@@ -16,7 +16,6 @@ LOCALE_DIR = File.dirname(__FILE__) + '/../../config/locales/'
 EN = YAML.load_file(LOCALE_DIR + 'en.yml')
 
 def iterate(hash, fhash = {}, path = '', outfile = $stdout)
 EN = YAML.load_file(LOCALE_DIR + 'en.yml')
 
 def iterate(hash, fhash = {}, path = '', outfile = $stdout)

-  postr = ''

   hash.each do |key, val|
     fhash[key] = {} unless fhash.key? key
     if val.is_a? Hash
   hash.each do |key, val|
     fhash[key] = {} unless fhash.key? key
     if val.is_a? Hash


@@ -32,7 +31,6 @@ end
 
 def lang2po(lang, outfile = $stdout)
   puts lang
 
 def lang2po(lang, outfile = $stdout)
   puts lang

-  oth = {}

   infile = LOCALE_DIR + lang + '.yml'
   if File.exist? infile
     oth = YAML.load_file(infile)
   infile = LOCALE_DIR + lang + '.yml'
   if File.exist? infile
     oth = YAML.load_file(infile)

diff --git a/script/statistics b/script/statistics
index 47a368a812d7994cfe86b5b2d7ddc70542d5bdd4..4165bb0d36fd8237f033836f38e014cb68c60938 100755 (executable)
--- a/script/statistics
+++ b/script/statistics
@@ -82,7 +82,7 @@ begin
 
     puts "</table>"
   end
 
     puts "</table>"
   end

-rescue Exception => e
+rescue StandardError => e

   puts "<p><em>Exception: #{e}</em><br />#{e.backtrace.join('<br />')}</p>"
 end
 
   puts "<p><em>Exception: #{e}</em><br />#{e.backtrace.join('<br />')}</p>"
 end
 

diff --git a/test/controllers/amf_controller_test.rb b/test/controllers/amf_controller_test.rb
index 20002f7cce62c1356f5a4486d77b529d1df0abcc..def849f2aa3a157f9f69c218f74165f4547b899b 100644 (file)
--- a/test/controllers/amf_controller_test.rb
+++ b/test/controllers/amf_controller_test.rb
@@ -446,7 +446,7 @@ class AmfControllerTest < ActionController::TestCase
   # Using similar method for the node controller test
   def test_putpoi_create_valid
     # This node has no tags
   # Using similar method for the node controller test
   def test_putpoi_create_valid
     # This node has no tags

-    nd = Node.new
+

     # create a node with random lat/lon
     lat = rand(100) - 50 + rand
     lon = rand(100) - 50 + rand
     # create a node with random lat/lon
     lat = rand(100) - 50 + rand
     lon = rand(100) - 50 + rand


@@ -485,7 +485,7 @@ class AmfControllerTest < ActionController::TestCase
 
     ####
     # This node has some tags
 
     ####
     # This node has some tags

-    tnd = Node.new
+

     # create a node with random lat/lon
     lat = rand(100) - 50 + rand
     lon = rand(100) - 50 + rand
     # create a node with random lat/lon
     lat = rand(100) - 50 + rand
     lon = rand(100) - 50 + rand


@@ -528,7 +528,7 @@ class AmfControllerTest < ActionController::TestCase
   # try creating a POI with rubbish in the tags
   def test_putpoi_create_with_control_chars
     # This node has no tags
   # try creating a POI with rubbish in the tags
   def test_putpoi_create_with_control_chars
     # This node has no tags

-    nd = Node.new
+

     # create a node with random lat/lon
     lat = rand(100) - 50 + rand
     lon = rand(100) - 50 + rand
     # create a node with random lat/lon
     lat = rand(100) - 50 + rand
     lon = rand(100) - 50 + rand


@@ -563,7 +563,7 @@ class AmfControllerTest < ActionController::TestCase
   # try creating a POI with rubbish in the tags
   def test_putpoi_create_with_invalid_utf8
     # This node has no tags
   # try creating a POI with rubbish in the tags
   def test_putpoi_create_with_invalid_utf8
     # This node has no tags

-    nd = Node.new
+

     # create a node with random lat/lon
     lat = rand(100) - 50 + rand
     lon = rand(100) - 50 + rand
     # create a node with random lat/lon
     lat = rand(100) - 50 + rand
     lon = rand(100) - 50 + rand


@@ -649,21 +649,21 @@ class AmfControllerTest < ActionController::TestCase
     req.read(2)   # version
 
     # parse through any headers
     req.read(2)   # version
 
     # parse through any headers

-    headers = AMF.getint(req)                                  # Read number of headers
-    headers.times do                                           # Read each header
-      name = AMF.getstring(req)                                #  |
-      req.getc                                                         #  | skip boolean
-      value = AMF.getvalue(req)                                #  |
+    headers = AMF.getint(req)          # Read number of headers
+    headers.times do                   # Read each header
+      AMF.getstring(req)               #  |
+      req.getc                         #  | skip boolean
+      AMF.getvalue(req)                        #  |

     end
 
     # parse through responses
     results = {}
     end
 
     # parse through responses
     results = {}

-    bodies = AMF.getint(req)                                   # Read number of bodies
-    bodies.times do                                                    # Read each body
-      message = AMF.getstring(req)                     #  | get message name
-      index = AMF.getstring(req)                               #  | get index in response sequence
-      bytes = AMF.getlong(req)                         #  | get total size in bytes
-      args = AMF.getvalue(req)                         #  | get response (probably an array)
+    bodies = AMF.getint(req)           # Read number of bodies
+    bodies.times do                    # Read each body
+      message = AMF.getstring(req)     #  | get message name
+      AMF.getstring(req)               #  | get index in response sequence
+      AMF.getlong(req)                 #  | get total size in bytes
+      args = AMF.getvalue(req)         #  | get response (probably an array)

       results[message] = args
     end
     @amf_result = results
       results[message] = args
     end
     @amf_result = results

diff --git a/test/controllers/changeset_controller_test.rb b/test/controllers/changeset_controller_test.rb
index 07b06e675b94b6f384ec953f1c602de275b68ae5..b65926d93bc75a337db69f1526303d58920ac188 100644 (file)
--- a/test/controllers/changeset_controller_test.rb
+++ b/test/controllers/changeset_controller_test.rb
@@ -521,7 +521,6 @@ EOF
         put :create
       end
       assert_response :success
         put :create
       end
       assert_response :success

-      changeset_id = @response.body.to_i

     end
   end
 
     end
   end
 


@@ -778,6 +777,7 @@ EOF
     # check that objects are unmodified
     assert_nodes_are_equal(node, Node.find(1))
     assert_ways_are_equal(way, Way.find(1))
     # check that objects are unmodified
     assert_nodes_are_equal(node, Node.find(1))
     assert_ways_are_equal(way, Way.find(1))

+    assert_relations_are_equal(rel, Relation.find(1))

   end
 
   ##
   end
 
   ##

diff --git a/test/controllers/node_controller_test.rb b/test/controllers/node_controller_test.rb
index 8fb6d8e16b9b7a0a1675e5458ed4e5d91df11840..9e030ed39cb1c8264e825236b831d2e95c4906cb 100644 (file)
--- a/test/controllers/node_controller_test.rb
+++ b/test/controllers/node_controller_test.rb
@@ -194,14 +194,12 @@ class NodeControllerTest < ActionController::TestCase
     # in a way...
     content(nodes(:used_node_1).to_xml)
     delete :delete, :id => current_nodes(:used_node_1).id
     # in a way...
     content(nodes(:used_node_1).to_xml)
     delete :delete, :id => current_nodes(:used_node_1).id

-    assert_require_public_data
-    "shouldn't be able to delete a node used in a way (#{@response.body})"
+    assert_require_public_data "shouldn't be able to delete a node used in a way (#{@response.body})"

 
     # in a relation...
     content(nodes(:node_used_by_relationship).to_xml)
     delete :delete, :id => current_nodes(:node_used_by_relationship).id
 
     # in a relation...
     content(nodes(:node_used_by_relationship).to_xml)
     delete :delete, :id => current_nodes(:node_used_by_relationship).id

-    assert_require_public_data
-    "shouldn't be able to delete a node used in a relation (#{@response.body})"
+    assert_require_public_data "shouldn't be able to delete a node used in a relation (#{@response.body})"

 
     ## now set auth for the public data user
     basic_authorization(users(:public_user).email, "test")
 
     ## now set auth for the public data user
     basic_authorization(users(:public_user).email, "test")

diff --git a/test/controllers/old_node_controller_test.rb b/test/controllers/old_node_controller_test.rb
index 6e90773fabecda1185a731ce8d6b4ccc6ca09b2f..1b131b3404e820ec7d1c10f22545804b919e9f88 100644 (file)
--- a/test/controllers/old_node_controller_test.rb
+++ b/test/controllers/old_node_controller_test.rb
@@ -35,7 +35,6 @@ class OldNodeControllerTest < ActionController::TestCase
   def test_version
     ## First try this with a non-public user
     basic_authorization(users(:normal_user).email, "test")
   def test_version
     ## First try this with a non-public user
     basic_authorization(users(:normal_user).email, "test")

-    changeset_id = changesets(:normal_user_first_change).id

 
     # setup a simple XML node
     xml_doc = current_nodes(:visible_node).to_xml
 
     # setup a simple XML node
     xml_doc = current_nodes(:visible_node).to_xml


@@ -85,7 +84,6 @@ class OldNodeControllerTest < ActionController::TestCase
 
     ## Now do it with the public user
     basic_authorization(users(:public_user).email, "test")
 
     ## Now do it with the public user
     basic_authorization(users(:public_user).email, "test")

-    changeset_id = changesets(:public_user_first_change).id

 
     # setup a simple XML node
     xml_doc = current_nodes(:node_with_versions).to_xml
 
     # setup a simple XML node
     xml_doc = current_nodes(:node_with_versions).to_xml

diff --git a/test/controllers/relation_controller_test.rb b/test/controllers/relation_controller_test.rb
index 2650d706ceb4f1c2aa66a33b4b17f3e78fca16b3..c8ca07a38efd0cb2357533af2f09a59fa110fcda 100644 (file)
--- a/test/controllers/relation_controller_test.rb
+++ b/test/controllers/relation_controller_test.rb
@@ -681,7 +681,7 @@ OSM
     content doc
     put :update, :id => relation_id
     assert_response :success, "can't update relation: #{@response.body}"
     content doc
     put :update, :id => relation_id
     assert_response :success, "can't update relation: #{@response.body}"

-    new_version = @response.body.to_i
+    assert_equal 2, @response.body.to_i

 
     # get it back again and check the ordering again
     get :read, :id => relation_id
 
     # get it back again and check the ordering again
     get :read, :id => relation_id

diff --git a/test/controllers/way_controller_test.rb b/test/controllers/way_controller_test.rb
index 3ae7aa36eb2d196af9c58c817813183edcdb6a14..33d9b457945e9d024ca02f3ed6c7098b38ce40ba 100644 (file)
--- a/test/controllers/way_controller_test.rb
+++ b/test/controllers/way_controller_test.rb
@@ -124,11 +124,9 @@ class WayControllerTest < ActionController::TestCase
       "<nd ref='#{nid1}'/><nd ref='#{nid2}'/>" +
       "<tag k='test' v='yes' /></way></osm>"
     put :create
       "<nd ref='#{nid1}'/><nd ref='#{nid2}'/>" +
       "<tag k='test' v='yes' /></way></osm>"
     put :create

-    # hope for success
+    # hope for failure

     assert_response :forbidden,
     assert_response :forbidden,

-                    "way upload did not return success status"
-    # read id of created way and search for it
-    wayid = @response.body
+                    "way upload did not return forbidden status"

 
     ## Now use a public user
     nid1 = current_nodes(:used_node_1).id
 
     ## Now use a public user
     nid1 = current_nodes(:used_node_1).id

diff --git a/test/helpers/application_helper_test.rb b/test/helpers/application_helper_test.rb
index 3a1264628b7821c25d9a25c2abfd4077f9ed1791..04517c2b55b4a30ab3385af27c7438b637428427 100644 (file)
--- a/test/helpers/application_helper_test.rb
+++ b/test/helpers/application_helper_test.rb
@@ -7,10 +7,6 @@ class ApplicationHelperTest < ActionView::TestCase
     I18n.locale = "en"
   end
 
     I18n.locale = "en"
   end
 

-  def setup
-    I18n.locale = "en"
-  end
-

   def test_linkify
     %w(http://example.com/test ftp://example.com/test https://example.com/test).each do |link|
       text = "Test #{link} is made into a link"
   def test_linkify
     %w(http://example.com/test ftp://example.com/test https://example.com/test).each do |link|
       text = "Test #{link} is made into a link"

diff --git a/test/integration/user_creation_test.rb b/test/integration/user_creation_test.rb
index e45ff5b2ddfe4754a7074cc9cb2da22ddb976c51..3b79c433ddceece982648397da2e1801ea340f7d 100644 (file)
--- a/test/integration/user_creation_test.rb
+++ b/test/integration/user_creation_test.rb
@@ -171,7 +171,6 @@ class UserCreationTest < ActionDispatch::IntegrationTest
   def test_user_create_openid_failure
     new_email = "newtester-openid2@osm.org"
     display_name = "new_tester-openid2"
   def test_user_create_openid_failure
     new_email = "newtester-openid2@osm.org"
     display_name = "new_tester-openid2"

-    password = "testtest2"

     assert_difference('User.count', 0) do
       assert_difference('ActionMailer::Base.deliveries.size', 0) do
         post "/user/new",
     assert_difference('User.count', 0) do
       assert_difference('ActionMailer::Base.deliveries.size', 0) do
         post "/user/new",


@@ -190,7 +189,6 @@ class UserCreationTest < ActionDispatch::IntegrationTest
   def test_user_create_openid_redirect
     new_email = "redirect_tester_openid@osm.org"
     display_name = "redirect_tester_openid"
   def test_user_create_openid_redirect
     new_email = "redirect_tester_openid@osm.org"
     display_name = "redirect_tester_openid"

-    password = ""

     # nothing special about this page, just need a protected page to redirect back to.
     referer = "/traces/mine"
     assert_difference('User.count') do
     # nothing special about this page, just need a protected page to redirect back to.
     referer = "/traces/mine"
     assert_difference('User.count') do

diff --git a/test/integration/user_login_test.rb b/test/integration/user_login_test.rb
index 10c0f63b88558a50fd92d27dfb8e300a6ecefa59..83322c76c3dfdfb1b941049452af9359369a40ea 100644 (file)
--- a/test/integration/user_login_test.rb
+++ b/test/integration/user_login_test.rb
@@ -292,8 +292,7 @@ class UserLoginTest < ActionDispatch::IntegrationTest
     post '/login', 'openid_url' => "http://localhost:1123/john.doe?openid.success=true", :referer => "/history"
     assert_response :redirect
 
     post '/login', 'openid_url' => "http://localhost:1123/john.doe?openid.success=true", :referer => "/history"
     assert_response :redirect
 

-    res = openid_request(@response.redirect_url)
-    res2 = post '/login', res
+    post '/login', openid_request(@response.redirect_url)

 
     assert_response :redirect
     follow_redirect!
 
     assert_response :redirect
     follow_redirect!


@@ -311,8 +310,7 @@ class UserLoginTest < ActionDispatch::IntegrationTest
     post '/login', 'openid_url' => "http://localhost:1123/john.doe", :referer => "/diary"
     assert_response :redirect
 
     post '/login', 'openid_url' => "http://localhost:1123/john.doe", :referer => "/diary"
     assert_response :redirect
 

-    res = openid_request(@response.redirect_url)
-    post '/login', res
+    post '/login', openid_request(@response.redirect_url)

 
     assert_response :redirect
     follow_redirect!
 
     assert_response :redirect
     follow_redirect!


@@ -361,7 +359,7 @@ class UserLoginTest < ActionDispatch::IntegrationTest
     assert_response :redirect
 
     res = openid_request(@response.redirect_url)
     assert_response :redirect
 
     res = openid_request(@response.redirect_url)

-    res2 = post '/login', res
+    post '/login', res

 
     assert_response :redirect
     follow_redirect!
 
     assert_response :redirect
     follow_redirect!

diff --git a/test/lib/bounding_box_test.rb b/test/lib/bounding_box_test.rb
index eff48655cc495c992639a6d69670d67dd0e2246e..bd2d6fec637266f84e0ec3272656ddeb755678ee 100644 (file)
--- a/test/lib/bounding_box_test.rb
+++ b/test/lib/bounding_box_test.rb
@@ -144,7 +144,6 @@ class BoundingBoxTest < ActiveSupport::TestCase
   end
 
   def test_expand_max_lat_with_margin
   end
 
   def test_expand_max_lat_with_margin

-    bbox = @bbox_expand

     @expand_max_lat_array.each_with_index do |array_string, index|
       check_expand(@bbox_expand_minus_two, array_string, 1, @expand_max_lat_margin_response[index])
     end
     @expand_max_lat_array.each_with_index do |array_string, index|
       check_expand(@bbox_expand_minus_two, array_string, 1, @expand_max_lat_margin_response[index])
     end

diff --git a/test/lib/i18n_test.rb b/test/lib/i18n_test.rb
index 700966928a7c3f1eef5375d044417fec890d34b7..e8fcb687e0726919bb4704807e457abd3169afcf 100644 (file)
--- a/test/lib/i18n_test.rb
+++ b/test/lib/i18n_test.rb
@@ -3,7 +3,7 @@ require 'test_helper'
 class I18nTest < ActiveSupport::TestCase
   I18n.available_locales.each do |locale|
     define_method("test_#{locale.to_s.underscore}".to_sym) do
 class I18nTest < ActiveSupport::TestCase
   I18n.available_locales.each do |locale|
     define_method("test_#{locale.to_s.underscore}".to_sym) do

-      plural_keys = plural_keys(locale)
+      # plural_keys = plural_keys(locale)

 
       translation_keys.each do |key|
         variables = []
 
       translation_keys.each do |key|
         variables = []


@@ -32,7 +32,7 @@ class I18nTest < ActiveSupport::TestCase
 
         if value.is_a?(Hash)
           value.each do |subkey, subvalue|
 
         if value.is_a?(Hash)
           value.each do |subkey, subvalue|

-            #            assert plural_keys.include?(subkey), "#{key}.#{subkey} is not a valid plural key"
+            # assert plural_keys.include?(subkey), "#{key}.#{subkey} is not a valid plural key"

 
             unless subvalue.nil?
               subvalue.scan(/%\{(\w+)\}/) do
 
             unless subvalue.nil?
               subvalue.scan(/%\{(\w+)\}/) do

diff --git a/test/models/changeset_test.rb b/test/models/changeset_test.rb
index f1ed1134ecd1214285b0b99b46eb3713402c6df1..dba1a3b4361695f18ed0e633142ceec3c8a07f04 100644 (file)
--- a/test/models/changeset_test.rb
+++ b/test/models/changeset_test.rb
@@ -40,7 +40,7 @@ class ChangesetTest < ActiveSupport::TestCase
     message_update = assert_raise(OSM::APIBadXMLError) do
       Changeset.from_xml(nokv, false)
     end
     message_update = assert_raise(OSM::APIBadXMLError) do
       Changeset.from_xml(nokv, false)
     end

-    assert_match /tag is missing key/, message_create.message
+    assert_match /tag is missing key/, message_update.message

   end
 
   def test_from_xml_no_v
   end
 
   def test_from_xml_no_v

diff --git a/test/models/message_test.rb b/test/models/message_test.rb
index 05f3d90345a692640089772d0623313baebf3bbc..5cd1712110acfadd3ff1f5e9786163cfb0771586 100644 (file)
--- a/test/models/message_test.rb
+++ b/test/models/message_test.rb
@@ -25,7 +25,7 @@ class MessageTest < ActiveSupport::TestCase
   def test_validating_msgs
     message = messages(:unread_message)
     assert message.valid?
   def test_validating_msgs
     message = messages(:unread_message)
     assert message.valid?

-    massage = messages(:read_message)
+    message = messages(:read_message)

     assert message.valid?
   end
 
     assert message.valid?
   end
 


@@ -79,8 +79,6 @@ class MessageTest < ActiveSupport::TestCase
       rescue ArgumentError => ex
         assert_equal ex.to_s, "invalid byte sequence in UTF-8"
 
       rescue ArgumentError => ex
         assert_equal ex.to_s, "invalid byte sequence in UTF-8"
 

-      rescue ActiveRecord::RecordInvalid
-        # because we only test invalid sequences it is OK to barf on them

       end
     end
   end
       end
     end
   end

diff --git a/test/models/note_test.rb b/test/models/note_test.rb
index 1c67a3aa0e4cbffa8a170fd457324eef58a8d343..1f0cd74e5c701b939bf750bb5f418623fbace393 100644 (file)
--- a/test/models/note_test.rb
+++ b/test/models/note_test.rb
@@ -30,7 +30,7 @@ class NoteTest < ActiveSupport::TestCase
     assert_not_nil note.closed_at
   end
 
     assert_not_nil note.closed_at
   end
 

-  def test_close
+  def test_reopen

     note = notes(:closed_note_with_comment)
     assert_equal "closed", note.status
     assert_not_nil note.closed_at
     note = notes(:closed_note_with_comment)
     assert_equal "closed", note.status
     assert_not_nil note.closed_at

diff --git a/test/test_helper.rb b/test/test_helper.rb
index 718f7d643b7ced16cb16e7985879c51c61127e3a..f59bed64857e1e1c668bc86feecc926278a0ab9e 100644 (file)
--- a/test/test_helper.rb
+++ b/test/test_helper.rb
@@ -71,6 +71,20 @@ class ActiveSupport::TestCase
     end
   end
 
     end
   end
 

+  ##
+  # for some reason assert_equal a, b fails when the relations are
+  # actually equal, so this method manually checks the fields...
+  def assert_relations_are_equal(a, b)
+    assert_not_nil a, "first relation is not allowed to be nil"
+    assert_not_nil b, "second relation #{a.id} is not allowed to be nil"
+    assert_equal a.id, b.id, "relation IDs"
+    assert_equal a.changeset_id, b.changeset_id, "changeset ID on relation #{a.id}"
+    assert_equal a.visible, b.visible, "visible on relation #{a.id}, #{a.visible.inspect} != #{b.visible.inspect}"
+    assert_equal a.version, b.version, "version on relation #{a.id}"
+    assert_equal a.tags, b.tags, "tags on relation #{a.id}"
+    assert_equal a.members, b.members, "member references on relation #{a.id}"
+  end
+

   ##
   # for some reason assert_equal a, b fails when the ways are actually
   # equal, so this method manually checks the fields...
   ##
   # for some reason assert_equal a, b fails when the ways are actually
   # equal, so this method manually checks the fields...


@@ -130,20 +144,21 @@ class ActiveSupport::TestCase
 
   # Set things up for OpenID testing
   def openid_setup
 
   # Set things up for OpenID testing
   def openid_setup

-    rots_response = Net::HTTP.get_response(URI.parse("http://localhost:1123/"))
+    Net::HTTP.get_response(URI.parse("http://localhost:1123/"))

   rescue
     # It isn't, so start a new instance.
     rots = IO.popen("#{Rails.root}/vendor/gems/rots-0.2.1/bin/rots --silent")
 
     # Wait for up to 30 seconds for the server to start and respond before continuing
   rescue
     # It isn't, so start a new instance.
     rots = IO.popen("#{Rails.root}/vendor/gems/rots-0.2.1/bin/rots --silent")
 
     # Wait for up to 30 seconds for the server to start and respond before continuing

-    for i in (1..30)
+    1.upto(30).each do

       begin
         sleep 1
       begin
         sleep 1

-        rots_response = Net::HTTP.get_response(URI.parse("http://localhost:1123/"))
+        Net::HTTP.get_response(URI.parse("http://localhost:1123/"))

         # If the rescue block doesn't fire, ROTS is up and running and we can continue
         break
         # If the rescue block doesn't fire, ROTS is up and running and we can continue
         break

-        rescue
+      rescue

         # If the connection failed, do nothing and repeat the loop
         # If the connection failed, do nothing and repeat the loop

+        next

       end
     end
 
       end
     end