food_info 0.0.5 → 0.0.6

data/HISTORY.markdown

@@ -1,5 +1,8 @@
 # Changelog
 
+## 0.0.6 October 21, 2011
+* FatSecret: Retry once if timestamp invalid (API only supports single request/second)
+
 ## 0.0.5 September 26, 2011
 * Bugfix: missing 'return' was wreaking havoc with FoodInfo.search
 

data/lib/food_info/adapters/fat_secret.rb

@@ -10,6 +10,7 @@ module FoodInfo
   module Adapters
     class FatSecret
       include HTTParty
+      RETRY_INVALID_TIMESTAMP = 1 # Only retry once to avoid huge pileup if concurrent
       
       def initialize(opts = {})
         raise AuthorizationError.new("Missing required argument :key")    unless @key    = opts[:key]
@@ -36,11 +37,18 @@ module FoodInfo
   
       protected
   
-      def query(method, opts = {})
+      def query(method, opts = {}, retried = 0)
         query_url = Request.new(method, {:key => @key, :secret => @secret}, opts).signed_request
-        data = self.class.get( query_url )        
-        raise DataSourceException.new(data['error']['message']) if data['error']
+        data = self.class.get( query_url )
         
+        if data['error']  # Invalid timestamp can happen if more than one request/second. Allow retrying once.
+          if data['error']['message'] =~ 'Invalid/expired timestamp' && retried < RETRY_INVALID_TIMESTAMP
+            return query(method, opts, retried + 1)
+          else
+            raise DataSourceException.new(data['error']['message'])
+          end
+        end
+      
         return data
       end
       

data/lib/food_info/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: food_info
 version: !ruby/object:Gem::Version
-  version: 0.0.5
+  version: 0.0.6
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-09-26 00:00:00.000000000Z
+date: 2011-10-21 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: httparty
-  requirement: &70296305209760 !ruby/object:Gem::Requirement
+  requirement: &70256719087420 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: 0.7.7
   type: :runtime
   prerelease: false
-  version_requirements: *70296305209760
+  version_requirements: *70256719087420
 - !ruby/object:Gem::Dependency
   name: hashie
-  requirement: &70296305209140 !ruby/object:Gem::Requirement
+  requirement: &70256719086900 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: 1.1.0
   type: :runtime
   prerelease: false
-  version_requirements: *70296305209140
+  version_requirements: *70256719086900
 - !ruby/object:Gem::Dependency
   name: ruby-hmac
-  requirement: &70296305208640 !ruby/object:Gem::Requirement
+  requirement: &70256719086520 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,7 +43,7 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70296305208640
+  version_requirements: *70256719086520
 description: Generic Ruby interface to look up nutritional information on food.  Design
   is modular so other adapters can be plugged in, but only data source currently implemented
   is FatSecret.