openbeautyfacts 0.5.1 → 0.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 51847b4724a92c3136027fd5e1901527f2ede8e5
-  data.tar.gz: 75a13bffe213105afd84ff8c23fc65e9a8159d88
+SHA256:
+  metadata.gz: cc506aa648b094eb8218c5cc4408c2cefde133e60677e1fd97a1c8f8e92a33c8
+  data.tar.gz: 61c3e27a3a945ce47c6e71a0c727ddfda9eb818206118f8f1529725d2064cec8
 SHA512:
-  metadata.gz: aedb7561dacc935930bd36b88d949e624de58958e260e64b70acc7a20630096694dbea5df7a0941ae331beb732202676ad7a93ac0f0ee2dab018a06ae0514d54
-  data.tar.gz: 3f833e3890e6626e779ebb8156f622a40806ebcca2f8ce30751d2d7f1c239c6d9807689cf3ae4dbf55d019ee2e6e2e6120c50bc86718d58735a8a1785dadb7ef
+  metadata.gz: 7c8f56653b09b9d5fd46eef55c420e2fc8817afba5fce876ae72db5058b2d18efd24600f8f75189c2f2e06662335ac70fb91ca3edc1b96a9df3a83a92df9067c
+  data.tar.gz: 49796fc369ac2a22dfeb61e54174aa763563f80591ed2ce24857c84f3bf157ffb248bdd45b191e5705b39c7b5c87325446611437663d7ba324f2f10fafcf75c8

data/README.md

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

data/lib/openbeautyfacts/faq.rb

@@ -16,7 +16,7 @@ module Openbeautyfacts
     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/openbeautyfacts/locale.rb

@@ -1,3 +1,5 @@
+require 'open-uri'
+
 module Openbeautyfacts
   class Locale < String
 
@@ -8,12 +10,13 @@ module Openbeautyfacts
       # 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,18 +27,18 @@ module Openbeautyfacts
         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
 
   end
-end
+end

data/lib/openbeautyfacts/mission.rb

@@ -1,4 +1,5 @@
 require 'hashie'
+require 'open-uri'
 
 module Openbeautyfacts
   class Mission < Hashie::Mash
@@ -15,7 +16,7 @@ module Openbeautyfacts
       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 Openbeautyfacts
     #
     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/openbeautyfacts/press.rb

@@ -24,7 +24,7 @@ module Openbeautyfacts
     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 li')

data/lib/openbeautyfacts/product.rb

@@ -1,3 +1,4 @@
+require 'cgi'
 require 'hashie'
 require 'net/http'
 require 'nokogiri'
@@ -21,7 +22,7 @@ module Openbeautyfacts
       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 Openbeautyfacts
         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 Openbeautyfacts
       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 Openbeautyfacts
             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/openbeautyfacts/version.rb

@@ -1,3 +1,3 @@
 module Openbeautyfacts
-  VERSION = "0.5.1"
+  VERSION = "0.6.0"
 end

data/test/minitest_helper.rb

@@ -6,6 +6,12 @@ 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

data/test/test_openbeautyfacts.rb

@@ -103,16 +103,17 @@ class TestOpenbeautyfacts < Minitest::Test
 
   def test_it_fetches_additives
     VCR.use_cassette("additives") do
-      additives = ::Openbeautyfacts::Additive.all(locale: 'fr') # FR to have riskiness
-      assert_equal "https://fr.openbeautyfacts.org/additif/e470-sels-de-sodium-potassium-calcium-d-acides-gras", additives.first.url
+      additives = ::Openbeautyfacts::Additive.all # World to have riskiness
+      assert_includes additives.map { |additive| additive['url'] }, "https://world.openbeautyfacts.org/additive/e508-potassium-chloride"
       refute_nil additives.detect { |additive| !additive['riskiness'].nil? }
     end
   end
 
   def test_it_fetches_additives_for_locale
     VCR.use_cassette("additives_locale") do
+      skip("Website have a bug with Additives page on https://fr.openbeautyfacts.org/additifs")
       additives = ::Openbeautyfacts::Additive.all(locale: 'fr')
-      assert_equal "https://fr.openbeautyfacts.org/additif/e470-sels-de-sodium-potassium-calcium-d-acides-gras", additives.first.url
+      assert_includes additives.map { |additive| additive['url'] }, "https://fr.openbeautyfacts.org/additif/e470-sels-de-sodium-potassium-calcium-d-acides-gras"
     end
   end
 
@@ -135,6 +136,7 @@ class TestOpenbeautyfacts < Minitest::Test
 
   def test_it_fetches_brands_for_locale
     VCR.use_cassette("brands_locale") do
+      skip("Website have a bug with Brands page on https://fr.openbeautyfacts.org/marques")
       brands = ::Openbeautyfacts::Brand.all(locale: 'fr')
       assert_includes brands.map { |brand| brand['name'] }, "Sedapoux"
     end
@@ -153,14 +155,14 @@ class TestOpenbeautyfacts < Minitest::Test
   def test_it_fetches_product_states
     VCR.use_cassette("product_states") do
       product_states = ::Openbeautyfacts::ProductState.all
-      assert_equal "https://world.openbeautyfacts.org/state/empty", product_states.last.url
+      assert_includes product_states.map { |product_state| product_state['url'] }, "https://world.openbeautyfacts.org/state/empty"
     end
   end
 
   def test_it_fetches_product_states_for_locale
     VCR.use_cassette("product_states_locale") do
       product_states = ::Openbeautyfacts::ProductState.all(locale: 'fr')
-      assert_equal "https://fr.openbeautyfacts.org/etat/vide", product_states.last.url
+      assert_includes product_states.map { |product_state| product_state['url'] }, "https://fr.openbeautyfacts.org/etat/vide"
     end
   end
 
@@ -287,6 +289,7 @@ class TestOpenbeautyfacts < Minitest::Test
   # Period after openings
 
   def test_it_fetches_period_after_openings
+    skip "Source page is gone"
     VCR.use_cassette("period_after_openings") do
       period_after_openings = ::Openbeautyfacts::PeriodAfterOpening.all
       assert_includes period_after_openings.map { |period_after_opening| period_after_opening['name'] }, "12 months"
@@ -294,6 +297,7 @@ class TestOpenbeautyfacts < Minitest::Test
   end
 
   def test_it_fetches_period_after_openings_for_locale
+    skip "Source page is gone"
     VCR.use_cassette("period_after_openings_locale") do
       period_after_openings = ::Openbeautyfacts::PeriodAfterOpening.all(locale: 'fr')
       assert_includes period_after_openings.map { |period_after_opening| period_after_opening['name'] }, "12 mois"

metadata

@@ -1,29 +1,35 @@
 --- !ruby/object:Gem::Specification
 name: openbeautyfacts
 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.10'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.3'
+        version: '3.10'
 description: Open Beauty Facts API Wrapper, the open database about beauty products.
 email:
-- nicolas.leger@nleger.com
+- opensource@nleger.com
 executables: []
 extensions: []
 extra_rdoc_files: []
@@ -150,11 +156,11 @@ files:
 - lib/openbeautyfacts/version.rb
 - test/minitest_helper.rb
 - test/test_openbeautyfacts.rb
-homepage: https://github.com/openbeautyfacts/openbeautyfacts-ruby
+homepage: https://github.com/openfoodfacts/openbeautyfacts-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 Beauty Facts API Wrapper
 test_files: []