openbeautyfacts 0.1.2 → 0.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a05e2fba051f2eb1fc70cd7a13a740b6a7909783
-  data.tar.gz: 18de8b97c52c45c636c396dcc121655b47a1754a
+  metadata.gz: 14999a9b6ccae0d6b356ffa2ece4539012d11896
+  data.tar.gz: 2eee40350db2fb6f5b1b94a83da55a47d9fbef3c
 SHA512:
-  metadata.gz: c8ff286d06da3a12dcce36cec633ad7990c0aa4a1e3404dc253b40d0f86773b42312ebe6c870c99e43282f8e8655b21a4484eeb30b375fa2c7bded8e055d7f9d
-  data.tar.gz: b241d88d2fba5da98dcf1226cce738bcdf22d00b594b8d29641ae369e4061748e36cd75d0892efd74d1f9169d41215d140aab97959674ab93ee125f562108c7a
+  metadata.gz: 8192cbe32bb23b4d6d8b241c24022edef7dcb7400380edaba3fcc2b600cf92d4201205564397b9fcb6611adecee8fdcbb37787f2584dfe48558fc5202556cd13
+  data.tar.gz: 57aeb89751737202685bca0c627a2cb56d13693cd7581d4f17bae520a9ebc2d9e390ed4ed9a6c46b1c37630834dd39d2a9609c4e45a6870ee63a0ba54ee7edaf

data/README.md

@@ -1,11 +1,11 @@
 # Open Beauty Facts
 
-[![Gem Version](https://badge.fury.io/rb/openbeautyfacts.svg)](http://badge.fury.io/rb/openbeautyfacts)
+[![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)
 [![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)
-[![Documentation](http://inch-ci.org/github/openfoodfacts/openbeautyfacts-ruby.svg?branch=master)](http://inch-ci.org/github/openfoodfacts/openbeautyfacts-ruby)
+[![Documentation](https://inch-ci.org/github/openfoodfacts/openbeautyfacts-ruby.svg?branch=master)](https://inch-ci.org/github/openfoodfacts/openbeautyfacts-ruby)
 
 API Wrapper for [Open Beauty Facts](https://openbeautyfacts.org/), the open database about beauty products.
 
@@ -35,14 +35,19 @@ All data is available for World, French, UK and US version for now. You should u
 - City
 - Contributor
 - Country
+- EntryDate
 - Faq
 - IngredientThatMayBeFromPalmOil
 - Label
+- LastEditDate
 - Locale
 - ManufacturingPlace
+- Mission
+- NumberOfIngredients
 - Origin
 - PackagerCode
 - Packaging
+- PeriodAfterOpening
 - Press
 - Product
 - ProductState

data/lib/openbeautyfacts.rb

@@ -4,12 +4,16 @@ require_relative 'openbeautyfacts/category'
 require_relative 'openbeautyfacts/city'
 require_relative 'openbeautyfacts/contributor'
 require_relative 'openbeautyfacts/country'
+require_relative 'openbeautyfacts/entry_date'
 require_relative 'openbeautyfacts/faq'
 require_relative 'openbeautyfacts/ingredient'
 require_relative 'openbeautyfacts/ingredient_that_may_be_from_palm_oil'
 require_relative 'openbeautyfacts/label'
+require_relative 'openbeautyfacts/last_edit_date'
 require_relative 'openbeautyfacts/locale'
 require_relative 'openbeautyfacts/manufacturing_place'
+require_relative 'openbeautyfacts/mission'
+require_relative 'openbeautyfacts/number_of_ingredients'
 require_relative 'openbeautyfacts/origin'
 require_relative 'openbeautyfacts/packager_code'
 require_relative 'openbeautyfacts/packaging'

data/lib/openbeautyfacts/entry_date.rb

@@ -0,0 +1,33 @@
+require 'hashie'
+
+module Openbeautyfacts
+  class EntryDate < Hashie::Mash
+
+    # TODO: Add more locales
+    LOCALE_PATHS = {
+      'fr' => 'dates-d-ajout',
+      'uk' => 'entry-dates',
+      'us' => 'entry-dates',
+      'world' => 'entry-dates'
+    }
+
+    class << self
+
+      # Get entry dates
+      #
+      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 entry date
+    #
+    def products(page: -1)
+      Product.from_website_page(url, page: page, products_count: products_count) if url
+    end
+
+  end
+end

data/lib/openbeautyfacts/last_edit_date.rb

@@ -0,0 +1,33 @@
+require 'hashie'
+
+module Openbeautyfacts
+  class LastEditDate < Hashie::Mash
+
+    # TODO: Add more locales
+    LOCALE_PATHS = {
+      'fr' => 'dates-de-derniere-modification',
+      'uk' => 'last-edit-dates',
+      'us' => 'last-edit-dates',
+      'world' => 'last-edit-dates'
+    }
+
+    class << self
+
+      # Get last edit dates
+      #
+      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 last edit date
+    #
+    def products(page: -1)
+      Product.from_website_page(url, page: page, products_count: products_count) if url
+    end
+
+  end
+end

data/lib/openbeautyfacts/mission.rb

@@ -0,0 +1,71 @@
+require 'hashie'
+
+module Openbeautyfacts
+  class Mission < Hashie::Mash
+
+    # TODO: Add more locales
+    LOCALE_PATHS = {
+      'fr' => 'missions',
+      'uk' => 'missions',
+      'us' => 'missions',
+      'world' => 'missions'
+    }
+
+    class << self
+      def all(locale: DEFAULT_LOCALE, domain: DEFAULT_DOMAIN)
+        if path = LOCALE_PATHS[locale]
+          url = "https://#{locale}.#{domain}/#{path}"
+          html = open(url).read
+          dom = Nokogiri::HTML.fragment(html)
+
+          dom.css('#missions li').map do |mission_dom|
+            links = mission_dom.css('a')
+
+            attributes = {
+              "title" => links.first.text.strip,
+              "url" => URI.join(url, links.first.attr('href')).to_s,
+              "description" => mission_dom.css('div').first.children[2].text.gsub('→', '').strip,
+              "users_count" => links.last.text[/(\d+)/, 1].to_i
+            }
+
+            new(attributes)
+          end
+        end
+      end
+    end
+
+    # Fetch mission
+    #
+    def fetch
+      if (self.url)
+        html = open(self.url).read
+        dom = Nokogiri::HTML.fragment(html)
+
+        description = dom.css('#description').first
+
+        # Remove "All missions" link
+        users = dom.css('#main_column a')[0..-2].map do |user_link|
+          User.new(
+            "user_id" => user_link.text.strip,
+            "url" => URI.join(self.url, user_link.attr('href')).to_s,
+          )
+        end
+
+        mission = {
+          "title" => dom.css('h1').first.text.strip,
+          "description" => description.text.strip,
+          "description_long" => description.next.text.strip,
+
+          "users" => users,
+          "users_count" => users.count
+        }
+
+        self.merge!(mission)
+      end
+
+      self
+    end
+    alias_method :reload, :fetch
+
+  end
+end

data/lib/openbeautyfacts/number_of_ingredients.rb

@@ -0,0 +1,33 @@
+require 'hashie'
+
+module Openbeautyfacts
+  class NumberOfIngredients < Hashie::Mash
+
+    # TODO: Add more locales
+    LOCALE_PATHS = {
+      'fr' => 'nombres-d-ingredients',
+      'uk' => 'numbers-of-ingredients',
+      'us' => 'numbers-of-ingredients',
+      'world' => 'numbers-of-ingredients'
+    }
+
+    class << self
+
+      # Get last edit dates
+      #
+      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 last edit date
+    #
+    def products(page: -1)
+      Product.from_website_page(url, page: page, products_count: products_count) if url
+    end
+
+  end
+end

data/lib/openbeautyfacts/user.rb

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

data/lib/openbeautyfacts/version.rb

@@ -1,3 +1,3 @@
 module Openbeautyfacts
-  VERSION = "0.1.2"
+  VERSION = "0.5.0"
 end

data/test/test_openbeautyfacts.rb

@@ -198,6 +198,94 @@ class TestOpenbeautyfacts < Minitest::Test
     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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: openbeautyfacts
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.5.0
 platform: ruby
 authors:
 - Nicolas Leger
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-01-24 00:00:00.000000000 Z
+date: 2017-10-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: hashie
@@ -126,12 +126,16 @@ files:
 - lib/openbeautyfacts/city.rb
 - lib/openbeautyfacts/contributor.rb
 - lib/openbeautyfacts/country.rb
+- lib/openbeautyfacts/entry_date.rb
 - lib/openbeautyfacts/faq.rb
 - lib/openbeautyfacts/ingredient.rb
 - lib/openbeautyfacts/ingredient_that_may_be_from_palm_oil.rb
 - lib/openbeautyfacts/label.rb
+- lib/openbeautyfacts/last_edit_date.rb
 - lib/openbeautyfacts/locale.rb
 - lib/openbeautyfacts/manufacturing_place.rb
+- lib/openbeautyfacts/mission.rb
+- lib/openbeautyfacts/number_of_ingredients.rb
 - lib/openbeautyfacts/origin.rb
 - lib/openbeautyfacts/packager_code.rb
 - lib/openbeautyfacts/packaging.rb
@@ -189,7 +193,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.8
+rubygems_version: 2.6.13
 signing_key: 
 specification_version: 4
 summary: Open Beauty Facts API Wrapper