simple_geocode 0.5.1 → 0.6.0

data/Gemfile

@@ -3,6 +3,7 @@ source "http://rubygems.org"
 # Example:
 #   gem "activesupport", ">= 2.3.5"
 
+gem "sqlite3"
 gem "simple_cache_rs"
 
 # Add dependencies to develop your gem here.

data/Gemfile.lock

@@ -1,24 +1,28 @@
 GEM
   remote: http://rubygems.org/
   specs:
-    addressable (2.2.7)
+    addressable (2.3.3)
     archive-tar-minitar (0.5.2)
     columnize (0.3.6)
-    crack (0.3.1)
+    crack (0.3.2)
+    expectation (0.3.1)
     git (1.2.5)
-    jeweler (1.8.3)
+    jeweler (1.8.4)
       bundler (~> 1.0)
       git (>= 1.2.5)
       rake
       rdoc
-    json (1.6.6)
+    json (1.7.7)
     linecache19 (0.5.12)
       ruby_core_source (>= 0.1.4)
-    multi_json (1.2.0)
-    psych (1.3.1)
-    rake (0.9.2.2)
-    rdoc (3.12)
+    multi_json (1.7.2)
+    psych (1.3.4)
+    rake (10.0.4)
+    rdoc (4.0.1)
       json (~> 1.4)
+    redis (3.0.3)
+    redis-namespace (1.2.1)
+      redis (~> 3.0.0)
     ruby-debug-base19 (0.11.25)
       columnize (>= 0.3.1)
       linecache19 (>= 0.5.11)
@@ -29,17 +33,19 @@ GEM
       ruby-debug-base19 (>= 0.11.19)
     ruby_core_source (0.1.5)
       archive-tar-minitar (>= 0.5.2)
-    simple_cache_rs (0.9.1)
-      sqlite3
-    simplecov (0.6.1)
+    simple_cache_rs (0.11.0)
+      expectation
+      redis
+      redis-namespace
+    simplecov (0.7.1)
       multi_json (~> 1.0)
-      simplecov-html (~> 0.5.3)
-    simplecov-html (0.5.3)
-    sqlite3 (1.3.5)
-    vcr (2.0.1)
-    webmock (1.8.6)
+      simplecov-html (~> 0.7.1)
+    simplecov-html (0.7.1)
+    sqlite3 (1.3.7)
+    vcr (2.4.0)
+    webmock (1.11.0)
       addressable (>= 2.2.7)
-      crack (>= 0.1.7)
+      crack (>= 0.3.2)
 
 PLATFORMS
   ruby
@@ -51,5 +57,6 @@ DEPENDENCIES
   ruby-debug19
   simple_cache_rs
   simplecov
+  sqlite3
   vcr
   webmock

data/VERSION

@@ -1 +1 @@
-0.5.1
+0.6.0

data/lib/simple_geocode.rb

@@ -19,17 +19,17 @@ module SimpleGeocoder
   
   def geocode(address)
     cache.cached(address, TIME_TO_LIVE) { 
-      url = "http://maps.google.com/maps/geo?q=#{CGI.escape(address)}&output=json&oe=utf-8"
-
+      url = "http://maps.googleapis.com/maps/api/geocode/json?address=#{CGI.escape(address)}&sensor=false&region=de"
       data = JSON.parse(get(url))
 
-      status = data["Status"]
-      if status["code"] != 200
-        STDERR.puts "Geocoding failed for '#{address}' with status #{status["code"]}"
+      if data["status"] != "OK"
+        STDERR.puts "Geocoding failed for '#{address}'"
         return
       end
 
-      data["Placemark"].first["Point"]["coordinates"]
+      results = data["results"]
+      location = results[0]["geometry"]["location"]
+      location.values_at("lng", "lat")
     }
   end
   

