geoclue 0.1.1 → 0.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 66f96002a66f1fbc8136f7efc8b42665446b0acbbf234a6893dc203feb9bd331
-  data.tar.gz: 8adb10655b6568b752d0723a77b347d4ffa7fe13eec496c4857e3969819c3feb
+  metadata.gz: 0124bfbdb74f8f7db512a10befb4551c1c7881f00838ef049661844135304124
+  data.tar.gz: d7a8a7d0de41620460f248c167e8b41ffc788e7f37597303b0fcafcb0d68eebd
 SHA512:
-  metadata.gz: faa415d7aecaf74a0382d756adfc3cfd3d1fbcaf2529282ecb8d5d68fa68bc1fa6e3083163c93ef7ea4fdb699db21f69a24452b4cb90f030e903947a9189e332
-  data.tar.gz: 58164e0b9064af2e9160835e0e487cbf0a51dee33fccba7c3250cba423476bcb9b7e2cfaf6e8b63122ac658672ee4df9d53988afb3cef538bb1c3a83be5a9c45
+  metadata.gz: 7ccea38f74d1f5b5ab602934f92af1729c89db184227c4db63e7597ee6dc337e13f9ee61b75a6c782b28981ebec01546357ec135c831d5c0f5baf8fe38629da0
+  data.tar.gz: aa91cdcbc3d5882f1934b969b4640d2bd0d1dba0f836b06274ed1b01a5447e1091cf9486960a1d68371fd446f577a94d8b9446559de4dc1f99ecee4f41ebba4e

data/.gitignore

@@ -6,3 +6,4 @@
 /pkg/
 /spec/reports/
 /tmp/
+*.gem

data/CHANGELOG.md

@@ -2,6 +2,15 @@
 
 All notable changes to the project will be documented here.
 
+## [0.1.2] - 2020-06-28
+
+### Added
+- Add settlement field in results to capture city, town, village
+
+### Fixed
+- Update ReverseGeocoder to use OpenStreetMap
+  Previous solution LocationIQ removed public access API
+
 ## [0.1.1] - 2019-06-09
 
 ### Fixed

data/Gemfile.lock

@@ -1,14 +1,14 @@
 PATH
   remote: .
   specs:
-    geoclue (0.1.1)
+    geoclue (0.1.2)
       ruby-dbus (~> 0.15.0)
 
 GEM
   remote: https://rubygems.org/
   specs:
-    minitest (5.11.3)
-    rake (10.5.0)
+    minitest (5.14.0)
+    rake (12.3.3)
     ruby-dbus (0.15.0)
 
 PLATFORMS
@@ -18,7 +18,7 @@ DEPENDENCIES
   bundler (~> 1.17)
   geoclue!
   minitest (~> 5.0)
-  rake (~> 10.0)
+  rake (~> 12.3)
 
 BUNDLED WITH
    1.17.2

data/geoclue.gemspec

@@ -38,6 +38,6 @@ Gem::Specification.new do |spec|
   spec.add_dependency "ruby-dbus", "~> 0.15.0"
 
   spec.add_development_dependency "bundler", "~> 1.17"
-  spec.add_development_dependency "rake", "~> 10.0"
+  spec.add_development_dependency "rake", "~> 12.3"
   spec.add_development_dependency "minitest", "~> 5.0"
 end

data/lib/geoclue/cache.rb

@@ -4,6 +4,8 @@ module GeoClue
   class Cache
     attr_accessor :data
 
+    EXPIRATION = 900
+
     def initialize
       @data = {}
       read if valid?
@@ -47,7 +49,7 @@ module GeoClue
     end
 
     def recent?
-      (Time.now - File.mtime(filepath)) < 900
+      (Time.now - File.mtime(filepath)) < EXPIRATION
     end
 
     def full?

data/lib/geoclue/client.rb

@@ -3,7 +3,7 @@ require 'dbus'
 module GeoClue
   class Client
     COORD_KEYS = %w[latitude longitude accuracy].freeze
-    ADDR_KEYS = %w[house_number road city county state country postcode country_code].freeze
+    ADDR_KEYS = %w[house_number road settlement city town village county state country postcode country_code].freeze
 
     def initialize
       @data = {}
@@ -50,7 +50,7 @@ module GeoClue
     def manager
       @manager ||= begin
                      object = service["/org/freedesktop/GeoClue2/Manager"]
-                     interface = object["org.freedesktop.GeoClue2.Manager"]
+                     object["org.freedesktop.GeoClue2.Manager"]
                      object
                    end
     end
@@ -66,7 +66,11 @@ module GeoClue
                     interface["DesktopId"] = "geoclue-ruby"
                     interface["RequestedAccuracyLevel"] = ['u', 8]
                     interface.on_signal("LocationUpdated") do
-                      handle_location_update(interface["Location"])
+                      begin
+                        handle_location_update(interface["Location"])
+                      rescue DBus::InvalidPacketException
+                        retry
+                      end
                     end
                     Thread.new { interface["Location"] }
                     object
@@ -75,7 +79,7 @@ module GeoClue
 
     def handle_location_update(location_id)
       location = service[location_id]
-      interface = location["org.freedesktop.GeoClue2.Location"]
+      location["org.freedesktop.GeoClue2.Location"]
       @data = location.GetAll("org.freedesktop.GeoClue2.Location").transform_keys(&:downcase)
     end
   end

data/lib/geoclue/reverse_geocoder.rb

@@ -4,10 +4,24 @@ module GeoClue
   module ReverseGeocoder
     class << self
       def geocode(coords)
-        url =  "https://locationiq.com/v1/reverse_sandbox.php?format=json&lat=#{coords["latitude"]}&lon=#{coords["longitude"]}"
-        uri = URI(url)
-        result = Net::HTTP.get(uri)
-        JSON.parse(result)["address"]
+        url = URI::HTTPS.build(
+          scheme: "https",
+          host: "nominatim.openstreetmap.org",
+          path: "/reverse",
+          query: URI.encode_www_form(
+            format: 'json',
+            lat: coords['latitude'],
+            lon: coords['longitude']
+          )
+        )
+
+        result = JSON.parse(Net::HTTP.get(url))
+
+        return {} if ! result.key?("address")
+
+        addr = result["address"]
+        addr["settlement"] = addr["city"] || addr["town"] || addr["village"]
+        addr
       end
     end
   end

data/lib/geoclue/version.rb

@@ -1,3 +1,3 @@
 module GeoClue
-  VERSION = "0.1.1"
+  VERSION = "0.1.2"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: geoclue
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
 platform: ruby
 authors:
 - Jacob Evan Shreve
-autorequire: 
+autorequire:
 bindir: exe
 cert_chain: []
-date: 2019-12-11 00:00:00.000000000 Z
+date: 2020-06-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ruby-dbus
@@ -44,14 +44,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '12.3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '12.3'
 - !ruby/object:Gem::Dependency
   name: minitest
   requirement: !ruby/object:Gem::Requirement
@@ -100,7 +100,7 @@ metadata:
   homepage_uri: https://github.com/shreve/geoclue-ruby
   source_code_uri: https://github.com/shreve/geoclue-ruby
   changelog_uri: https://github.com/shreve/geoclue-ruby/blob/master/CHANGELOG.md
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -116,7 +116,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubygems_version: 3.0.3
-signing_key: 
+signing_key:
 specification_version: 4
 summary: Access your computer's geographic coordinates
 test_files: []