food_info 0.0.4 → 0.0.5

data/HISTORY.markdown

@@ -1,5 +1,8 @@
 # Changelog
 
+## 0.0.5 September 26, 2011
+* Bugfix: missing 'return' was wreaking havoc with FoodInfo.search
+
 ## 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

data/lib/food_info.rb

@@ -28,11 +28,11 @@ module FoodInfo
     end
 
     def search(q, opts = {})
-      cached(:search, q, opts) { next_adapter.search(q, opts) }
+      cached(:search, q, opts)
     end
     
-    def details(id)
-      cached(:details, id) { next_adapter.details(id) }
+    def details(id, opts = {})
+      cached(:details, id)
     end
 
 
@@ -40,7 +40,7 @@ module FoodInfo
 
     def cached(method, param, opts = {}, &block)
       # TODO - implement caching strategy
-      block.call
+      next_adapter.send(method, param, opts)
     end
 
     # FUTURE: This connection pool code won't do much good until HTTParty is non-blocking

data/lib/food_info/adapters/fat_secret.rb

@@ -24,12 +24,12 @@ module FoodInfo
         }
         params[:page_number] = [params[:page_number].to_i - 1, 0].max # FatSecret's pagination starts at 0
         params[:max_results] = [params[:max_results].to_i, 50].min    # FatSecret's max allowed results per page
-        
+                
         data = query('foods.search', params)
         Data::SearchResults.new( data['foods'] )
       end
   
-      def details(food_id)
+      def details(food_id, opts = {})
         data = query('food.get', :food_id => food_id)
         Data::FoodItem.new( data['food'] )
       end

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

@@ -12,14 +12,14 @@ module FoodInfo
           property :total_results
       
           def initialize(*args)
-            super(*args)
+            super(*args)            
             normalize_data
           end
           
-          def normalize_data
+          def normalize_data            
             [:page, :per_page, :total_results].each do |n|
               self[n] = self[n].to_i
-            end
+            end            
             
             self[:page] += 1 # FatSecret indexes their pages from 0
             self[:results] = [self[:results]] unless self[:results].is_a?(Array)
@@ -33,7 +33,7 @@ module FoodInfo
           
           # 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?
+            return super(idx) if idx.is_a?(Symbol) || idx.to_i.zero?
             self[:results][idx]
           end          
           

data/lib/food_info/version.rb

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

metadata

@@ -1,78 +1,58 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: food_info
-version: !ruby/object:Gem::Version 
-  hash: 23
+version: !ruby/object:Gem::Version
+  version: 0.0.5
   prerelease: 
-  segments: 
-  - 0
-  - 0
-  - 4
-  version: 0.0.4
 platform: ruby
-authors: 
+authors:
 - Kali Donovan
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2011-09-26 00:00:00 Z
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2011-09-26 00:00:00.000000000Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: httparty
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  requirement: &70296305209760 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 13
-        segments: 
-        - 0
-        - 7
-        - 7
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
         version: 0.7.7
   type: :runtime
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: hashie
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  version_requirements: *70296305209760
+- !ruby/object:Gem::Dependency
+  name: hashie
+  requirement: &70296305209140 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 19
-        segments: 
-        - 1
-        - 1
-        - 0
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
         version: 1.1.0
   type: :runtime
-  version_requirements: *id002
-- !ruby/object:Gem::Dependency 
-  name: ruby-hmac
   prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  version_requirements: *70296305209140
+- !ruby/object:Gem::Dependency
+  name: ruby-hmac
+  requirement: &70296305208640 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :runtime
-  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: 
+  prerelease: false
+  version_requirements: *70296305208640
+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
@@ -95,36 +75,26 @@ files:
 - 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 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      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: []
-