twofishes 2.0.0 → 2.1.0.pre.rc.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2cff3a037a0c3102d1d484202cb413c80940f93c
-  data.tar.gz: be8c7567efa843fd0b2e5ccd6d1e6eadc516ec32
+  metadata.gz: 60346193a88118337642826f79fb68b87373fda3
+  data.tar.gz: 1ca46ac922435ce41af3d5e46725689acf20ddc2
 SHA512:
-  metadata.gz: 54ec9f93b83e93b7649d57c54a4861080440da51307f423cf2b77f4c3ab4bb1ef9438878454c35e133046b29719b5adb0e04901fcf9e12d7c5db71791eff0baa
-  data.tar.gz: 0fd3d7a83db9dafab05e0e658f861e48ce6aa3350848745f64a51aed6b0d1a11d4db602d9bef350572e940cefecc16967f16bd95893b277858b61b65cdbc052e
+  metadata.gz: 74f76b892901bfb33ec5aa15cb913a74c28216a70d922647bc0793bd922d00864a8f07d6fe1d470ba6cc2a99316b14e1aed3af482929fdad79e541e09e62638e
+  data.tar.gz: 1ffe49e7909c92ee1bb6a7a2735973b86363444598d6075c61fae209d582179a8817825f130cdad180f9abe23a41540e77e6374cb506cbff2028359baf730e9e

data/lib/twofishes.rb

@@ -6,4 +6,5 @@ require 'thrift/geocoder'
 require 'twofishes/errors'
 require 'twofishes/result'
 require 'twofishes/underscored'
+require 'twofishes/geocode_request'
 require 'twofishes/client'

data/lib/twofishes/client.rb

@@ -11,9 +11,11 @@ module Twofishes
     # @example
     #   Twofishes::Client.geocode('Zurich, Switzerland')
     #
-    def self.geocode(location, includes: [])
+
+    def self.geocode(location, options = {})
       handle_response do
-        request = GeocodeRequest.new(query: location, responseIncludes: includes)
+        options[:query] = location
+        request = Twofishes::GeocodeRequest.new(options)
         thrift_client.geocode(request)
       end
     end
@@ -25,10 +27,10 @@ module Twofishes
     # @example
     #   Twofishes::Client.reverse_geocode([47.3787733, 8.5273363])
     #
-    def self.reverse_geocode(coordinates, includes: [])
+    def self.reverse_geocode(coordinates, options = {})
       handle_response do
-        point = GeocodePoint.new(lat: coordinates[0], lng: coordinates[1])
-        request = GeocodeRequest.new(ll: point, responseIncludes: includes)
+        options[:ll] = coordinates
+        request = Twofishes::GeocodeRequest.new(options)
         thrift_client.reverseGeocode(request)
       end
     end
@@ -38,7 +40,8 @@ module Twofishes
         Geocoder::Client,
         Twofishes.configuration.address,
         retries: Twofishes.configuration.retries,
-        timeout: Twofishes.configuration.timeout
+        timeout: Twofishes.configuration.timeout,
+        connect_timeout: Twofishes.configuration.connect_timeout
       )
     end
 

data/lib/twofishes/configuration.rb

@@ -2,13 +2,14 @@ module Twofishes
   class Configuration
     # @see https://github.com/thoughtbot/clearance/blob/master/lib/clearance/configuration.rb
 
-    attr_accessor :host, :port, :timeout, :retries
+    attr_accessor :host, :port, :timeout, :retries, :connect_timeout
 
     def initialize
       @host = '127.0.0.1'
       @port = 8080
       @timeout = 3
       @retries = 2
+      @connect_timeout = 0.5
     end
 
     def address

data/lib/twofishes/geocode_request.rb

