Merge pull request #608 from exviva/fix_warnings

Fix warnings
alexreisner · Feb 24, 2014 · 3c0859c · 3c0859c
2 parents 2203be0 + 11f515c
commit 3c0859c
Show file tree

Hide file tree

Showing 10 changed files with 16 additions and 15 deletions.
diff --git a/lib/geocoder/cache.rb b/lib/geocoder/cache.rb
@@ -49,7 +49,8 @@ def expire(url)
 
     private # ----------------------------------------------------------------
 
-    attr_reader :prefix, :store
+    def prefix; @prefix; end
+    def store; @store; end
 
     ##
     # Cache key for a given URL.
@@ -63,7 +64,7 @@ def key_for(url)
     # that have non-nil values.
     #
     def keys
-      store.keys.select{ |k| k.match /^#{prefix}/ and interpret(store[k]) }
+      store.keys.select{ |k| k.match(/^#{prefix}/) and interpret(store[k]) }
     end
 
     ##

diff --git a/lib/geocoder/lookups/base.rb b/lib/geocoder/lookups/base.rb
@@ -15,6 +15,9 @@ module Geocoder
   module Lookup
 
     class Base
+      def initialize
+        @cache = nil
+      end
 
       ##
       # Human-readable name of the geocoding API.

diff --git a/lib/geocoder/lookups/cloudmade.rb b/lib/geocoder/lookups/cloudmade.rb
@@ -24,7 +24,7 @@ def results(query)
     end
 
     def query_url_params(query)
-      params = {
+      {
         :query => query.sanitized_text,
         :return_location => true,
         :return_geometry => false

diff --git a/lib/geocoder/lookups/maxmind_local.rb b/lib/geocoder/lookups/maxmind_local.rb
@@ -7,7 +7,7 @@ class MaxmindLocal < Base
     def initialize
       begin
         require 'geoip'
-      rescue LoadError => e
+      rescue LoadError
         raise 'Could not load geoip dependency. To use MaxMind Local lookup you must add geoip gem to your Gemfile or have it installed in your system.'
       end
 
@@ -38,4 +38,4 @@ def results(query)
       result.nil? ? [] : [result.to_hash]
     end
   end
-end
+end
diff --git a/lib/geocoder/lookups/yahoo.rb b/lib/geocoder/lookups/yahoo.rb
@@ -50,7 +50,7 @@ def results(query)
     # to warning message.
     #
     def parse_raw_data(raw_data)
-      if raw_data.match /^<\?xml/
+      if raw_data.match(/^<\?xml/)
         if raw_data.include?("Rate Limit Exceeded")
           raise_error(Geocoder::OverQueryLimitError) || warn("Over API query limit.")
         elsif raw_data =~ /<yahoo:description>(Please provide valid credentials.*)<\/yahoo:description>/i

diff --git a/lib/geocoder/models/base.rb b/lib/geocoder/models/base.rb
@@ -1,5 +1,3 @@
-require 'geocoder'
-
 module Geocoder
 
   ##
@@ -29,7 +27,7 @@ def reverse_geocoded_by
       private # ----------------------------------------------------------------
 
       def geocoder_init(options)
-        unless @geocoder_options
+        unless defined?(@geocoder_options)
           @geocoder_options = {}
           require "geocoder/stores/#{geocoder_file_name}"
           include Geocoder::Store.const_get(geocoder_module_name)
@@ -39,4 +37,3 @@ def geocoder_init(options)
     end
   end
 end
-
diff --git a/lib/geocoder/railtie.rb b/lib/geocoder/railtie.rb
@@ -1,4 +1,3 @@
-require 'geocoder'
 require 'geocoder/models/active_record'
 
 module Geocoder

diff --git a/lib/geocoder/request.rb b/lib/geocoder/request.rb
@@ -1,5 +1,3 @@
-require 'geocoder'
-
 module Geocoder
   module Request
 

diff --git a/lib/geocoder/results/test.rb b/lib/geocoder/results/test.rb
@@ -5,7 +5,10 @@ module Result
     class Test < Base
 
       def self.add_result_attribute(attr)
-        return if respond_to?(attr.to_sym)
+        begin
+          remove_method(attr) if method_defined?(attr)
+        rescue NameError # method defined on superclass
+        end
 
         define_method(attr) do
           @data[attr.to_s] || @data[attr.to_sym]

diff --git a/lib/geocoder/stores/active_record.rb b/lib/geocoder/stores/active_record.rb
@@ -219,7 +219,7 @@ def add_exclude_condition(conditions, exclude)
       end
 
       def using_sqlite?
-        connection.adapter_name.match /sqlite/i
+        connection.adapter_name.match(/sqlite/i)
       end
 
       ##