From 1c5b47e4fd337e01946ba644fa7c724451b91333 Mon Sep 17 00:00:00 2001
From: Alex Reisner <alex@alexreisner.com>
Date: Thu, 24 Mar 2011 23:46:53 -0400
Subject: [PATCH] Fix Ruby 1.8 syntax errors.
---
lib/geocoder/orms/active_record.rb | 2 +-
test/geocoder_test.rb | 3 ++-
2 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/lib/geocoder/orms/active_record.rb b/lib/geocoder/orms/active_record.rb
index 9dec1d4b..44098b8f 100644
--- a/lib/geocoder/orms/active_record.rb
+++ b/lib/geocoder/orms/active_record.rb
@@ -162,7 +162,7 @@ module Geocoder::Orm
default_near_scope_options(latitude, longitude, radius, options).merge(
:select => "#{options[:select] || '*'}, " +
"#{distance} AS distance" +
- (bearing ? ", #{bearing} AS bearing" : ""),
+ (bearing ? ", #{bearing} AS bearing" : "")
)
end
diff --git a/test/geocoder_test.rb b/test/geocoder_test.rb
index f3cfc0dd..7b071735 100644
--- a/test/geocoder_test.rb
+++ b/test/geocoder_test.rb
@@ -232,7 +232,8 @@ class GeocoderTest < Test::Unit::TestCase
p1 = points[d]
p2 = points[opp]
- b = Geocoder::Calculations.bearing_between(*(p1 + p2), :method => m)
+ args = p1 + p2 + [:method => m]
+ b = Geocoder::Calculations.bearing_between(*args)
assert (b - bearings[opp]).abs < 1,
"Bearing (#{m}) should be close to #{bearings[opp]} but was #{b}."
end
--
GitLab