openfoodfacts 0.3.1 → 0.6.0

data/lib/openfoodfacts/store.rb

@@ -15,9 +15,9 @@ module Openfoodfacts
 
       # Get stores
       #
-      def all(locale: Openfoodfacts::DEFAULT_LOCALE)
+      def all(locale: DEFAULT_LOCALE, domain: DEFAULT_DOMAIN)
         if path = LOCALE_PATHS[locale]
-          Product.tags_from_page(self, "http://#{locale}.openfoodfacts.org/#{path}")
+          Product.tags_from_page(self, "https://#{locale}.#{domain}/#{path}")
         end
       end
 
@@ -30,4 +30,4 @@ module Openfoodfacts
     end
 
   end
-end
+end

data/lib/openfoodfacts/trace.rb

@@ -15,9 +15,9 @@ module Openfoodfacts
 
       # Get traces
       #
-      def all(locale: Openfoodfacts::DEFAULT_LOCALE)
+      def all(locale: DEFAULT_LOCALE, domain: DEFAULT_DOMAIN)
         if path = LOCALE_PATHS[locale]
-          Product.tags_from_page(self, "http://#{locale}.openfoodfacts.org/#{path}")
+          Product.tags_from_page(self, "https://#{locale}.#{domain}/#{path}")
         end
       end
 
@@ -30,4 +30,4 @@ module Openfoodfacts
     end
 
   end
-end
+end

data/lib/openfoodfacts/user.rb

@@ -6,10 +6,10 @@ module Openfoodfacts
     class << self
 
       # Login
-      # WARNING SECURITY: It is not made throught HTTPS Secure so password can be read on the way.
       #