@@ -0,0 +1,68 @@
+module Twofishes
+  class GeocodeRequest < ::GeocodeRequest
+    def initialize(options = {})
+      options = substitute_aliases(options)
+
+      options[:ll] = prepare_ll(options[:ll])
+      options[:bounds] = prepare_bounds(options[:bounds])
+
+      super(options)
+    end
+
+    def prepare_ll(ll)
+      case ll
+      when String
+        lat, lng = ll.split(/\s*,\s*/)
+        GeocodePoint.new(lat: lat.to_f, lng: lng.to_f)
+      when Array
+        GeocodePoint.new(lat: ll[0].to_f, lng: ll[1].to_f)
+      when Hash
+        GeocodePoint.new(lat: ll[:lat].to_f, lng: ll[:lng].to_f)
+      else
+        ll
+      end
+    end
+
+    def prepare_bounds(bounds)
+      case bounds
+      when String
+        ne_lat, ne_lng, sw_lat, sw_lng = bounds.split(/\s*,\s*/)
+        ne = GeocodePoint.new(lat: ne_lat.to_f, lng: ne_lng.to_f)
+        sw = GeocodePoint.new(lat: sw_lat.to_f, lng: sw_lng.to_f)
+        GeocodeBoundingBox.new(ne: ne, sw: sw)
+      when Array
+        ne = GeocodePoint.new(lat: bounds[0].to_f, lng: bounds[1].to_f)
+        sw = GeocodePoint.new(lat: bounds[2].to_f, lng: bounds[3].to_f)
+        GeocodeBoundingBox.new(ne: ne, sw: sw)
+      when Hash
+        ne = GeocodePoint.new(lat: bounds[:ne_lat].to_f, lng: bounds[:ne_lng].to_f)
+        sw = GeocodePoint.new(lat: bounds[:sw_lat].to_f, lng: bounds[:sw_lng].to_f)
+        GeocodeBoundingBox.new(ne: ne, sw: sw)
+      else
+        bounds
+      end
+    end
+
+    def substitute_aliases(options)
+      options = options.dup
+
+      options[:maxInterpretations] ||= options.delete(:max_interpretations) || options.delete(:max)
+      options[:allowedSources] ||= options.delete(:allowed_sources) || options.delete(:sources)
+      options[:responseIncludes] ||= options.delete(:response_includes) || options.delete(:includes)
+      options[:woeHint] ||= options.delete(:woe_hint)
+      options[:woeRestrict] ||= options.delete(:woe_restrict)
+      options[:autocompleteBias] ||= options.delete(:autocomplete_bias) || options.delete(:bias)
+
+      if options[:ll].kind_of? Hash
+        options[:ll][:lng] = options[:ll][:lon] if options[:ll][:lon]
+      end
+
+      if options[:bounds].kind_of? Hash
+        options[:bounds][:ne_lng] = options[:bounds][:ne_lon] if options[:bounds] and options[:bounds][:ne_lon]
+        options[:bounds][:sw_lng] = options[:bounds][:sw_lon] if options[:bounds] and options[:bounds][:sw_lon]
+      end
+
+      options
+    end
+  end
+end

data/lib/twofishes/version.rb

@@ -1,3 +1,3 @@
 module Twofishes
-  VERSION = "2.0.0"
+  VERSION = "2.1.0.pre.rc.1"
 end

metadata

@@ -1,16 +1,17 @@
 --- !ruby/object:Gem::Specification
 name: twofishes
 version: !ruby/object:Gem::Version
-  version: 2.0.0
+  version: 2.1.0.pre.rc.1
 platform: ruby
 authors:
 - Christian Felder
 - Miha Rekar
 - Bartek Bułat
+- Sebastian Delmont
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-04-02 00:00:00.000000000 Z
+date: 2015-07-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -151,6 +152,7 @@ files:
 - lib/twofishes/client.rb
 - lib/twofishes/configuration.rb
 - lib/twofishes/errors.rb
+- lib/twofishes/geocode_request.rb
 - lib/twofishes/result.rb
 - lib/twofishes/underscored.rb
 - lib/twofishes/version.rb
@@ -169,9 +171,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '2.0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - '>'
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubyforge_project: 
 rubygems_version: 2.4.5