geokit 1.6.7 → 1.7.0.rc1

checksums.yaml

@@ -0,0 +1,15 @@
+---
+!binary "U0hBMQ==":
+  metadata.gz: !binary |-
+    YmMyOTc1ZjczMWU1MzU3YzBjMDEzYzUzNGYxYzliNjYwOGVhNzdmNw==
+  data.tar.gz: !binary |-
+    NDBjNjIyMWY0YjRhMGVjNWJlZjA0YmI3Yzk4MDMzOWM2N2U4MWM0Ng==
+!binary "U0hBNTEy":
+  metadata.gz: !binary |-
+    MWE4NjBkMGU2N2U5NGFhYjZmNGUxMTA2NDQ3MDMxODEwYTliYmEwYWNhOWY0
+    ZDJmZTkzNDQ1Y2RkMjAzNzE4NGNkYzgwYjViY2YyMDZkYjhlYTllZjg4OGU0
+    YmNmZDQ2ZmVhZjMwMjgwYThlODA1MGJlMGRiMTcyYWI4YWEzYzU=
+  data.tar.gz: !binary |-
+    NmJmZGU0MTJiZDZlNzBiNzUwNzY3N2E4OTY3MzhiY2RhZTMyYzc3ZWQxODkw
+    NzRjNDdjYTgwMTY1OTg1MWI3MDNmYTIzZTI1YTA2YmRlOGNkYjhhZTlhYWMw
+    ODc5MjhmZDU5M2ZmMTcyMTQzYTliNzkzZDBiYWI3NzA1Nzg4MzA=

data/Gemfile

@@ -2,3 +2,5 @@ source "http://rubygems.org"
 
 # Specify your gem's dependencies in geokit.gemspec
 gemspec
+
+gem 'coveralls', :require => false

data/README.markdown

@@ -17,10 +17,11 @@ The Geokit gem provides:
  * Rectangular bounds calculations: is a point within a given rectangular bounds?
  * Heading and midpoint calculations
 
-Combine this gem with the [geokit-rails plugin](http://github.com/geokit/geokit-rails) to get location-based finders for your Rails app.
+Combine this gem with the [geokit-rails plugin](http://github.com/imajes/geokit-rails) to get location-based finders for your Rails app.
 
-* Repository at Github: [http://github.com/geokit/geokit](http://github.com/geokit/geokit).
-* RDoc pages: [http://rdoc.info/github/geokit/geokit/master/frames](http://rdoc.info/github/geokit/geokit/master/frames)
+* Geokit main site [http://rubygeokit.org/](http://rubygeokit.org).
+* Repository at Github: [http://github.com/imajes/geokit](http://github.com/imajes/geokit).
+* RDoc pages: [http://rdoc.info/github/imajes/geokit/master/frames](http://rdoc.info/github/imajes/geokit/master/frames)
 * Follow the Google Group for updates and discussion on Geokit: [http://groups.google.com/group/geokit](http://groups.google.com/group/geokit)
 
 ## INSTALL
@@ -125,7 +126,7 @@ If you're using this gem by itself, here are the configuration options:
     # Geokit::Geocoders::ip_provider_order = [:external,:geo_plugin,:ip]
 ```
 
-If you're using this gem with the [geokit-rails plugin](http://github.com/geokit/geokit-rails), the plugin
+If you're using this gem with the [geokit-rails plugin](http://github.com/imajes/geokit-rails), the plugin
 creates a template with these settings and places it in `config/initializers/geokit_config.rb`.
 
 ## SUPPORTED GEOCODERS

data/Rakefile

@@ -1,8 +1,7 @@
 require "bundler/gem_tasks"
 require 'rake/testtask'
 
-task :default do
-end
+task :default => :test
 
 Rake::TestTask.new do |t|
   t.libs << "test"

data/ext/mkrf_conf.rb

@@ -0,0 +1,15 @@
+require 'rubygems'
+require 'rubygems/command.rb'
+require 'rubygems/dependency_installer.rb'
+begin
+  Gem::Command.build_args = ARGV
+  rescue NoMethodError
+end
+inst = Gem::DependencyInstaller.new
+begin
+  if RUBY_VERSION < "1.9"
+    inst.install "iconv"
+  end
+rescue
+  exit(1)
+end

data/geokit.gemspec

@@ -10,12 +10,13 @@ Gem::Specification.new do |spec|
   spec.email         = ["michael+geokit@noack.com.au"]
   spec.description   = %q{Geokit provides geocoding and distance calculation in an easy-to-use API}
   spec.summary       = %q{Geokit: encoding and distance calculation gem}
-  spec.homepage      = "http://github.com/geokit/geokit"
+  spec.homepage      = "http://geokit.org"
   spec.license       = "MIT"
 
   spec.has_rdoc = true
   spec.rdoc_options = ["--main", "README.markdown"]
   spec.extra_rdoc_files = ["README.markdown"]
+  spec.extensions = 'ext/mkrf_conf.rb'
 
   spec.files         = `git ls-files`.split($/)
   spec.executables   = spec.files.grep(%r{^bin/}) { |f| File.basename(f) }
@@ -28,5 +29,5 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "simplecov-rcov"
   spec.add_development_dependency 'rake'
   spec.add_development_dependency 'mocha'
-  spec.add_development_dependency 'coveralls'
 end
+

data/lib/geokit/mappable.rb

@@ -237,6 +237,11 @@ module Geokit
       @lng=lng.to_f if lng
     end
 
+    def ll=(hash)
+      self.lat = hash['lat']
+      self.lng = hash['lng']
+    end
+
     # Returns the lat and lng attributes as a comma-separated string.
     def ll
       "#{lat},#{lng}"

data/lib/geokit/services/google3.rb

@@ -10,7 +10,7 @@ module Geokit
         res = self.call_geocoder_service(submit_url)
         return GeoLoc.new unless (res.is_a?(Net::HTTPSuccess) || res.is_a?(Net::HTTPOK))
         json = res.body
-        logger.debug "Google reverse-geocoding. LL: #{latlng}. Result: #{CGI.escape(json)}"
+        logger.debug "Google reverse-geocoding. LL: #{latlng}. Result: #{json}"
         return self.json2GeoLoc(json)
       end
 
@@ -48,7 +48,7 @@ module Geokit
         return GeoLoc.new if !res.is_a?(Net::HTTPSuccess)
 
         json = res.body
-        logger.debug "Google geocoding. Address: #{address}. Result: #{CGI.escape(json)}"
+        logger.debug "Google geocoding. Address: #{address}. Result: #{json}"
 
         return self.json2GeoLoc(json, address)
       end
@@ -85,8 +85,7 @@ module Geokit
           "&region=#{bias.to_s.downcase}"
         when Bounds
           # viewport biasing
-          url_escaped_string = Geokit::Inflector::url_escape("#{bias.sw.to_s}|#{bias.ne.to_s}")
-          "&bounds=#{url_escaped_string}"
+          Geokit::Inflector::url_escape("&bounds=#{bias.sw.to_s}|#{bias.ne.to_s}")
         end
       end
 
@@ -181,17 +180,12 @@ module Geokit
           res.accuracy = 7
         end
 
-        res.lat=addr['geometry']['location']['lat'].to_f
-        res.lng=addr['geometry']['location']['lng'].to_f
-
-        ne=Geokit::LatLng.new(
-          addr['geometry']['viewport']['northeast']['lat'].to_f,
-          addr['geometry']['viewport']['northeast']['lng'].to_f
-        )
-        sw=Geokit::LatLng.new(
-          addr['geometry']['viewport']['southwest']['lat'].to_f,
-          addr['geometry']['viewport']['southwest']['lng'].to_f
-        )
+        res.ll = addr['geometry']['location']
+
+        ne = Geokit::LatLng.new
+        ne.ll = addr['geometry']['viewport']['northeast']
+        sw = Geokit::LatLng.new
+        sw.ll = addr['geometry']['viewport']['southwest']
         res.suggested_bounds = Geokit::Bounds.new(sw,ne)
 
         res

data/lib/geokit/services/ip.rb

@@ -57,7 +57,7 @@ module Geokit
         res = GeoLoc.new
         res.provider = 'hostip'
         res.city, res.state = yaml['City'].split(', ')
-        res.country, res.country_code = yaml['Country'].split(' (')
+        country, res.country_code = yaml['Country'].split(' (')
         res.lat = yaml['Latitude']
         res.lng = yaml['Longitude']
         res.country_code.chop!

data/lib/geokit/version.rb

@@ -1,3 +1,3 @@
 module Geokit
-  VERSION = '1.6.7'
+  VERSION = '1.7.0.rc1'
 end

data/test/helper.rb

@@ -16,6 +16,7 @@ if ENV['COVERAGE']
   Coveralls.wear!
 
   SimpleCov.formatter = SimpleCov::Formatter::RcovFormatter
+  SimpleCov.start
   SimpleCov.start do
     add_filter '/test/'
     add_group 'lib', 'lib'

data/test/test_google_geocoder3.rb

@@ -504,16 +504,6 @@ class GoogleGeocoder3Test < BaseGeocoderTest #:nodoc: all
      assert_equal Geokit::Bounds.new(Geokit::LatLng.new(37.7908019197085, -122.3953489802915), Geokit::LatLng.new(37.7934998802915, -122.3926510197085)), res.suggested_bounds
    end
 
-   def test_google3_suggested_bounds_url
-     bounds = Geokit::Bounds.new(
-       Geokit::LatLng.new(33.7036917, -118.6681759),
-       Geokit::LatLng.new(34.3373061, -118.1552891)
-     )
-     url = "http://maps.google.com/maps/api/geocode/json?sensor=false&address=Winnetka&bounds=33.7036917%2C-118.6681759%7C34.3373061%2C-118.1552891"
-     Geokit::Geocoders::GoogleGeocoder3.expects(:call_geocoder_service).with(url)
-     Geokit::Geocoders::GoogleGeocoder3.geocode('Winnetka', :bias => bounds)
-  end
-
    def test_service_unavailable
      response = MockFailure.new
      url = "http://maps.google.com/maps/api/geocode/json?sensor=false&address=#{Geokit::Inflector::url_escape(@address)}"

metadata

@@ -1,133 +1,109 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: geokit
-version: !ruby/object:Gem::Version 
-  hash: 1
-  prerelease: 
-  segments: 
-  - 1
-  - 6
-  - 7
-  version: 1.6.7
+version: !ruby/object:Gem::Version
+  version: 1.7.0.rc1
 platform: ruby
-authors: 
+authors:
 - Michael Noack, James Cox, Andre Lewis & Bill Eisenhauer
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2013-09-20 00:00:00 Z
-dependencies: 
-- !ruby/object:Gem::Dependency 
-  version_requirements: &id001 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 31
-        segments: 
-        - 1
-        - 3
-        - 2
-        version: 1.3.2
+date: 2013-06-19 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: multi_json
-  prerelease: false
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 1.3.2
   type: :runtime
-  requirement: *id001
-- !ruby/object:Gem::Dependency 
-  version_requirements: &id002 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">"
-      - !ruby/object:Gem::Version 
-        hash: 15
-        segments: 
-        - 1
-        - 0
-        version: "1.0"
-  name: bundler
   prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 1.3.2
+- !ruby/object:Gem::Dependency
+  name: bundler
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ! '>'
+      - !ruby/object:Gem::Version
+        version: '1.0'
   type: :development
-  requirement: *id002
-- !ruby/object:Gem::Dependency 
-  version_requirements: &id003 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
-  name: simplecov
   prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ! '>'
+      - !ruby/object:Gem::Version
+        version: '1.0'
+- !ruby/object:Gem::Dependency
+  name: simplecov
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  requirement: *id003
-- !ruby/object:Gem::Dependency 
-  version_requirements: &id004 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
-  name: simplecov-rcov
   prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: simplecov-rcov
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  requirement: *id004
-- !ruby/object:Gem::Dependency 
-  version_requirements: &id005 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
-  name: rake
   prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: rake
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  requirement: *id005
-- !ruby/object:Gem::Dependency 
-  version_requirements: &id006 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
-  name: mocha
   prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: mocha
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  requirement: *id006
-- !ruby/object:Gem::Dependency 
-  version_requirements: &id007 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
-  name: coveralls
   prerelease: false
-  type: :development
-  requirement: *id007
-description: Geokit provides geocoding and distance calculation in an easy-to-use API
-email: 
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+description: Geokit provides geocoding and distance calculation in an easy-to-use
+  API
+email:
 - michael+geokit@noack.com.au
 executables: []
-
-extensions: []
-
-extra_rdoc_files: 
+extensions:
+- ext/mkrf_conf.rb
+extra_rdoc_files:
 - README.markdown
-files: 
+files:
 - .gitignore
 - .travis.yml
 - CHANGELOG.md
@@ -136,6 +112,7 @@ files:
 - Manifest.txt
 - README.markdown
 - Rakefile
+- ext/mkrf_conf.rb
 - geokit.gemspec
 - lib/geokit.rb
 - lib/geokit/geocoders.rb
@@ -171,41 +148,33 @@ files:
 - test/test_polygon_contains.rb
 - test/test_us_geocoder.rb
 - test/test_yahoo_geocoder.rb
-homepage: http://github.com/geokit/geokit
-licenses: 
+homepage: http://geokit.org
+licenses:
 - MIT
+metadata: {}
 post_install_message: 
-rdoc_options: 
+rdoc_options:
 - --main
 - README.markdown
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
-  none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
-  none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
+required_ruby_version: !ruby/object:Gem::Requirement
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
+  requirements:
+  - - ! '>'
+    - !ruby/object:Gem::Version
+      version: 1.3.1
 requirements: []
-
 rubyforge_project: 
-rubygems_version: 1.8.25
+rubygems_version: 2.0.3
 signing_key: 
-specification_version: 3
-summary: "Geokit: encoding and distance calculation gem"
-test_files: 
+specification_version: 4
+summary: ! 'Geokit: encoding and distance calculation gem'
+test_files:
 - test/helper.rb
 - test/test_base_geocoder.rb
 - test/test_bounds.rb