RubyGems - geokit - Versions diffs - 1.8.2 → 1.8.3 - Mend

geokit 1.8.2 → 1.8.3

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (12) hide show

data/CHANGELOG.md +4 -0
data/README.markdown +8 -8
data/fixtures/vcr_cassettes/google_reverse_madrid_es.yml +463 -0
data/lib/geokit/geocoders.rb +25 -24
data/lib/geokit/geocoders/google.rb +10 -14
data/lib/geokit/multi_geocoder.rb +2 -2
data/lib/geokit/version.rb +1 -1
data/test/test_google_geocoder.rb +13 -2
data/test/test_multi_geocoder.rb +14 -14
data/test/test_multi_ip_geocoder.rb +5 -5
metadata +32 -5
checksums.yaml +0 -15

data/CHANGELOG.md CHANGED

@@ -1,3 +1,7 @@
+## 1.8.3
+* Fix MultiGeocoder with geocoders that only have one argument
 ## 1.8.2
 * Fix due to name clash with dependency definitions in geokit 1.8.1

data/README.markdown CHANGED

@@ -266,19 +266,19 @@ You must then also require such extenal file back in your main geokit configurat
   module Geokit
     module Geocoders
-    # Should be overriden as Geokit::Geocoders::external_key in your configuration file
-      @@external_key = 'REPLACE_WITH_YOUR_API_KEY'
-      __define_accessors
+      # and use :my to specify this geocoder in your list of geocoders.
+      class MyGeocoder < Geocoder
+        # Use via: Geokit::Geocoders::MyGeocoder.key = 'MY KEY'
+        config :key
-    # Replace name 'External' (below) with the name of your custom geocoder class
-    # and use :external to specify this geocoder in your list of geocoders.
-      class ExternalGeocoder < Geocoder
         private
         def self.do_geocode(address, options = {})
           # Main geocoding method
-      end
+        end
-        def self.parse_http_resp(body) # :nodoc:
+        def self.parse_json(json)
           # Helper method to parse http response. See geokit/geocoders.rb.
         end
       end

data/fixtures/vcr_cassettes/google_reverse_madrid_es.yml ADDED

