mat 0.0.2 → 0.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4661de4427e8006fece6e12523bdd86e7511a661
-  data.tar.gz: 9701f7420de90d675426497a349ce3a0cab0fea2
+  metadata.gz: 7fd6c2b0fb8fda922ff65602717a64bc5236002f
+  data.tar.gz: 055392b1f18446daf417c4ba2c844b94082f7feb
 SHA512:
-  metadata.gz: e22976351959a023dac8b9d91534e136f92ba2db22c8181283396c5f8cac055900a45dc8df00cdc36a59843778d7a5df9bb3b4844d0cdb149b0c2d00610e34c2
-  data.tar.gz: 084b9d44bf2726c3174f4d4c2c40ea04969121d376adb21cd5ca731edd10fde9be08319370ef3d2bdc007242a929b3ef93fe823c99e55d97dab74b7dad39b31f
+  metadata.gz: badf4f8eaf1aa52286bfdde3bf8debcc816f33713c36689018287b1613f9d4e4a6f58bc0fbdcc3afc9688b0acc2e00e1ea5df31e9ef9e4383bd5ec4ea37b40c8
+  data.tar.gz: 3d4872e3e73e3a27604070b314ec29241629b55c14373e91c2815f7b9b6d55953481538a6b6c49b41e3ebb3253788b4a101241f88b7c4d202319559060ea702c

data/README.md

@@ -31,7 +31,7 @@ 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
+# Get the `iron` value (method_missing is used to retrieve each nutrient)
 food.iron #=> 1.09
 
 # Find a specific food by its number
@@ -42,6 +42,94 @@ food.name #=> "Ister gris"
 Mat.nutrients
 ```
 
+### CLI
+
+This gem comes with a simple command line interface.
+
+```ruby
+# Finding foodstuff by its number
+$ mat 55
+{
+  "name": "Mimosasallad",
+  "number": 55,
+  "nutrientValues": {
+    "energyKj": 651,
+    "energyKcal": 156,
+    "protein": 2.4,
+    "fat": 12,
+    "carbohydrates": 8.9,
+    "fibres": 1.8,
+    "salt": 0.1,
+    "ash": 0.6,
+    "water": 74.2,
+    "alcohol": 0,
+    "monosaccharides": 3.3,
+    "disaccharides": 4.5,
+    "saccharose": 4.2,
+    "wholegrain": 0,
+    "saturatedFattyAcids": 3.8,
+    "fattyAcid40100": 0.5,
+    "fattyAcid120": 0.1,
+    "fattyAcid140": 0.5,
+    "fattyAcid160": 1.9,
+    "fattyAcid180": 0.7,
+    "fattyAcid200": 0,
+    "monounsaturatedFattyAcids": 2.6,
+    "fattyAcid161": 0.1,
+    "fattyAcid181": 2.5,
+    "sumPolyunsaturatedFattyAcids": 4.4,
+    "n6FattyAcids": 0.1,
+    "fattyAcid182": 3.9,
+    "fattyAcid204": 0,
+    "n3FattyAcids": 0,
+    "fattyAcid183": 0.5,
+    "longN3FattyAcids": 0,
+    "epa": 0,
+    "dpa": 0,
+    "dha": 0,
+    "transFattyAcids": 0.1,
+    "cholesterol": 50.3,
+    "retinolEquivalents": 76,
+    "retinol": 68,
+    "betacarotene": 92,
+    "vitaminD": 0.15,
+    "vitaminE": 1.24,
+    "vitaminK": 3,
+    "timamine": 0.09,
+    "riboflavin": 0.1,
+    "vitaminC": 12,
+    "niacin": 0.5,
+    "niacinEquivalents": 1,
+    "vitaminB6": 0.1,
+    "vitaminB12": 0.23,
+    "phosphorous": 55,
+    "folate": 23,
+    "iodine": 4,
+    "trash": 17,
+    "iron": 0.54,
+    "calcium": 31,
+    "potassium": 199,
+    "magnesium": 13,
+    "sodium": 45,
+    "selenium": 2.3,
+    "zink": 0.4
+  }
+}
+
+# You can also search for foodstuff
+$ mat hasselnötter
+[
+  {
+    "name": "Hasselnötter",
+    "number": 1558
+  },
+  {
+    "name": "Mjölkchoklad m hackade hasselnötter Schweizernöt",
+    "number": 1848
+  }
+]
+```
+
 ## Contributing
 
 1. Fork it

data/bin/mat

@@ -1,20 +1,5 @@
 #!/usr/bin/env ruby
 
-require 'mat'
-require 'json'
+require_relative '../lib/mat/cli'
 
-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?
+Mat::CLI.search(ARGV.first) if ARGV.any?

data/lib/mat.rb

@@ -9,7 +9,7 @@ require_relative "mat/version"
 module Mat
   class << self
     def api(config = nil)
-      API.new(config).tap do |api|
+      (@api ||= API.new config).tap do |api|
         yield(api.config) if block_given?
       end
     end

data/lib/mat/cli.rb

@@ -0,0 +1,26 @@
+# encoding: utf-8
+
+require_relative '../mat'
+
+require 'json'
+
+module Mat
+  class CLI
+    class << self
+      def get_data(query)
+        if query.to_s.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
+    end
+  end
+end
+

data/lib/mat/version.rb

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

data/mat.gemspec

@@ -22,7 +22,7 @@ Gem::Specification.new do |spec|
   spec.require_paths = ["lib"]
 
   spec.add_development_dependency "bundler", "~> 1.3"
-  spec.add_development_dependency "minitest", "~> 4.7"
+  spec.add_development_dependency "minitest", "~> 5.0"
   spec.add_development_dependency "rake"
   spec.add_development_dependency "pry"
 end

data/spec/fixtures/nutrient.json

@@ -0,0 +1,302 @@
+[
+    {
+        "slug": "alcohol",
+        "name": "Alcohol",
+        "unit": "g"
+    },
+    {
+        "slug": "ash",
+        "name": "Ash",
+        "unit": "g"
+    },
+    {
+        "slug": "betacarotene",
+        "name": "Betacarotene",
+        "unit": "ug"
+    },
+    {
+        "slug": "calcium",
+        "name": "Calcium",
+        "unit": "mg"
+    },
+    {
+        "slug": "carbohydrates",
+        "name": "Carbohydrates",
+        "unit": "g"
+    },
+    {
+        "slug": "cholesterol",
+        "name": "Cholesterol",
+        "unit": "mg"
+    },
+    {
+        "slug": "dha",
+        "name": "DHA (fatty acid 22:6)",
+        "unit": "g"
+    },
+    {
+        "slug": "disaccharides",
+        "name": "Disaccharides",
+        "unit": "g"
+    },
+    {
+        "slug": "dpa",
+        "name": "DPA (fatty acid 22:5)",
+        "unit": "g"
+    },
+    {
+        "slug": "energyKcal",
+        "name": "Energy kCal",
+        "unit": "kcal"
+    },
+    {
+        "slug": "energyKj",
+        "name": "Energy  kJ",
+        "unit": "kj"
+    },
+    {
+        "slug": "epa",
+        "name": "EPA (fatty acid 20:5)",
+        "unit": "g"
+    },
+    {
+        "slug": "fat",
+        "name": "Fat",
+        "unit": "g"
+    },
+    {
+        "slug": "fattyAcid120",
+        "name": "Fatty acid 12:0",
+        "unit": "g"
+    },
+    {
+        "slug": "fattyAcid140",
+        "name": "Fatty acid 14:0",
+        "unit": "g"
+    },
+    {
+        "slug": "fattyAcid160",
+        "name": "Fatty acid 16:0",
+        "unit": "g"
+    },
+    {
+        "slug": "fattyAcid161",
+        "name": "Fatty acid 16:1",
+        "unit": "g"
+    },
+    {
+        "slug": "fattyAcid180",
+        "name": "Fatty acid 18:0",
+        "unit": "g"
+    },
+    {
+        "slug": "fattyAcid181",
+        "name": "Fatty acid 18:1",
+        "unit": "g"
+    },
+    {
+        "slug": "fattyAcid182",
+        "name": "Fatty acid 18:2",
+        "unit": "g"
+    },
+    {
+        "slug": "fattyAcid183",
+        "name": "Fatty acid 18:3",
+        "unit": "g"
+    },
+    {
+        "slug": "fattyAcid200",
+        "name": "Fatty acid 20:0",
+        "unit": "g"
+    },
+    {
+        "slug": "fattyAcid204",
+        "name": "Fatty acid 20:4",
+        "unit": "g"
+    },
+    {
+        "slug": "fattyAcid40100",
+        "name": "Fatty acid 4:0-10:0",
+        "unit": "g"
+    },
+    {
+        "slug": "fibres",
+        "name": "Fibres",
+        "unit": "g"
+    },
+    {
+        "slug": "folate",
+        "name": "Folate",
+        "unit": "ug"
+    },
+    {
+        "slug": "iodine",
+        "name": "Iodine",
+        "unit": "ug"
+    },
+    {
+        "slug": "iron",
+        "name": "Iron",
+        "unit": "mg"
+    },
+    {
+        "slug": "longN3FattyAcids",
+        "name": "Sum long n-3 fatty acids",
+        "unit": "g"
+    },
+    {
+        "slug": "magnesium",
+        "name": "Magnesium",
+        "unit": "mg"
+    },
+    {
+        "slug": "monosaccharides",
+        "name": "Monosaccharides",
+        "unit": "g"
+    },
+    {
+        "slug": "monounsaturatedFattyAcids",
+        "name": "Sum monounsaturated fatty acids",
+        "unit": "g"
+    },
+    {
+        "slug": "n3FattyAcids",
+        "name": "Sum n-3 fatty acids",
+        "unit": "g"
+    },
+    {
+        "slug": "n6FattyAcids",
+        "name": "Sum n-6 fatty acids",
+        "unit": "g"
+    },
+    {
+        "slug": "niacin",
+        "name": "Niacin",
+        "unit": "mg"
+    },
+    {
+        "slug": "niacinEquivalents",
+        "name": "Niacin equivalents",
+        "unit": ""
+    },
+    {
+        "slug": "phosphorous",
+        "name": "Phosphorous",
+        "unit": "mg"
+    },
+    {
+        "slug": "potassium",
+        "name": "Potassium",
+        "unit": "mg"
+    },
+    {
+        "slug": "protein",
+        "name": "Protein",
+        "unit": "g"
+    },
+    {
+        "slug": "retinol",
+        "name": "Retinol",
+        "unit": "ug"
+    },
+    {
+        "slug": "retinolEquivalents",
+        "name": "Retinol equivalents",
+        "unit": ""
+    },
+    {
+        "slug": "riboflavin",
+        "name": "Riboflavin",
+        "unit": "mg"
+    },
+    {
+        "slug": "saccharose",
+        "name": "Saccharose",
+        "unit": "g"
+    },
+    {
+        "slug": "salt",
+        "name": "Salt",
+        "unit": "g"
+    },
+    {
+        "slug": "saturatedFattyAcids",
+        "name": "Sum saturated fatty acids",
+        "unit": "g"
+    },
+    {
+        "slug": "selenium",
+        "name": "Selenium",
+        "unit": "ug"
+    },
+    {
+        "slug": "sodium",
+        "name": "Sodium",
+        "unit": "gm"
+    },
+    {
+        "slug": "sumPolyunsaturatedFattyAcids",
+        "name": "Sum polyunsaturated fatty acids",
+        "unit": "g"
+    },
+    {
+        "slug": "timamine",
+        "name": "Timamine",
+        "unit": "mg"
+    },
+    {
+        "slug": "transFattyAcids",
+        "name": "Sum trans fatty acids",
+        "unit": "g"
+    },
+    {
+        "slug": "trash",
+        "name": "trash",
+        "unit": "percentage"
+    },
+    {
+        "slug": "vitaminB12",
+        "name": "Vitamin B12",
+        "unit": "ug"
+    },
+    {
+        "slug": "vitaminB6",
+        "name": "Vitamin B6",
+        "unit": "mg"
+    },
+    {
+        "slug": "vitaminC",
+        "name": "Vitamin C",
+        "unit": "mg"
+    },
+    {
+        "slug": "vitaminD",
+        "name": "Vitamin D",
+        "unit": "ug"
+    },
+    {
+        "slug": "vitaminE",
+        "name": "Vitamin E",
+        "unit": "mg"
+    },
+    {
+        "slug": "vitaminK",
+        "name": "Vitamin K",
+        "unit": "ug"
+    },
+    {
+        "slug": "water",
+        "name": "Water",
+        "unit": "g"
+    },
+    {
+        "slug": "wholegrain",
+        "name": "Wholegrain sum",
+        "unit": "g"
+    },
+    {
+        "slug": "zink",
+        "name": "Zink",
+        "unit": "mg"
+    }
+]

data/spec/mat/api/config_spec.rb

@@ -0,0 +1,40 @@
+# encoding: utf-8
+
+require_relative '../../spec_helper'
+
+describe "Config" do
+  subject {
+    Mat::API::Config.new do |c|
+      c.base_url = base_url
+    end
+  }
+
+  let(:base_url) { 'http://config.test/' }
+
+  it "returns the base_url" do
+    subject.base_url.must_equal 'http://config.test/'
+  end
+
+  describe "json_parser" do
+    it "is a lambda by default" do
+      subject.json_parser.
+        parse('{"foo":123}')['foo'].must_equal 123
+    end
+
+    it "can be changed" do
+      subject.json_parser = "foo"
+      subject.json_parser.must_equal "foo"
+    end
+  end
+
+  describe "http_client" do
+    it "is Net::HTTP by default" do
+      subject.http_client.must_equal Mat::HTTP
+    end
+
+    it "can be changed" do
+      subject.http_client = "bar"
+      subject.http_client.must_equal "bar"
+    end
+  end
+end

data/spec/mat/cli_spec.rb

@@ -0,0 +1,35 @@
+# encoding: utf-8
+
+require_relative '../spec_helper'
+
+describe Mat::CLI do
+  subject { Mat::CLI }
+
+  describe "get_data" do
+    it "finds foodstuff by number" do
+      Mat.api.stub(:foodstuff, "data") do
+        subject.get_data(123).must_equal "data"
+      end
+    end
+
+    it "queries foodstuffs by name" do
+      Mat.api.stub(:foodstuffs, "search result") do
+        subject.get_data('Mjölk').must_equal "search result"
+      end
+    end
+  end
+
+  describe "search" do
+    it "pretty formats the returned JSON" do
+      subject.stub(:get_data, ->(q) { { foo:'bar' } }) do
+        ->{ subject.search('foo') }.must_output "{\n  \"foo\": \"bar\"\n}\n"
+      end
+    end
+
+    it "prints a warning on exception" do
+      subject.stub(:get_data, ->(q){ raise Mat::HTTP::Exception }) do
+        ->{ subject.search('foo') }.must_output nil, "Nothing found\n"
+      end
+    end
+  end
+end

data/spec/mat/nutrient_spec.rb

@@ -0,0 +1,35 @@
+# encoding: utf-8
+
+require_relative '../spec_helper'
+
+describe Mat::Nutrient do
+  subject { Mat::Nutrient }
+
+  let(:fixture_data)  { parsed_fixture('nutrient') }
+  let(:nutrients)     { fixture_data.map { |d| subject.new(d) } }
+  let(:nutrient)      { nutrients[4] }
+
+  describe "initialize" do
+    it "takes data as input" do
+      subject.new("foo").data.must_equal "foo"
+    end
+  end
+
+  describe "slug" do
+    it "returns the slug from the data" do
+      nutrient.slug.must_equal "carbohydrates"
+    end
+  end
+
+  describe "name" do
+    it "returns the name from the data" do
+      nutrient.name.must_equal "Carbohydrates"
+    end
+  end
+
+  describe "unit" do
+    it "returns the unit from the data" do
+      nutrient.unit.must_equal "g"
+    end
+  end
+end

data/spec/mat_spec.rb

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

data/spec/spec_helper.rb

@@ -1,10 +1,11 @@
 # encoding: utf-8
 
+require "minitest/autorun"
 require "minitest/spec"
 require "minitest/pride"
-require "minitest/autorun"
 
 require_relative "../lib/mat"
+require_relative "../lib/mat/cli"
 
 $loaded_fixtures = {}
 $parsed_fixtures = {}

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mat
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
 platform: ruby
 authors:
 - Peter Hellberg
@@ -30,14 +30,14 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '4.7'
+        version: '5.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '4.7'
+        version: '5.0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -84,16 +84,20 @@ files:
 - lib/mat.rb
 - lib/mat/api.rb
 - lib/mat/api/config.rb
+- lib/mat/cli.rb
 - lib/mat/foodstuff.rb
 - lib/mat/http.rb
 - lib/mat/nutrient.rb
 - lib/mat/version.rb
 - mat.gemspec
-- spec/fixtures/foodstuff/24_nutrient_carbohydrates.json
 - spec/fixtures/foodstuff/44.json
+- spec/fixtures/nutrient.json
+- spec/mat/api/config_spec.rb
 - spec/mat/api_spec.rb
+- spec/mat/cli_spec.rb
 - spec/mat/foodstuff_spec.rb
 - spec/mat/http_spec.rb
+- spec/mat/nutrient_spec.rb
 - spec/mat/version_spec.rb
 - spec/mat_spec.rb
 - spec/spec_helper.rb
@@ -122,12 +126,14 @@ signing_key:
 specification_version: 4
 summary: A small API client for the Mat API
 test_files:
-- spec/fixtures/foodstuff/24_nutrient_carbohydrates.json
 - spec/fixtures/foodstuff/44.json
+- spec/fixtures/nutrient.json
+- spec/mat/api/config_spec.rb
 - spec/mat/api_spec.rb
+- spec/mat/cli_spec.rb
 - spec/mat/foodstuff_spec.rb
 - spec/mat/http_spec.rb
+- spec/mat/nutrient_spec.rb
 - spec/mat/version_spec.rb
 - spec/mat_spec.rb
 - spec/spec_helper.rb
-has_rdoc: 

data/spec/fixtures/foodstuff/24_nutrient_carbohydrates.json

@@ -1,5 +0,0 @@
-{
-    "name": "Gravlaxsås",
-    "foodstuffNumber": 24,
-    "carbohydrates": 13.1
-}