nutriscore 0.2.0 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 32fc807c0ac252fb44029dd894b01c6e1a73cdb018818683265bcfbaf28e6414
-  data.tar.gz: e52bbc975c607d50c68f308ccb0c374841a8cfc209b2e176b88c2b1ae22cf97c
+  metadata.gz: 5546badbbce48d13c565aa9adb7e0acccd1625916f11dcc77f34fb7fcb0571a6
+  data.tar.gz: b884ceed940198537890c1d81be684baa0c30ff885776f9b661c22da5595c4f7
 SHA512:
-  metadata.gz: 60a6712c438ea99a6ea46560327fa25f8519bc80aefb8e65a3eaf272568f53a4ce08219731656b02f8eada7ed28bc48385173107ed767221d9002334b3d2cda3
-  data.tar.gz: 36571b3a8c1930043e961ef776f5bbdfa958da5f2759cd029ab555ac5354dbbbc9e2251aa11242a9006cc1b27efa401759764bdbd0f8e629529700c346f2c392
+  metadata.gz: ec3de5c8ceaa94d7d445c8a25c95eaeb4f13133a4bcfd709513c86ce8b0b7a80753fe73fe96a42892f851079ac0090cecf49f536c6fd6db1d0c094bc0c1a6ead
+  data.tar.gz: f6854b82b1fe9ba3ac30552466d16b79c85f6684beb48829f057300d758f883e36e923a53a34df03863e81965b58d2e617bc4f5dd3862aa85e6013902ee392eb

data/README.md

@@ -1,5 +1,7 @@
 # Nutriscore
 