@@ -0,0 +1,463 @@
+---
+http_interactions:
+- request:
+    method: get
+    uri: http://maps.google.com/maps/api/geocode/json?language=es&latlng=40.416,-3.703&sensor=false
+    body:
+      encoding: US-ASCII
+      string: ''
+    headers:
+      Accept:
+      - ! '*/*'
+      User-Agent:
+      - Ruby
+  response:
+    status:
+      code: 200
+      message: !binary |-
+        T0s=
+    headers:
+      !binary "Q29udGVudC1UeXBl":
+      - !binary |-
+        YXBwbGljYXRpb24vanNvbjsgY2hhcnNldD1VVEYtOA==
+      !binary "RGF0ZQ==":
+      - !binary |-
+        RnJpLCAyNyBEZWMgMjAxMyAxMToyNDoyMyBHTVQ=
+      !binary "RXhwaXJlcw==":
+      - !binary |-
+        U2F0LCAyOCBEZWMgMjAxMyAxMToyNDoyMyBHTVQ=
+      !binary "Q2FjaGUtQ29udHJvbA==":
+      - !binary |-
+        cHVibGljLCBtYXgtYWdlPTg2NDAw
+      !binary "QWNjZXNzLUNvbnRyb2wtQWxsb3ctT3JpZ2lu":
+      - !binary |-
+        Kg==
+      !binary "U2VydmVy":
+      - !binary |-
+        bWFmZQ==
+      !binary "WC1Yc3MtUHJvdGVjdGlvbg==":
+      - !binary |-
+        MTsgbW9kZT1ibG9jaw==
+      !binary "WC1GcmFtZS1PcHRpb25z":
+      - !binary |-
+        U0FNRU9SSUdJTg==
+      !binary "VHJhbnNmZXItRW5jb2Rpbmc=":
+      - !binary |-
+        Y2h1bmtlZA==
+    body:
+      encoding: ASCII-8BIT
+      string: !binary |-
+        ewogICAicmVzdWx0cyIgOiBbCiAgICAgIHsKICAgICAgICAgImFkZHJlc3Nf
+        Y29tcG9uZW50cyIgOiBbCiAgICAgICAgICAgIHsKICAgICAgICAgICAgICAg
+        ImxvbmdfbmFtZSIgOiAiMTUiLAogICAgICAgICAgICAgICAic2hvcnRfbmFt
+        ZSIgOiAiMTUiLAogICAgICAgICAgICAgICAidHlwZXMiIDogWyAic3RyZWV0
+        X251bWJlciIgXQogICAgICAgICAgICB9LAogICAgICAgICAgICB7CiAgICAg
+        ICAgICAgICAgICJsb25nX25hbWUiIDogIkMvIENhcnJldGFzIiwKICAgICAg
+        ICAgICAgICAgInNob3J0X25hbWUiIDogIkMvIENhcnJldGFzIiwKICAgICAg
+        ICAgICAgICAgInR5cGVzIiA6IFsgInJvdXRlIiBdCiAgICAgICAgICAgIH0s
+        CiAgICAgICAgICAgIHsKICAgICAgICAgICAgICAgImxvbmdfbmFtZSIgOiAi
+        TWFkcmlkIiwKICAgICAgICAgICAgICAgInNob3J0X25hbWUiIDogIk1hZHJp
+        ZCIsCiAgICAgICAgICAgICAgICJ0eXBlcyIgOiBbICJsb2NhbGl0eSIsICJw
+        b2xpdGljYWwiIF0KICAgICAgICAgICAgfSwKICAgICAgICAgICAgewogICAg
+        ICAgICAgICAgICAibG9uZ19uYW1lIiA6ICJNYWRyaWQiLAogICAgICAgICAg
+        ICAgICAic2hvcnRfbmFtZSIgOiAiTSIsCiAgICAgICAgICAgICAgICJ0eXBl
+        cyIgOiBbICJhZG1pbmlzdHJhdGl2ZV9hcmVhX2xldmVsXzIiLCAicG9saXRp
+        Y2FsIiBdCiAgICAgICAgICAgIH0sCiAgICAgICAgICAgIHsKICAgICAgICAg
+        ICAgICAgImxvbmdfbmFtZSIgOiAiQ29tdW5pZGFkIGRlIE1hZHJpZCIsCiAg
+        ICAgICAgICAgICAgICJzaG9ydF9uYW1lIiA6ICJDb211bmlkYWQgZGUgTWFk
+        cmlkIiwKICAgICAgICAgICAgICAgInR5cGVzIiA6IFsgImFkbWluaXN0cmF0
+        aXZlX2FyZWFfbGV2ZWxfMSIsICJwb2xpdGljYWwiIF0KICAgICAgICAgICAg
+        fSwKICAgICAgICAgICAgewogICAgICAgICAgICAgICAibG9uZ19uYW1lIiA6
+        ICJFc3Bhw7FhIiwKICAgICAgICAgICAgICAgInNob3J0X25hbWUiIDogIkVT
+        IiwKICAgICAgICAgICAgICAgInR5cGVzIiA6IFsgImNvdW50cnkiLCAicG9s
+        aXRpY2FsIiBdCiAgICAgICAgICAgIH0sCiAgICAgICAgICAgIHsKICAgICAg
+        ICAgICAgICAgImxvbmdfbmFtZSIgOiAiMjgwMTIiLAogICAgICAgICAgICAg
+        ICAic2hvcnRfbmFtZSIgOiAiMjgwMTIiLAogICAgICAgICAgICAgICAidHlw
+        ZXMiIDogWyAicG9zdGFsX2NvZGUiIF0KICAgICAgICAgICAgfQogICAgICAg
+        ICBdLAogICAgICAgICAiZm9ybWF0dGVkX2FkZHJlc3MiIDogIkMvIENhcnJl
+        dGFzLCAxNSwgMjgwMTIgTWFkcmlkLCBFc3Bhw7FhIiwKICAgICAgICAgImdl
+        b21ldHJ5IiA6IHsKICAgICAgICAgICAgImxvY2F0aW9uIiA6IHsKICAgICAg
+        ICAgICAgICAgImxhdCIgOiA0MC40MTU5Njc4LAogICAgICAgICAgICAgICAi
+        bG5nIiA6IC0zLjcwMzEyMTUKICAgICAgICAgICAgfSwKICAgICAgICAgICAg
+        ImxvY2F0aW9uX3R5cGUiIDogIlJPT0ZUT1AiLAogICAgICAgICAgICAidmll
+        d3BvcnQiIDogewogICAgICAgICAgICAgICAibm9ydGhlYXN0IiA6IHsKICAg
+        ICAgICAgICAgICAgICAgImxhdCIgOiA0MC40MTczMTY3ODAyOTE0OSwKICAg
+        ICAgICAgICAgICAgICAgImxuZyIgOiAtMy43MDE3NzI1MTk3MDg0OTgKICAg
+        ICAgICAgICAgICAgfSwKICAgICAgICAgICAgICAgInNvdXRod2VzdCIgOiB7
+        CiAgICAgICAgICAgICAgICAgICJsYXQiIDogNDAuNDE0NjE4ODE5NzA4NDks
+        CiAgICAgICAgICAgICAgICAgICJsbmciIDogLTMuNzA0NDcwNDgwMjkxNTAy
+        CiAgICAgICAgICAgICAgIH0KICAgICAgICAgICAgfQogICAgICAgICB9LAog
+        ICAgICAgICAidHlwZXMiIDogWyAic3RyZWV0X2FkZHJlc3MiIF0KICAgICAg
+        fSwKICAgICAgewogICAgICAgICAiYWRkcmVzc19jb21wb25lbnRzIiA6IFsK
+        ICAgICAgICAgICAgewogICAgICAgICAgICAgICAibG9uZ19uYW1lIiA6ICJD
+        YXJyZXRhcyAtIFB1ZXJ0YSBkZWwgU29sIiwKICAgICAgICAgICAgICAgInNo
+        b3J0X25hbWUiIDogIkNhcnJldGFzIC0gUHVlcnRhIGRlbCBTb2wiLAogICAg
+        ICAgICAgICAgICAidHlwZXMiIDogWyAiYnVzX3N0YXRpb24iLCAidHJhbnNp
+        dF9zdGF0aW9uIiwgImVzdGFibGlzaG1lbnQiIF0KICAgICAgICAgICAgfSwK
+        ICAgICAgICAgICAgewogICAgICAgICAgICAgICAibG9uZ19uYW1lIiA6ICJN
+        YWRyaWQiLAogICAgICAgICAgICAgICAic2hvcnRfbmFtZSIgOiAiTWFkcmlk
+        IiwKICAgICAgICAgICAgICAgInR5cGVzIiA6IFsgImxvY2FsaXR5IiwgInBv
+        bGl0aWNhbCIgXQogICAgICAgICAgICB9LAogICAgICAgICAgICB7CiAgICAg
+        ICAgICAgICAgICJsb25nX25hbWUiIDogIk1hZHJpZCIsCiAgICAgICAgICAg
+        ICAgICJzaG9ydF9uYW1lIiA6ICJNIiwKICAgICAgICAgICAgICAgInR5cGVz
+        IiA6IFsgImFkbWluaXN0cmF0aXZlX2FyZWFfbGV2ZWxfMiIsICJwb2xpdGlj
+        YWwiIF0KICAgICAgICAgICAgfSwKICAgICAgICAgICAgewogICAgICAgICAg
+        ICAgICAibG9uZ19uYW1lIiA6ICJDb211bmlkYWQgZGUgTWFkcmlkIiwKICAg
+        ICAgICAgICAgICAgInNob3J0X25hbWUiIDogIkNvbXVuaWRhZCBkZSBNYWRy
+        aWQiLAogICAgICAgICAgICAgICAidHlwZXMiIDogWyAiYWRtaW5pc3RyYXRp
+        dmVfYXJlYV9sZXZlbF8xIiwgInBvbGl0aWNhbCIgXQogICAgICAgICAgICB9
+        LAogICAgICAgICAgICB7CiAgICAgICAgICAgICAgICJsb25nX25hbWUiIDog
+        IkVzcGHDsWEiLAogICAgICAgICAgICAgICAic2hvcnRfbmFtZSIgOiAiRVMi
+        LAogICAgICAgICAgICAgICAidHlwZXMiIDogWyAiY291bnRyeSIsICJwb2xp
+        dGljYWwiIF0KICAgICAgICAgICAgfSwKICAgICAgICAgICAgewogICAgICAg
+        ICAgICAgICAibG9uZ19uYW1lIiA6ICIyODAxMiIsCiAgICAgICAgICAgICAg
+        ICJzaG9ydF9uYW1lIiA6ICIyODAxMiIsCiAgICAgICAgICAgICAgICJ0eXBl
+        cyIgOiBbICJwb3N0YWxfY29kZSIgXQogICAgICAgICAgICB9CiAgICAgICAg
+        IF0sCiAgICAgICAgICJmb3JtYXR0ZWRfYWRkcmVzcyIgOiAiQ2FycmV0YXMg
+        LSBQdWVydGEgZGVsIFNvbCwgMjgwMTIgTWFkcmlkLCBFc3Bhw7FhIiwKICAg
+        ICAgICAgImdlb21ldHJ5IiA6IHsKICAgICAgICAgICAgImxvY2F0aW9uIiA6
+        IHsKICAgICAgICAgICAgICAgImxhdCIgOiA0MC40MTY0NiwKICAgICAgICAg
+        ICAgICAgImxuZyIgOiAtMy43MDMzOAogICAgICAgICAgICB9LAogICAgICAg
+        ICAgICAibG9jYXRpb25fdHlwZSIgOiAiQVBQUk9YSU1BVEUiLAogICAgICAg
+        ICAgICAidmlld3BvcnQiIDogewogICAgICAgICAgICAgICAibm9ydGhlYXN0
+        IiA6IHsKICAgICAgICAgICAgICAgICAgImxhdCIgOiA0MC40MTc4MDg5ODAy
+        OTE1LAogICAgICAgICAgICAgICAgICAibG5nIiA6IC0zLjcwMjAzMTAxOTcw
+        ODQ5NwogICAgICAgICAgICAgICB9LAogICAgICAgICAgICAgICAic291dGh3
+        ZXN0IiA6IHsKICAgICAgICAgICAgICAgICAgImxhdCIgOiA0MC40MTUxMTEw
+        MTk3MDg1LAogICAgICAgICAgICAgICAgICAibG5nIiA6IC0zLjcwNDcyODk4
+        MDI5MTUwMgogICAgICAgICAgICAgICB9CiAgICAgICAgICAgIH0KICAgICAg
+        ICAgfSwKICAgICAgICAgInR5cGVzIiA6IFsgImJ1c19zdGF0aW9uIiwgInRy
+        YW5zaXRfc3RhdGlvbiIsICJlc3RhYmxpc2htZW50IiBdCiAgICAgIH0sCiAg
+        ICAgIHsKICAgICAgICAgImFkZHJlc3NfY29tcG9uZW50cyIgOiBbCiAgICAg
+        ICAgICAgIHsKICAgICAgICAgICAgICAgImxvbmdfbmFtZSIgOiAiU29sIiwK
+        ICAgICAgICAgICAgICAgInNob3J0X25hbWUiIDogIlNvbCIsCiAgICAgICAg
+        ICAgICAgICJ0eXBlcyIgOiBbICJuZWlnaGJvcmhvb2QiLCAicG9saXRpY2Fs
+        IiBdCiAgICAgICAgICAgIH0sCiAgICAgICAgICAgIHsKICAgICAgICAgICAg
+        ICAgImxvbmdfbmFtZSIgOiAiTWFkcmlkIiwKICAgICAgICAgICAgICAgInNo
+        b3J0X25hbWUiIDogIk1hZHJpZCIsCiAgICAgICAgICAgICAgICJ0eXBlcyIg
+        OiBbICJsb2NhbGl0eSIsICJwb2xpdGljYWwiIF0KICAgICAgICAgICAgfSwK
+        ICAgICAgICAgICAgewogICAgICAgICAgICAgICAibG9uZ19uYW1lIiA6ICJN
+        YWRyaWQiLAogICAgICAgICAgICAgICAic2hvcnRfbmFtZSIgOiAiTWFkcmlk
+        IiwKICAgICAgICAgICAgICAgInR5cGVzIiA6IFsgInBvbGl0aWNhbCIgXQog
+        ICAgICAgICAgICB9LAogICAgICAgICAgICB7CiAgICAgICAgICAgICAgICJs
+        b25nX25hbWUiIDogIk1hZHJpZCIsCiAgICAgICAgICAgICAgICJzaG9ydF9u
+        YW1lIiA6ICJNIiwKICAgICAgICAgICAgICAgInR5cGVzIiA6IFsgImFkbWlu
+        aXN0cmF0aXZlX2FyZWFfbGV2ZWxfMiIsICJwb2xpdGljYWwiIF0KICAgICAg
+        ICAgICAgfSwKICAgICAgICAgICAgewogICAgICAgICAgICAgICAibG9uZ19u
+        YW1lIiA6ICJDb211bmlkYWQgZGUgTWFkcmlkIiwKICAgICAgICAgICAgICAg
+        InNob3J0X25hbWUiIDogIkNvbXVuaWRhZCBkZSBNYWRyaWQiLAogICAgICAg
+        ICAgICAgICAidHlwZXMiIDogWyAiYWRtaW5pc3RyYXRpdmVfYXJlYV9sZXZl
+        bF8xIiwgInBvbGl0aWNhbCIgXQogICAgICAgICAgICB9LAogICAgICAgICAg
+        ICB7CiAgICAgICAgICAgICAgICJsb25nX25hbWUiIDogIkVzcGHDsWEiLAog
+        ICAgICAgICAgICAgICAic2hvcnRfbmFtZSIgOiAiRVMiLAogICAgICAgICAg
+        ICAgICAidHlwZXMiIDogWyAiY291bnRyeSIsICJwb2xpdGljYWwiIF0KICAg
+        ICAgICAgICAgfQogICAgICAgICBdLAogICAgICAgICAiZm9ybWF0dGVkX2Fk
+        ZHJlc3MiIDogIlNvbCwgTWFkcmlkLCBFc3Bhw7FhIiwKICAgICAgICAgImdl
+        b21ldHJ5IiA6IHsKICAgICAgICAgICAgImJvdW5kcyIgOiB7CiAgICAgICAg
+        ICAgICAgICJub3J0aGVhc3QiIDogewogICAgICAgICAgICAgICAgICAibGF0
+        IiA6IDQwLjQyMDMyNDksCiAgICAgICAgICAgICAgICAgICJsbmciIDogLTMu
+        Njk5MzA3CiAgICAgICAgICAgICAgIH0sCiAgICAgICAgICAgICAgICJzb3V0
+        aHdlc3QiIDogewogICAgICAgICAgICAgICAgICAibGF0IiA6IDQwLjQxMzU0
+        MjAwMDAwMDAxLAogICAgICAgICAgICAgICAgICAibG5nIiA6IC0zLjcwODY5
+        MDEKICAgICAgICAgICAgICAgfQogICAgICAgICAgICB9LAogICAgICAgICAg
+        ICAibG9jYXRpb24iIDogewogICAgICAgICAgICAgICAibGF0IiA6IDQwLjQx
+        NjY2MzUsCiAgICAgICAgICAgICAgICJsbmciIDogLTMuNzA0MTY4NwogICAg
+        ICAgICAgICB9LAogICAgICAgICAgICAibG9jYXRpb25fdHlwZSIgOiAiQVBQ
+        Uk9YSU1BVEUiLAogICAgICAgICAgICAidmlld3BvcnQiIDogewogICAgICAg
+        ICAgICAgICAibm9ydGhlYXN0IiA6IHsKICAgICAgICAgICAgICAgICAgImxh
+        dCIgOiA0MC40MjAzMjQ5LAogICAgICAgICAgICAgICAgICAibG5nIiA6IC0z
+        LjY5OTMwNwogICAgICAgICAgICAgICB9LAogICAgICAgICAgICAgICAic291
+        dGh3ZXN0IiA6IHsKICAgICAgICAgICAgICAgICAgImxhdCIgOiA0MC40MTM1
+        NDIwMDAwMDAwMSwKICAgICAgICAgICAgICAgICAgImxuZyIgOiAtMy43MDg2
+        OTAxCiAgICAgICAgICAgICAgIH0KICAgICAgICAgICAgfQogICAgICAgICB9
+        LAogICAgICAgICAidHlwZXMiIDogWyAibmVpZ2hib3Job29kIiwgInBvbGl0
+        aWNhbCIgXQogICAgICB9LAogICAgICB7CiAgICAgICAgICJhZGRyZXNzX2Nv
+        bXBvbmVudHMiIDogWwogICAgICAgICAgICB7CiAgICAgICAgICAgICAgICJs
+        b25nX25hbWUiIDogIjI4MDEyIiwKICAgICAgICAgICAgICAgInNob3J0X25h
+        bWUiIDogIjI4MDEyIiwKICAgICAgICAgICAgICAgInR5cGVzIiA6IFsgInBv
+        c3RhbF9jb2RlIiBdCiAgICAgICAgICAgIH0sCiAgICAgICAgICAgIHsKICAg
+        ICAgICAgICAgICAgImxvbmdfbmFtZSIgOiAiTWFkcmlkIiwKICAgICAgICAg
+        ICAgICAgInNob3J0X25hbWUiIDogIk1hZHJpZCIsCiAgICAgICAgICAgICAg
+        ICJ0eXBlcyIgOiBbICJsb2NhbGl0eSIsICJwb2xpdGljYWwiIF0KICAgICAg
+        ICAgICAgfSwKICAgICAgICAgICAgewogICAgICAgICAgICAgICAibG9uZ19u
+        YW1lIiA6ICJNYWRyaWQiLAogICAgICAgICAgICAgICAic2hvcnRfbmFtZSIg
+        OiAiTSIsCiAgICAgICAgICAgICAgICJ0eXBlcyIgOiBbICJhZG1pbmlzdHJh
+        dGl2ZV9hcmVhX2xldmVsXzIiLCAicG9saXRpY2FsIiBdCiAgICAgICAgICAg
+        IH0sCiAgICAgICAgICAgIHsKICAgICAgICAgICAgICAgImxvbmdfbmFtZSIg
+        OiAiQ29tdW5pZGFkIGRlIE1hZHJpZCIsCiAgICAgICAgICAgICAgICJzaG9y
+        dF9uYW1lIiA6ICJDb211bmlkYWQgZGUgTWFkcmlkIiwKICAgICAgICAgICAg
+        ICAgInR5cGVzIiA6IFsgImFkbWluaXN0cmF0aXZlX2FyZWFfbGV2ZWxfMSIs
+        ICJwb2xpdGljYWwiIF0KICAgICAgICAgICAgfSwKICAgICAgICAgICAgewog
+        ICAgICAgICAgICAgICAibG9uZ19uYW1lIiA6ICJFc3Bhw7FhIiwKICAgICAg
+        ICAgICAgICAgInNob3J0X25hbWUiIDogIkVTIiwKICAgICAgICAgICAgICAg
+        InR5cGVzIiA6IFsgImNvdW50cnkiLCAicG9saXRpY2FsIiBdCiAgICAgICAg
+        ICAgIH0KICAgICAgICAgXSwKICAgICAgICAgImZvcm1hdHRlZF9hZGRyZXNz
+        IiA6ICIyODAxMiBNYWRyaWQsIEVzcGHDsWEiLAogICAgICAgICAiZ2VvbWV0
+        cnkiIDogewogICAgICAgICAgICAiYm91bmRzIiA6IHsKICAgICAgICAgICAg
+        ICAgIm5vcnRoZWFzdCIgOiB7CiAgICAgICAgICAgICAgICAgICJsYXQiIDog
+        NDAuNDE2Njk3NCwKICAgICAgICAgICAgICAgICAgImxuZyIgOiAtMy42OTEz
+        MTAzCiAgICAgICAgICAgICAgIH0sCiAgICAgICAgICAgICAgICJzb3V0aHdl
+        c3QiIDogewogICAgICAgICAgICAgICAgICAibGF0IiA6IDQwLjQwMTI3NTcs
+        CiAgICAgICAgICAgICAgICAgICJsbmciIDogLTMuNzA4Njc5Nzk5OTk5OTk5
+        CiAgICAgICAgICAgICAgIH0KICAgICAgICAgICAgfSwKICAgICAgICAgICAg
+        ImxvY2F0aW9uIiA6IHsKICAgICAgICAgICAgICAgImxhdCIgOiA0MC40MDkx
+        MTA2LAogICAgICAgICAgICAgICAibG5nIiA6IC0zLjcwMTYzMTY5OTk5OTk5
+        OQogICAgICAgICAgICB9LAogICAgICAgICAgICAibG9jYXRpb25fdHlwZSIg
+        OiAiQVBQUk9YSU1BVEUiLAogICAgICAgICAgICAidmlld3BvcnQiIDogewog
+        ICAgICAgICAgICAgICAibm9ydGhlYXN0IiA6IHsKICAgICAgICAgICAgICAg
+        ICAgImxhdCIgOiA0MC40MTY2OTc0LAogICAgICAgICAgICAgICAgICAibG5n
+        IiA6IC0zLjY5MTMxMDMKICAgICAgICAgICAgICAgfSwKICAgICAgICAgICAg
+        ICAgInNvdXRod2VzdCIgOiB7CiAgICAgICAgICAgICAgICAgICJsYXQiIDog
+        NDAuNDAxMjc1NywKICAgICAgICAgICAgICAgICAgImxuZyIgOiAtMy43MDg2
+        Nzk3OTk5OTk5OTkKICAgICAgICAgICAgICAgfQogICAgICAgICAgICB9CiAg
+        ICAgICAgIH0sCiAgICAgICAgICJ0eXBlcyIgOiBbICJwb3N0YWxfY29kZSIg
+        XQogICAgICB9LAogICAgICB7CiAgICAgICAgICJhZGRyZXNzX2NvbXBvbmVu
+        dHMiIDogWwogICAgICAgICAgICB7CiAgICAgICAgICAgICAgICJsb25nX25h
+        bWUiIDogIkNlbnRybyIsCiAgICAgICAgICAgICAgICJzaG9ydF9uYW1lIiA6
+        ICJDZW50cm8iLAogICAgICAgICAgICAgICAidHlwZXMiIDogWyAic3VibG9j
+        YWxpdHkiLCAicG9saXRpY2FsIiBdCiAgICAgICAgICAgIH0sCiAgICAgICAg
+        ICAgIHsKICAgICAgICAgICAgICAgImxvbmdfbmFtZSIgOiAiTWFkcmlkIiwK
+        ICAgICAgICAgICAgICAgInNob3J0X25hbWUiIDogIk1hZHJpZCIsCiAgICAg
+        ICAgICAgICAgICJ0eXBlcyIgOiBbICJsb2NhbGl0eSIsICJwb2xpdGljYWwi
+        IF0KICAgICAgICAgICAgfSwKICAgICAgICAgICAgewogICAgICAgICAgICAg
+        ICAibG9uZ19uYW1lIiA6ICJNYWRyaWQiLAogICAgICAgICAgICAgICAic2hv
+        cnRfbmFtZSIgOiAiTWFkcmlkIiwKICAgICAgICAgICAgICAgInR5cGVzIiA6
+        IFsgInBvbGl0aWNhbCIgXQogICAgICAgICAgICB9LAogICAgICAgICAgICB7
+        CiAgICAgICAgICAgICAgICJsb25nX25hbWUiIDogIk1hZHJpZCIsCiAgICAg
+        ICAgICAgICAgICJzaG9ydF9uYW1lIiA6ICJNIiwKICAgICAgICAgICAgICAg
+        InR5cGVzIiA6IFsgImFkbWluaXN0cmF0aXZlX2FyZWFfbGV2ZWxfMiIsICJw
+        b2xpdGljYWwiIF0KICAgICAgICAgICAgfSwKICAgICAgICAgICAgewogICAg
+        ICAgICAgICAgICAibG9uZ19uYW1lIiA6ICJDb211bmlkYWQgZGUgTWFkcmlk
+        IiwKICAgICAgICAgICAgICAgInNob3J0X25hbWUiIDogIkNvbXVuaWRhZCBk
+        ZSBNYWRyaWQiLAogICAgICAgICAgICAgICAidHlwZXMiIDogWyAiYWRtaW5p
+        c3RyYXRpdmVfYXJlYV9sZXZlbF8xIiwgInBvbGl0aWNhbCIgXQogICAgICAg
+        ICAgICB9LAogICAgICAgICAgICB7CiAgICAgICAgICAgICAgICJsb25nX25h
+        bWUiIDogIkVzcGHDsWEiLAogICAgICAgICAgICAgICAic2hvcnRfbmFtZSIg
+        OiAiRVMiLAogICAgICAgICAgICAgICAidHlwZXMiIDogWyAiY291bnRyeSIs
+        ICJwb2xpdGljYWwiIF0KICAgICAgICAgICAgfQogICAgICAgICBdLAogICAg
+        ICAgICAiZm9ybWF0dGVkX2FkZHJlc3MiIDogIkNlbnRybywgTWFkcmlkLCBF
+        c3Bhw7FhIiwKICAgICAgICAgImdlb21ldHJ5IiA6IHsKICAgICAgICAgICAg
+        ImJvdW5kcyIgOiB7CiAgICAgICAgICAgICAgICJub3J0aGVhc3QiIDogewog
+        ICAgICAgICAgICAgICAgICAibGF0IiA6IDQwLjQzMDYxNiwKICAgICAgICAg
+        ICAgICAgICAgImxuZyIgOiAtMy42OTAyODkKICAgICAgICAgICAgICAgfSwK
+        ICAgICAgICAgICAgICAgInNvdXRod2VzdCIgOiB7CiAgICAgICAgICAgICAg
+        ICAgICJsYXQiIDogNDAuNDA1MDQxLAogICAgICAgICAgICAgICAgICAibG5n
+        IiA6IC0zLjcyMjg3OAogICAgICAgICAgICAgICB9CiAgICAgICAgICAgIH0s
+        CiAgICAgICAgICAgICJsb2NhdGlvbiIgOiB7CiAgICAgICAgICAgICAgICJs
+        YXQiIDogNDAuNDExNTE2NSwKICAgICAgICAgICAgICAgImxuZyIgOiAtMy43
+        MDc2NDQ1CiAgICAgICAgICAgIH0sCiAgICAgICAgICAgICJsb2NhdGlvbl90
+        eXBlIiA6ICJBUFBST1hJTUFURSIsCiAgICAgICAgICAgICJ2aWV3cG9ydCIg
+        OiB7CiAgICAgICAgICAgICAgICJub3J0aGVhc3QiIDogewogICAgICAgICAg
+        ICAgICAgICAibGF0IiA6IDQwLjQzMDYxNiwKICAgICAgICAgICAgICAgICAg
+        ImxuZyIgOiAtMy42OTAyODkKICAgICAgICAgICAgICAgfSwKICAgICAgICAg
+        ICAgICAgInNvdXRod2VzdCIgOiB7CiAgICAgICAgICAgICAgICAgICJsYXQi
+        IDogNDAuNDA1MDQxLAogICAgICAgICAgICAgICAgICAibG5nIiA6IC0zLjcy
+        Mjg3OAogICAgICAgICAgICAgICB9CiAgICAgICAgICAgIH0KICAgICAgICAg
+        fSwKICAgICAgICAgInR5cGVzIiA6IFsgInN1YmxvY2FsaXR5IiwgInBvbGl0
+        aWNhbCIgXQogICAgICB9LAogICAgICB7CiAgICAgICAgICJhZGRyZXNzX2Nv
+        bXBvbmVudHMiIDogWwogICAgICAgICAgICB7CiAgICAgICAgICAgICAgICJs
+        b25nX25hbWUiIDogIk1hZHJpZCIsCiAgICAgICAgICAgICAgICJzaG9ydF9u
+        YW1lIiA6ICJNYWRyaWQiLAogICAgICAgICAgICAgICAidHlwZXMiIDogWyAi
+        bG9jYWxpdHkiLCAicG9saXRpY2FsIiBdCiAgICAgICAgICAgIH0sCiAgICAg
+        ICAgICAgIHsKICAgICAgICAgICAgICAgImxvbmdfbmFtZSIgOiAiTWFkcmlk
+        IiwKICAgICAgICAgICAgICAgInNob3J0X25hbWUiIDogIk1hZHJpZCIsCiAg
+        ICAgICAgICAgICAgICJ0eXBlcyIgOiBbICJwb2xpdGljYWwiIF0KICAgICAg
+        ICAgICAgfSwKICAgICAgICAgICAgewogICAgICAgICAgICAgICAibG9uZ19u
+        YW1lIiA6ICJNYWRyaWQiLAogICAgICAgICAgICAgICAic2hvcnRfbmFtZSIg
+        OiAiTSIsCiAgICAgICAgICAgICAgICJ0eXBlcyIgOiBbICJhZG1pbmlzdHJh
+        dGl2ZV9hcmVhX2xldmVsXzIiLCAicG9saXRpY2FsIiBdCiAgICAgICAgICAg
+        IH0sCiAgICAgICAgICAgIHsKICAgICAgICAgICAgICAgImxvbmdfbmFtZSIg
+        OiAiQ29tdW5pZGFkIGRlIE1hZHJpZCIsCiAgICAgICAgICAgICAgICJzaG9y
+        dF9uYW1lIiA6ICJDb211bmlkYWQgZGUgTWFkcmlkIiwKICAgICAgICAgICAg
+        ICAgInR5cGVzIiA6IFsgImFkbWluaXN0cmF0aXZlX2FyZWFfbGV2ZWxfMSIs
+        ICJwb2xpdGljYWwiIF0KICAgICAgICAgICAgfSwKICAgICAgICAgICAgewog
+        ICAgICAgICAgICAgICAibG9uZ19uYW1lIiA6ICJFc3Bhw7FhIiwKICAgICAg
+        ICAgICAgICAgInNob3J0X25hbWUiIDogIkVTIiwKICAgICAgICAgICAgICAg
+        InR5cGVzIiA6IFsgImNvdW50cnkiLCAicG9saXRpY2FsIiBdCiAgICAgICAg
+        ICAgIH0KICAgICAgICAgXSwKICAgICAgICAgImZvcm1hdHRlZF9hZGRyZXNz
+        IiA6ICJNYWRyaWQsIEVzcGHDsWEiLAogICAgICAgICAiZ2VvbWV0cnkiIDog
+        ewogICAgICAgICAgICAiYm91bmRzIiA6IHsKICAgICAgICAgICAgICAgIm5v
+        cnRoZWFzdCIgOiB7CiAgICAgICAgICAgICAgICAgICJsYXQiIDogNDAuNTYz
+        NTkwMywKICAgICAgICAgICAgICAgICAgImxuZyIgOiAtMy41MjQ5MTE2CiAg
+        ICAgICAgICAgICAgIH0sCiAgICAgICAgICAgICAgICJzb3V0aHdlc3QiIDog
+        ewogICAgICAgICAgICAgICAgICAibGF0IiA6IDQwLjMxMjA2MzksCiAgICAg
+        ICAgICAgICAgICAgICJsbmciIDogLTMuODM0MTYxOAogICAgICAgICAgICAg
+        ICB9CiAgICAgICAgICAgIH0sCiAgICAgICAgICAgICJsb2NhdGlvbiIgOiB7
+        CiAgICAgICAgICAgICAgICJsYXQiIDogNDAuNDE2Nzc1NCwKICAgICAgICAg
+        ICAgICAgImxuZyIgOiAtMy43MDM3OTAyCiAgICAgICAgICAgIH0sCiAgICAg
+        ICAgICAgICJsb2NhdGlvbl90eXBlIiA6ICJBUFBST1hJTUFURSIsCiAgICAg
+        ICAgICAgICJ2aWV3cG9ydCIgOiB7CiAgICAgICAgICAgICAgICJub3J0aGVh
+        c3QiIDogewogICAgICAgICAgICAgICAgICAibGF0IiA6IDQwLjU2MzU5MDMs
+        CiAgICAgICAgICAgICAgICAgICJsbmciIDogLTMuNTI0OTExNgogICAgICAg
+        ICAgICAgICB9LAogICAgICAgICAgICAgICAic291dGh3ZXN0IiA6IHsKICAg
+        ICAgICAgICAgICAgICAgImxhdCIgOiA0MC4zMTIwNjM5LAogICAgICAgICAg
+        ICAgICAgICAibG5nIiA6IC0zLjgzNDE2MTgKICAgICAgICAgICAgICAgfQog
+        ICAgICAgICAgICB9CiAgICAgICAgIH0sCiAgICAgICAgICJ0eXBlcyIgOiBb
+        ICJsb2NhbGl0eSIsICJwb2xpdGljYWwiIF0KICAgICAgfSwKICAgICAgewog
+        ICAgICAgICAiYWRkcmVzc19jb21wb25lbnRzIiA6IFsKICAgICAgICAgICAg
+        ewogICAgICAgICAgICAgICAibG9uZ19uYW1lIiA6ICJNYWRyaWQiLAogICAg
+        ICAgICAgICAgICAic2hvcnRfbmFtZSIgOiAiTWFkcmlkIiwKICAgICAgICAg
+        ICAgICAgInR5cGVzIiA6IFsgInBvbGl0aWNhbCIgXQogICAgICAgICAgICB9
+        LAogICAgICAgICAgICB7CiAgICAgICAgICAgICAgICJsb25nX25hbWUiIDog
+        Ik1hZHJpZCIsCiAgICAgICAgICAgICAgICJzaG9ydF9uYW1lIiA6ICJNIiwK
+        ICAgICAgICAgICAgICAgInR5cGVzIiA6IFsgImFkbWluaXN0cmF0aXZlX2Fy
+        ZWFfbGV2ZWxfMiIsICJwb2xpdGljYWwiIF0KICAgICAgICAgICAgfSwKICAg
+        ICAgICAgICAgewogICAgICAgICAgICAgICAibG9uZ19uYW1lIiA6ICJDb211
+        bmlkYWQgZGUgTWFkcmlkIiwKICAgICAgICAgICAgICAgInNob3J0X25hbWUi
+        IDogIkNvbXVuaWRhZCBkZSBNYWRyaWQiLAogICAgICAgICAgICAgICAidHlw
+        ZXMiIDogWyAiYWRtaW5pc3RyYXRpdmVfYXJlYV9sZXZlbF8xIiwgInBvbGl0
+        aWNhbCIgXQogICAgICAgICAgICB9LAogICAgICAgICAgICB7CiAgICAgICAg
+        ICAgICAgICJsb25nX25hbWUiIDogIkVzcGHDsWEiLAogICAgICAgICAgICAg
+        ICAic2hvcnRfbmFtZSIgOiAiRVMiLAogICAgICAgICAgICAgICAidHlwZXMi
+        IDogWyAiY291bnRyeSIsICJwb2xpdGljYWwiIF0KICAgICAgICAgICAgfQog
+        ICAgICAgICBdLAogICAgICAgICAiZm9ybWF0dGVkX2FkZHJlc3MiIDogIk1h
+        ZHJpZCwgRXNwYcOxYSIsCiAgICAgICAgICJnZW9tZXRyeSIgOiB7CiAgICAg
+        ICAgICAgICJib3VuZHMiIDogewogICAgICAgICAgICAgICAibm9ydGhlYXN0
+        IiA6IHsKICAgICAgICAgICAgICAgICAgImxhdCIgOiA0MC42NDMzMzI2OTk5
+        OTk5OSwKICAgICAgICAgICAgICAgICAgImxuZyIgOiAtMy41MTgyMzQ5CiAg
+        ICAgICAgICAgICAgIH0sCiAgICAgICAgICAgICAgICJzb3V0aHdlc3QiIDog
+        ewogICAgICAgICAgICAgICAgICAibGF0IiA6IDQwLjMxMjA2MzksCiAgICAg
+        ICAgICAgICAgICAgICJsbmciIDogLTMuODg4OTU2NgogICAgICAgICAgICAg
+        ICB9CiAgICAgICAgICAgIH0sCiAgICAgICAgICAgICJsb2NhdGlvbiIgOiB7
+        CiAgICAgICAgICAgICAgICJsYXQiIDogNDAuNDE1NzU2OSwKICAgICAgICAg
+        ICAgICAgImxuZyIgOiAtMy43MDM3MjE0OTk5OTk5OTkKICAgICAgICAgICAg
+        fSwKICAgICAgICAgICAgImxvY2F0aW9uX3R5cGUiIDogIkFQUFJPWElNQVRF
+        IiwKICAgICAgICAgICAgInZpZXdwb3J0IiA6IHsKICAgICAgICAgICAgICAg
+        Im5vcnRoZWFzdCIgOiB7CiAgICAgICAgICAgICAgICAgICJsYXQiIDogNDAu
+        NjQzMzMyNjk5OTk5OTksCiAgICAgICAgICAgICAgICAgICJsbmciIDogLTMu
+        NTE4MjM0OQogICAgICAgICAgICAgICB9LAogICAgICAgICAgICAgICAic291
+        dGh3ZXN0IiA6IHsKICAgICAgICAgICAgICAgICAgImxhdCIgOiA0MC4zMTIw
+        NjM5LAogICAgICAgICAgICAgICAgICAibG5nIiA6IC0zLjg4ODk1NjYKICAg
+        ICAgICAgICAgICAgfQogICAgICAgICAgICB9CiAgICAgICAgIH0sCiAgICAg
+        ICAgICJ0eXBlcyIgOiBbICJwb2xpdGljYWwiIF0KICAgICAgfSwKICAgICAg
+        ewogICAgICAgICAiYWRkcmVzc19jb21wb25lbnRzIiA6IFsKICAgICAgICAg
+        ICAgewogICAgICAgICAgICAgICAibG9uZ19uYW1lIiA6ICLDgXJlYSBNZXRy
+        b3BvbGl0YWxpdGFuYSB5IENvcnJlZG9yIGRlbCBIZW5hcmVzIiwKICAgICAg
+        ICAgICAgICAgInNob3J0X25hbWUiIDogIsOBcmVhIE1ldHJvcG9saXRhbGl0
+        YW5hIHkgQ29ycmVkb3IgZGVsIEhlbmFyZXMiLAogICAgICAgICAgICAgICAi
+        dHlwZXMiIDogWyAiYWRtaW5pc3RyYXRpdmVfYXJlYV9sZXZlbF8zIiwgInBv
+        bGl0aWNhbCIgXQogICAgICAgICAgICB9LAogICAgICAgICAgICB7CiAgICAg
+        ICAgICAgICAgICJsb25nX25hbWUiIDogIk1hZHJpZCIsCiAgICAgICAgICAg
+        ICAgICJzaG9ydF9uYW1lIiA6ICJNIiwKICAgICAgICAgICAgICAgInR5cGVz
+        IiA6IFsgImFkbWluaXN0cmF0aXZlX2FyZWFfbGV2ZWxfMiIsICJwb2xpdGlj
+        YWwiIF0KICAgICAgICAgICAgfSwKICAgICAgICAgICAgewogICAgICAgICAg
+        ICAgICAibG9uZ19uYW1lIiA6ICJDb211bmlkYWQgZGUgTWFkcmlkIiwKICAg
+        ICAgICAgICAgICAgInNob3J0X25hbWUiIDogIkNvbXVuaWRhZCBkZSBNYWRy
+        aWQiLAogICAgICAgICAgICAgICAidHlwZXMiIDogWyAiYWRtaW5pc3RyYXRp
+        dmVfYXJlYV9sZXZlbF8xIiwgInBvbGl0aWNhbCIgXQogICAgICAgICAgICB9
+        LAogICAgICAgICAgICB7CiAgICAgICAgICAgICAgICJsb25nX25hbWUiIDog
+        IkVzcGHDsWEiLAogICAgICAgICAgICAgICAic2hvcnRfbmFtZSIgOiAiRVMi
+        LAogICAgICAgICAgICAgICAidHlwZXMiIDogWyAiY291bnRyeSIsICJwb2xp
+        dGljYWwiIF0KICAgICAgICAgICAgfQogICAgICAgICBdLAogICAgICAgICAi
+        Zm9ybWF0dGVkX2FkZHJlc3MiIDogIsOBcmVhIE1ldHJvcG9saXRhbGl0YW5h
+        IHkgQ29ycmVkb3IgZGVsIEhlbmFyZXMsIE1hZHJpZCwgRXNwYcOxYSIsCiAg
+        ICAgICAgICJnZW9tZXRyeSIgOiB7CiAgICAgICAgICAgICJib3VuZHMiIDog
+        ewogICAgICAgICAgICAgICAibm9ydGhlYXN0IiA6IHsKICAgICAgICAgICAg
+        ICAgICAgImxhdCIgOiA0MC42NDUzODc1LAogICAgICAgICAgICAgICAgICAi
+        bG5nIiA6IC0zLjI4Mzg5NzkKICAgICAgICAgICAgICAgfSwKICAgICAgICAg
+        ICAgICAgInNvdXRod2VzdCIgOiB7CiAgICAgICAgICAgICAgICAgICJsYXQi
+        IDogNDAuMTk4OTI2OSwKICAgICAgICAgICAgICAgICAgImxuZyIgOiAtNC4w
+        MDY0NTM4OTk5OTk5OTkKICAgICAgICAgICAgICAgfQogICAgICAgICAgICB9
+        LAogICAgICAgICAgICAibG9jYXRpb24iIDogewogICAgICAgICAgICAgICAi
+        bGF0IiA6IDQwLjQ5NTU0OTMsCiAgICAgICAgICAgICAgICJsbmciIDogLTMu
+        NjYyMzIzOQogICAgICAgICAgICB9LAogICAgICAgICAgICAibG9jYXRpb25f
+        dHlwZSIgOiAiQVBQUk9YSU1BVEUiLAogICAgICAgICAgICAidmlld3BvcnQi
+        IDogewogICAgICAgICAgICAgICAibm9ydGhlYXN0IiA6IHsKICAgICAgICAg
+        ICAgICAgICAgImxhdCIgOiA0MC42NDUzODc1LAogICAgICAgICAgICAgICAg
+        ICAibG5nIiA6IC0zLjI4Mzg5NzkKICAgICAgICAgICAgICAgfSwKICAgICAg
+        ICAgICAgICAgInNvdXRod2VzdCIgOiB7CiAgICAgICAgICAgICAgICAgICJs
+        YXQiIDogNDAuMTk4OTI2OSwKICAgICAgICAgICAgICAgICAgImxuZyIgOiAt
+        NC4wMDY0NTM4OTk5OTk5OTkKICAgICAgICAgICAgICAgfQogICAgICAgICAg
+        ICB9CiAgICAgICAgIH0sCiAgICAgICAgICJ0eXBlcyIgOiBbICJhZG1pbmlz
+        dHJhdGl2ZV9hcmVhX2xldmVsXzMiLCAicG9saXRpY2FsIiBdCiAgICAgIH0s
+        CiAgICAgIHsKICAgICAgICAgImFkZHJlc3NfY29tcG9uZW50cyIgOiBbCiAg
+        ICAgICAgICAgIHsKICAgICAgICAgICAgICAgImxvbmdfbmFtZSIgOiAiTWFk
+        cmlkIiwKICAgICAgICAgICAgICAgInNob3J0X25hbWUiIDogIk0iLAogICAg
+        ICAgICAgICAgICAidHlwZXMiIDogWyAiYWRtaW5pc3RyYXRpdmVfYXJlYV9s
+        ZXZlbF8yIiwgInBvbGl0aWNhbCIgXQogICAgICAgICAgICB9LAogICAgICAg
+        ICAgICB7CiAgICAgICAgICAgICAgICJsb25nX25hbWUiIDogIkNvbXVuaWRh
+        ZCBkZSBNYWRyaWQiLAogICAgICAgICAgICAgICAic2hvcnRfbmFtZSIgOiAi
+        Q29tdW5pZGFkIGRlIE1hZHJpZCIsCiAgICAgICAgICAgICAgICJ0eXBlcyIg
+        OiBbICJhZG1pbmlzdHJhdGl2ZV9hcmVhX2xldmVsXzEiLCAicG9saXRpY2Fs
+        IiBdCiAgICAgICAgICAgIH0sCiAgICAgICAgICAgIHsKICAgICAgICAgICAg
+        ICAgImxvbmdfbmFtZSIgOiAiRXNwYcOxYSIsCiAgICAgICAgICAgICAgICJz
+        aG9ydF9uYW1lIiA6ICJFUyIsCiAgICAgICAgICAgICAgICJ0eXBlcyIgOiBb
+        ICJjb3VudHJ5IiwgInBvbGl0aWNhbCIgXQogICAgICAgICAgICB9CiAgICAg
+        ICAgIF0sCiAgICAgICAgICJmb3JtYXR0ZWRfYWRkcmVzcyIgOiAiTWFkcmlk
+        LCBFc3Bhw7FhIiwKICAgICAgICAgImdlb21ldHJ5IiA6IHsKICAgICAgICAg
+        ICAgImJvdW5kcyIgOiB7CiAgICAgICAgICAgICAgICJub3J0aGVhc3QiIDog
+        ewogICAgICAgICAgICAgICAgICAibGF0IiA6IDQxLjE2NTg0NDcwMDAwMDAx
+        LAogICAgICAgICAgICAgICAgICAibG5nIiA6IC0zLjA1Mjk4MzMKICAgICAg
+        ICAgICAgICAgfSwKICAgICAgICAgICAgICAgInNvdXRod2VzdCIgOiB7CiAg
+        ICAgICAgICAgICAgICAgICJsYXQiIDogMzkuODg0NzE5NSwKICAgICAgICAg
+        ICAgICAgICAgImxuZyIgOiAtNC41NzkwNzYxCiAgICAgICAgICAgICAgIH0K
+        ICAgICAgICAgICAgfSwKICAgICAgICAgICAgImxvY2F0aW9uIiA6IHsKICAg
+        ICAgICAgICAgICAgImxhdCIgOiA0MC40MTYyODgzLAogICAgICAgICAgICAg
+        ICAibG5nIiA6IC0zLjcwMzM3MjUKICAgICAgICAgICAgfSwKICAgICAgICAg
+        ICAgImxvY2F0aW9uX3R5cGUiIDogIkFQUFJPWElNQVRFIiwKICAgICAgICAg
+        ICAgInZpZXdwb3J0IiA6IHsKICAgICAgICAgICAgICAgIm5vcnRoZWFzdCIg
+        OiB7CiAgICAgICAgICAgICAgICAgICJsYXQiIDogNDEuMTY1ODQ0NzAwMDAw
+        MDEsCiAgICAgICAgICAgICAgICAgICJsbmciIDogLTMuMDUyOTgzMwogICAg
+        ICAgICAgICAgICB9LAogICAgICAgICAgICAgICAic291dGh3ZXN0IiA6IHsK
+        ICAgICAgICAgICAgICAgICAgImxhdCIgOiAzOS44ODQ3MTk1LAogICAgICAg
+        ICAgICAgICAgICAibG5nIiA6IC00LjU3OTA3NjEKICAgICAgICAgICAgICAg
+        fQogICAgICAgICAgICB9CiAgICAgICAgIH0sCiAgICAgICAgICJ0eXBlcyIg
+        OiBbICJhZG1pbmlzdHJhdGl2ZV9hcmVhX2xldmVsXzIiLCAicG9saXRpY2Fs
+        IiBdCiAgICAgIH0sCiAgICAgIHsKICAgICAgICAgImFkZHJlc3NfY29tcG9u
+        ZW50cyIgOiBbCiAgICAgICAgICAgIHsKICAgICAgICAgICAgICAgImxvbmdf
+        bmFtZSIgOiAiQ29tdW5pZGFkIGRlIE1hZHJpZCIsCiAgICAgICAgICAgICAg
+        ICJzaG9ydF9uYW1lIiA6ICJDb211bmlkYWQgZGUgTWFkcmlkIiwKICAgICAg
+        ICAgICAgICAgInR5cGVzIiA6IFsgImFkbWluaXN0cmF0aXZlX2FyZWFfbGV2
+        ZWxfMSIsICJwb2xpdGljYWwiIF0KICAgICAgICAgICAgfSwKICAgICAgICAg
+        ICAgewogICAgICAgICAgICAgICAibG9uZ19uYW1lIiA6ICJFc3Bhw7FhIiwK
+        ICAgICAgICAgICAgICAgInNob3J0X25hbWUiIDogIkVTIiwKICAgICAgICAg
+        ICAgICAgInR5cGVzIiA6IFsgImNvdW50cnkiLCAicG9saXRpY2FsIiBdCiAg
+        ICAgICAgICAgIH0KICAgICAgICAgXSwKICAgICAgICAgImZvcm1hdHRlZF9h
+        ZGRyZXNzIiA6ICJDb211bmlkYWQgZGUgTWFkcmlkLCBFc3Bhw7FhIiwKICAg
+        ICAgICAgImdlb21ldHJ5IiA6IHsKICAgICAgICAgICAgImJvdW5kcyIgOiB7
+        CiAgICAgICAgICAgICAgICJub3J0aGVhc3QiIDogewogICAgICAgICAgICAg
+        ICAgICAibGF0IiA6IDQxLjE2NTg0NDcwMDAwMDAxLAogICAgICAgICAgICAg
+        ICAgICAibG5nIiA6IC0zLjA1Mjk4MzMKICAgICAgICAgICAgICAgfSwKICAg
+        ICAgICAgICAgICAgInNvdXRod2VzdCIgOiB7CiAgICAgICAgICAgICAgICAg
+        ICJsYXQiIDogMzkuODg0NzE5NSwKICAgICAgICAgICAgICAgICAgImxuZyIg
+        OiAtNC41NzkwNzYxCiAgICAgICAgICAgICAgIH0KICAgICAgICAgICAgfSwK
+        ICAgICAgICAgICAgImxvY2F0aW9uIiA6IHsKICAgICAgICAgICAgICAgImxh
+        dCIgOiA0MC40MTY3NTE1LAogICAgICAgICAgICAgICAibG5nIiA6IC0zLjcw
+        MzgzMjIKICAgICAgICAgICAgfSwKICAgICAgICAgICAgImxvY2F0aW9uX3R5
+        cGUiIDogIkFQUFJPWElNQVRFIiwKICAgICAgICAgICAgInZpZXdwb3J0IiA6
+        IHsKICAgICAgICAgICAgICAgIm5vcnRoZWFzdCIgOiB7CiAgICAgICAgICAg
+        ICAgICAgICJsYXQiIDogNDEuMTY1ODQ0NzAwMDAwMDEsCiAgICAgICAgICAg
+        ICAgICAgICJsbmciIDogLTMuMDUyOTgzMwogICAgICAgICAgICAgICB9LAog
+        ICAgICAgICAgICAgICAic291dGh3ZXN0IiA6IHsKICAgICAgICAgICAgICAg
+        ICAgImxhdCIgOiAzOS44ODQ3MTk1LAogICAgICAgICAgICAgICAgICAibG5n
+        IiA6IC00LjU3OTA3NjEKICAgICAgICAgICAgICAgfQogICAgICAgICAgICB9
+        CiAgICAgICAgIH0sCiAgICAgICAgICJ0eXBlcyIgOiBbICJhZG1pbmlzdHJh
+        dGl2ZV9hcmVhX2xldmVsXzEiLCAicG9saXRpY2FsIiBdCiAgICAgIH0sCiAg
+        ICAgIHsKICAgICAgICAgImFkZHJlc3NfY29tcG9uZW50cyIgOiBbCiAgICAg
+        ICAgICAgIHsKICAgICAgICAgICAgICAgImxvbmdfbmFtZSIgOiAiRXNwYcOx
+        YSIsCiAgICAgICAgICAgICAgICJzaG9ydF9uYW1lIiA6ICJFUyIsCiAgICAg
+        ICAgICAgICAgICJ0eXBlcyIgOiBbICJjb3VudHJ5IiwgInBvbGl0aWNhbCIg
+        XQogICAgICAgICAgICB9CiAgICAgICAgIF0sCiAgICAgICAgICJmb3JtYXR0
+        ZWRfYWRkcmVzcyIgOiAiRXNwYcOxYSIsCiAgICAgICAgICJnZW9tZXRyeSIg
+        OiB7CiAgICAgICAgICAgICJib3VuZHMiIDogewogICAgICAgICAgICAgICAi
+        bm9ydGhlYXN0IiA6IHsKICAgICAgICAgICAgICAgICAgImxhdCIgOiA0My43
+        OTIzNzk1LAogICAgICAgICAgICAgICAgICAibG5nIiA6IDQuMzI3NzgzOTk5
+        OTk5OTk5CiAgICAgICAgICAgICAgIH0sCiAgICAgICAgICAgICAgICJzb3V0
+        aHdlc3QiIDogewogICAgICAgICAgICAgICAgICAibGF0IiA6IDI3LjYzNzc4
+        OTQsCiAgICAgICAgICAgICAgICAgICJsbmciIDogLTE4LjE2MDc4ODEKICAg
+        ICAgICAgICAgICAgfQogICAgICAgICAgICB9LAogICAgICAgICAgICAibG9j
+        YXRpb24iIDogewogICAgICAgICAgICAgICAibGF0IiA6IDQwLjQ2MzY2NzAw
+        MDAwMDAxLAogICAgICAgICAgICAgICAibG5nIiA6IC0zLjc0OTIyCiAgICAg
+        ICAgICAgIH0sCiAgICAgICAgICAgICJsb2NhdGlvbl90eXBlIiA6ICJBUFBS
+        T1hJTUFURSIsCiAgICAgICAgICAgICJ2aWV3cG9ydCIgOiB7CiAgICAgICAg
+        ICAgICAgICJub3J0aGVhc3QiIDogewogICAgICAgICAgICAgICAgICAibGF0
+        IiA6IDQ1LjI0NCwKICAgICAgICAgICAgICAgICAgImxuZyIgOiA1LjA5OAog
+        ICAgICAgICAgICAgICB9LAogICAgICAgICAgICAgICAic291dGh3ZXN0IiA6
+        IHsKICAgICAgICAgICAgICAgICAgImxhdCIgOiAzNS4xNzMwMDAwMDAwMDAw
+        MSwKICAgICAgICAgICAgICAgICAgImxuZyIgOiAtMTIuNTI0CiAgICAgICAg
+        ICAgICAgIH0KICAgICAgICAgICAgfQogICAgICAgICB9LAogICAgICAgICAi
+        dHlwZXMiIDogWyAiY291bnRyeSIsICJwb2xpdGljYWwiIF0KICAgICAgfQog
+        ICBdLAogICAic3RhdHVzIiA6ICJPSyIKfQo=
+    http_version:
+  recorded_at: Fri, 27 Dec 2013 11:24:21 GMT
+recorded_with: VCR 2.8.0

