geocoder 1.2.6 → 1.6.1

data/lib/geocoder/stores/base.rb

@@ -6,7 +6,7 @@ module Geocoder
       # Is this object geocoded? (Does it have latitude and longitude?)
       #
       def geocoded?
-        to_coordinates.compact.size > 0
+        to_coordinates.compact.size == 2
       end
 
       ##
@@ -55,17 +55,6 @@ module Geocoder
           point, to_coordinates, options)
       end
 
-      ##
-      # Get nearby geocoded objects.
-      # Takes the same options hash as the near class method (scope).
-      # Returns nil if the object is not geocoded.
-      #
-      def nearbys(radius = 20, options = {})
-        return nil unless geocoded?
-        options.merge!(:exclude => self) unless send(self.class.primary_key).nil?
-        self.class.near(self, radius, options)
-      end
-
       ##
       # Look up coordinates and assign to +latitude+ and +longitude+ attributes
       # (or other as specified in +geocoded_by+). Returns coordinates (array).
@@ -101,7 +90,7 @@ module Geocoder
           return
         end
 
-        query_options = [:lookup, :ip_lookup, :language].inject({}) do |hash, key|
+        query_options = [:lookup, :ip_lookup, :language, :params].inject({}) do |hash, key|
           if options.has_key?(key)
             val = options[key]
             hash[key] = val.respond_to?(:call) ? val.call(self) : val
@@ -124,4 +113,3 @@ module Geocoder
     end
   end
 end
-

data/lib/geocoder/stores/mongo_base.rb

@@ -11,37 +11,6 @@ module Geocoder::Store
         scope :not_geocoded, lambda {
           where(geocoder_options[:coordinates] => nil)
         }
-
-        scope :near, lambda{ |location, *args|
-          coords  = Geocoder::Calculations.extract_coordinates(location)
-
-          # no results if no lat/lon given
-          return where(:id => false) unless coords.is_a?(Array)
-
-          radius  = args.size > 0 ? args.shift : 20
-          options = args.size > 0 ? args.shift : {}
-          options[:units] ||= geocoder_options[:units]
-
-          # Use BSON::OrderedHash if Ruby's hashes are unordered.
-          # Conditions must be in order required by indexes (see mongo gem).
-          version = RUBY_VERSION.split('.').map { |i| i.to_i }
-          empty = version[0] < 2 && version[1] < 9 ? BSON::OrderedHash.new : {}
-
-          conds = empty.clone
-          field = geocoder_options[:coordinates]
-          conds[field] = empty.clone
-          conds[field]["$nearSphere"]  = coords.reverse
-
-          if radius
-            conds[field]["$maxDistance"] = \
-              Geocoder::Calculations.distance_to_radians(radius, options[:units])
-          end
-
-          if obj = options[:exclude]
-            conds[:_id.ne] = obj.id
-          end
-          where(conds)
-        }
       end
     end
 

data/lib/geocoder/version.rb

@@ -1,3 +1,3 @@
 module Geocoder
-  VERSION = "1.2.6"
+  VERSION = "1.6.1"
 end

data/lib/geocoder.rb

@@ -1,4 +1,6 @@
 require "geocoder/configuration"
+require "geocoder/logger"
+require "geocoder/kernel_logger"
 require "geocoder/query"
 require "geocoder/calculations"
 require "geocoder/exceptions"
@@ -43,5 +45,4 @@ end
 # load Railtie if Rails exists
 if defined?(Rails)
   require "geocoder/railtie"
-  Geocoder::Railtie.insert
 end

data/lib/hash_recursive_merge.rb

@@ -60,9 +60,8 @@ module HashRecursiveMerge
   #    h1.merge(h2)     #=> {"a" => 100, "b" = >254, "c" => {"c1" => 16, "c3" => 94}}
   # 
   def rmerge(other_hash)
-    r = {}
     merge(other_hash) do |key, oldval, newval|
-      r[key] = oldval.class == self.class ? oldval.rmerge(newval) : newval
+      oldval.class == self.class ? oldval.rmerge(newval) : newval
     end
   end
 

data/lib/maxmind_database.rb

@@ -21,7 +21,7 @@ module Geocoder
     end
 
     def insert(package, dir = "tmp")
-      data_files(package).each do |filepath,table|
+      data_files(package, dir).each do |filepath,table|
         print "Resetting table #{table}..."
         ActiveRecord::Base.connection.execute("DELETE FROM #{table}")
         puts "done"
@@ -96,9 +96,9 @@ module Geocoder
 
     def archive_url_path(package)
       {
-        geolite_country_csv: "GeoIPCountryCSV.zip",
-        geolite_city_csv: "GeoLiteCity_CSV/GeoLiteCity-latest.zip",
-        geolite_asn_csv: "asnum/GeoIPASNum2.zip"
+        geolite_country_csv: "GeoLite2-Country-CSV.zip",
+        geolite_city_csv: "GeoLite2-City-CSV.zip",
+        geolite_asn_csv: "GeoLite2-ASN-CSV.zip"
       }[package]
     end
 

data/lib/tasks/geocoder.rake

@@ -1,20 +1,45 @@
+require "geocoder/models/mongoid"
+
 namespace :geocode do
   desc "Geocode all objects without coordinates."
   task :all => :environment do
     class_name = ENV['CLASS'] || ENV['class']
     sleep_timer = ENV['SLEEP'] || ENV['sleep']
     batch = ENV['BATCH'] || ENV['batch']
+    reverse = ENV['REVERSE'] || ENV['reverse']
+    limit = ENV['LIMIT'] || ENV['limit']
     raise "Please specify a CLASS (model)" unless class_name
     klass = class_from_string(class_name)
-    batch = batch.to_i unless batch.nil?
+    batch = (batch.to_i unless batch.nil?) || 1000
+    orm = (klass < Geocoder::Model::Mongoid) ? 'mongoid' : 'active_record'
+    reverse = false unless reverse.to_s.downcase == 'true'
 
-    klass.not_geocoded.find_each(batch_size: batch) do |obj|
-      obj.geocode; obj.save
+    geocode_record = lambda { |obj|
+      reverse ? obj.reverse_geocode : obj.geocode
+      obj.save
       sleep(sleep_timer.to_f) unless sleep_timer.nil?
+    }
+
+    scope = reverse ? klass.not_reverse_geocoded : klass.not_geocoded
+    scope = scope.limit(limit) if limit
+    if orm == 'mongoid'
+      scope.each do |obj|
+        geocode_record.call(obj)
+      end
+    elsif orm == 'active_record'
+      if limit
+        scope.each do |obj|
+          geocode_record.call(obj)
+        end
+      else
+        scope.find_each(batch_size: batch) do |obj|
+          geocode_record.call(obj)
+        end
+      end
     end
+
   end
 end
-
 ##
 # Get a class object from the string given in the shell environment.
 # Similar to ActiveSupport's +constantize+ method.

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: geocoder
 version: !ruby/object:Gem::Version
-  version: 1.2.6
+  version: 1.6.1
 platform: ruby
 authors:
 - Alex Reisner
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-11-08 00:00:00.000000000 Z
+date: 2020-01-23 00:00:00.000000000 Z
 dependencies: []
 description: Provides object geocoding (by street or IP address), reverse geocoding
   (coordinates to street address), distance queries for ActiveRecord and Mongoid,
@@ -21,60 +21,78 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
-- ".gitignore"
-- ".travis.yml"
 - CHANGELOG.md
 - LICENSE
 - README.md
-- Rakefile
 - bin/geocode
 - examples/autoexpire_cache_dalli.rb
 - examples/autoexpire_cache_redis.rb
 - examples/cache_bypass.rb
-- gemfiles/Gemfile.mongoid-2.4.x
+- examples/reverse_geocode_job.rb
 - lib/generators/geocoder/config/config_generator.rb
 - lib/generators/geocoder/config/templates/initializer.rb
 - lib/generators/geocoder/maxmind/geolite_city_generator.rb
 - lib/generators/geocoder/maxmind/geolite_country_generator.rb
 - lib/generators/geocoder/maxmind/templates/migration/geolite_city.rb
 - lib/generators/geocoder/maxmind/templates/migration/geolite_country.rb
+- lib/generators/geocoder/migration_version.rb
 - lib/geocoder.rb
 - lib/geocoder/cache.rb
 - lib/geocoder/calculations.rb
 - lib/geocoder/cli.rb
 - lib/geocoder/configuration.rb
 - lib/geocoder/configuration_hash.rb
+- lib/geocoder/esri_token.rb
 - lib/geocoder/exceptions.rb
 - lib/geocoder/ip_address.rb
+- lib/geocoder/kernel_logger.rb
+- lib/geocoder/logger.rb
 - lib/geocoder/lookup.rb
+- lib/geocoder/lookups/amap.rb
 - lib/geocoder/lookups/baidu.rb
 - lib/geocoder/lookups/baidu_ip.rb
+- lib/geocoder/lookups/ban_data_gouv_fr.rb
 - lib/geocoder/lookups/base.rb
 - lib/geocoder/lookups/bing.rb
+- lib/geocoder/lookups/db_ip_com.rb
 - lib/geocoder/lookups/dstk.rb
 - lib/geocoder/lookups/esri.rb
 - lib/geocoder/lookups/freegeoip.rb
 - lib/geocoder/lookups/geocoder_ca.rb
-- lib/geocoder/lookups/geocoder_us.rb
 - lib/geocoder/lookups/geocodio.rb
 - lib/geocoder/lookups/geoip2.rb
+- lib/geocoder/lookups/geoportail_lu.rb
 - lib/geocoder/lookups/google.rb
 - lib/geocoder/lookups/google_places_details.rb
+- lib/geocoder/lookups/google_places_search.rb
 - lib/geocoder/lookups/google_premier.rb
 - lib/geocoder/lookups/here.rb
+- lib/geocoder/lookups/ip2location.rb
+- lib/geocoder/lookups/ipapi_com.rb
+- lib/geocoder/lookups/ipdata_co.rb
+- lib/geocoder/lookups/ipgeolocation.rb
+- lib/geocoder/lookups/ipinfo_io.rb
+- lib/geocoder/lookups/ipregistry.rb
+- lib/geocoder/lookups/ipstack.rb
+- lib/geocoder/lookups/latlon.rb
+- lib/geocoder/lookups/location_iq.rb
+- lib/geocoder/lookups/mapbox.rb
 - lib/geocoder/lookups/mapquest.rb
 - lib/geocoder/lookups/maxmind.rb
+- lib/geocoder/lookups/maxmind_geoip2.rb
 - lib/geocoder/lookups/maxmind_local.rb
 - lib/geocoder/lookups/nominatim.rb
-- lib/geocoder/lookups/okf.rb
 - lib/geocoder/lookups/opencagedata.rb
-- lib/geocoder/lookups/ovi.rb
+- lib/geocoder/lookups/osmnames.rb
+- lib/geocoder/lookups/pelias.rb
+- lib/geocoder/lookups/pickpoint.rb
 - lib/geocoder/lookups/pointpin.rb
 - lib/geocoder/lookups/postcode_anywhere_uk.rb
+- lib/geocoder/lookups/postcodes_io.rb
 - lib/geocoder/lookups/smarty_streets.rb
 - lib/geocoder/lookups/telize.rb
+- lib/geocoder/lookups/tencent.rb
 - lib/geocoder/lookups/test.rb
-- lib/geocoder/lookups/yahoo.rb
 - lib/geocoder/lookups/yandex.rb
 - lib/geocoder/models/active_record.rb
 - lib/geocoder/models/base.rb
@@ -84,34 +102,51 @@ files:
 - lib/geocoder/query.rb
 - lib/geocoder/railtie.rb
 - lib/geocoder/request.rb
+- lib/geocoder/results/amap.rb
 - lib/geocoder/results/baidu.rb
 - lib/geocoder/results/baidu_ip.rb
+- lib/geocoder/results/ban_data_gouv_fr.rb
 - lib/geocoder/results/base.rb
 - lib/geocoder/results/bing.rb
+- lib/geocoder/results/db_ip_com.rb
 - lib/geocoder/results/dstk.rb
 - lib/geocoder/results/esri.rb
 - lib/geocoder/results/freegeoip.rb
 - lib/geocoder/results/geocoder_ca.rb
-- lib/geocoder/results/geocoder_us.rb
 - lib/geocoder/results/geocodio.rb
 - lib/geocoder/results/geoip2.rb
+- lib/geocoder/results/geoportail_lu.rb
 - lib/geocoder/results/google.rb
 - lib/geocoder/results/google_places_details.rb
+- lib/geocoder/results/google_places_search.rb
 - lib/geocoder/results/google_premier.rb
 - lib/geocoder/results/here.rb
+- lib/geocoder/results/ip2location.rb
+- lib/geocoder/results/ipapi_com.rb
+- lib/geocoder/results/ipdata_co.rb
+- lib/geocoder/results/ipgeolocation.rb
+- lib/geocoder/results/ipinfo_io.rb
+- lib/geocoder/results/ipregistry.rb
+- lib/geocoder/results/ipstack.rb
+- lib/geocoder/results/latlon.rb
+- lib/geocoder/results/location_iq.rb
+- lib/geocoder/results/mapbox.rb
 - lib/geocoder/results/mapquest.rb
 - lib/geocoder/results/maxmind.rb
+- lib/geocoder/results/maxmind_geoip2.rb
 - lib/geocoder/results/maxmind_local.rb
 - lib/geocoder/results/nominatim.rb
-- lib/geocoder/results/okf.rb
 - lib/geocoder/results/opencagedata.rb
-- lib/geocoder/results/ovi.rb
+- lib/geocoder/results/osmnames.rb
+- lib/geocoder/results/pelias.rb
+- lib/geocoder/results/pickpoint.rb
 - lib/geocoder/results/pointpin.rb
 - lib/geocoder/results/postcode_anywhere_uk.rb
+- lib/geocoder/results/postcodes_io.rb
 - lib/geocoder/results/smarty_streets.rb
 - lib/geocoder/results/telize.rb
+- lib/geocoder/results/tencent.rb
 - lib/geocoder/results/test.rb
-- lib/geocoder/results/yahoo.rb
 - lib/geocoder/results/yandex.rb
 - lib/geocoder/sql.rb
 - lib/geocoder/stores/active_record.rb
@@ -122,151 +157,14 @@ files:
 - lib/geocoder/version.rb
 - lib/hash_recursive_merge.rb
 - lib/maxmind_database.rb
-- lib/oauth_util.rb
 - lib/tasks/geocoder.rake
 - lib/tasks/maxmind.rake
