food_info 0.0.3 → 0.0.4

data/HISTORY.markdown

@@ -1,5 +1,9 @@
 # Changelog
 
+## 0.0.4 September 26, 2011
+* API improvement: Can index directly into search results (e.g. FoodInfo.search('a')[3])
+* Bugfix: FoodInfo.details('..') now correctly handles results with only one serving returned
+
 ## 0.0.3 September 12, 2011
 * Added missing gem dependency on ruby-hmac
 

data/lib/food_info.rb

@@ -28,17 +28,24 @@ module FoodInfo
     end
 
     def search(q, opts = {})
-      next_adapter.search(q, opts)
+      cached(:search, q, opts) { next_adapter.search(q, opts) }
     end
     
     def details(id)
-      next_adapter.details(id)
+      cached(:details, id) { next_adapter.details(id) }
     end
 
 
+
+
+    def cached(method, param, opts = {}, &block)
+      # TODO - implement caching strategy
+      block.call
+    end
+
     # FUTURE: This connection pool code won't do much good until HTTParty is non-blocking
     def next_adapter
-      raise NoAdapterSpecified.new("You must run FoodInfo.establish_connection first") unless @@pool
+      raise NoAdapterSpecified.new("You must run FoodInfo.establish_connection first") unless defined?(@@pool)
       @@cursor = (@@cursor + 1) % @@pool.length
       @@pool[@@cursor]
     end

data/lib/food_info/adapters/fat_secret.rb

@@ -1,4 +1,5 @@
 require 'httparty'
+
 require 'food_info/adapters/fat_secret/request'
 require 'food_info/adapters/fat_secret/data/search_result'
 require 'food_info/adapters/fat_secret/data/search_results'

data/lib/food_info/adapters/fat_secret/data/food_item.rb

@@ -13,7 +13,11 @@ module FoodInfo
 
           def initialize(*args)
             super(*args)
-            self[:servings] = self[:servings]['serving'].collect{|s| FoodServing.new(s) }
+
+            # Can't use Array(), as that turns internals of the hash into array pairs as well
+            serving_info = self[:servings]['serving']
+            serving_info = [serving_info] if serving_info.is_a?(Hash)
+            self[:servings] = serving_info.collect{|s| FoodServing.new(s) }
           end
         end
       

data/lib/food_info/adapters/fat_secret/data/search_results.rb

@@ -31,6 +31,12 @@ module FoodInfo
             self[:results].each{|result| block.call(result)}
           end
           
+          # Allows pulling out a specific index without having to call results -- search('cheese')[3], not search('cheese').results[3]
+          def [](idx)
+            super(idx) if idx.is_a?(Symbol) || idx.to_i.zero?
+            self[:results][idx]
+          end          
+          
         end
     
       end

data/lib/food_info/cache_adapters/mem_cache.rb

@@ -0,0 +1,7 @@
+module FoodInfo
+  module CacheAdapters
+    class MemCache
+      
+    end
+  end
+end

data/lib/food_info/utils.rb

@@ -1,3 +1,5 @@
+require 'cgi'
+
 class String 
   def oauth_escape
     CGI.escape(self).gsub("%7E", "~").gsub("+", "%20") 

data/lib/food_info/version.rb

@@ -1,3 +1,3 @@
 module FoodInfo
-  VERSION = "0.0.3"
+  VERSION = "0.0.4"
 end

metadata

@@ -1,58 +1,78 @@
---- !ruby/object:Gem::Specification
+--- !ruby/object:Gem::Specification 
 name: food_info
-version: !ruby/object:Gem::Version
-  version: 0.0.3
+version: !ruby/object:Gem::Version 
+  hash: 23
   prerelease: 
+  segments: 
+  - 0
+  - 0
+  - 4
+  version: 0.0.4
 platform: ruby
-authors:
+authors: 
 - Kali Donovan
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-09-12 00:00:00.000000000Z
-dependencies:
-- !ruby/object:Gem::Dependency
+
+date: 2011-09-26 00:00:00 Z
+dependencies: 
+- !ruby/object:Gem::Dependency 
   name: httparty
-  requirement: &2164537000 !ruby/object:Gem::Requirement
+  prerelease: false
+  requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 13
+        segments: 
+        - 0
+        - 7
+        - 7
         version: 0.7.7
   type: :runtime
-  prerelease: false
-  version_requirements: *2164537000
-- !ruby/object:Gem::Dependency
+  version_requirements: *id001
+- !ruby/object:Gem::Dependency 
   name: hashie
-  requirement: &2164534900 !ruby/object:Gem::Requirement
+  prerelease: false
+  requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 19
+        segments: 
+        - 1
+        - 1
+        - 0
         version: 1.1.0
   type: :runtime
-  prerelease: false
-  version_requirements: *2164534900
-- !ruby/object:Gem::Dependency
+  version_requirements: *id002
+- !ruby/object:Gem::Dependency 
   name: ruby-hmac
-  requirement: &2164534020 !ruby/object:Gem::Requirement
+  prerelease: false
+  requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
   type: :runtime
-  prerelease: false
-  version_requirements: *2164534020
-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.
-email:
+  version_requirements: *id003
+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.
+email: 
 - kali@deviantech.com
 executables: []
+
 extensions: []
+
 extra_rdoc_files: []
-files:
+
+files: 
 - .gitignore
 - Gemfile
 - HISTORY.markdown
@@ -69,31 +89,42 @@ files:
 - lib/food_info/adapters/fat_secret/data/search_result.rb
 - lib/food_info/adapters/fat_secret/data/search_results.rb
 - lib/food_info/adapters/fat_secret/request.rb
+- lib/food_info/cache_adapters/mem_cache.rb
 - lib/food_info/errors.rb
 - lib/food_info/utils.rb
 - lib/food_info/version.rb
 homepage: https://github.com/deviantech/food_info
 licenses: []
+
 post_install_message: 
 rdoc_options: []
-require_paths:
+
+require_paths: 
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement
+required_ruby_version: !ruby/object:Gem::Requirement 
   none: false
-  requirements:
-  - - ! '>='
-    - !ruby/object:Gem::Version
-      version: '0'
-required_rubygems_version: !ruby/object:Gem::Requirement
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
+      version: "0"
+required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
-  requirements:
-  - - ! '>='
-    - !ruby/object:Gem::Version
-      version: '0'
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
+      version: "0"
 requirements: []
+
 rubyforge_project: 
 rubygems_version: 1.8.10
 signing_key: 
 specification_version: 3
 summary: API for researching nutritional information of various foods
 test_files: []
+