-      def login(user_id, password, locale: Openfoodfacts::DEFAULT_LOCALE)
-        uri = URI("http://#{locale}.openfoodfacts.org/cgi/session.pl")
+      def login(user_id, password, locale: DEFAULT_LOCALE, domain: DEFAULT_DOMAIN)
+        path = 'cgi/session.pl'
+        uri = URI("https://#{locale}.#{domain}/#{path}")
         params = {
           "jqm" => "1",
           "user_id" => user_id,
@@ -29,7 +29,7 @@ module Openfoodfacts
 
     # Login
     #
-    def login(locale: Openfoodfacts::DEFAULT_LOCALE)
+    def login(locale: DEFAULT_LOCALE)
       if user = self.class.login(self.user_id, self.password, locale: locale)
         self.name = user.name
         self
@@ -37,4 +37,4 @@ module Openfoodfacts
     end
 
   end
-end
+end

data/lib/openfoodfacts/version.rb

@@ -1,3 +1,3 @@
 module Openfoodfacts
-  VERSION = "0.3.1"
+  VERSION = "0.6.0"
 end

data/test/minitest_helper.rb

@@ -6,7 +6,13 @@ require 'minitest/autorun'
 require 'webmock/minitest'
 require 'vcr'
 
+# Avoid OpenSSL certificate verify failed error
+if ENV.has_key?('APPVEYOR') && Gem::Version.new(RUBY_VERSION) < Gem::Version.new('2.4')
+  require 'openssl'
+  OpenSSL::SSL::VERIFY_PEER = OpenSSL::SSL::VERIFY_NONE
+end
+
 VCR.configure do |c|
   c.cassette_library_dir = "test/fixtures"
   c.hook_into :webmock
-end
+end

data/test/test_openfoodfacts.rb

@@ -13,9 +13,7 @@ class TestOpenfoodfacts < Minitest::Test
   def test_it_fetches_locales
     VCR.use_cassette("index") do
       locales = ::Openfoodfacts::Locale.all
-      assert_includes locales, "world"
-      assert_includes locales, "fr"
-      assert_includes locales, "be-fr"
+      assert_includes locales.map { |locale| locale['code'] }, "gd"
     end
   end
 
@@ -37,7 +35,7 @@ class TestOpenfoodfacts < Minitest::Test
 
   def test_it_returns_product_weburl
     product = ::Openfoodfacts::Product.new(code: "3029330003533")
-    assert_equal "http://world.openfoodfacts.org/product/#{product.code}", product.weburl(locale: 'world')
+    assert_equal "https://world.openfoodfacts.org/product/#{product.code}", product.weburl(locale: 'world')
   end
 
   def test_it_fetches_product
@@ -52,22 +50,22 @@ class TestOpenfoodfacts < Minitest::Test
 
   def test_it_get_product
     product_code = "3029330003533"
-    
+
     VCR.use_cassette("product_#{product_code}", record: :once, match_requests_on: [:host, :path]) do
       assert_equal ::Openfoodfacts::Product.get(product_code).code, product_code
     end
   end
 
   def test_that_it_search
-    term = "Chocolat"
+    term = "coca"
     first_product = nil
 
     VCR.use_cassette("search_#{term}") do
       products = ::Openfoodfacts::Product.search(term, page_size: 42)
       first_product = products.first
 
-      assert_match /#{term}/i, products.last["product_name"]
-      assert_match /#{term}/i, ::Openfoodfacts::Product.search(term).last["product_name"]
+      assert_match(/#{term}/i, products.last["product_name"])
+      assert_match(/#{term}/i, ::Openfoodfacts::Product.search(term).last["product_name"])
       assert_equal products.size, 42
     end
 
@@ -105,8 +103,8 @@ class TestOpenfoodfacts < Minitest::Test
 
   def test_it_fetches_additives
     VCR.use_cassette("additives") do
-      additives = ::Openfoodfacts::Additive.all(locale: 'fr') # FR to have riskiness
-      assert_equal "http://fr.openfoodfacts.org/additif/e330-acide-citrique", additives.first.url
+      additives = ::Openfoodfacts::Additive.all # World to have riskiness
+      assert_includes additives.map { |additive| additive['url'] }, "https://world.openfoodfacts.org/additive/e330-citric-acid"
       refute_nil additives.detect { |additive| !additive['riskiness'].nil? }
     end
   end
@@ -114,14 +112,14 @@ class TestOpenfoodfacts < Minitest::Test
   def test_it_fetches_additives_for_locale
     VCR.use_cassette("additives_locale") do
       additives = ::Openfoodfacts::Additive.all(locale: 'fr')
-      assert_equal "http://fr.openfoodfacts.org/additif/e330-acide-citrique", additives.first.url
+      assert_includes additives.map { |additive| additive['url'] }, "https://fr.openfoodfacts.org/additif/e330-acide-citrique"
     end
   end
 
   def test_it_fetches_products_with_additive
-    additive = ::Openfoodfacts::Additive.new("url" => "http://world.openfoodfacts.org/additive/e452i-sodium-polyphosphate")
+    additive = ::Openfoodfacts::Additive.new("url" => "https://world.openfoodfacts.org/additive/e452i-sodium-polyphosphate")
     VCR.use_cassette("products_with_additive") do
-      products_with_additive = additive.products(page: -1)
+      products_with_additive = additive.products(page: 1)
       refute_empty products_with_additive
     end
   end
@@ -143,20 +141,58 @@ class TestOpenfoodfacts < Minitest::Test
   end
 
   def test_it_fetches_products_for_brand
-    brand = ::Openfoodfacts::Brand.new("url" => "http://world.openfoodfacts.org/brand/bel")
+    brand = ::Openfoodfacts::Brand.new("url" => "https://world.openfoodfacts.org/brand/bel")
     VCR.use_cassette("products_for_brand") do
-      products_for_brand = brand.products(page: -1)
+      products_for_brand = brand.products(page: 1)
       refute_empty products_for_brand
     end
   end
 
-  # Labels
+  # Nutrition Grades
+
+  def test_it_fetches_nutrition_grades
+    VCR.use_cassette("nutrition_grades") do
+      nutrition_grades = ::Openfoodfacts::NutritionGrade.all
+      assert_includes nutrition_grades.map { |nutrition_grade| nutrition_grade['name'] }, "Unknown"
+    end
+  end
+
+  def test_it_fetches_nutrition_grades_for_locale
+    VCR.use_cassette("nutrition_grades_locale") do
+      nutrition_grades = ::Openfoodfacts::NutritionGrade.all(locale: 'fr')
+      assert_includes nutrition_grades.map { |nutrition_grade| nutrition_grade['name'] }, "Inconnu"
+    end
+  end
+
+  def test_it_fetches_products_for_nutrition_grade
+    nutrition_grade = ::Openfoodfacts::NutritionGrade.new("url" => "https://world.openfoodfacts.org/nutrition-grade/c")
+    VCR.use_cassette("products_for_nutrition_grade") do
+      products_for_nutrition_grade = nutrition_grade.products(page: 1)
+      refute_empty products_for_nutrition_grade
+    end
+  end
+
+  # Languages
+
+  def test_it_fetches_languages
+    VCR.use_cassette("languages") do
+      languages = ::Openfoodfacts::Language.all
+      assert_includes languages.map { |language| language['name'] }, "French"
+    end
+  end
 
-  def test_it_fetches_labels
-    VCR.use_cassette("labels") do
-      labels = ::Openfoodfacts::Label.all(locale: 'fr')
-      bio_label = labels.detect { |label| label.name == "Bio" }
-      assert_equal "http://fr.openfoodfacts.org/label/bio", bio_label.url
+  def test_it_fetches_languages_for_locale
+    VCR.use_cassette("languages_locale") do
+      languages = ::Openfoodfacts::Language.all(locale: 'fr')
+      assert_includes languages.map { |language| language['name'] }, "Anglais"
+    end
+  end
+
+  def test_it_fetches_products_for_language
+    language = ::Openfoodfacts::Language.new("url" => "https://world.openfoodfacts.org/language/french")
+    VCR.use_cassette("products_for_language") do
+      products_for_language = language.products(page: 1)
+      refute_empty products_for_language
     end
   end
 
@@ -165,25 +201,97 @@ class TestOpenfoodfacts < Minitest::Test
   def test_it_fetches_product_states
     VCR.use_cassette("product_states") do
       product_states = ::Openfoodfacts::ProductState.all
-      assert_equal "http://world.openfoodfacts.org/state/empty", product_states.last.url
+      assert_equal "https://world.openfoodfacts.org/state/front-photo-not-selected", product_states.last.url
     end
   end
 
   def test_it_fetches_product_states_for_locale
     VCR.use_cassette("product_states_locale") do
       product_states = ::Openfoodfacts::ProductState.all(locale: 'fr')
-      assert_equal "http://fr.openfoodfacts.org/etat/vide", product_states.last.url
+      assert_equal "https://fr.openfoodfacts.org/etat/en:front-photo-not-selected", product_states.last.url
     end
   end
 
   def test_it_fetches_products_for_state
-    product_state = ::Openfoodfacts::ProductState.new("url" => "http://world.openfoodfacts.org/state/photos-uploaded", "products_count" => 22)
+    product_state = ::Openfoodfacts::ProductState.new("url" => "https://world.openfoodfacts.org/state/photos-uploaded", "products_count" => 22)
     VCR.use_cassette("products_for_state") do
-      products_for_state = product_state.products(page: -1)
+      products_for_state = product_state.products(page: 1)
       refute_empty products_for_state
     end
   end
 
+  # Entry date
+
+  def test_it_fetches_entry_dates
+    VCR.use_cassette("entry_dates") do
+      entry_dates = ::Openfoodfacts::EntryDate.all
+      assert_includes entry_dates.map { |entry_date| entry_date['name'] }, "2017-03-09"
+    end
+  end
+
+  def test_it_fetches_entry_dates_for_locale
+    VCR.use_cassette("entry_dates_locale") do
+      entry_dates = ::Openfoodfacts::EntryDate.all(locale: 'fr')
+      assert_includes entry_dates.map { |entry_date| entry_date['name'] }, "2017-03-09"
+    end
+  end
+
+  def test_it_fetches_products_for_entry_date
+    entry_date = ::Openfoodfacts::EntryDate.new("url" => "https://world.openfoodfacts.org/entry-date/2014-04-17")
+    VCR.use_cassette("products_for_entry_date") do
+      products_for_entry_date = entry_date.products(page: 1)
+      refute_empty products_for_entry_date
+    end
+  end
+
+  # Last edit date
+
+  def test_it_fetches_last_edit_dates
+    VCR.use_cassette("last_edit_dates") do
+      last_edit_dates = ::Openfoodfacts::LastEditDate.all
+      assert_includes last_edit_dates.map { |last_edit_date| last_edit_date['name'] }, "2017-03-23"
+    end
+  end
+
+  def test_it_fetches_last_edit_dates_for_locale
+    VCR.use_cassette("last_edit_dates_locale") do
+      last_edit_dates = ::Openfoodfacts::LastEditDate.all(locale: 'fr')
+      assert_includes last_edit_dates.map { |last_edit_date| last_edit_date['name'] }, "2017-03-23"
+    end
+  end
+
+  def test_it_fetches_products_for_last_edit_date
+    last_edit_date = ::Openfoodfacts::LastEditDate.new("url" => "https://world.openfoodfacts.org/last-edit-date/2020-04")
+    VCR.use_cassette("products_for_last_edit_date") do
+      products_for_last_edit_date = last_edit_date.products(page: 1)
+      refute_empty products_for_last_edit_date
+    end
+  end
+
+  # Number of Ingredients
+
+  def test_it_fetches_numbers_of_ingredients
+    VCR.use_cassette("numbers_of_ingredients") do
+      numbers_of_ingredients = ::Openfoodfacts::NumberOfIngredients.all
+      assert_includes numbers_of_ingredients.map { |number_of_ingredients| number_of_ingredients['name'] }, "38"
+    end
+  end
+
+  def test_it_fetches_numbers_of_ingredients_for_locale
+    VCR.use_cassette("number_of_ingredients_locale") do
+      numbers_of_ingredients = ::Openfoodfacts::NumberOfIngredients.all(locale: 'fr')
+      assert_includes numbers_of_ingredients.map { |number_of_ingredients| number_of_ingredients['name'] }, "38"
+    end
+  end
+
+  def test_it_fetches_products_for_number_of_ingredients
+    number_of_ingredients = ::Openfoodfacts::NumberOfIngredients.new("url" => "https://world.openfoodfacts.org/number-of-ingredients/38")
+    VCR.use_cassette("products_for_number_of_ingredients") do
+      products_for_number_of_ingredients = number_of_ingredients.products(page: 1)
+      refute_empty products_for_number_of_ingredients
+    end
+  end
+
   # FAQ
 
   def test_it_fetches_faq
@@ -192,6 +300,24 @@ class TestOpenfoodfacts < Minitest::Test
     end
   end
 
+  # Mission
+
+  def test_it_fetches_missions
+    VCR.use_cassette("missions") do
+      skip("Website have a bug with Missions page on https://fr.openfoodfacts.org/missions")
+      refute_empty ::Openfoodfacts::Mission.all(locale: 'fr')
+    end
+  end
+
+  def test_it_fetches_mission
+    VCR.use_cassette("mission", record: :once, match_requests_on: [:host, :path]) do
+      skip("Website have a bug with Mission page on https://fr.openfoodfacts.org/mission/informateur-100-produits")
+      mission = ::Openfoodfacts::Mission.new(url: "https://fr.openfoodfacts.org/mission/informateur-100-produits")
+      mission.fetch
+      refute_empty mission.users
+    end
+  end
+
   # Press
 
   def test_it_fetches_press

metadata

@@ -1,130 +1,122 @@
 --- !ruby/object:Gem::Specification
 name: openfoodfacts
 version: !ruby/object:Gem::Version
-  version: 0.3.1
+  version: 0.6.0
 platform: ruby
 authors:
 - Nicolas Leger
-autorequire: 
+autorequire:
 bindir: exe
 cert_chain: []
-date: 2016-04-09 00:00:00.000000000 Z
+date: 2020-12-30 00:00:00.000000000 Z
 dependencies:
-- !ruby/object:Gem::Dependency
-  name: her
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.8'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.8'
 - !ruby/object:Gem::Dependency
   name: hashie
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '3.4'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '5.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '3.4'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '5.0'
 - !ruby/object:Gem::Dependency
   name: nokogiri
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.6'
+        version: '1.7'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.6'
+        version: '1.7'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.8'
+        version: '2.1'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.8'
+        version: '2.1'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.4'
+        version: '12.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.4'
+        version: '12.0'
 - !ruby/object:Gem::Dependency
   name: minitest
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '5.8'
+        version: '5.10'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '5.8'
+        version: '5.10'
 - !ruby/object:Gem::Dependency
   name: vcr
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '5.1'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '5.1'
 - !ruby/object:Gem::Dependency
   name: webmock
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.22'
+        version: '3.11'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.22'
-description: OpenFoodFacts API Wrapper, the open database about food.
+        version: '3.11'
+description: Open Food Facts API Wrapper, the open database about food.
 email:
-- nicolas.leger@nleger.com
+- opensource@nleger.com
 executables: []
 extensions: []
 extra_rdoc_files: []
@@ -140,11 +132,17 @@ files:
 - lib/openfoodfacts/city.rb
 - lib/openfoodfacts/contributor.rb
 - lib/openfoodfacts/country.rb
+- lib/openfoodfacts/entry_date.rb
 - lib/openfoodfacts/faq.rb
 - lib/openfoodfacts/ingredient_that_may_be_from_palm_oil.rb
 - lib/openfoodfacts/label.rb
+- lib/openfoodfacts/language.rb
+- lib/openfoodfacts/last_edit_date.rb
 - lib/openfoodfacts/locale.rb
 - lib/openfoodfacts/manufacturing_place.rb
+- lib/openfoodfacts/mission.rb
+- lib/openfoodfacts/number_of_ingredients.rb
+- lib/openfoodfacts/nutrition_grade.rb
 - lib/openfoodfacts/origin.rb
 - lib/openfoodfacts/packager_code.rb
 - lib/openfoodfacts/packaging.rb
@@ -156,31 +154,13 @@ files:
 - lib/openfoodfacts/trace.rb
 - lib/openfoodfacts/user.rb
 - lib/openfoodfacts/version.rb
-- test/fixtures/additives.yml
-- test/fixtures/additives_locale.yml
-- test/fixtures/brands.yml
-- test/fixtures/brands_locale.yml
-- test/fixtures/faq.yml
-- test/fixtures/fetch_product_3029330003533.yml
-- test/fixtures/index.yml
-- test/fixtures/labels.yml
-- test/fixtures/login_user.yml
-- test/fixtures/press.yml
-- test/fixtures/product_3029330003533.yml
-- test/fixtures/product_states.yml
-- test/fixtures/product_states_locale.yml
-- test/fixtures/products_for_brand.yml
-- test/fixtures/products_for_state.yml
-- test/fixtures/products_with_additive.yml
-- test/fixtures/search_Chocolat.yml
-- test/fixtures/search_Chocolat_1_000_000.yml
 - test/minitest_helper.rb
 - test/test_openfoodfacts.rb
 homepage: https://github.com/openfoodfacts/openfoodfacts-ruby
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -188,16 +168,15 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '2.0'
+      version: '2.5'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.6.3
-signing_key: 
+rubygems_version: 3.2.3
+signing_key:
 specification_version: 4
-summary: OpenFoodFacts API Wrapper
+summary: Open Food Facts API Wrapper
 test_files: []