From d6dd3919d6f1e2ab901c46b5faf80728a468c959 Mon Sep 17 00:00:00 2001
From: Nikolay Petrachkov <nik@jastix.biz>
Date: Mon, 20 Oct 2014 07:19:16 +0200
Subject: [PATCH] Use faster ruby methods
---
lib/geocoder/results/test.rb | 2 +-
lib/geocoder/stores/active_record.rb | 8 ++++----
test/unit/test_mode_test.rb | 2 +-
3 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/lib/geocoder/results/test.rb b/lib/geocoder/results/test.rb
index 17905f07..61d422ce 100644
--- a/lib/geocoder/results/test.rb
+++ b/lib/geocoder/results/test.rb
@@ -22,7 +22,7 @@ module Geocoder
end
def initialize(data)
- data.keys.each do |attr|
+ data.each_key do |attr|
Test.add_result_attribute(attr)
end
diff --git a/lib/geocoder/stores/active_record.rb b/lib/geocoder/stores/active_record.rb
index 91fabe05..fddcc854 100644
--- a/lib/geocoder/stores/active_record.rb
+++ b/lib/geocoder/stores/active_record.rb
@@ -118,13 +118,13 @@ module Geocoder::Store
latitude_attribute = options[:latitude] || geocoder_options[:latitude]
longitude_attribute = options[:longitude] || geocoder_options[:longitude]
options[:units] ||= (geocoder_options[:units] || Geocoder.config.units)
- select_distance = options.fetch(:select_distance, true)
+ select_distance = options.fetch(:select_distance) { true }
options[:order] = "" if !select_distance && !options.include?(:order)
- select_bearing = options.fetch(:select_bearing, true)
+ select_bearing = options.fetch(:select_bearing) { true }
bearing = bearing_sql(latitude, longitude, options)
distance = distance_sql(latitude, longitude, options)
- distance_column = options.fetch(:distance_column, 'distance')
- bearing_column = options.fetch(:bearing_column, 'bearing')
+ distance_column = options.fetch(:distance_column) { 'distance' }
+ bearing_column = options.fetch(:bearing_column) { 'bearing' }
b = Geocoder::Calculations.bounding_box([latitude, longitude], radius, options)
args = b + [
diff --git a/test/unit/test_mode_test.rb b/test/unit/test_mode_test.rb
index 38b054c0..a27d304f 100644
--- a/test/unit/test_mode_test.rb
+++ b/test/unit/test_mode_test.rb
@@ -21,7 +21,7 @@ class TestModeTest < GeocoderTestCase
result = results.first
assert_equal 1, results.size
- mock_attributes.keys.each do |attr|
+ mock_attributes.each_key do |attr|
assert_equal mock_attributes[attr], result.send(attr)
end
end
--
GitLab