data/lib/geokit/geocoders.rb CHANGED

@@ -76,19 +76,6 @@ module Geokit
     # The Geocoder base class which defines the interface to be used by all
     # other geocoders.
     class Geocoder
-      def self.config(*attrs)
-        attrs.each do |attr|
-          class_eval <<-METHOD
-            @@#{attr} = nil
-            def self.#{attr}=(value)
-              @@#{attr} = value
-            end
-            def self.#{attr}
-              @@#{attr}
-            end
-          METHOD
-        end
-      end
       # Main method which calls the do_geocode template method which subclasses
       # are responsible for implementing.  Returns a populated GeoLoc or an
       # empty one with a failed success code.
@@ -104,9 +91,31 @@ module Geokit
       # Main method which calls the do_reverse_geocode template method which subclasses
       # are responsible for implementing.  Returns a populated GeoLoc or an
       # empty one with a failed success code.
-      def self.reverse_geocode(latlng)
-        logger.debug "#{provider_name} geocoding. latlng: #{latlng}"
-        do_reverse_geocode(latlng) || GeoLoc.new
+      def self.reverse_geocode(latlng, *args)
+        logger.debug "#{provider_name} geocoding. latlng: #{latlng}, args #{args}"
+        do_reverse_geocode(latlng, *args) || GeoLoc.new
+      end
+      protected
+      def self.logger
+        Geokit::Geocoders::logger
+      end
+      private
+      def self.config(*attrs)
+        attrs.each do |attr|
+          class_eval <<-METHOD
+            @@#{attr} = nil
+            def self.#{attr}=(value)
+              @@#{attr} = value
+            end
+            def self.#{attr}
+              @@#{attr}
+            end
+          METHOD
+        end
       end
       def self.new_loc
