location-one 0.0.5 → 0.0.6

data/Gemfile.lock

@@ -1,15 +1,17 @@
 PATH
   remote: .
   specs:
-    location-one (0.0.5)
+    location-one (0.0.6)
       geocoder (~> 1.1)
+      httpclient
       json
 
 GEM
   remote: http://rubygems.org/
   specs:
-    geocoder (1.1.2)
-    json (1.7.3)
+    geocoder (1.1.3)
+    httpclient (2.2.7)
+    json (1.7.5)
 
 PLATFORMS
   ruby

data/lib/location-one/core.rb

@@ -1,6 +1,6 @@
 require 'geocoder'
 require 'json'
-require 'net/http'
+require 'httpclient'
 
 module LocationOne
   #SUPPORTED_BACKENDS =
@@ -14,47 +14,45 @@ module LocationOne
   class Client
     attr_accessor :http, :backend
 
-    def initialize(backend,opt_client=nil)
+    def initialize(backend, opt_client=nil)
       @backend = backend
-      @http = opt_client || Net::HTTP.new(backend[:host], backend[:port])
+      @http = opt_client
     end
 
     def change_location(options, opt_data={})
-
       if (options[:latitude] and not options[:longitude]) or
           (options[:longitude] and not options[:latitude])
         raise "Both latitude and longitude must be specified if either is."
       end
       if (options[:latitude])
-        change_location_by_coords(options[:latitude], options[:longitude],opt_data)
+        change_location_by_coords(options[:latitude], options[:longitude], opt_data)
       else
         if not options[:place]
           raise "Either :place or :latitude and :longitude must be specified."
         end
-        change_location_by_place(options[:place],opt_data)
+        change_location_by_place(options[:place], opt_data)
       end
     end
 
-    def change_location_by_coords(lat, lon,opt_data={})
-      req = Net::HTTP::Post.new(backend[:path])
+    def change_location_by_coords(lat, lon, opt_data={})
 
       body_data = {:action => :change_location,
                    :latitude => lat,
                    :longitude => lon}.merge(opt_data)
 
-      req.body = body_data.to_json
 
-      res = @http.request(req)
 
-      begin
-        @http.finish if @http.started?
-      rescue
+      body = make_http_request(
+          :uri => URI.parse("http://#{@backend[:host]}:#{@backend[:port]}#{@backend[:path]}"),
+          :method => :post,
+          :body => body_data.to_json
+      )
 
+
+      unless body
+        raise "Set location change failed, for #{lat}, #{lon} (#{body})."
       end
-      if res.code !='200'
-        raise "Response error code #{res.code}, for #{lat}, #{lon} (#{res.body})."
-      end
-      res.body
+      body
     end
 
     def self.location_by_place(place)
@@ -63,9 +61,65 @@ module LocationOne
       results.first
     end
 
-    def change_location_by_place(place,opt_data={})
+    def change_location_by_place(place, opt_data={})
       best_result = Client.location_by_place(place)
-      change_location_by_coords(best_result.latitude, best_result.longitude,opt_data)
+      change_location_by_coords(best_result.latitude, best_result.longitude, opt_data)
+    end
+
+    def make_http_request(options)
+      body = nil
+      3.times do |count|
+        begin
+          if not @http
+            @http = init_request(options)
+          end
+          if options[:method] == :post
+            body = @http.post(options[:uri], options[:body]).body
+          else
+            body = @http.get(options[:uri], options[:body]).body
+          end
+          break
+        rescue HTTPClient::TimeoutError => e
+          if count < 2
+            sleep(0.5)
+            @http.reset_all
+            @http=nil
+            STDOUT.write "Retrying.. #{e.class}: (#{e})\n"
+            STDOUT.flush
+
+          else
+            puts "Failing... #{e.class}"
+            raise e
+          end
+        rescue Exception => e
+          case e
+            when Errno::ECONNREFUSED, Errno::ECONNRESET, Errno::ECONNABORTED, Errno::ETIMEDOUT
+              if count < 2
+                sleep(0.5)
+                @http.reset_all
+                @http=nil
+                STDOUT.write "Retrying.. #{e.class}: (#{e})\n"
+                STDOUT.flush
+
+              else
+                puts "Failing... #{e.class}"
+                raise e
+              end
+            else
+              raise e
+          end
+        end
+      end
+
+      body
+    end
+
+    def init_request(url)
+      http = HTTPClient.new
+      http.connect_timeout = 15
+      http.send_timeout = 15
+      http.receive_timeout = 15
+      http
     end
 
   end

data/lib/location-one/version.rb

@@ -1,3 +1,3 @@
 module LocationOne
-  VERSION = "0.0.5"
+  VERSION = "0.0.6"
 end

data/location-one.gemspec

@@ -17,5 +17,6 @@ Gem::Specification.new do |s|
 
   s.add_dependency( "geocoder","~>1.1")
   s.add_dependency( "json" )
+  s.add_dependency( "httpclient" )
 
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: location-one
 version: !ruby/object:Gem::Version
-  version: 0.0.5
+  version: 0.0.6
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-07-25 00:00:00.000000000 Z
+date: 2012-09-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: geocoder
@@ -43,6 +43,22 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: httpclient
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: Location Simulation Client for Calabash and Frank backends.
 email:
 - karl@lesspainful.com