fat_secret 0.0.4 → 0.0.5

data/lib/fat_secret/connection.rb

@@ -14,11 +14,11 @@ module FatSecret
 
         params = default_parameters.merge(params).merge(method: method)
         uri = request_uri('GET', params)
-        # response = Typhoeus.get(
-        #   "#{uri.scheme}://#{uri.host}:#{uri.port}#{uri.path}",
-        #   params: params, followlocation: true
-        # )
-        JSON.parse(uri.read)
+        response = uri.read
+        FatSecret.configuration.logger.debug(
+          "FatSecret Response: #{response}"
+        )
+        JSON.parse(response)
       end
 
       private

data/lib/fat_secret/relations/has_many.rb

@@ -17,7 +17,9 @@ module FatSecret
 
           define_method "#{type}=" do |array|
             klass = "FatSecret::#{type.to_s.singularize.classify}".constantize
-            servings = array[type.to_s.singularize].map do |attrs|
+            servings = array[type.to_s.singularize]
+            servings = [servings] unless servings.is_a?(Array)
+            servings = servings.map do |attrs|
               klass.new(attrs)
             end
             @servings = HasManyProxy.new(servings)

data/lib/fat_secret/version.rb

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

data/spec/lib/fat_secret/food_spec.rb

@@ -35,30 +35,49 @@ describe FatSecret::Food do
   describe '.get' do
     before { configure }
 
-    subject do
-      VCR.use_cassette('get_milk', match_requests_on: [ :host ], allow_playback_repeats: true) do
-        FatSecret::Food.get(793)
+    context 'when there are multiple servings', :multiple_servings do
+      subject do
+        VCR.use_cassette('get_milk', match_requests_on: [ :host ], allow_playback_repeats: true) do
+          FatSecret::Food.get(793)
+        end
       end
-    end
 
-    it 'should return a food object' do
-      subject.should be_instance_of(FatSecret::Food)
-    end
+      it 'should return a food object' do
+        subject.should be_instance_of(FatSecret::Food)
+      end
 
-    it 'should populate the food name' do
-      subject.name.should eql('Milk')
-    end
+      it 'should populate the food name' do
+        subject.name.should eql('Milk')
+      end
 
-    it 'should populate the servings' do
-      subject.servings.should_not be_blank
-    end
+      it 'should populate the servings' do
+        subject.servings.should_not be_blank
+      end
 
-    it 'should use serving objects in the servings relation' do
-      subject.servings.first.should be_instance_of(FatSecret::Serving)
+      it 'should use serving objects in the servings relation' do
+        subject.servings.first.should be_instance_of(FatSecret::Serving)
+      end
+
+      it 'should add the serving data to the servings' do
+        subject.servings.first.saturated_fat.should eql(2.965)
+      end
     end
 
-    it 'should add the serving data to the servings' do
-      subject.servings.first.saturated_fat.should eql(2.965)
+    context 'when there is only 1 serving', :one_serving do
+      subject do
+        VCR.use_cassette(
+          'get_steel_cut_oats', match_requests_on: [ :host ],
+          allow_playback_repeats: true
+        ) do
+          FatSecret::Food.get(2095870)
+        end
+      end
+
+      it { should be_instance_of(FatSecret::Food) }
+
+      it { subject.servings.count.should eql(1) }
+
+      it { subject.servings.first.calories.should eql(150.0) }
     end
   end
 

data/spec/vcr_cassettes/get_steel_cut_oats.yml

@@ -0,0 +1,47 @@
+---
+http_interactions:
+- request:
+    method: get
+    uri: http://platform.fatsecret.com/rest/server.api?food_id=2095870&format=json&method=food.get&oauth_consumer_key=7ebedda1451640ecbd8db41ea22d1351&oauth_nonce=429e9d97ad3f4f51&oauth_signature=xxPMCPmw5CxkTpTo2RGpmevl5co%3D&oauth_signature_method=HMAC-SHA1&oauth_timestamp=1362913468&oauth_version=1.0
+    body:
+      encoding: US-ASCII
+      string: ''
+    headers:
+      accept:
+      - ! '*/*'
+      user-agent:
+      - Ruby
+  response:
+    status:
+      code: 200
+      message: OK
+    headers:
+      cache-control:
+      - private
+      content-type:
+      - application/json; charset=utf-8
+      server:
+      - Microsoft-IIS/7.5
+      x-aspnet-version:
+      - 4.0.30319
+      x-powered-by:
+      - ASP.NET
+      date:
+      - Sun, 10 Mar 2013 11:04:27 GMT
+      content-length:
+      - '840'
+    body:
+      encoding: US-ASCII
+      string: ! '{ "food": {"brand_name": "Hodgson Mill", "food_id": "2095870", "food_name":
+        "Steel Cut Oats", "food_type": "Brand", "food_url": "http:\/\/www.fatsecret.com\/calories-nutrition\/hodgson-mill\/steel-cut-oats",
+        "servings": {"serving": {"calcium": "0", "calories": "150", "carbohydrate":
+        "27", "cholesterol": "0", "fat": "2.5", "fiber": "4", "iron": "10", "measurement_description":
+        "serving", "metric_serving_amount": "40.000", "metric_serving_unit": "g",
+        "monounsaturated_fat": "0", "number_of_units": "1.000", "polyunsaturated_fat":
+        "0", "potassium": "167", "protein": "5", "saturated_fat": "0.5", "serving_description":
+        "1\/4 cup", "serving_id": "2053719", "serving_url": "http:\/\/www.fatsecret.com\/calories-nutrition\/hodgson-mill\/steel-cut-oats",
+        "sodium": "0", "sugar": "1", "trans_fat": "0", "vitamin_a": "0", "vitamin_c":
+        "0" } } }}'
+    http_version: '1.1'
+  recorded_at: Sun, 10 Mar 2013 11:04:28 GMT
+recorded_with: VCR 2.3.0

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: fat_secret
 version: !ruby/object:Gem::Version
-  version: 0.0.4
+  version: 0.0.5
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-02-02 00:00:00.000000000 Z
+date: 2013-03-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: active_attr
@@ -128,6 +128,7 @@ files:
 - spec/support/vcr.rb
 - spec/vcr_cassettes/get_milk.yml
 - spec/vcr_cassettes/get_servings_association.yml
+- spec/vcr_cassettes/get_steel_cut_oats.yml
 - spec/vcr_cassettes/search_for_milk.yml
 homepage: https://github.com/mattbeedle/FatSecret
 licenses: []
@@ -165,4 +166,5 @@ test_files:
 - spec/support/vcr.rb
 - spec/vcr_cassettes/get_milk.yml
 - spec/vcr_cassettes/get_servings_association.yml
+- spec/vcr_cassettes/get_steel_cut_oats.yml
 - spec/vcr_cassettes/search_for_milk.yml