@@ -130,14 +139,6 @@ module Geokit
         GeoLoc.new
       end
-      protected
-      def self.logger
-        Geokit::Geocoders::logger
-      end
-      private
       # Wraps the geocoder call around a proxy if necessary.
       def self.do_get(url)
         uri = URI.parse(url)

data/lib/geokit/geocoders/google.rb CHANGED

@@ -4,18 +4,16 @@ module Geokit
       config :client_id, :cryptographic_key, :channel
       private
-      # Template method which does the reverse-geocode lookup.
-      def self.do_reverse_geocode(latlng)
+      # ==== OPTIONS
+      # * :language - See: https://developers.google.com/maps/documentation/geocoding
+      def self.do_reverse_geocode(latlng, options = {})
         latlng=LatLng.normalize(latlng)
-        url = submit_url("/maps/api/geocode/json?sensor=false&latlng=#{Geokit::Inflector::url_escape(latlng.ll)}")
+        url = submit_url("latlng=#{Geokit::Inflector::url_escape(latlng.ll)}", options)
         process :json, url
       end
-      # Template method which does the geocode lookup.
-      #
-      # Supports viewport/country code biasing
-      #
       # ==== OPTIONS
+      # * :language - See: https://developers.google.com/maps/documentation/geocoding
       # * :bias - This option makes the Google Geocoder return results biased to a particular
       #           country or viewport. Country code biasing is achieved by passing the ccTLD
       #           ('uk' for .co.uk, for example) as a :bias value. For a list of ccTLD's,
@@ -38,13 +36,9 @@ module Geokit
       # Geokit::Geocoders::GoogleGeocoder.geocode('Winnetka', :bias => bounds).state # => 'CA'
       def self.do_geocode(address, options = {})
         bias_str = options[:bias] ? construct_bias_string_from_options(options[:bias]) : ''
-        language_str = options[:language] ? "&language=#{options[:language]}" : ''
         address_str = address.is_a?(GeoLoc) ? address.to_geocodeable_s : address
-        url = submit_url("/maps/api/geocode/json?sensor=false&address=#{Geokit::Inflector::url_escape(address_str)}#{bias_str}#{language_str}")
-        res = call_geocoder_service(url)
-        return GeoLoc.new if !res.is_a?(Net::HTTPSuccess)
-        parse :json, res.body
+        url = submit_url("address=#{Geokit::Inflector::url_escape(address_str)}#{bias_str}", options)
+        process :json, url
       end
       # This code comes from Googles Examples
@@ -61,7 +55,9 @@ module Geokit
       end
-      def self.submit_url(query_string)
+      def self.submit_url(query_string, options = {})
+        language_str = options[:language] ? "&language=#{options[:language]}" : ''
+        query_string = "/maps/api/geocode/json?sensor=false&#{query_string}#{language_str}"
         if client_id && cryptographic_key
           channel_string = channel ? "&channel=#{channel}" : ''
           urlToSign = query_string + "&client=#{client_id}" + channel_string

