twofishes 1.0.1 → 2.0.0.pre.rc.1

data/lib/twofishes.rb

@@ -1,5 +1,9 @@
-require "twofishes/version"
-require "twofishes/configuration"
-require "twofishes/errors"
-require "twofishes/result"
-require "twofishes/client"
+require 'twofishes/version'
+require 'twofishes/configuration'
+require 'thrift_client'
+require 'thrift/geocoder_types'
+require 'thrift/geocoder'
+require 'twofishes/errors'
+require 'twofishes/result'
+require 'twofishes/underscored'
+require 'twofishes/client'

data/lib/twofishes/client.rb

@@ -1,53 +1,53 @@
-require 'httparty'
-
 module Twofishes
   class Client
     # @see https://github.com/foursquare/twofishes/blob/master/docs/twofishes_requests.md
 
-    include HTTParty
-    # debug_output $stderr # httparty debugging
-
     # Geocodes a given string.
     #
-    # @param [String] query
+    # @param [String] location
+    # @param [Array] list of additional ResponseIncludes constants
     # @return [Twofishes::Result]
     #
     # @example
-    #     Twofishes::Client.geocode('Zurich, Switzerland')
+    #   Twofishes::Client.geocode('Zurich, Switzerland')
     #
-    def self.geocode(location)
-      call_api(query: location)
+    def self.geocode(location, includes: [])
+      handle_response do
+        request = GeocodeRequest.new(query: location, responseIncludes: includes)
+        thrift_client.geocode(request)
+      end
     end
 
     # Reverse geocodes lat/lng.
     #
-    # @param [Float] lat
-    # @param [Float] lng
+    # @param [Array] latitude, longitude pair
     # @return [Twofishes::Result]
-    #
     # @example
-    #     Twofishes::Client.reverse_geocode(47.3787733, 8.5273363)
+    #   Twofishes::Client.reverse_geocode([47.3787733, 8.5273363])
     #
-    def self.reverse_geocode(coordinates)
-      call_api(ll: coordinates.join(','))
-    end
-
-    def self.call_api(params)
+    def self.reverse_geocode(coordinates, includes: [])
       handle_response do
-        get(Twofishes.configuration.base_url, query: params, timeout: Twofishes.configuration.timeout)
+        point = GeocodePoint.new(lat: coordinates[0], lng: coordinates[1])
+        request = GeocodeRequest.new(ll: point, responseIncludes: includes)
+        thrift_client.reverseGeocode(request)
       end
     end
 
+    def self.thrift_client
+      @thrift_client ||= ThriftClient.new(
+        Geocoder::Client,
+        Twofishes.configuration.address,
+        retries: Twofishes.configuration.retries,
+        timeout: Twofishes.configuration.timeout
+      )
+    end
+
     private
 
     def self.handle_response
-      response = yield
-      if response.code == 200
-        Result.from_response(response)
-      else
-        raise Twofishes::InvalidResponseError, response.to_s.lines.first
-      end
+      Result.from_response(yield)
+    rescue => e
+      raise Twofishes::InvalidResponseError, e.message
     end
-
   end
 end

data/lib/twofishes/configuration.rb

@@ -1,16 +1,19 @@
 module Twofishes
-
   class Configuration
-
     # @see https://github.com/thoughtbot/clearance/blob/master/lib/clearance/configuration.rb
 
-    attr_accessor :base_url, :timeout
+    attr_accessor :host, :port, :timeout, :retries
 
     def initialize
-      @base_url = 'http://localhost:8081'
+      @host = '127.0.0.1'
+      @port = 8080
       @timeout = 3
+      @retries = 2
     end
 
+    def address
+      "#{host}:#{port}"
+    end
   end
 
   def self.configuration
@@ -24,5 +27,4 @@ module Twofishes
   def self.reset_configuration
     @configuration = nil
   end
-
 end

data/lib/twofishes/errors.rb

@@ -1,6 +1,4 @@
 module Twofishes
-
   class InvalidResponseError < StandardError
   end