data/simple_geocode.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "simple_geocode"
-  s.version = "0.5.1"
+  s.version = "0.6.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["radiospiel"]
-  s.date = "2012-04-09"
+  s.date = "2013-04-01"
   s.description = "Some basics that your application could benefit from."
   s.email = "eno@open-lab.org"
   s.extra_rdoc_files = [
@@ -40,6 +40,7 @@ Gem::Specification.new do |s|
     s.specification_version = 3
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
+      s.add_runtime_dependency(%q<sqlite3>, [">= 0"])
       s.add_runtime_dependency(%q<simple_cache_rs>, [">= 0"])
       s.add_development_dependency(%q<bundler>, [">= 0"])
       s.add_development_dependency(%q<jeweler>, [">= 0"])
@@ -49,6 +50,7 @@ Gem::Specification.new do |s|
       s.add_development_dependency(%q<simplecov>, [">= 0"])
       s.add_development_dependency(%q<ruby-debug19>, [">= 0"])
     else
+      s.add_dependency(%q<sqlite3>, [">= 0"])
       s.add_dependency(%q<simple_cache_rs>, [">= 0"])
       s.add_dependency(%q<bundler>, [">= 0"])
       s.add_dependency(%q<jeweler>, [">= 0"])
@@ -59,6 +61,7 @@ Gem::Specification.new do |s|
       s.add_dependency(%q<ruby-debug19>, [">= 0"])
     end
   else
+    s.add_dependency(%q<sqlite3>, [">= 0"])
     s.add_dependency(%q<simple_cache_rs>, [">= 0"])
     s.add_dependency(%q<bundler>, [">= 0"])
     s.add_dependency(%q<jeweler>, [">= 0"])

data/test/fixtures-vcr/geocoder.yml

@@ -2,7 +2,7 @@
 http_interactions:
 - request:
     method: get
-    uri: http://maps.google.com/maps/geo?oe=utf-8&output=json&q=Berlin
+    uri: http://maps.googleapis.com/maps/api/geocode/json?address=Berlin&region=de&sensor=false
     body:
       encoding: US-ASCII
       string: ''
@@ -18,19 +18,97 @@ http_interactions:
     headers:
       Content-Type:
       - !binary |-
-        dGV4dC9qYXZhc2NyaXB0OyBjaGFyc2V0PVVURi04
+        YXBwbGljYXRpb24vanNvbjsgY2hhcnNldD1VVEYtOA==
+      !binary "RGF0ZQ==":
+      - !binary |-
+        TW9uLCAwMSBBcHIgMjAxMyAxMToyMzoyNCBHTVQ=
+      !binary "RXhwaXJlcw==":
+      - !binary |-
+        VHVlLCAwMiBBcHIgMjAxMyAxMToyMzoyNCBHTVQ=
+      Cache-Control:
+      - !binary |-
+        cHVibGljLCBtYXgtYWdlPTg2NDAw
       !binary "VmFyeQ==":
       - !binary |-
         QWNjZXB0LUxhbmd1YWdl
-      !binary "RGF0ZQ==":
+      Access-Control-Allow-Origin:
       - !binary |-
-        V2VkLCAwNCBBcHIgMjAxMiAxNToxMTo0MyBHTVQ=
+        Kg==
       !binary "U2VydmVy":
       - !binary |-
         bWFmZQ==
+      X-Xss-Protection:
+      - !binary |-
+        MTsgbW9kZT1ibG9jaw==
+      X-Frame-Options:
+      - !binary |-
+        U0FNRU9SSUdJTg==
+      Transfer-Encoding:
+      - !binary |-
+        Y2h1bmtlZA==
+    body:
+      encoding: US-ASCII
+      string: ! "{\n   \"results\" : [\n      {\n         \"address_components\" :
+        [\n            {\n               \"long_name\" : \"Berlin\",\n               \"short_name\"
+        : \"Berlin\",\n               \"types\" : [ \"locality\", \"political\" ]\n
+        \           },\n            {\n               \"long_name\" : \"Berlin\",\n
+        \              \"short_name\" : \"Berlin\",\n               \"types\" : [
+        \"administrative_area_level_1\", \"political\" ]\n            },\n            {\n
+        \              \"long_name\" : \"Germany\",\n               \"short_name\"
+        : \"DE\",\n               \"types\" : [ \"country\", \"political\" ]\n            }\n
+        \        ],\n         \"formatted_address\" : \"Berlin, Germany\",\n         \"geometry\"
+        : {\n            \"bounds\" : {\n               \"northeast\" : {\n                  \"lat\"
+        : 52.67545420,\n                  \"lng\" : 13.76111760\n               },\n
+        \              \"southwest\" : {\n                  \"lat\" : 52.33946479999999,\n
+        \                 \"lng\" : 13.0883460\n               }\n            },\n
+        \           \"location\" : {\n               \"lat\" : 52.5191710,\n               \"lng\"
+        : 13.40609120\n            },\n            \"location_type\" : \"APPROXIMATE\",\n
+        \           \"viewport\" : {\n               \"northeast\" : {\n                  \"lat\"
+        : 52.67545420,\n                  \"lng\" : 13.76111760\n               },\n
+        \              \"southwest\" : {\n                  \"lat\" : 52.33946479999999,\n
+        \                 \"lng\" : 13.0883460\n               }\n            }\n
+        \        },\n         \"types\" : [ \"locality\", \"political\" ]\n      }\n
+        \  ],\n   \"status\" : \"OK\"\n}\n"
+    http_version: 
+  recorded_at: Mon, 01 Apr 2013 11:23:24 GMT
+- request:
+    method: get
+    uri: http://maps.googleapis.com/maps/api/geocode/json?address=10178%20Berlin,%20Rosenthaler%20Stra%C3%9Fe%2040/41&region=de&sensor=false
+    body:
+      encoding: US-ASCII
+      string: ''
+    headers:
+      Accept:
+      - ! '*/*'
+      User-Agent:
+      - Ruby
+  response:
+    status:
+      code: 200
+      message: !binary |-
+        T0s=
+    headers:
+      Content-Type:
+      - !binary |-
+        YXBwbGljYXRpb24vanNvbjsgY2hhcnNldD1VVEYtOA==
+      !binary "RGF0ZQ==":
+      - !binary |-
+        TW9uLCAwMSBBcHIgMjAxMyAxMToyMzoyNCBHTVQ=
+      !binary "RXhwaXJlcw==":
+      - !binary |-
+        VHVlLCAwMiBBcHIgMjAxMyAxMToyMzoyNCBHTVQ=
       Cache-Control:
       - !binary |-
-        cHJpdmF0ZQ==
+        cHVibGljLCBtYXgtYWdlPTg2NDAw
+      !binary "VmFyeQ==":
+      - !binary |-
+        QWNjZXB0LUxhbmd1YWdl
+      Access-Control-Allow-Origin:
+      - !binary |-
+        Kg==
+      !binary "U2VydmVy":
+      - !binary |-
+        bWFmZQ==
       X-Xss-Protection:
       - !binary |-
         MTsgbW9kZT1ibG9jaw==
@@ -41,17 +119,54 @@ http_interactions:
       - !binary |-
         Y2h1bmtlZA==
     body:
-      encoding: US-ASCII
-      string: ! "{\n  \"name\": \"Berlin\",\n  \"Status\": {\n    \"code\": 200,\n
-        \   \"request\": \"geocode\"\n  },\n  \"Placemark\": [ {\n    \"id\": \"p1\",\n
-        \   \"address\": \"Berlin, Germany\",\n    \"AddressDetails\": {\n   \"Accuracy\"
-        : 4,\n   \"Country\" : {\n      \"AdministrativeArea\" : {\n         \"AdministrativeAreaName\"
-        : \"Berlin\",\n         \"Locality\" : {\n            \"LocalityName\" : \"Berlin\"\n
-        \        }\n      },\n      \"CountryName\" : \"Deutschland\",\n      \"CountryNameCode\"
-        : \"DE\"\n   }\n},\n    \"ExtendedData\": {\n      \"LatLonBox\": {\n        \"north\":
-        52.7409729,\n        \"south\": 52.3064887,\n        \"east\": 13.9185276,\n
-        \       \"west\": 12.8940524\n      }\n    },\n    \"Point\": {\n      \"coordinates\":
-        [ 13.4062900, 52.5242680, 0 ]\n    }\n  } ]\n}\n"
+      encoding: ASCII-8BIT
+      string: !binary |-
+        ewogICAicmVzdWx0cyIgOiBbCiAgICAgIHsKICAgICAgICAgImFkZHJlc3Nf
+        Y29tcG9uZW50cyIgOiBbCiAgICAgICAgICAgIHsKICAgICAgICAgICAgICAg
+        ImxvbmdfbmFtZSIgOiAiNDAiLAogICAgICAgICAgICAgICAic2hvcnRfbmFt
+        ZSIgOiAiNDAiLAogICAgICAgICAgICAgICAidHlwZXMiIDogWyAic3RyZWV0
+        X251bWJlciIgXQogICAgICAgICAgICB9LAogICAgICAgICAgICB7CiAgICAg
+        ICAgICAgICAgICJsb25nX25hbWUiIDogIlJvc2VudGhhbGVyIFN0cmHDn2Ui
+        LAogICAgICAgICAgICAgICAic2hvcnRfbmFtZSIgOiAiUm9zZW50aGFsZXIg
+        U3RyYcOfZSIsCiAgICAgICAgICAgICAgICJ0eXBlcyIgOiBbICJyb3V0ZSIg
+        XQogICAgICAgICAgICB9LAogICAgICAgICAgICB7CiAgICAgICAgICAgICAg
+        ICJsb25nX25hbWUiIDogIk1pdHRlIiwKICAgICAgICAgICAgICAgInNob3J0
+        X25hbWUiIDogIk1pdHRlIiwKICAgICAgICAgICAgICAgInR5cGVzIiA6IFsg
+        InN1YmxvY2FsaXR5IiwgInBvbGl0aWNhbCIgXQogICAgICAgICAgICB9LAog
+        ICAgICAgICAgICB7CiAgICAgICAgICAgICAgICJsb25nX25hbWUiIDogIk1p
+        dHRlIiwKICAgICAgICAgICAgICAgInNob3J0X25hbWUiIDogIk1pdHRlIiwK
+        ICAgICAgICAgICAgICAgInR5cGVzIiA6IFsgInN1YmxvY2FsaXR5IiwgInBv
+        bGl0aWNhbCIgXQogICAgICAgICAgICB9LAogICAgICAgICAgICB7CiAgICAg
+        ICAgICAgICAgICJsb25nX25hbWUiIDogIkJlcmxpbiIsCiAgICAgICAgICAg
+        ICAgICJzaG9ydF9uYW1lIiA6ICJCZXJsaW4iLAogICAgICAgICAgICAgICAi
+        dHlwZXMiIDogWyAibG9jYWxpdHkiLCAicG9saXRpY2FsIiBdCiAgICAgICAg
+        ICAgIH0sCiAgICAgICAgICAgIHsKICAgICAgICAgICAgICAgImxvbmdfbmFt
+        ZSIgOiAiQmVybGluIiwKICAgICAgICAgICAgICAgInNob3J0X25hbWUiIDog
+        IkJlcmxpbiIsCiAgICAgICAgICAgICAgICJ0eXBlcyIgOiBbICJhZG1pbmlz
+        dHJhdGl2ZV9hcmVhX2xldmVsXzEiLCAicG9saXRpY2FsIiBdCiAgICAgICAg
+        ICAgIH0sCiAgICAgICAgICAgIHsKICAgICAgICAgICAgICAgImxvbmdfbmFt
+        ZSIgOiAiR2VybWFueSIsCiAgICAgICAgICAgICAgICJzaG9ydF9uYW1lIiA6
+        ICJERSIsCiAgICAgICAgICAgICAgICJ0eXBlcyIgOiBbICJjb3VudHJ5Iiwg
+        InBvbGl0aWNhbCIgXQogICAgICAgICAgICB9LAogICAgICAgICAgICB7CiAg
+        ICAgICAgICAgICAgICJsb25nX25hbWUiIDogIjEwMTc4IiwKICAgICAgICAg
+        ICAgICAgInNob3J0X25hbWUiIDogIjEwMTc4IiwKICAgICAgICAgICAgICAg
+        InR5cGVzIiA6IFsgInBvc3RhbF9jb2RlIiBdCiAgICAgICAgICAgIH0KICAg
+        ICAgICAgXSwKICAgICAgICAgImZvcm1hdHRlZF9hZGRyZXNzIiA6ICJSb3Nl
+        bnRoYWxlciBTdHJhw59lIDQwLCAxMDE3OCBCZXJsaW4sIEdlcm1hbnkiLAog
+        ICAgICAgICAiZ2VvbWV0cnkiIDogewogICAgICAgICAgICAibG9jYXRpb24i
+        IDogewogICAgICAgICAgICAgICAibGF0IiA6IDUyLjUyNDc4MCwKICAgICAg
+        ICAgICAgICAgImxuZyIgOiAxMy40MDE3MTAKICAgICAgICAgICAgfSwKICAg
+        ICAgICAgICAgImxvY2F0aW9uX3R5cGUiIDogIlJPT0ZUT1AiLAogICAgICAg
+        ICAgICAidmlld3BvcnQiIDogewogICAgICAgICAgICAgICAibm9ydGhlYXN0
+        IiA6IHsKICAgICAgICAgICAgICAgICAgImxhdCIgOiA1Mi41MjYxMjg5ODAy
+        OTE1MCwKICAgICAgICAgICAgICAgICAgImxuZyIgOiAxMy40MDMwNTg5ODAy
+        OTE1MAogICAgICAgICAgICAgICB9LAogICAgICAgICAgICAgICAic291dGh3
+        ZXN0IiA6IHsKICAgICAgICAgICAgICAgICAgImxhdCIgOiA1Mi41MjM0MzEw
+        MTk3MDg1MCwKICAgICAgICAgICAgICAgICAgImxuZyIgOiAxMy40MDAzNjEw
+        MTk3MDg1MAogICAgICAgICAgICAgICB9CiAgICAgICAgICAgIH0KICAgICAg
+        ICAgfSwKICAgICAgICAgInBhcnRpYWxfbWF0Y2giIDogdHJ1ZSwKICAgICAg
+        ICAgInR5cGVzIiA6IFsgInN0cmVldF9hZGRyZXNzIiBdCiAgICAgIH0KICAg
+        XSwKICAgInN0YXR1cyIgOiAiT0siCn0K
     http_version: 
-  recorded_at: Wed, 04 Apr 2012 15:11:44 GMT
-recorded_with: VCR 2.0.1
+  recorded_at: Mon, 01 Apr 2013 11:23:24 GMT
+recorded_with: VCR 2.4.0

data/test/geocoder_test.rb

@@ -9,14 +9,24 @@ end
 
 class GeocoderTest < Test::Unit::TestCase
   def test_geocoder
-    expected = [13.40629, 52.524268, 0]
+    expected = [13.4060912, 52.519171]
 
     SimpleGeocoder.cache.clear
     
-    VCR.use_cassette('geocoder') do
+    VCR.use_cassette('geocoder', :record => :new_episodes) do
       assert_equal(expected, SimpleGeocoder.geocode("Berlin"))
     end
 
+    # This is run outside the use_cassette block, because this request 
+    # must be cached.
     assert_equal(expected, SimpleGeocoder.geocode("Berlin"))
   end
+
+  def test_utf8
+    VCR.use_cassette "geocoder", :record => :new_episodes do
+      s = '10178 Berlin, Rosenthaler Straße 40/41'
+      expected = [13.40171, 52.52478]
+      assert_equal(expected, SimpleGeocoder.geocode(s))
+    end
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: simple_geocode
 version: !ruby/object:Gem::Version
