From b0756a0897830fe99998e67cd67f028441954206 Mon Sep 17 00:00:00 2001 From: Alex Reisner <alex@alexreisner.com> Date: Sat, 17 Sep 2011 10:17:53 -0400 Subject: [PATCH] Clean up code whitespace. --- lib/geocoder/configuration.rb | 9 ++++----- lib/geocoder/lookups/bing.rb | 2 +- lib/geocoder/results/geocoder_ca.rb | 2 +- test/configuration_test.rb | 2 +- test/mongoid_test_helper.rb | 4 ++-- test/services_test.rb | 2 +- test/test_helper.rb | 4 ++-- 7 files changed, 12 insertions(+), 13 deletions(-) diff --git a/lib/geocoder/configuration.rb b/lib/geocoder/configuration.rb index b5656992..44baabee 100644 --- a/lib/geocoder/configuration.rb +++ b/lib/geocoder/configuration.rb @@ -41,19 +41,18 @@ module Geocoder # define getters and setters for all configuration settings self.options_and_defaults.each do |option, default| class_eval(<<-END, __FILE__, __LINE__ + 1) - + @@#{option} = default unless defined? @@#{option} - + def self.#{option} @@#{option} end - + def self.#{option}=(obj) @@#{option} = obj end - + END end - end end diff --git a/lib/geocoder/lookups/bing.rb b/lib/geocoder/lookups/bing.rb index cba04c30..2bec5a4f 100644 --- a/lib/geocoder/lookups/bing.rb +++ b/lib/geocoder/lookups/bing.rb @@ -12,7 +12,7 @@ module Geocoder::Lookup def results(query, reverse = false) return [] unless doc = fetch_data(query, reverse) - + if doc['statusDescription'] == "OK" return doc['resourceSets'].first['estimatedTotal'] > 0 ? doc['resourceSets'].first['resources'] : [] else diff --git a/lib/geocoder/results/geocoder_ca.rb b/lib/geocoder/results/geocoder_ca.rb index e0f4bdd8..4edb80a8 100644 --- a/lib/geocoder/results/geocoder_ca.rb +++ b/lib/geocoder/results/geocoder_ca.rb @@ -51,7 +51,7 @@ module Geocoder::Result end - private # ---------------------------------------------------------------- + private # ---------------------------------------------------------------- def canadian_province_abbreviations %w[ON QC NS NB MB BC PE SK AB NL] diff --git a/test/configuration_test.rb b/test/configuration_test.rb index cece36b7..4c4e6681 100644 --- a/test/configuration_test.rb +++ b/test/configuration_test.rb @@ -9,5 +9,5 @@ class ConfigurationTest < Test::Unit::TestCase Geocoder.search "something dumb" end end - + end diff --git a/test/mongoid_test_helper.rb b/test/mongoid_test_helper.rb index 5486a124..69eb2fd0 100644 --- a/test/mongoid_test_helper.rb +++ b/test/mongoid_test_helper.rb @@ -4,9 +4,9 @@ require 'test/unit' $LOAD_PATH.unshift(File.dirname(__FILE__)) $LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib')) -Mongoid.configure do |config| +Mongoid.configure do |config| config.logger = Logger.new($stderr, :debug) -end +end ## # Geocoded model. diff --git a/test/services_test.rb b/test/services_test.rb index ab73a8e7..b01b84ab 100644 --- a/test/services_test.rb +++ b/test/services_test.rb @@ -1,7 +1,7 @@ # encoding: utf-8 require 'test_helper' -class ServicesTest < Test::Unit::TestCase +class ServicesTest < Test::Unit::TestCase # --- Google --- diff --git a/test/test_helper.rb b/test/test_helper.rb index 380c7f30..137f756f 100644 --- a/test/test_helper.rb +++ b/test/test_helper.rb @@ -231,12 +231,12 @@ end class Test::Unit::TestCase - + def teardown Geocoder.send(:remove_const, :Configuration) load "geocoder/configuration.rb" end - + def venue_params(abbrev) { :msg => ["Madison Square Garden", "4 Penn Plaza, New York, NY"] -- GitLab