-
 end

data/lib/twofishes/result.rb

@@ -1,56 +1,32 @@
-require 'rash'
-
+require 'delegate'
 module Twofishes
-
-  class Result
-
-    def initialize(hash)
-      @data = Hashie::Rash.new(hash)
-    end
-
-    def self.from_response(hash)
-      if hash['interpretations']
-        hash['interpretations'].map { |interpretation| self.new(interpretation) }
-      else
-        []
-      end
-    end
-
-    def name
-      feature.name
-    end
-
-    def display_name
-      feature.display_name
-    end
-
-    def country_code
-      feature.cc
-    end
-
-    def lat
-      feature.geometry.center.lat
-    end
-
-    def lng
-      feature.geometry.center.lng
+  class Result < SimpleDelegator
+    def self.from_response(response)
+      response.interpretations.map { |interpretation|
+        new(interpretation)
+      }
     end
+  end
+end
 
-    def coordinates
-      [lat, lng]
-    end
+require 'forwardable'
+class GeocodeInterpretation
+  extend Forwardable
+  def_delegators :feature, *GeocodeFeature::FIELDS.map { |_, v| v[:name] }
 
-    def parents
-      @data.parents.map { |parent| Twofishes::Result.new(parent) }
-    end
+  def country_code
+    cc
+  end
 
-    def method_missing(method_sym, *arguments, &block)
-      @data.send(method_sym)
-    end
+  def lat
+    geometry.center.lat
+  end
 
-    def respond_to?(method_sym, include_private=false)
-      @data.respond_to?(method_sym) ? true : super
-    end
+  def lng
+    geometry.center.lng
+  end
 
+  def coordinates
+    [lat, lng]
   end
-end
+end

data/lib/twofishes/underscored.rb

@@ -0,0 +1,17 @@
+require 'active_support/core_ext/string/inflections'
+
+module Underscored
+  def self.included(base)
+    base::FIELDS.map { |_, v|
+      define_method(v[:name].underscore) { send(v[:name]) }
+    }
+  end
+end
+
+class GeocodeInterpretation
+  include Underscored
+end
+
+class GeocodeFeature
+  include Underscored
+end

data/lib/twofishes/version.rb

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

metadata

@@ -1,57 +1,59 @@
 --- !ruby/object:Gem::Specification
 name: twofishes
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 2.0.0.pre.rc.1
 platform: ruby
 authors:
 - Christian Felder
+- Miha Rekar
+- Bartek Bułat
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-12-08 00:00:00.000000000 Z
+date: 2015-02-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: httparty
+  name: activesupport
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
-        version: 0.12.0
+        version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
-        version: 0.12.0
+        version: '0'
 - !ruby/object:Gem::Dependency
-  name: rash
+  name: thrift_client
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
-        version: 0.4.0
+        version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
-        version: 0.4.0
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - '>='
       - !ruby/object:Gem::Version
-        version: '1.5'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - '>='
       - !ruby/object:Gem::Version
-        version: '1.5'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -81,7 +83,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: fakeweb
+  name: mocha
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
@@ -95,7 +97,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: mocha
+  name: yard
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
@@ -109,7 +111,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: yard
+  name: codeclimate-test-reporter
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
@@ -123,7 +125,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: codeclimate-test-reporter
+  name: pry
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
@@ -143,11 +145,14 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- lib/thrift/geocoder.rb
+- lib/thrift/geocoder_types.rb
 - lib/twofishes.rb
 - lib/twofishes/client.rb
 - lib/twofishes/configuration.rb
 - lib/twofishes/errors.rb
 - lib/twofishes/result.rb
+- lib/twofishes/underscored.rb
 - lib/twofishes/version.rb
 homepage: https://github.com/masone/twofishes-ruby
 licenses:
@@ -164,12 +169,12 @@ 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.3
+rubygems_version: 2.4.5
 signing_key: 
 specification_version: 4
 summary: Client for foursquare's Twofishes API, a sparse reverse geocoder.