+[![Gem Version](https://badge.fury.io/rb/nutriscore.svg)](https://rubygems.org/gems/nutriscore)
+
 Consumer food products in some countries have a nutritional score, indicating
 how healthy the product is to eat. Each country has its own approach, but in
 the European Union the _Nutri-Score_ in several countries.
@@ -24,9 +26,9 @@ was adopted in 2017 for use as a voluntary label on the packaging.
 In 2018, Belgium and Spain adopted the same scheme.
 
 Other countries are evaluating adopting the Nutri-Score as well, including
-The Netherlands. There is also a
-[European citizen's initiative](http://ec.europa.eu/citizens-initiative/public/initiatives/ongoing/details/2019/000008)
-to adopt it Europe-wide.
+The Netherlands. There was also a
+[European citizen's initiative](http://ec.europa.eu/citizens-initiative/public/initiatives/ongoing/details/2019/000008_en)
+to adopt it Europe-wide, but this has been withdrawn.
 
 ## Installation
 
@@ -37,27 +39,29 @@ gem install nutriscore
 ## Usage
 
 The input for all nutritional scores are a product category and nutritional values.
-Which nutrients are required depends on the product category.
+Which nutrients are required depends on the product category. Note that `fvnp` stands
+for the amount of fruits, vegetables, nuts and pulses (and, since Oct 2019, also
+rapeseed, walnuts and olive oils).
 
 ```ruby
 require 'nutriscore'
 
 # Fruit fromage frais
 product_a = {
-  energy: 459,                 # kJ/100g
-  fat_saturated: 1.8,          #  g/100g
-  sugar: 13.4,                 #  g/100g
-  sodium: 0.1 / 1000,          #  g/100g
-  fruits_vegetables_nuts: 8,   #  g/100g (= weight-%)
-  fibres: 0.6,                 #  g/100g
-  proteins: 6.5,               #  g/100g
+  energy: 459,          # kJ/100g
+  fat_saturated: 1.8,   #  g/100g
+  sugar: 13.4,          #  g/100g
+  sodium: 0.1,          #  g/100g
+  fvnp: 8,              #  g/100g (= weight-%)
+  fibres: 0.6,          #  g/100g
+  proteins: 6.5,        #  g/100g
 }
 
 # Compute the french Nutri-Score for a generic product.
 score = Nutriscore::FR::SpecificScore.new(product_a)
 #<Nutriscore::FR::SpecificScore score=0
 #  positive_score=#<Nutriscore::FR::PositiveScore score=4
-#                    fruits_vegetables_nuts=0 fibres=0 proteins=4>
+#                    fvnp=0 fibres=0 proteins=4>
 #  negative_score=#<Nutriscore::FR::NegativeScore score=4
 #                    energy=1 fat_saturated=1 sugar=2 sodium=0>>
 score.score.single

data/lib/nutriscore/fr/drinks_score.rb

@@ -8,7 +8,7 @@ module Nutriscore
       include DrinksScoreClass
 
       def self.nutrient_keys
-        [:energy, :sugar, :fruits_vegetables]
+        [:energy, :sugar, :fvnp]
       end
 
       def energy
@@ -45,10 +45,10 @@ module Nutriscore
         end
       end
 
-      def fruits_vegetables
+      def fvnp
         # the text mentions % but here we use g/100ml
         # we'd need to either ask for %, ask for g/100g, or require a density ...
-        score_value(@nutrients.fruits_vegetables, 0..10) do |v|
+        score_value(@nutrients.fvnp, 0..10) do |v|
           if    v > 80 then 10
           elsif v > 60 then  4
           elsif v > 40 then  2

data/lib/nutriscore/fr/negative_score.rb

@@ -37,7 +37,7 @@ module Nutriscore
           elsif v >  3 then  3
           elsif v >  2 then  2
           elsif v >  1 then  1
-          else                   0
+          else               0
           end
         end
       end
@@ -61,6 +61,7 @@ module Nutriscore
 
       def sodium
         score_value(@nutrients.sodium, 0..10) do |v|
+          v *= 1000 if v # comparison is in mg/100g
           if    v > 900 then 10
           elsif v > 810 then  9
           elsif v > 720 then  8

data/lib/nutriscore/fr/positive_score.rb

@@ -5,11 +5,11 @@ module Nutriscore
     class PositiveScore < Nutriscore::Common::Score
 
       def self.nutrient_keys
-        [:fruits_vegetables_nuts, :fibres, :proteins]
+        [:fvnp, :fibres, :proteins]
       end
 
-      def fruits_vegetables_nuts
-        score_value(@nutrients.fruits_vegetables_nuts, 0..5) do |v|
+      def fvnp
+        score_value(@nutrients.fvnp, 0..5) do |v|
           if    v > 80 then 5
           elsif v > 60 then 2
           elsif v > 40 then 1

data/lib/nutriscore/fr/specific_score.rb

@@ -6,9 +6,9 @@ module Nutriscore
     # this is for general products
     class SpecificScore < GeneralScore
       def score
-        if @negative.score.min < 11 || @positive.fruits_vegetables_nuts.max >= 5
+        if @negative.score.min < 11 || @positive.fvnp.max >= 5
           @negative.score - @positive.score
-        elsif @negative.score.max >= 11 && @positive.fruits_vegetables_nuts.min < 5
+        elsif @negative.score.max >= 11 && @positive.fvnp.min < 5
           @negative.score - @positive.score_without_proteins
         else
           Range.new(

data/lib/nutriscore/uk/positive_score.rb

@@ -11,11 +11,11 @@ module Nutriscore
       end
 
       def self.nutrient_keys
-        [:fruits_vegetables_nuts, :fibres, :proteins]
+        [:fvnp, :fibres, :proteins]
       end
 
-      def fruits_vegetables_nuts
-        score_value(@nutrients.fruits_vegetables_nuts, 0..5) do |v|
+      def fvnp
+        score_value(@nutrients.fvnp, 0..5) do |v|
           if    v > 80 then 5
           elsif v > 60 then 2
           elsif v > 40 then 1

data/lib/nutriscore/uk/specific_score.rb

@@ -7,10 +7,10 @@ module Nutriscore
     class SpecificScore < GeneralScore
       def score
         # 'If a food or drink scores 11 or more ‘A’ points then it cannot score points for protein
-        #  unless it also scores 5 points for fruit, vegetables and nuts.'
-        if @negative.score.min < 11 || @positive.fruits_vegetables_nuts.max >= 5
+        #  unless it also scores 5 points for fruit, vegetables, nuts and pulses.'
+        if @negative.score.min < 11 || @positive.fvnp.max >= 5
           @negative.score - @positive.score
-        elsif @negative.score.max >= 11 && @positive.fruits_vegetables_nuts.min < 5
+        elsif @negative.score.max >= 11 && @positive.fvnp.min < 5
           @negative.score - @positive.score_without_proteins
         else
           Range.new(

data/lib/nutriscore/version.rb

@@ -1,4 +1,4 @@
 module Nutriscore
-  VERSION      = '0.2.0'
-  VERSION_DATE = '2021-06-07'
+  VERSION      = '0.3.0'
+  VERSION_DATE = '2022-05-05'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: nutriscore
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.3.0
 platform: ruby
 authors:
 - wvengen
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-06-07 00:00:00.000000000 Z
+date: 2022-05-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec