openbeautyfacts 0.1.0 → 0.6.0

data/lib/openbeautyfacts/origin.rb

@@ -17,7 +17,7 @@ module Openbeautyfacts
       #
       def all(locale: DEFAULT_LOCALE, domain: DEFAULT_DOMAIN)
         if path = LOCALE_PATHS[locale]
-          Product.tags_from_page(self, "http://#{locale}.#{domain}/#{path}")
+          Product.tags_from_page(self, "https://#{locale}.#{domain}/#{path}")
         end
       end
 

data/lib/openbeautyfacts/packager_code.rb

@@ -17,7 +17,7 @@ module Openbeautyfacts
       #
       def all(locale: DEFAULT_LOCALE, domain: DEFAULT_DOMAIN)
         if path = LOCALE_PATHS[locale]
-          Product.tags_from_page(self, "http://#{locale}.#{domain}/#{path}")
+          Product.tags_from_page(self, "https://#{locale}.#{domain}/#{path}")
         end
       end
 

data/lib/openbeautyfacts/packaging.rb

@@ -17,7 +17,7 @@ module Openbeautyfacts
       #
       def all(locale: DEFAULT_LOCALE, domain: DEFAULT_DOMAIN)
         if path = LOCALE_PATHS[locale]
-          Product.tags_from_page(self, "http://#{locale}.#{domain}/#{path}")
+          Product.tags_from_page(self, "https://#{locale}.#{domain}/#{path}")
         end
       end
 

data/lib/openbeautyfacts/period_after_opening.rb

@@ -0,0 +1,33 @@
+require 'hashie'
+
+module Openbeautyfacts
+  class PeriodAfterOpening < Hashie::Mash
+
+    # TODO: Add more locales
+    LOCALE_PATHS = {
+      'fr' => 'durees-d-utilisation-apres-ouverture',
+      'uk' => 'periods-after-opening',
+      'us' => 'periods-after-opening',
+      'world' => 'periods-after-opening'
+    }
+
+    class << self
+
+      # Get labels
+      #
+      def all(locale: DEFAULT_LOCALE, domain: DEFAULT_DOMAIN)
+        if path = LOCALE_PATHS[locale]
+          Product.tags_from_page(self, "https://#{locale}.#{domain}/#{path}")
+        end
+      end
+
+    end
+
+    # Get products with label
+    #
+    def products(page: -1)
+      Product.from_website_page(url, page: page, products_count: products_count) if url
+    end
+
+  end
+end

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("http://#{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
@@ -34,17 +35,17 @@ module Openbeautyfacts
       def url(code, locale: DEFAULT_LOCALE, domain: DEFAULT_DOMAIN)
         if code
           path = "api/v0/produit/#{code}.json"
-          "http://#{locale}.#{domain}/#{path}"
+          "https://#{locale}.#{domain}/#{path}"
         end
       end
 
       # Search products
       #
       def search(terms, locale: DEFAULT_LOCALE, page: 1, page_size: 20, sort_by: 'unique_scans_n', domain: DEFAULT_DOMAIN)
-        terms = URI::encode(terms)
+        terms = CGI.escape(terms)
         path = "cgi/search.pl?search_terms=#{terms}&jqm=1&page=#{page}&page_size=#{page_size}&sort_by=#{sort_by}"
-        url = "http://#{locale}.#{domain}/#{path}"
-        json = open(url).read
+        url = "https://#{locale}.#{domain}/#{path}"
+        json = URI.open(url).read
         hash = JSON.parse(json)
         html = hash["jqm"]
 
@@ -78,11 +79,11 @@ 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')
-        from_html_list(html, 'ul.products li', /\/(\d+)[\/|\Z]/i, locale: 'world')
+        from_html_list(html, 'ul.products li', /\/(\d+)\/?/i, locale: 'world')
       end
 
       # page -1 to fetch all pages
@@ -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|
@@ -151,7 +152,7 @@ module Openbeautyfacts
       if self.code && self.lc
         subdomain = self.lc == 'world' ? 'world' : "world-#{self.lc}"
         path = 'cgi/product_jqm.pl'
-        uri = URI("http://#{subdomain}.#{domain}/#{path}")
+        uri = URI("https://#{subdomain}.#{domain}/#{path}")
         params = self.to_hash
         params.merge!("user_id" => user.user_id, "password" => user.password) if user
         response = Net::HTTP.post_form(uri, params)
@@ -177,7 +178,7 @@ module Openbeautyfacts
 
       if self.code && prefix = LOCALE_WEBURL_PREFIXES[locale]
         path = "#{prefix}/#{self.code}"
-        "http://#{locale}.#{domain}/#{path}"
+        "https://#{locale}.#{domain}/#{path}"
       end
     end
 

data/lib/openbeautyfacts/product_state.rb

@@ -17,7 +17,7 @@ module Openbeautyfacts
       #
       def all(locale: DEFAULT_LOCALE, domain: DEFAULT_DOMAIN)
         if path = LOCALE_PATHS[locale]
-          Product.tags_from_page(self, "http://#{locale}.#{domain}/#{path}")
+          Product.tags_from_page(self, "https://#{locale}.#{domain}/#{path}")
         end
       end
 

data/lib/openbeautyfacts/purchase_place.rb

@@ -17,7 +17,7 @@ module Openbeautyfacts
       #
       def all(locale: DEFAULT_LOCALE, domain: DEFAULT_DOMAIN)
         if path = LOCALE_PATHS[locale]
-          Product.tags_from_page(self, "http://#{locale}.#{domain}/#{path}")
+          Product.tags_from_page(self, "https://#{locale}.#{domain}/#{path}")
         end
       end
 

data/lib/openbeautyfacts/store.rb

@@ -17,7 +17,7 @@ module Openbeautyfacts
       #
       def all(locale: DEFAULT_LOCALE, domain: DEFAULT_DOMAIN)
         if path = LOCALE_PATHS[locale]
-          Product.tags_from_page(self, "http://#{locale}.#{domain}/#{path}")
+          Product.tags_from_page(self, "https://#{locale}.#{domain}/#{path}")
         end
       end
 

data/lib/openbeautyfacts/trace.rb

@@ -17,7 +17,7 @@ module Openbeautyfacts
       #
       def all(locale: DEFAULT_LOCALE, domain: DEFAULT_DOMAIN)
         if path = LOCALE_PATHS[locale]
-          Product.tags_from_page(self, "http://#{locale}.#{domain}/#{path}")
+          Product.tags_from_page(self, "https://#{locale}.#{domain}/#{path}")
         end
       end
 

data/lib/openbeautyfacts/user.rb

@@ -6,11 +6,10 @@ module Openbeautyfacts
     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: DEFAULT_LOCALE, domain: DEFAULT_DOMAIN)
         path = 'cgi/session.pl'
