mat 0.0.1 → 0.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a9766485afe87dccb42c0ecec87cd259f9b45503
-  data.tar.gz: 270ab12ccd5262b6f77f84be8e117155f7a33215
+  metadata.gz: 4661de4427e8006fece6e12523bdd86e7511a661
+  data.tar.gz: 9701f7420de90d675426497a349ce3a0cab0fea2
 SHA512:
-  metadata.gz: 295337f809540e33831b43ff7ed360ab626ad272da1fe6344b5732a21bb4fa6f0a04231cd6189a75f1e7c4028245022b32b7602d1595ce0d6e058fbc3d40e234
-  data.tar.gz: 12d167649edeba0ab5e00716bf5a53ddd029b3d22045e6db966db8dc79f039f4a02f1862d4e2dbf81f000c3b50c9a8f7dedf8bf0f1185b7c52755711170a4bed
+  metadata.gz: e22976351959a023dac8b9d91534e136f92ba2db22c8181283396c5f8cac055900a45dc8df00cdc36a59843778d7a5df9bb3b4844d0cdb149b0c2d00610e34c2
+  data.tar.gz: 084b9d44bf2726c3174f4d4c2c40ea04969121d376adb21cd5ca731edd10fde9be08319370ef3d2bdc007242a929b3ef93fe823c99e55d97dab74b7dad39b31f

data/.travis.yml

@@ -0,0 +1,6 @@
+language: ruby
+rvm:
+  - 2.0.0
+  - 1.9.3
+  - jruby-19mode
+  - rbx-19mode

data/README.md

@@ -4,6 +4,8 @@ A small (unofficial) API client for the [Mat API](http://matapi.se/).
 
 The documentation is in Swedish, but so is the [data](http://www.slv.se/sv/grupp1/mat-och-naring/vad-innehaller-maten/livsmedelsdatabasen-/).
 
+[![Build Status](https://travis-ci.org/peterhellberg/mat.png?branch=master)](https://travis-ci.org/peterhellberg/mat)
+
 ## Installation
 
 Add this line to your application's Gemfile:
@@ -23,18 +25,21 @@ Or install it yourself as:
 It is probably a good idea to take a look in `specs`
 
 ```ruby
-# All nutrients
-Mat.nutrients
-
 # Find the first food with ’köttfärs’ in the name
-köttfärspaj = Mat.all('Köttfärs').first
+food = Mat.all('Köttfärs').first
+
+# You can also pass a search query to the find method
+food = Mat.find('Köttfärs')
 
 # Get the `iron` value
-köttfärspaj.iron #=> 1.09
+food.iron #=> 1.09
 
 # Find a specific food by its number
 food = Mat.find(3)
 food.name #=> "Ister gris"
+
+# You can also list all nutrients
+Mat.nutrients
 ```
 
 ## Contributing

data/bin/mat

@@ -0,0 +1,20 @@
+#!/usr/bin/env ruby
+
+require 'mat'
+require 'json'
+
+def get_data(query)
+  if query.match(/^\d+$/)
+    Mat.api.foodstuff(query)
+  else
+    Mat.api.foodstuffs(query)
+  end
+end
+
+def search(query)
+  puts JSON.pretty_generate get_data(query)
+rescue Mat::HTTP::Exception
+  warn "Nothing found"
+end
+
+search(ARGV.first) if ARGV.any?

data/lib/mat/foodstuff.rb

@@ -23,7 +23,7 @@ module Mat
     end
 
     def name
-      data['name']
+      data['name'].to_s.strip
     end
 
     def number

data/lib/mat/version.rb

@@ -1,5 +1,5 @@
 # encoding: utf-8
 
 module Mat
-  VERSION = "0.0.1"
+  VERSION = "0.0.2"
 end

data/spec/fixtures/foodstuff/44.json

@@ -1,58 +1,60 @@
 {
     "name": "Dressing majonnäs fett ca 40% ",
-    "foodstuffNumber": 44,
-    "energyKj": 1898,
-    "energyKcal": 454,
-    "protein": 0.5,
-    "fat": 40,
-    "carbohydrates": 24,
-    "fibres": 0.2,
-    "salt": 1.7,
-    "ash": 2.1,
-    "water": 33.2,
-    "alcohol": 0,
-    "monosaccharides": 3.1,
-    "disaccharides": 18.6,
-    "saccharose": 18.6,
-    "wholegrain": 0,
-    "saturatedFattyAcids": 6.1,
-    "fattyAcid40100": 0,
-    "fattyAcid120": 0,
-    "fattyAcid140": 0,
-    "fattyAcid160": 4.2,
-    "fattyAcid180": 1.5,
-    "fattyAcid200": 0.2,
-    "monounsaturatedFattyAcids": 9.8,
-    "fattyAcid161": 0,
-    "fattyAcid181": 9.8,
-    "sumPolyunsaturatedFattyAcids": 22.3,
-    "fattyAcid182": 19.7,
-    "fattyAcid204": 0,
-    "fattyAcid183": 2.6,
-    "epa": 0,
-    "dpa": 0,
-    "dha": 0,
-    "cholesterol": 26,
-    "retinolEquivalents": 2,
-    "retinol": 2,
-    "betacarotene": 0,
-    "vitaminD": 0,
-    "vitaminE": 2.5,
-    "timamine": 0.01,
-    "riboflavin": 0.02,
-    "vitaminC": 0,
-    "niacin": 0,
-    "niacinEquivalents": 0.1,
-    "vitaminB6": 0.02,
-    "vitaminB12": 0.2,
-    "phosphorous": 17,
-    "folate": 7,
-    "trash": 0,
-    "iron": 0.3,
-    "calcium": 11,
-    "potassium": 142,
-    "magnesium": 5,
-    "sodium": 680,
-    "selenium": 0.5,
-    "zink": 0.1
+    "number": 44,
+    "nutrientValues": {
+        "energyKj": 1898,
+        "energyKcal": 454,
+        "protein": 0.5,
+        "fat": 40,
+        "carbohydrates": 24,
+        "fibres": 0.2,
+        "salt": 1.7,
+        "ash": 2.1,
+        "water": 33.2,
+        "alcohol": 0,
+        "monosaccharides": 3.1,
+        "disaccharides": 18.6,
+        "saccharose": 18.6,
+        "wholegrain": 0,
+        "saturatedFattyAcids": 6.1,
+        "fattyAcid40100": 0,
+        "fattyAcid120": 0,
+        "fattyAcid140": 0,
+        "fattyAcid160": 4.2,
+        "fattyAcid180": 1.5,
+        "fattyAcid200": 0.2,
+        "monounsaturatedFattyAcids": 9.8,
+        "fattyAcid161": 0,
+        "fattyAcid181": 9.8,
+        "sumPolyunsaturatedFattyAcids": 22.3,
+        "fattyAcid182": 19.7,
+        "fattyAcid204": 0,
+        "fattyAcid183": 2.6,
+        "epa": 0,
+        "dpa": 0,
+        "dha": 0,
+        "cholesterol": 26,
+        "retinolEquivalents": 2,
+        "retinol": 2,
+        "betacarotene": 0,
+        "vitaminD": 0,
+        "vitaminE": 2.5,
+        "timamine": 0.01,
+        "riboflavin": 0.02,
+        "vitaminC": 0,
+        "niacin": 0,
+        "niacinEquivalents": 0.1,
+        "vitaminB6": 0.02,
+        "vitaminB12": 0.2,
+        "phosphorous": 17,
+        "folate": 7,
+        "trash": 0,
+        "iron": 0.3,
+        "calcium": 11,
+        "potassium": 142,
+        "magnesium": 5,
+        "sodium": 680,
+        "selenium": 0.5,
+        "zink": 0.1
+    }
 }

data/spec/mat/foodstuff_spec.rb

@@ -14,4 +14,40 @@ describe Mat::Foodstuff do
       subject.new("foo").data.must_equal "foo"
     end
   end
+
+  describe "name" do
+    it "returns the name from the data" do
+      foodstuff.name.must_equal "Dressing majonnäs fett ca 40%"
+    end
+  end
+
+  describe "number" do
+    it "returns the number from the data" do
+      foodstuff.number.must_equal 44
+    end
+  end
+
+  describe "nutrient_values" do
+    it "returns the nutrient values for the food" do
+      foodstuff.nutrient_values['energyKj'].must_equal 1898
+    end
+
+    it "it retrieves more data if needed" do
+      food = subject.new("number" => 44)
+
+      Mat.api.stub(:foodstuff, fixture_data) do
+        food.nutrient_values['energyKj'].must_equal 1898
+      end
+    end
+  end
+
+  describe "get_data!" do
+    it "retrieves more data" do
+      food = subject.new("number" => 44)
+
+      Mat.api.stub(:foodstuff, fixture_data) do
+        food.get_data!.zink.must_equal 0.1
+      end
+    end
+  end
 end

data/spec/mat_spec.rb

@@ -12,7 +12,7 @@ describe Mat do
       api.config.base_url.must_equal "api.test"
     end
 
-    it "memoizes the api client" do
+    it "does not memoize the api client" do
       subject.api.object_id.wont_equal subject.api.object_id
     end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mat
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
 platform: ruby
 authors:
 - Peter Hellberg
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-05-11 00:00:00.000000000 Z
+date: 2013-05-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -69,15 +69,18 @@ dependencies:
 description: 
 email:
 - peter@c7.se
-executables: []
+executables:
+- mat
 extensions: []
 extra_rdoc_files: []
 files:
 - .gitignore
+- .travis.yml
 - Gemfile
 - LICENSE.txt
 - README.md
 - Rakefile
+- bin/mat
 - lib/mat.rb
 - lib/mat/api.rb
 - lib/mat/api/config.rb