diff --git a/lib/geocoder/configuration.rb b/lib/geocoder/configuration.rb index b565699235ade3999e9ce54417fa0944ff8c81aa..44baabeebf4547d063ee0798ce643a2d1aebfa86 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 cba04c30814e7991acbf021a9aa35db28fc6d15f..2bec5a4f1ec09a6443692b8a1fc356fe42dbbdfe 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 e0f4bdd8af89916f59207d23726d143b8592dd3c..4edb80a83e9911ba56d9752c570d142213275bfe 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 cece36b74bdcc566fca9094c7e0dcd377238ce7f..4c4e668186218874e10611f24cd2f899f667ab79 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 5486a12436ce680d54f25271223e742f54ab17c7..69eb2fd044c593898780e3e73fb2f8463905e207 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 ab73a8e7e1295066cb3f6188d18a8dedf39e32e9..b01b84abcbdb03c4c2f466f6b39859d687b26774 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 380c7f302500081306fd8e91314320edf4205c6e..137f756fdbad489f0880c08e64f452d0bf2ef7cb 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"]