-        uri = URI("http://#{locale}.#{domain}/#{path}")
+        uri = URI("https://#{locale}.#{domain}/#{path}")
         params = {
           "jqm" => "1",
           "user_id" => user_id,

data/lib/openbeautyfacts/version.rb

@@ -1,3 +1,3 @@
 module Openbeautyfacts
-  VERSION = "0.1.0"
+  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

@@ -13,9 +13,7 @@ class TestOpenbeautyfacts < Minitest::Test
   def test_it_fetches_locales
     VCR.use_cassette("index") do
       locales = ::Openbeautyfacts::Locale.all
-      assert_includes locales, "world"
-      assert_includes locales, "fr"
-      assert_includes locales, "es-gl"
+      assert_includes locales.map { |locale| locale['code'] }, "gd"
     end
   end
 
@@ -37,7 +35,7 @@ class TestOpenbeautyfacts < Minitest::Test
 
   def test_it_returns_product_weburl
     product = ::Openbeautyfacts::Product.new(code: "3600550362626")
-    assert_equal "http://world.openbeautyfacts.org/product/#{product.code}", product.weburl(locale: 'world')
+    assert_equal "https://world.openbeautyfacts.org/product/#{product.code}", product.weburl(locale: 'world')
   end
 
   def test_it_fetches_product
@@ -66,8 +64,8 @@ class TestOpenbeautyfacts < Minitest::Test
       products = ::Openbeautyfacts::Product.search(term, page_size: 24)
       first_product = products.first
 
-      assert_match /#{term}/i, products.last["product_name"]
-      assert_match /#{term}/i, ::Openbeautyfacts::Product.search(term).last["product_name"]
+      assert_match(/#{term}/i, products.last["product_name"])
+      assert_match(/#{term}/i, ::Openbeautyfacts::Product.search(term).last["product_name"])
       assert_equal products.size, 24
     end
 
@@ -105,23 +103,24 @@ 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 "http://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 "http://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
 
   def test_it_fetches_products_with_additive
-    additive = ::Openbeautyfacts::Additive.new("url" => "http://world.openbeautyfacts.org/additive/e539-sodium-thiosulfate")
+    additive = ::Openbeautyfacts::Additive.new("url" => "https://world.openbeautyfacts.org/additive/e539-sodium-thiosulfate")
     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
@@ -137,15 +136,16 @@ 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
   end
 
   def test_it_fetches_products_for_brand
-    brand = ::Openbeautyfacts::Brand.new("url" => "http://world.openbeautyfacts.org/brand/sedapoux")
+    brand = ::Openbeautyfacts::Brand.new("url" => "https://world.openbeautyfacts.org/brand/sedapoux")
     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
@@ -155,25 +155,163 @@ class TestOpenbeautyfacts < Minitest::Test
   def test_it_fetches_product_states
     VCR.use_cassette("product_states") do
       product_states = ::Openbeautyfacts::ProductState.all
-      assert_equal "http://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 "http://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
 
   def test_it_fetches_products_for_state
-    product_state = ::Openbeautyfacts::ProductState.new("url" => "http://world.openbeautyfacts.org/state/photos-uploaded", "products_count" => 22)
+    product_state = ::Openbeautyfacts::ProductState.new("url" => "https://world.openbeautyfacts.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
 
+  # Ingredients
+
+  def test_it_fetches_ingredients
+    VCR.use_cassette("ingredients") do
+      ingredients = ::Openbeautyfacts::Ingredient.all
+      assert_includes ingredients.map { |ingredient| ingredient['name'] }, "Water"
+    end
+  end
+
+  def test_it_fetches_ingredients_for_locale
+    VCR.use_cassette("ingredients_locale") do
+      ingredients = ::Openbeautyfacts::Ingredient.all(locale: 'fr')
+      assert_includes ingredients.map { |ingredient| ingredient['name'] }, "Eau"
+    end
+  end
+
+  def test_it_fetches_products_for_ingredient
+    ingredient = ::Openbeautyfacts::Ingredient.new("url" => "https://world.openbeautyfacts.org/ingredient/water")
+    VCR.use_cassette("products_for_ingredient") do
+      products_for_ingredient = ingredient.products(page: 1)
+      refute_empty products_for_ingredient
+    end
+  end
+
+  # Entry date
+
+  def test_it_fetches_entry_dates
+    VCR.use_cassette("entry_dates") do
+      entry_dates = ::Openbeautyfacts::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 = ::Openbeautyfacts::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 = ::Openbeautyfacts::EntryDate.new("url" => "https://world.openbeautyfacts.org/entry-date/2016-02-12")
+    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 = ::Openbeautyfacts::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 = ::Openbeautyfacts::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 = ::Openbeautyfacts::LastEditDate.new("url" => "https://world.openbeautyfacts.org/last-edit-date/2016-02-12")
+    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
+
+  # Mission
+
+  def test_it_fetches_missions
+    VCR.use_cassette("missions") do
+      refute_empty ::Openbeautyfacts::Mission.all(locale: 'fr')
+    end
+  end
+
+  def test_it_fetches_mission
+    VCR.use_cassette("mission", record: :once, match_requests_on: [:host, :path]) do
+      mission = ::Openbeautyfacts::Mission.new(url: "https://fr.openbeautyfacts.org/mission/25-produits")
+      mission.fetch
+      refute_empty mission.users
+    end
+  end
+
+  # Number of Ingredients
+
+  def test_it_fetches_numbers_of_ingredients
+    VCR.use_cassette("numbers_of_ingredients") do
+      numbers_of_ingredients = ::Openbeautyfacts::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 = ::Openbeautyfacts::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 = ::Openbeautyfacts::NumberOfIngredients.new("url" => "https://world.openbeautyfacts.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
+
+  # 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"
+    end
+  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"
+    end
+  end
+
+  def test_it_fetches_products_for_period_after_opening
+    period_after_opening = ::Openbeautyfacts::PeriodAfterOpening.new("url" => "https://world.openbeautyfacts.org/period-after-opening/12-months")
+    VCR.use_cassette("products_for_period_after_opening") do
+      products_for_period_after_opening = period_after_opening.products(page: 1)
+      refute_empty products_for_period_after_opening
+    end
+  end
+
   # FAQ
 
   def test_it_fetches_faq