data/lib/geokit/multi_geocoder.rb CHANGED

@@ -22,14 +22,14 @@ module Geokit
       #
       # The failover approach is crucial for production-grade apps, but is rarely used.
       # 98% of your geocoding calls will be successful with the first call
-      def self.do_geocode(address, options = {})
+      def self.do_geocode(address, *args)
         geocode_ip = /^(\d{1,3}\.\d{1,3}\.\d{1,3}\.\d{1,3})$/.match(address)
         provider_order = geocode_ip ? Geokit::Geocoders::ip_provider_order : Geokit::Geocoders::provider_order
         provider_order.each do |provider|
           klass = geocoder(provider)
           begin
-            res = klass.send :geocode, address, options
+            res = klass.send :geocode, address, *args
             return res if res.success?
           rescue => e
             logger.error("An error has occurred during geocoding: #{e}\nAddress: #{address}. Provider: #{provider}")

data/lib/geokit/version.rb CHANGED

@@ -1,3 +1,3 @@
 module Geokit
-  VERSION = '1.8.2'
+  VERSION = '1.8.3'
 end

data/test/test_google_geocoder.rb CHANGED

@@ -30,10 +30,10 @@ class GoogleGeocoderTest < BaseGeocoderTest #:nodoc: all
   def test_google_signature_and_url
     Geokit::Geocoders::GoogleGeocoder.client_id = 'clientID'
     Geokit::Geocoders::GoogleGeocoder.cryptographic_key = 'vNIXE0xscrmjlyV-12Nj_BvUPaw='
