openbeautyfacts 0.1.0 → 0.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: dc1875dd0d4f35000da26600c17317afe76eb644
-  data.tar.gz: 04cf3b96a42e49e6aecab11762630c8bbe68c002
+SHA256:
+  metadata.gz: cc506aa648b094eb8218c5cc4408c2cefde133e60677e1fd97a1c8f8e92a33c8
+  data.tar.gz: 61c3e27a3a945ce47c6e71a0c727ddfda9eb818206118f8f1529725d2064cec8
 SHA512:
-  metadata.gz: 10ea3c62fed84fc3f5a9a0d1f1676da2999342095f8b65c2e1cbf2e408473cf04af7a5b221e5dcc443b2ed618239d0b8dd960a3b220abbe8804a275251d55de3
-  data.tar.gz: b35cc9a9329c61020d69eed0a55b5b57a9af3a4241cbe5e1d886fa227c6ce77ffc920822a6dd209dd300e0f8e5a8e545a0cf2c90c4667455ae21d0669b264943
+  metadata.gz: 7c8f56653b09b9d5fd46eef55c420e2fc8817afba5fce876ae72db5058b2d18efd24600f8f75189c2f2e06662335ac70fb91ca3edc1b96a9df3a83a92df9067c
+  data.tar.gz: 49796fc369ac2a22dfeb61e54174aa763563f80591ed2ce24857c84f3bf157ffb248bdd45b191e5705b39c7b5c87325446611437663d7ba324f2f10fafcf75c8

data/README.md

@@ -1,13 +1,14 @@
 # Open Beauty Facts
 
-[![Gem Version](https://badge.fury.io/rb/openbeautyfacts.svg)](http://badge.fury.io/rb/openbeautyfacts)
-[![Build Status](https://travis-ci.org/openbeautyfacts/openbeautyfacts-ruby.svg?branch=master)](https://travis-ci.org/openbeautyfacts/openbeautyfacts-ruby)
-[![Dependency Status](https://gemnasium.com/openbeautyfacts/openbeautyfacts-ruby.svg)](https://gemnasium.com/openbeautyfacts/openbeautyfacts-ruby)
-[![Code Climate](https://codeclimate.com/github/openbeautyfacts/openbeautyfacts-ruby/badges/gpa.svg)](https://codeclimate.com/github/openbeautyfacts/openbeautyfacts-ruby)
-[![Coverage Status](https://coveralls.io/repos/github/openfoodfacts/openbeautyfacts-ruby/badge.svg?branch=master)](https://coveralls.io/github/openbeautyfacts/openbeautyfacts-ruby?branch=master)
-[![Documentation](http://inch-ci.org/github/openbeautyfacts/openbeautyfacts-ruby.svg?branch=master)](http://inch-ci.org/github/openbeautyfacts/openbeautyfacts-ruby)
+[![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)
+[![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](http://openbeautyfacts.org/), the open database about beauty products.
+API Wrapper for [Open Beauty Facts](https://openbeautyfacts.org/), the open database about beauty products.
 
 ## Installation
 
@@ -35,14 +36,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
@@ -79,7 +85,7 @@ end
 # Search products
 
 products = Openbeautyfacts::Product.search("Chocolate", locale: 'world', page_size: 3)
-# => [#<Openbeautyfacts::Product _id="3045140105502" code="3045140105502" id="3045140105502" image_small_url="http://en.openbeautyfacts.org/images/products/304/514/010/5502/front.7.100.jpg" lc="en" product_name="Milka au lait du Pays Alpin">, #<Openbeautyfacts::Product _id="3046920028363" code="3046920028363" id="3046920028363" image_small_url="http://en.openbeautyfacts.org/images/products/304/692/002/8363/front.5.100.jpg" lc="en" product_name="Tableta de chocolate negro \"Lindt Excellence\" 85% cacao">, #<Openbeautyfacts::Product _id="3046920029759" code="3046920029759" id="3046920029759" image_small_url="http://en.openbeautyfacts.org/images/products/304/692/002/9759/front.9.100.jpg" lc="en" product_name="Tableta de chocolate negro \"Lindt Excellence\" 90% cacao">]
+# => [#<Openbeautyfacts::Product _id="3045140105502" code="3045140105502" id="3045140105502" image_small_url="https://en.openbeautyfacts.org/images/products/304/514/010/5502/front.7.100.jpg" lc="en" product_name="Milka au lait du Pays Alpin">, #<Openbeautyfacts::Product _id="3046920028363" code="3046920028363" id="3046920028363" image_small_url="https://en.openbeautyfacts.org/images/products/304/692/002/8363/front.5.100.jpg" lc="en" product_name="Tableta de chocolate negro \"Lindt Excellence\" 85% cacao">, #<Openbeautyfacts::Product _id="3046920029759" code="3046920029759" id="3046920029759" image_small_url="https://en.openbeautyfacts.org/images/products/304/692/002/9759/front.9.100.jpg" lc="en" product_name="Tableta de chocolate negro \"Lindt Excellence\" 90% cacao">]
 
 # You might need to fetch full product data from results
 
@@ -104,7 +110,7 @@ To install this gem onto your local machine, run `bundle exec rake install`. To
 
 ## Contributing
 
-1. Fork it ( https://github.com/openbeautyfacts/openbeautyfacts-ruby/fork )
+1. Fork it ( https://github.com/openfoodfacts/openbeautyfacts-ruby/fork )
 2. Create your feature branch (`git checkout -b my-new-feature`)
 3. Commit your changes (`git commit -am 'Add some feature'`)
 4. Push to the branch (`git push origin my-new-feature`)

data/lib/openbeautyfacts.rb

@@ -4,14 +4,20 @@ 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'
+require_relative 'openbeautyfacts/period_after_opening'
 require_relative 'openbeautyfacts/press'
 require_relative 'openbeautyfacts/product'
 require_relative 'openbeautyfacts/product_state'

data/lib/openbeautyfacts/additive.rb

@@ -17,7 +17,7 @@ module Openbeautyfacts
       #
       def all(locale: DEFAULT_LOCALE, domain: DEFAULT_DOMAIN)
         if path = LOCALE_PATHS[locale]
-          page_url = "http://#{locale}.#{domain}/#{path}"
+          page_url = "https://#{locale}.#{domain}/#{path}"
 
           Product.tags_from_page(self, page_url) do |tag|
             columns = tag.css('td')

data/lib/openbeautyfacts/allergen.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/brand.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/category.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/city.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/contributor.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/country.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/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/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("http://#{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/ingredient.rb

@@ -0,0 +1,33 @@
+require 'hashie'
+
+module Openbeautyfacts
+  class Ingredient < Hashie::Mash
+
+    # TODO: Add more locales
+    LOCALE_PATHS = {
+      'fr' => 'ingredients',
+      'uk' => 'ingredients',
+      'us' => 'ingredients',
+      'world' => 'ingredients'
+    }
+
+    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/ingredient_that_may_be_from_palm_oil.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/label.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/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/locale.rb

@@ -1,3 +1,5 @@
+require 'open-uri'
+
 module Openbeautyfacts
   class Locale < String
 
@@ -8,13 +10,14 @@ module Openbeautyfacts
       # Get locales
       #
       def all(domain: DEFAULT_DOMAIN)
-        url = "http://#{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('ul li a').map { |locale_link|
-          locale_from_link(locale_link.attr('href'))
-        }.uniq.sort
+        hash.map { |pair|
+          locale_from_pair(pair, domain: domain)
+        }.compact
       end
 
       # Return locale from link
@@ -24,6 +27,17 @@ module Openbeautyfacts
         locale unless locale.nil? || locale == 'static'
       end
 
+      # Return locale from pair
+      #
+      def locale_from_pair(pair, domain: DEFAULT_DOMAIN)
+        code = pair.first
+        {
+          "name" => pair.last.strip,
+          "code" => code,
+          "url" => "https://#{code}.#{domain}"
+        } if code
+      end
+
     end
 
   end

data/lib/openbeautyfacts/manufacturing_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/mission.rb

@@ -0,0 +1,72 @@
+require 'hashie'
+require 'open-uri'
+
+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 = URI.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 = URI.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