openfoodfacts 0.5.1 → 0.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: b0d0dfc51ebc907f81991a5725a81139000c7487
-  data.tar.gz: 32d96c22c65f92a5de7b2d082dce6c70a3be68d9
+SHA256:
+  metadata.gz: 8ee85e6766c13c0afa60c4800d43c99c85282f3544427d725cee0a97023631d9
+  data.tar.gz: 054c0a1972297b84f91b7c3d3d96006655d29f755f781800ec80808b297e840f
 SHA512:
-  metadata.gz: d6e3f8bef342ec68d4e95067374f5d428221f0f0f3c0d2ecaef9c96a221461c8a07000ae708446b5f72c61df93aaeb7333102c54f1c353cb823f0141c792de58
-  data.tar.gz: 02a3b387e5492379f6c687449a0bef6cd6ace94161330d36dc4a90d48a2eddce233fce9ae65ac0ffbfc472b20813d08233f03da11936f255b6876598fa6b64b4
+  metadata.gz: 7e9a7773561119e9b32f16677848dd28b54ce4c31f740d5a1f7b3f9592c6798d739d2815030bd507a4ed8df318f30f3fcaf06f26700f36dd26b67f45e2280099
+  data.tar.gz: d188187e2245d87ef1bd051485212f24bce554d7f9add603559617bea6353831535f21dcac65cc008b21492cf50ebdf0b3006359fcf531f7b0bd0ea3d51df5c5

data/README.md