-    url = Geokit::Geocoders::GoogleGeocoder.send(:submit_url, '/maps/api/geocode/json?address=New+York&sensor=false')
+    url = Geokit::Geocoders::GoogleGeocoder.send(:submit_url, 'address=New+York')
     Geokit::Geocoders::GoogleGeocoder.client_id = nil
     Geokit::Geocoders::GoogleGeocoder.cryptographic_key = nil
-    assert_equal 'http://maps.googleapis.com/maps/api/geocode/json?address=New+York&sensor=false&client=clientID&signature=KrU1TzVQM7Ur0i8i7K3huiw3MsA=', url
+    assert_equal 'http://maps.googleapis.com/maps/api/geocode/json?sensor=false&address=New+York&client=clientID&signature=9mevp7SoVsSKzF9nj-vApMYbatg=', url
   end
   def test_google_full_address
@@ -189,6 +189,17 @@ class GoogleGeocoderTest < BaseGeocoderTest #:nodoc: all
      end
    end
+   def test_reverse_geocode_language
+     VCR.use_cassette('google_reverse_madrid_es') do
+     url = "http://maps.google.com/maps/api/geocode/json?sensor=false&latlng=40.416%2C-3.703&language=es"
+     TestHelper.expects(:last_url).with(url)
+     language_result = Geokit::Geocoders::GoogleGeocoder.reverse_geocode('40.416,-3.703', :language => 'es')
+     assert_equal 'ES', language_result.country_code
+     assert_equal 'Madrid', language_result.city
+     end
+   end
    def test_country_code_biasing
      VCR.use_cassette('google_country_code_biased_result') do
      url = "http://maps.google.com/maps/api/geocode/json?sensor=false&address=Syracuse&region=it"

data/test/test_multi_geocoder.rb CHANGED

@@ -1,6 +1,6 @@
 require File.join(File.dirname(__FILE__), 'helper')
-Geokit::Geocoders::provider_order=[:google,:yahoo,:us]
+Geokit::Geocoders::provider_order=[:google, :bing, :us]
 class MultiGeocoderTest < BaseGeocoderTest #:nodoc: all
@@ -10,27 +10,27 @@ class MultiGeocoderTest < BaseGeocoderTest #:nodoc: all
   end
   def test_successful_first
-    Geokit::Geocoders::GoogleGeocoder.expects(:geocode).with(@address, {}).returns(@success)
+    Geokit::Geocoders::GoogleGeocoder.expects(:geocode).with(@address).returns(@success)
     assert_equal @success, Geokit::Geocoders::MultiGeocoder.geocode(@address)
   end
   def test_failover
-    Geokit::Geocoders::GoogleGeocoder.expects(:geocode).with(@address, {}).returns(@failure)
-    Geokit::Geocoders::YahooGeocoder.expects(:geocode).with(@address, {}).returns(@success)
+    Geokit::Geocoders::GoogleGeocoder.expects(:geocode).with(@address).returns(@failure)
+    Geokit::Geocoders::BingGeocoder.expects(:geocode).with(@address).returns(@success)
     assert_equal @success, Geokit::Geocoders::MultiGeocoder.geocode(@address)
   end
   def test_double_failover
-    Geokit::Geocoders::GoogleGeocoder.expects(:geocode).with(@address, {}).returns(@failure)
-    Geokit::Geocoders::YahooGeocoder.expects(:geocode).with(@address, {}).returns(@failure)
-    Geokit::Geocoders::UsGeocoder.expects(:geocode).with(@address, {}).returns(@success)
+    Geokit::Geocoders::GoogleGeocoder.expects(:geocode).with(@address).returns(@failure)
+    Geokit::Geocoders::BingGeocoder.expects(:geocode).with(@address).returns(@failure)
+    Geokit::Geocoders::UsGeocoder.expects(:geocode).with(@address).returns(@success)
     assert_equal @success, Geokit::Geocoders::MultiGeocoder.geocode(@address)
   end
   def test_failure
-    Geokit::Geocoders::GoogleGeocoder.expects(:geocode).with(@address, {}).returns(@failure)
-    Geokit::Geocoders::YahooGeocoder.expects(:geocode).with(@address, {}).returns(@failure)
-    Geokit::Geocoders::UsGeocoder.expects(:geocode).with(@address, {}).returns(@failure)
+    Geokit::Geocoders::GoogleGeocoder.expects(:geocode).with(@address).returns(@failure)
+    Geokit::Geocoders::BingGeocoder.expects(:geocode).with(@address).returns(@failure)
+    Geokit::Geocoders::UsGeocoder.expects(:geocode).with(@address).returns(@failure)
     assert_equal @failure, Geokit::Geocoders::MultiGeocoder.geocode(@address)
   end
@@ -45,7 +45,7 @@ class MultiGeocoderTest < BaseGeocoderTest #:nodoc: all
     t1, t2 = Geokit::Geocoders.provider_order, Geokit::Geocoders.ip_provider_order # will need to reset after
     Geokit::Geocoders.provider_order = [:google]
     Geokit::Geocoders.ip_provider_order = [:geo_plugin]
-    Geokit::Geocoders::GoogleGeocoder.expects(:geocode).with("", {}).returns(@failure)
+    Geokit::Geocoders::GoogleGeocoder.expects(:geocode).with("").returns(@failure)
     Geokit::Geocoders::GeoPluginGeocoder.expects(:geocode).never
     assert_equal @failure, Geokit::Geocoders::MultiGeocoder.geocode("")
     Geokit::Geocoders.provider_order, Geokit::Geocoders.ip_provider_order = t1, t2 # reset to orig values
@@ -58,20 +58,20 @@ class MultiGeocoderTest < BaseGeocoderTest #:nodoc: all
   def test_reverse_geocode_failover
     Geokit::Geocoders::GoogleGeocoder.expects(:reverse_geocode).with(@latlng).returns(@failure)
-    Geokit::Geocoders::YahooGeocoder.expects(:reverse_geocode).with(@latlng).returns(@success)
+    Geokit::Geocoders::BingGeocoder.expects(:reverse_geocode).with(@latlng).returns(@success)
     assert_equal @success, Geokit::Geocoders::MultiGeocoder.reverse_geocode(@latlng)
   end
   def test_reverse_geocode_double_failover
     Geokit::Geocoders::GoogleGeocoder.expects(:reverse_geocode).with(@latlng).returns(@failure)
-    Geokit::Geocoders::YahooGeocoder.expects(:reverse_geocode).with(@latlng).returns(@failure)
+    Geokit::Geocoders::BingGeocoder.expects(:reverse_geocode).with(@latlng).returns(@failure)
     Geokit::Geocoders::UsGeocoder.expects(:reverse_geocode).with(@latlng).returns(@success)
     assert_equal @success, Geokit::Geocoders::MultiGeocoder.reverse_geocode(@latlng)
   end
   def test_reverse_geocode_failure
     Geokit::Geocoders::GoogleGeocoder.expects(:reverse_geocode).with(@latlng).returns(@failure)
-    Geokit::Geocoders::YahooGeocoder.expects(:reverse_geocode).with(@latlng).returns(@failure)
+    Geokit::Geocoders::BingGeocoder.expects(:reverse_geocode).with(@latlng).returns(@failure)
     Geokit::Geocoders::UsGeocoder.expects(:reverse_geocode).with(@latlng).returns(@failure)
     assert_equal @failure, Geokit::Geocoders::MultiGeocoder.reverse_geocode(@latlng)
   end

data/test/test_multi_ip_geocoder.rb CHANGED

@@ -12,19 +12,19 @@ class MultiIpGeocoderTest < BaseGeocoderTest #:nodoc: all
   end
   def test_successful_first
-    Geokit::Geocoders::GeoPluginGeocoder.expects(:geocode).with(@ip_address, {}).returns(@success)
+    Geokit::Geocoders::GeoPluginGeocoder.expects(:geocode).with(@ip_address).returns(@success)
     assert_equal @success, Geokit::Geocoders::MultiGeocoder.geocode(@ip_address)
   end
   def test_failover
-    Geokit::Geocoders::GeoPluginGeocoder.expects(:geocode).with(@ip_address, {}).returns(@failure)
-    Geokit::Geocoders::IpGeocoder.expects(:geocode).with(@ip_address, {}).returns(@success)
+    Geokit::Geocoders::GeoPluginGeocoder.expects(:geocode).with(@ip_address).returns(@failure)
+    Geokit::Geocoders::IpGeocoder.expects(:geocode).with(@ip_address).returns(@success)
     assert_equal @success, Geokit::Geocoders::MultiGeocoder.geocode(@ip_address)
   end
   def test_failure
-    Geokit::Geocoders::GeoPluginGeocoder.expects(:geocode).with(@ip_address, {}).returns(@failure)
-    Geokit::Geocoders::IpGeocoder.expects(:geocode).with(@ip_address, {}).returns(@failure)
+    Geokit::Geocoders::GeoPluginGeocoder.expects(:geocode).with(@ip_address).returns(@failure)
+    Geokit::Geocoders::IpGeocoder.expects(:geocode).with(@ip_address).returns(@failure)
     assert_equal @failure, Geokit::Geocoders::MultiGeocoder.geocode(@ip_address)
   end

metadata CHANGED

@@ -1,7 +1,8 @@
 --- !ruby/object:Gem::Specification
 name: geokit
 version: !ruby/object:Gem::Version
-  version: 1.8.2
+  version: 1.8.3
+  prerelease:
 platform: ruby
 authors:
 - Michael Noack
@@ -11,11 +12,12 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2013-12-26 00:00:00.000000000 Z
+date: 2013-12-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: multi_json
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -23,6 +25,7 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -30,6 +33,7 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>'
       - !ruby/object:Gem::Version
@@ -37,6 +41,7 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>'
       - !ruby/object:Gem::Version
@@ -44,6 +49,7 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: simplecov
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -51,6 +57,7 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -58,6 +65,7 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: simplecov-rcov
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -65,6 +73,7 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -72,6 +81,7 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -79,6 +89,7 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -86,6 +97,7 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: mocha
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -93,6 +105,7 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -100,6 +113,7 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: coveralls
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -107,6 +121,7 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -114,6 +129,7 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: vcr
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -121,6 +137,7 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -128,6 +145,7 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: webmock
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -135,6 +153,7 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -169,6 +188,7 @@ files:
 - fixtures/vcr_cassettes/google_language_response_fr.yml
 - fixtures/vcr_cassettes/google_multi.yml
 - fixtures/vcr_cassettes/google_reverse_madrid.yml
+- fixtures/vcr_cassettes/google_reverse_madrid_es.yml
 - fixtures/vcr_cassettes/ripe_geocode.yml
 - fixtures/vcr_cassettes/ripe_geocode_au.yml
 - fixtures/vcr_cassettes/yahoo_city.yml
@@ -228,7 +248,6 @@ files:
 homepage: http://github.com/geokit/geokit
 licenses:
 - MIT
-metadata: {}
 post_install_message:
 rdoc_options:
 - --main
@@ -236,20 +255,28 @@ rdoc_options:
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
+  none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+      segments:
+      - 0
+      hash: -1638925415436466829
 required_rubygems_version: !ruby/object:Gem::Requirement
+  none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+      segments:
+      - 0
+      hash: -1638925415436466829
 requirements: []
 rubyforge_project:
-rubygems_version: 2.1.11
+rubygems_version: 1.8.25
 signing_key:
-specification_version: 4
+specification_version: 3
 summary: ! 'Geokit: encoding and distance calculation gem'
 test_files:
 - test/helper.rb

checksums.yaml DELETED

@@ -1,15 +0,0 @@
----
-!binary "U0hBMQ==":
-  metadata.gz: !binary |-
-    NzdhNTJlNWE1YTg5MWI5MjMyOTRjMmNhOTQ0YzdmZmU3MzVmNzVkNA==
-  data.tar.gz: !binary |-
-    OTE1ZTA5NTg4NmU3NDdjZWNkZWM0ZmVhYmE3NjkzYWIzMzMxMGI1ZQ==
-SHA512:
-  metadata.gz: !binary |-
-    ODdlMDUwNjQxNzk0MDJhODNmZGRlMzYzNDUyZmRiNDYwZDU0ZWYzOGUxNGU4
-    MWIxMTc3MDQ3ZTc1NDM5OTI0MzUxMjVmOTNkODliN2M5M2M1ZTM0NDE4ZTRh
-    OGIxN2ZlMGYxN2UxNGFkMDU5YzU3ZGUyNDQ1N2JkYjNhNThmZTA=
-  data.tar.gz: !binary |-
-    YTQyNWVlOTk5OWY4ODkxNjMxNDk0NDhhZGM1MGZiYjE5ODBlZDEzZGI0Zjc4
-    ZDBkNzQ3MTJmMWU5M2JjMjc5YzQ4ODM3NzBjYWNkZjEyY2ZhZDAwM2ExOTNk
-    NTM4M2M4ZDNhYTZkNDMyYzM5OGZiODJiNDBkNTJkMmU2Y2I1NTc=