-- test/fixtures/baidu_invalid_key
-- test/fixtures/baidu_ip_202_198_16_3
-- test/fixtures/baidu_ip_invalid_key
-- test/fixtures/baidu_ip_no_results
-- test/fixtures/baidu_no_results
-- test/fixtures/baidu_reverse
-- test/fixtures/baidu_shanghai_pearl_tower
-- test/fixtures/bing_invalid_key
-- test/fixtures/bing_madison_square_garden
-- test/fixtures/bing_no_results
-- test/fixtures/bing_reverse
-- test/fixtures/cloudmade_invalid_key
-- test/fixtures/cloudmade_madison_square_garden
-- test/fixtures/cloudmade_no_results
-- test/fixtures/esri_madison_square_garden
-- test/fixtures/esri_no_results
-- test/fixtures/esri_reverse
-- test/fixtures/freegeoip_74_200_247_59
-- test/fixtures/freegeoip_no_results
-- test/fixtures/geocoder_ca_madison_square_garden
-- test/fixtures/geocoder_ca_no_results
-- test/fixtures/geocoder_ca_reverse
-- test/fixtures/geocoder_us_madison_square_garden
-- test/fixtures/geocoder_us_no_results
-- test/fixtures/geocodio_1101_pennsylvania_ave
-- test/fixtures/geocodio_bad_api_key
-- test/fixtures/geocodio_invalid
-- test/fixtures/geocodio_no_results
-- test/fixtures/geocodio_over_query_limit
-- test/fixtures/google_garbage
-- test/fixtures/google_madison_square_garden
-- test/fixtures/google_no_city_data
-- test/fixtures/google_no_locality
-- test/fixtures/google_no_results
-- test/fixtures/google_over_limit
-- test/fixtures/google_places_details_invalid_request
-- test/fixtures/google_places_details_madison_square_garden
-- test/fixtures/google_places_details_no_results
-- test/fixtures/google_places_details_no_reviews
-- test/fixtures/google_places_details_no_types
-- test/fixtures/here_madison_square_garden
-- test/fixtures/here_no_results
-- test/fixtures/mapquest_error
-- test/fixtures/mapquest_invalid_api_key
-- test/fixtures/mapquest_invalid_request
-- test/fixtures/mapquest_madison_square_garden
-- test/fixtures/mapquest_no_results
-- test/fixtures/maxmind_24_24_24_21
-- test/fixtures/maxmind_24_24_24_22
-- test/fixtures/maxmind_24_24_24_23
-- test/fixtures/maxmind_24_24_24_24
-- test/fixtures/maxmind_74_200_247_59
-- test/fixtures/maxmind_invalid_key
-- test/fixtures/maxmind_no_results
-- test/fixtures/nominatim_madison_square_garden
-- test/fixtures/nominatim_no_results
-- test/fixtures/nominatim_over_limit
-- test/fixtures/okf_kirstinmaki
-- test/fixtures/okf_no_results
-- test/fixtures/opencagedata_invalid_api_key
-- test/fixtures/opencagedata_invalid_request
-- test/fixtures/opencagedata_madison_square_garden
-- test/fixtures/opencagedata_no_results
-- test/fixtures/opencagedata_over_limit
-- test/fixtures/ovi_madison_square_garden
-- test/fixtures/ovi_no_results
-- test/fixtures/pointpin_10_10_10_10
-- test/fixtures/pointpin_555_555_555_555
-- test/fixtures/pointpin_80_111_555_555
-- test/fixtures/pointpin_no_results
-- test/fixtures/postcode_anywhere_uk_geocode_v2_00_WR26NJ
-- test/fixtures/postcode_anywhere_uk_geocode_v2_00_generic_error
-- test/fixtures/postcode_anywhere_uk_geocode_v2_00_hampshire
-- test/fixtures/postcode_anywhere_uk_geocode_v2_00_key_limit_exceeded
-- test/fixtures/postcode_anywhere_uk_geocode_v2_00_no_results
-- test/fixtures/postcode_anywhere_uk_geocode_v2_00_romsey
-- test/fixtures/postcode_anywhere_uk_geocode_v2_00_unknown_key
-- test/fixtures/smarty_streets_11211
-- test/fixtures/smarty_streets_madison_square_garden
-- test/fixtures/smarty_streets_no_results
-- test/fixtures/telize_10_10_10_10
-- test/fixtures/telize_555_555_555_555
-- test/fixtures/telize_74_200_247_59
-- test/fixtures/telize_no_results
-- test/fixtures/yahoo_error
-- test/fixtures/yahoo_invalid_key
-- test/fixtures/yahoo_madison_square_garden
-- test/fixtures/yahoo_no_results
-- test/fixtures/yahoo_over_limit
-- test/fixtures/yandex_canada_rue_dupuis_14
-- test/fixtures/yandex_invalid_key
-- test/fixtures/yandex_kremlin
-- test/fixtures/yandex_new_york
-- test/fixtures/yandex_no_city_and_town
-- test/fixtures/yandex_no_results
-- test/integration/http_client_test.rb
-- test/mongoid_test_helper.rb
-- test/test_helper.rb
-- test/unit/active_record_test.rb
-- test/unit/cache_test.rb
-- test/unit/calculations_test.rb
-- test/unit/configuration_test.rb
-- test/unit/error_handling_test.rb
-- test/unit/geocoder_test.rb
-- test/unit/https_test.rb
-- test/unit/ip_address_test.rb
-- test/unit/lookup_test.rb
-- test/unit/lookups/bing_test.rb
-- test/unit/lookups/dstk_test.rb
-- test/unit/lookups/esri_test.rb
-- test/unit/lookups/freegeoip_test.rb
-- test/unit/lookups/geocoder_ca_test.rb
-- test/unit/lookups/geocodio_test.rb
-- test/unit/lookups/geoip2_test.rb
-- test/unit/lookups/google_places_details_test.rb
-- test/unit/lookups/google_premier_test.rb
-- test/unit/lookups/google_test.rb
-- test/unit/lookups/mapquest_test.rb
-- test/unit/lookups/maxmind_local_test.rb
-- test/unit/lookups/maxmind_test.rb
-- test/unit/lookups/nominatim_test.rb
-- test/unit/lookups/okf_test.rb
-- test/unit/lookups/opencagedata_test.rb
-- test/unit/lookups/pointpin_test.rb
-- test/unit/lookups/postcode_anywhere_uk_test.rb
-- test/unit/lookups/smarty_streets_test.rb
-- test/unit/lookups/telize_test.rb
-- test/unit/lookups/yahoo_test.rb
-- test/unit/method_aliases_test.rb
-- test/unit/model_test.rb
-- test/unit/mongoid_test.rb
-- test/unit/near_test.rb
-- test/unit/oauth_util_test.rb
-- test/unit/proxy_test.rb
-- test/unit/query_test.rb
-- test/unit/rake_task_test.rb
-- test/unit/request_test.rb
-- test/unit/result_test.rb
-- test/unit/test_mode_test.rb
 homepage: http://www.rubygeocoder.com
-licenses: []
-metadata: {}
+licenses:
+- MIT
+metadata:
+  source_code_uri: https://github.com/alexreisner/geocoder
+  changelog_uri: https://github.com/alexreisner/geocoder/blob/master/CHANGELOG.md
 post_install_message: 
 rdoc_options: []
 require_paths:
@@ -275,15 +173,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 2.0.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 3.0.1
 signing_key: 
 specification_version: 4
 summary: Complete geocoding solution for Ruby.

data/.gitignore

@@ -1,6 +0,0 @@
-pkg/*
-rdoc/*
-*.gem
-.bundle
-Gemfile.lock
-api_keys.yml

data/.travis.yml

@@ -1,31 +0,0 @@
-rvm:
-  - 1.9.2
-  - 1.9.3
-  - 2.0.0
-  - 2.1.2
-  - jruby-19mode
-  - rbx-2
-gemfile:
-  - Gemfile
-  - gemfiles/Gemfile.mongoid-2.4.x
-env: SSL_CERT_DIR=/etc/ssl/certs
-matrix:
-  exclude:
-    - rvm: 1.9.2
-      gemfile: Gemfile
-      env: SSL_CERT_DIR=/etc/ssl/certs
-    - rvm: 1.9.3
-      gemfile: gemfiles/Gemfile.mongoid-2.4.x
-      env: SSL_CERT_DIR=/etc/ssl/certs
-    - rvm: 2.0.0
-      gemfile: gemfiles/Gemfile.mongoid-2.4.x
-      env: SSL_CERT_DIR=/etc/ssl/certs
-    - rvm: 2.1.2
-      gemfile: gemfiles/Gemfile.mongoid-2.4.x
-      env: SSL_CERT_DIR=/etc/ssl/certs
-    - rvm: jruby-19mode
-      gemfile: gemfiles/Gemfile.mongoid-2.4.x
-      env: SSL_CERT_DIR=/etc/ssl/certs
-    - rvm: rbx-2
-      gemfile: gemfiles/Gemfile.mongoid-2.4.x
-      env: SSL_CERT_DIR=/etc/ssl/certs

data/Rakefile

@@ -1,25 +0,0 @@
-require 'bundler'
-Bundler::GemHelper.install_tasks
-
-require 'rake/testtask'
-Rake::TestTask.new(:test) do |test|
-  test.libs << 'lib' << 'test'
-  test.pattern = 'test/unit/**/*_test.rb'
-  test.verbose = true
-end
-
-Rake::TestTask.new(:integration) do |test|
-  test.libs << 'lib' << 'test'
-  test.pattern = 'test/integration/*_test.rb'
-  test.verbose = true
-end
-
-task :default => [:test]
-
-require 'rdoc/task'
-Rake::RDocTask.new do |rdoc|
-  rdoc.rdoc_dir = 'rdoc'
-  rdoc.title = "Geocoder #{Geocoder::VERSION}"
-  rdoc.rdoc_files.include('*.rdoc')
-  rdoc.rdoc_files.include('lib/**/*.rb')
-end

data/gemfiles/Gemfile.mongoid-2.4.x

@@ -1,16 +0,0 @@
-source "http://rubygems.org"
-
-gemspec :path => '..'
-
-group :development, :test do
-  gem 'rake'
-  gem 'mongoid', '2.4.11'
-  gem 'bson_ext', :platforms => :ruby
-  gem 'geoip'
-
-  gem 'rails'
-
-  platforms :jruby do
-    gem 'jruby-openssl'
-  end
-end

data/lib/geocoder/lookups/geocoder_us.rb

@@ -1,39 +0,0 @@
-require 'geocoder/lookups/base'
-require "geocoder/results/geocoder_us"
-
-module Geocoder::Lookup
-  class GeocoderUs < Base
-
-    def name
-      "Geocoder.us"
-    end
-
-    def query_url(query)
-      if configuration.api_key
-        "http://#{configuration.api_key}@geocoder.us/member/service/csv/geocode?" + url_query_string(query)
-      else
-        "http://geocoder.us/service/csv/geocode?" + url_query_string(query)
-      end
-    end
-
-    private
-
-    def results(query)
-      return [] unless doc = fetch_data(query)
-      if doc[0].to_s =~ /^(\d+)\:/
-        return []
-      else
-        return [doc.size == 5 ? ((doc[0..1] << nil) + doc[2..4]) : doc]
-      end
-    end
-
-    def query_url_params(query)
-      (query.text =~ /^\d{5}(?:-\d{4})?$/ ? {:zip => query} : {:address => query.sanitized_text}).merge(super)
-    end
-
-    def parse_raw_data(raw_data)
-      raw_data.chomp.split(',')
-    end
-  end
-end
-

data/lib/geocoder/lookups/okf.rb

@@ -1,43 +0,0 @@
-require 'geocoder/lookups/base'
-require "geocoder/results/okf"
-
-module Geocoder::Lookup
-  class Okf < Base
-
-    def name
-      "Okf"
-    end
-
-    def query_url(query)
-      "#{protocol}://data.okf.fi/gis/1/geocode/json?" + url_query_string(query)
-    end
-
-    private # ---------------------------------------------------------------
-
-    def valid_response?(response)
-      status = parse_json(response.body)["status"]
-      super(response) and ['OK', 'ZERO_RESULTS'].include?(status)
-    end
-
-    def results(query)
-      return [] unless doc = fetch_data(query)
-      case doc['status']; when "OK" # OK status implies >0 results
-        return doc['results']
-      end
-      return []
-    end
-
-    def query_url_okf_params(query)
-      params = {
-        (query.reverse_geocode? ? :latlng : :address) => query.sanitized_text,
-        :sensor => "false",
-        :language => (query.language || configuration.language)
-      }
-      params
-    end
-
-    def query_url_params(query)
-      query_url_okf_params(query).merge(super)
-    end
-  end
-end