@@ -2,6 +2,7 @@
 
 [![Gem Version](https://badge.fury.io/rb/openfoodfacts.svg)](https://badge.fury.io/rb/openfoodfacts)
 [![Build Status](https://travis-ci.org/openfoodfacts/openfoodfacts-ruby.svg?branch=master)](https://travis-ci.org/openfoodfacts/openfoodfacts-ruby)
+[![Build status](https://ci.appveyor.com/api/projects/status/tarhvc59fw478das/branch/master?svg=true)](https://ci.appveyor.com/project/nicolasleger/openfoodfacts-ruby/branch/master)
 [![Dependency Status](https://gemnasium.com/openfoodfacts/openfoodfacts-ruby.svg)](https://gemnasium.com/openfoodfacts/openfoodfacts-ruby)
 [![Code Climate](https://codeclimate.com/github/openfoodfacts/openfoodfacts-ruby/badges/gpa.svg)](https://codeclimate.com/github/openfoodfacts/openfoodfacts-ruby)
 [![Coverage Status](https://coveralls.io/repos/github/openfoodfacts/openfoodfacts-ruby/badge.svg?branch=master)](https://coveralls.io/github/openfoodfacts/openfoodfacts-ruby?branch=master)

data/lib/openfoodfacts/faq.rb

@@ -16,7 +16,7 @@ module Openfoodfacts
     class << self
       def items(locale: DEFAULT_LOCALE, domain: DEFAULT_DOMAIN)
         if path = LOCALE_PATHS[locale]
-          html = open("https://#{locale}.#{domain}/#{path}").read
+          html = URI.open("https://#{locale}.#{domain}/#{path}").read
           dom = Nokogiri::HTML.fragment(html)
 
           titles = dom.css('#main_column h2')

data/lib/openfoodfacts/locale.rb

@@ -1,3 +1,5 @@
+require 'open-uri'
+
 module Openfoodfacts
   class Locale < String
 
@@ -8,12 +10,13 @@ module Openfoodfacts
       # Get locales
       #
       def all(domain: DEFAULT_DOMAIN)
-        url = "https://#{domain}/"
-        body = open(url).read
-        dom = Nokogiri.parse(body)
+        path = 'cgi/i18n/countries.pl?_type=query'
+        url = "https://#{GLOBAL}.#{domain}/#{path}"
+        json = URI.open(url).read
+        hash = JSON.parse(json)
 
-        dom.css('#select_country option').map { |option|
-          locale_from_option(option, domain: domain)
+        hash.map { |pair|
+          locale_from_pair(pair, domain: domain)
         }.compact
       end
 
@@ -24,15 +27,15 @@ module Openfoodfacts
         locale unless locale.nil? || locale == 'static'
       end
 
-      # Return locale from option
+      # Return locale from pair
       #
-      def locale_from_option(option, domain: DEFAULT_DOMAIN)
-        value = option.attr('value')
+      def locale_from_pair(pair, domain: DEFAULT_DOMAIN)
+        code = pair.first
         {
-          "name" => option.text.strip,
-          "code" => value,
-          "url" => "https://#{value}.#{domain}"
-        } if value
+          "name" => pair.last.strip,
+          "code" => code,
+          "url" => "https://#{code}.#{domain}"
+        } if code
       end
 
     end

data/lib/openfoodfacts/mission.rb

@@ -1,4 +1,5 @@
 require 'hashie'
+require 'open-uri'
 
 module Openfoodfacts
   class Mission < Hashie::Mash
@@ -15,7 +16,7 @@ module Openfoodfacts
       def all(locale: DEFAULT_LOCALE, domain: DEFAULT_DOMAIN)
         if path = LOCALE_PATHS[locale]
           url = "https://#{locale}.#{domain}/#{path}"
-          html = open(url).read
+          html = URI.open(url).read
           dom = Nokogiri::HTML.fragment(html)
 
           dom.css('#missions li').map do |mission_dom|
@@ -38,7 +39,7 @@ module Openfoodfacts
     #
     def fetch
       if (self.url)
-        html = open(self.url).read
+        html = URI.open(self.url).read
         dom = Nokogiri::HTML.fragment(html)
 
         description = dom.css('#description').first

data/lib/openfoodfacts/press.rb

@@ -8,44 +8,34 @@ module Openfoodfacts
 
     # TODO: Add more locales
     LOCALE_PATHS = {
-      'fr' => 'presse',
-      'uk' => 'press',
-      'us' => 'press',
-      'world' => 'press'
+      'fr' => 'revue-de-presse-fr'
     }
 
     LOCALE_DATE_FORMATS = {
-      'fr' => '%d/%m/%Y',
-      'uk' => '%d/%m/%Y',
-      'us' => '%d/%m/%Y',
-      'world' => '%d/%m/%Y'
+      'fr' => '%d/%m/%Y'
     }
 
     class << self
-      def items(locale: DEFAULT_LOCALE, domain: DEFAULT_DOMAIN)
+      def items(locale: 'fr', domain: DEFAULT_DOMAIN)
         if path = LOCALE_PATHS[locale]
-          html = open("https://#{locale}.#{domain}/#{path}").read
+          date_format = LOCALE_DATE_FORMATS[locale]
+
+          html = URI.open("https://#{locale}.#{domain}/#{path}").read
           dom = Nokogiri::HTML.fragment(html)
 
-          titles = dom.css('#main_column li')
+          titles = dom.css('#press_table tbody tr')
           titles.each_with_index.map do |item, index|
-            data = item.inner_html.split(' - ')
+            colums = item.css('td')
 
-            link = Nokogiri::HTML.fragment(data.first).css('a')
+            link = colums[1].css('a')
             attributes = {
-              "title" => link.text.strip,
-              "url" => link.attr('href').value
+              "type" => colums[0].text,
+              "title" => colums[1].text.strip,
+              "url" => link && link.attr('href') && link.attr('href').value,
+              "source" => colums[2].text.strip,
+              "date" => (DateTime.strptime(colums[3].text, date_format) rescue nil)
             }
 
-            last = Nokogiri::HTML.fragment(data.last)
-            if date_format = LOCALE_DATE_FORMATS[locale] and date = last.text.strip[/\d+\/\d+\/\d+\z/, 0]
-              attributes["date"] = DateTime.strptime(date, date_format)
-            end
-
-            if data.length >= 3
-              attributes["source"] = Nokogiri::HTML.fragment(data[-2]).text.strip
-            end
-
             new(attributes)
           end
         end

data/lib/openfoodfacts/product.rb

@@ -1,3 +1,4 @@
+require 'cgi'
 require 'hashie'
 require 'net/http'
 require 'nokogiri'
@@ -21,7 +22,7 @@ module Openfoodfacts
       def get(code, locale: DEFAULT_LOCALE)
         if code
           product_url = url(code, locale: locale)
-          json = open(product_url).read
+          json = URI.open(product_url).read
           hash = JSON.parse(json)
 
           new(hash["product"]) if !hash["status"].nil? && hash["status"] == 1
@@ -44,7 +45,7 @@ module Openfoodfacts
         terms = CGI.escape(terms)
         path = "cgi/search.pl?search_terms=#{terms}&jqm=1&page=#{page}&page_size=#{page_size}&sort_by=#{sort_by}"
         url = "https://#{locale}.#{domain}/#{path}"
-        json = open(url).read
+        json = URI.open(url).read
         hash = JSON.parse(json)
         html = hash["jqm"]
 
@@ -78,7 +79,7 @@ module Openfoodfacts
       end
 
       def from_jquery_mobile_list(jqm_html)
-        from_html_list(jqm_html, 'ul li:not(#loadmore)', /code=(\d+)\Z/i)
+        from_html_list(jqm_html, 'ul#search_results_list li:not(#loadmore)', /code=(\d+)\Z/i)
       end
 
       def from_website_list(html, locale: 'world')
@@ -104,13 +105,13 @@ module Openfoodfacts
             products
           end
         else
-          html = open("#{page_url}/#{page}").read
+          html = URI.open("#{page_url}/#{page}").read
           from_website_list(html, locale: Locale.locale_from_link(page_url))
         end
       end
 
       def tags_from_page(_klass, page_url, &custom_tag_parsing)
-        html = open(page_url).read
+        html = URI.open(page_url).read
         dom = Nokogiri::HTML.fragment(html)
 
         dom.css('table#tagstable tbody tr').map do |tag|

data/lib/openfoodfacts/version.rb

@@ -1,3 +1,3 @@
 module Openfoodfacts
-  VERSION = "0.5.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

@@ -103,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 "https://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
@@ -112,7 +112,7 @@ 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 "https://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
 
@@ -201,14 +201,14 @@ class TestOpenfoodfacts < Minitest::Test
   def test_it_fetches_product_states
     VCR.use_cassette("product_states") do
       product_states = ::Openfoodfacts::ProductState.all
-      assert_equal "https://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 "https://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
 
@@ -261,7 +261,7 @@ class TestOpenfoodfacts < Minitest::Test
   end
 
   def test_it_fetches_products_for_last_edit_date
-    last_edit_date = ::Openfoodfacts::LastEditDate.new("url" => "https://world.openfoodfacts.org/last-edit-date/2013-11-11")
+    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
@@ -304,12 +304,14 @@ class TestOpenfoodfacts < Minitest::Test
 
   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

metadata

@@ -1,29 +1,35 @@
 --- !ruby/object:Gem::Specification
 name: openfoodfacts
 version: !ruby/object:Gem::Version
-  version: 0.5.1
+  version: 0.6.0
 platform: ruby
 authors:
 - Nicolas Leger
-autorequire: 
+autorequire:
 bindir: exe
 cert_chain: []
-date: 2017-10-30 00:00:00.000000000 Z
+date: 2020-12-30 00:00:00.000000000 Z
 dependencies:
 - !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
@@ -44,14 +50,14 @@ dependencies:
     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
@@ -86,31 +92,31 @@ dependencies:
     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: '2.3'
+        version: '3.11'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.3'
+        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: []
@@ -154,7 +160,7 @@ homepage: https://github.com/openfoodfacts/openfoodfacts-ruby
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -162,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.13
-signing_key: 
+rubygems_version: 3.2.3
+signing_key:
 specification_version: 4
 summary: Open Food Facts API Wrapper
 test_files: []