-  version: 0.5.1
+  version: 0.6.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,22 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-04-09 00:00:00.000000000 Z
+date: 2013-04-01 00:00:00.000000000 Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  name: sqlite3
+  requirement: &70153237087800 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: *70153237087800
 - !ruby/object:Gem::Dependency
   name: simple_cache_rs
-  requirement: &70198443574400 !ruby/object:Gem::Requirement
+  requirement: &70153237086240 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +32,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70198443574400
+  version_requirements: *70153237086240
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &70198443591060 !ruby/object:Gem::Requirement
+  requirement: &70153237085500 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +43,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70198443591060
+  version_requirements: *70153237085500
 - !ruby/object:Gem::Dependency
   name: jeweler
-  requirement: &70198443590580 !ruby/object:Gem::Requirement
+  requirement: &70153237084580 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +54,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70198443590580
+  version_requirements: *70153237084580
 - !ruby/object:Gem::Dependency
   name: vcr
-  requirement: &70198443590100 !ruby/object:Gem::Requirement
+  requirement: &70153237083760 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +65,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70198443590100
+  version_requirements: *70153237083760
 - !ruby/object:Gem::Dependency
   name: webmock
-  requirement: &70198443589620 !ruby/object:Gem::Requirement
+  requirement: &70153237082900 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,10 +76,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70198443589620
+  version_requirements: *70153237082900
 - !ruby/object:Gem::Dependency
   name: psych
-  requirement: &70198443589140 !ruby/object:Gem::Requirement
+  requirement: &70153237082220 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,10 +87,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70198443589140
+  version_requirements: *70153237082220
 - !ruby/object:Gem::Dependency
   name: simplecov
-  requirement: &70198443588660 !ruby/object:Gem::Requirement
+  requirement: &70153237075140 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -87,10 +98,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70198443588660
+  version_requirements: *70153237075140
 - !ruby/object:Gem::Dependency
   name: ruby-debug19
-  requirement: &70198443588180 !ruby/object:Gem::Requirement
+  requirement: &70153237074340 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -98,7 +109,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70198443588180
+  version_requirements: *70153237074340
 description: Some basics that your application could benefit from.
 email: eno@open-lab.org
 executables: []
@@ -134,7 +145,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 1651131372381550161
+      hash: 958935403742451082
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: