openfoodfacts 0.3.1 → 0.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: e50cecb07962505751ce697e3b99797015126ba3
-  data.tar.gz: 96ec0cee88a120ef8de7fe0327e051f99468a535
+SHA256:
+  metadata.gz: 8ee85e6766c13c0afa60c4800d43c99c85282f3544427d725cee0a97023631d9
+  data.tar.gz: 054c0a1972297b84f91b7c3d3d96006655d29f755f781800ec80808b297e840f
 SHA512:
-  metadata.gz: 2dc910d560c309261f07f6b04f811219e553d5a7664107fe81223425c34d4635e25ae6d134135ef77fbba411a4740e405a2d07128dccde5a20758964cdca7e35
-  data.tar.gz: 42babde6c10c97618d0478734cfd2fe7a6679fc7cb93f65527bed7bee67a7ae3e6eddde113378fb741116a230d2c91391645288d0cd8fbbd3db4dfab18ca5c24
+  metadata.gz: 7e9a7773561119e9b32f16677848dd28b54ce4c31f740d5a1f7b3f9592c6798d739d2815030bd507a4ed8df318f30f3fcaf06f26700f36dd26b67f45e2280099
+  data.tar.gz: d188187e2245d87ef1bd051485212f24bce554d7f9add603559617bea6353831535f21dcac65cc008b21492cf50ebdf0b3006359fcf531f7b0bd0ea3d51df5c5

data/README.md

@@ -1,13 +1,14 @@
-# OpenFoodFacts
+# Open Food Facts
 
-[![Gem Version](https://badge.fury.io/rb/openfoodfacts.svg)](http://badge.fury.io/rb/openfoodfacts)
+[![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/nicolasleger/openfoodfacts-ruby/badge.svg)](https://coveralls.io/r/nicolasleger/openfoodfacts-ruby)
-[![Documentation](http://inch-ci.org/github/openfoodfacts/openfoodfacts-ruby.svg?branch=master)](http://inch-ci.org/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)
+[![Documentation](https://inch-ci.org/github/openfoodfacts/openfoodfacts-ruby.svg?branch=master)](https://inch-ci.org/github/openfoodfacts/openfoodfacts-ruby)
 
-API Wrapper for [OpenFoodFacts](https://openfoodfacts.org/), the open database about food.
+API Wrapper for [Open Food Facts](https://openfoodfacts.org/), the open database about food.
 
 ## Installation
 
@@ -35,11 +36,17 @@ All data is available for World, French, UK and US version for now. You should u
 - City
 - Contributor
 - Country
+- EntryDate
 - Faq
 - IngredientThatMayBeFromPalmOil
 - Label
+- LastEditDate
+- Language
 - Locale
 - ManufacturingPlace
+- Mission
+- NumberOfIngredients
+- NutritionGrade
 - Origin
 - PackagerCode
 - Packaging
@@ -79,7 +86,7 @@ end
 # Search products
 
 products = Openfoodfacts::Product.search("Chocolate", locale: 'world', page_size: 3)
-# => [#<Openfoodfacts::Product _id="3045140105502" code="3045140105502" id="3045140105502" image_small_url="http://en.openfoodfacts.org/images/products/304/514/010/5502/front.7.100.jpg" lc="en" product_name="Milka au lait du Pays Alpin">, #<Openfoodfacts::Product _id="3046920028363" code="3046920028363" id="3046920028363" image_small_url="http://en.openfoodfacts.org/images/products/304/692/002/8363/front.5.100.jpg" lc="en" product_name="Tableta de chocolate negro \"Lindt Excellence\" 85% cacao">, #<Openfoodfacts::Product _id="3046920029759" code="3046920029759" id="3046920029759" image_small_url="http://en.openfoodfacts.org/images/products/304/692/002/9759/front.9.100.jpg" lc="en" product_name="Tableta de chocolate negro \"Lindt Excellence\" 90% cacao">]
+# => [#<Openfoodfacts::Product _id="3045140105502" code="3045140105502" id="3045140105502" image_small_url="https://en.openfoodfacts.org/images/products/304/514/010/5502/front.7.100.jpg" lc="en" product_name="Milka au lait du Pays Alpin">, #<Openfoodfacts::Product _id="3046920028363" code="3046920028363" id="3046920028363" image_small_url="https://en.openfoodfacts.org/images/products/304/692/002/8363/front.5.100.jpg" lc="en" product_name="Tableta de chocolate negro \"Lindt Excellence\" 85% cacao">, #<Openfoodfacts::Product _id="3046920029759" code="3046920029759" id="3046920029759" image_small_url="https://en.openfoodfacts.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
 

data/lib/openfoodfacts.rb

@@ -4,11 +4,17 @@ require_relative 'openfoodfacts/category'
 require_relative 'openfoodfacts/city'
 require_relative 'openfoodfacts/contributor'
 require_relative 'openfoodfacts/country'
+require_relative 'openfoodfacts/entry_date'
 require_relative 'openfoodfacts/faq'
 require_relative 'openfoodfacts/ingredient_that_may_be_from_palm_oil'
 require_relative 'openfoodfacts/label'
+require_relative 'openfoodfacts/language'
+require_relative 'openfoodfacts/last_edit_date'
 require_relative 'openfoodfacts/locale'
 require_relative 'openfoodfacts/manufacturing_place'
+require_relative 'openfoodfacts/mission'
+require_relative 'openfoodfacts/number_of_ingredients'
+require_relative 'openfoodfacts/nutrition_grade'
 require_relative 'openfoodfacts/origin'
 require_relative 'openfoodfacts/packager_code'
 require_relative 'openfoodfacts/packaging'
@@ -28,6 +34,7 @@ require 'open-uri'
 module Openfoodfacts
 
   DEFAULT_LOCALE = Locale::GLOBAL
+  DEFAULT_DOMAIN = 'openfoodfacts.org'
 
   class << self
 
@@ -56,4 +63,4 @@ module Openfoodfacts
     end
 
   end
-end
+end

data/lib/openfoodfacts/additive.rb

@@ -15,9 +15,9 @@ module Openfoodfacts
 
       # Get additives
       #
-      def all(locale: Openfoodfacts::DEFAULT_LOCALE)
+      def all(locale: DEFAULT_LOCALE, domain: DEFAULT_DOMAIN)
         if path = LOCALE_PATHS[locale]
-          page_url = "http://#{locale}.openfoodfacts.org/#{path}"
+          page_url = "https://#{locale}.#{domain}/#{path}"
 
           Product.tags_from_page(self, page_url) do |tag|
             columns = tag.css('td')
@@ -26,10 +26,10 @@ module Openfoodfacts
             attributes = {
               "name" => link.text.strip,
               "url" => URI.join(page_url, link.attr('href')).to_s,
-              "products_count" => columns[1].text.to_i,
+              "products_count" => columns[1].text.to_i
             }
-            
-            riskiness = columns[2].attr('class')
+
+            riskiness = columns.last.attr('class')
             if riskiness
               attributes["riskiness"] = riskiness[/level_(\d+)/, 1].to_i
             end
@@ -48,4 +48,4 @@ module Openfoodfacts
     end
 
   end
-end
+end

data/lib/openfoodfacts/allergen.rb

@@ -15,9 +15,9 @@ module Openfoodfacts
 
       # Get allergens
       #
-      def all(locale: Openfoodfacts::DEFAULT_LOCALE)
+      def all(locale: DEFAULT_LOCALE, domain: DEFAULT_DOMAIN)
         if path = LOCALE_PATHS[locale]
-          Product.tags_from_page(self, "http://#{locale}.openfoodfacts.org/#{path}")
+          Product.tags_from_page(self, "https://#{locale}.#{domain}/#{path}")
         end
       end
 
@@ -30,4 +30,4 @@ module Openfoodfacts
     end
 
   end
-end
+end

data/lib/openfoodfacts/brand.rb

@@ -15,9 +15,9 @@ module Openfoodfacts
 
       # Get product brands
       #
-      def all(locale: Openfoodfacts::DEFAULT_LOCALE)
+      def all(locale: DEFAULT_LOCALE, domain: DEFAULT_DOMAIN)
         if path = LOCALE_PATHS[locale]
-          Product.tags_from_page(self, "http://#{locale}.openfoodfacts.org/#{path}")
+          Product.tags_from_page(self, "https://#{locale}.#{domain}/#{path}")
         end
       end
 

data/lib/openfoodfacts/category.rb

@@ -15,9 +15,9 @@ module Openfoodfacts
 
       # Get categories
       #
-      def all(locale: Openfoodfacts::DEFAULT_LOCALE)
+      def all(locale: DEFAULT_LOCALE, domain: DEFAULT_DOMAIN)
         if path = LOCALE_PATHS[locale]
-          Product.tags_from_page(self, "http://#{locale}.openfoodfacts.org/#{path}")
+          Product.tags_from_page(self, "https://#{locale}.#{domain}/#{path}")
         end
       end
 
@@ -30,4 +30,4 @@ module Openfoodfacts
     end
 
   end
-end
+end

data/lib/openfoodfacts/city.rb

@@ -15,9 +15,9 @@ module Openfoodfacts
 
       # Get cities
       #
-      def all(locale: Openfoodfacts::DEFAULT_LOCALE)
+      def all(locale: DEFAULT_LOCALE, domain: DEFAULT_DOMAIN)
         if path = LOCALE_PATHS[locale]
-          Product.tags_from_page(self, "http://#{locale}.openfoodfacts.org/#{path}")
+          Product.tags_from_page(self, "https://#{locale}.#{domain}/#{path}")
         end
       end
 
@@ -30,4 +30,4 @@ module Openfoodfacts
     end
 
   end
-end
+end

data/lib/openfoodfacts/contributor.rb

@@ -15,9 +15,9 @@ module Openfoodfacts
 
       # Get contributors
       #
-      def all(locale: Openfoodfacts::DEFAULT_LOCALE)
+      def all(locale: DEFAULT_LOCALE, domain: DEFAULT_DOMAIN)
         if path = LOCALE_PATHS[locale]
-          Product.tags_from_page(self, "http://#{locale}.openfoodfacts.org/#{path}")
+          Product.tags_from_page(self, "https://#{locale}.#{domain}/#{path}")
         end
       end
 
@@ -30,4 +30,4 @@ module Openfoodfacts
     end
 
   end
-end
+end

data/lib/openfoodfacts/country.rb

@@ -15,9 +15,9 @@ module Openfoodfacts
 
       # Get countries
       #
-      def all(locale: Openfoodfacts::DEFAULT_LOCALE)
+      def all(locale: DEFAULT_LOCALE, domain: DEFAULT_DOMAIN)
         if path = LOCALE_PATHS[locale]
-          Product.tags_from_page(self, "http://#{locale}.openfoodfacts.org/#{path}")
+          Product.tags_from_page(self, "https://#{locale}.#{domain}/#{path}")
         end
       end
 
@@ -30,4 +30,4 @@ module Openfoodfacts
     end
 
   end
-end
+end

data/lib/openfoodfacts/entry_date.rb

@@ -0,0 +1,33 @@
+require 'hashie'
+
+module Openfoodfacts
+  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/openfoodfacts/faq.rb

@@ -14,15 +14,15 @@ module Openfoodfacts
     }
 
     class << self
-      def items(locale: Openfoodfacts::DEFAULT_LOCALE)
+      def items(locale: DEFAULT_LOCALE, domain: DEFAULT_DOMAIN)
         if path = LOCALE_PATHS[locale]
-          html = open("http://#{locale}.openfoodfacts.org/#{path}").read
+          html = URI.open("https://#{locale}.#{domain}/#{path}").read
           dom = Nokogiri::HTML.fragment(html)
-          
+
           titles = dom.css('#main_column h2')
           titles.each_with_index.map do |item, index|
             paragraphs = []
-          
+
             element = item.next_sibling
             while !element.nil? && element.node_name != 'h2'
               if element.node_name == 'p'
@@ -47,4 +47,4 @@ module Openfoodfacts
     end
 
   end
-end
+end

data/lib/openfoodfacts/ingredient_that_may_be_from_palm_oil.rb

@@ -15,9 +15,9 @@ module Openfoodfacts
 
       # Get ingredients that may be from palm oil
       #
-      def all(locale: Openfoodfacts::DEFAULT_LOCALE)
+      def all(locale: DEFAULT_LOCALE, domain: DEFAULT_DOMAIN)
         if path = LOCALE_PATHS[locale]
-          Product.tags_from_page(self, "http://#{locale}.openfoodfacts.org/#{path}")
+          Product.tags_from_page(self, "https://#{locale}.#{domain}/#{path}")
         end
       end
 
@@ -30,4 +30,4 @@ module Openfoodfacts
     end
 
   end
-end
+end

data/lib/openfoodfacts/label.rb

@@ -1,10 +1,8 @@
 require 'hashie'
-require 'json'
-require 'open-uri'
 
 module Openfoodfacts
   class Label < Hashie::Mash
-    
+
     # TODO: Add more locales
     LOCALE_PATHS = {
       'fr' => 'labels',
@@ -17,12 +15,9 @@ module Openfoodfacts
 
       # Get labels
       #
-      def all(locale: Openfoodfacts::DEFAULT_LOCALE)
+      def all(locale: DEFAULT_LOCALE, domain: DEFAULT_DOMAIN)
         if path = LOCALE_PATHS[locale]
-          body = open("http://#{locale}.openfoodfacts.org/#{path}.json").read
-          json = JSON.parse(body)
-          json_labels = json['tags']
-          json_labels.map(&method(:new))
+          Product.tags_from_page(self, "https://#{locale}.#{domain}/#{path}")
         end
       end
 
@@ -31,8 +26,8 @@ module Openfoodfacts
     # Get products with label
     #
     def products(page: -1)
-      Product.from_api("#{url}.json", page: page) if url
+      Product.from_website_page(url, page: page, products_count: products_count) if url
     end
 
   end
-end
+end

data/lib/openfoodfacts/language.rb

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

data/lib/openfoodfacts/last_edit_date.rb

@@ -0,0 +1,33 @@
+require 'hashie'
+
+module Openfoodfacts
+  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/openfoodfacts/locale.rb

@@ -1,3 +1,5 @@
+require 'open-uri'
+
 module Openfoodfacts
   class Locale < String
 
@@ -7,14 +9,15 @@ module Openfoodfacts
 
       # Get locales
       #
-      def all
-        url = "http://openfoodfacts.org/"
-        body = open(url).read
-        dom = Nokogiri.parse(body)
-
-        dom.css('ul li a').map { |locale_link|
-          locale_from_link(locale_link.attr('href'))
-        }.uniq.sort
+      def all(domain: DEFAULT_DOMAIN)
+        path = 'cgi/i18n/countries.pl?_type=query'
+        url = "https://#{GLOBAL}.#{domain}/#{path}"
+        json = URI.open(url).read
+        hash = JSON.parse(json)
+
+        hash.map { |pair|
+          locale_from_pair(pair, domain: domain)
+        }.compact
       end
 
       # Return locale from link
@@ -24,6 +27,17 @@ module Openfoodfacts
         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