openfoodfacts 0.3.1 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e50cecb07962505751ce697e3b99797015126ba3
-  data.tar.gz: 96ec0cee88a120ef8de7fe0327e051f99468a535
+  metadata.gz: 1ab380f0014effa3920df74d1ba593e4f26d50e9
+  data.tar.gz: 384401825b4f8fdc2e3ea18555f79f9714567f59
 SHA512:
-  metadata.gz: 2dc910d560c309261f07f6b04f811219e553d5a7664107fe81223425c34d4635e25ae6d134135ef77fbba411a4740e405a2d07128dccde5a20758964cdca7e35
-  data.tar.gz: 42babde6c10c97618d0478734cfd2fe7a6679fc7cb93f65527bed7bee67a7ae3e6eddde113378fb741116a230d2c91391645288d0cd8fbbd3db4dfab18ca5c24
+  metadata.gz: 131ae9169cf6279ca8dac267d145e2c18513a2503e225c45f6de7e0ba8e16804ac7e9579a92295eea0078cbe5aa3113e59ee2a253b8ce5ca9cef2e28a775e9f2
+  data.tar.gz: c97be50ed729e1a64b40b28c520929df384a6fc02f6f48b364aaf1833e3609879b3c1ccdc3bc3ac61d9e1956f7c5cfb8961d390705ec4684db30cbfaccbaea84

data/README.md

@@ -1,13 +1,13 @@
-# OpenFoodFacts
+# Open Food Facts
 
 [![Gem Version](https://badge.fury.io/rb/openfoodfacts.svg)](http://badge.fury.io/rb/openfoodfacts)
 [![Build Status](https://travis-ci.org/openfoodfacts/openfoodfacts-ruby.svg?branch=master)](https://travis-ci.org/openfoodfacts/openfoodfacts-ruby)
 [![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)
+[![Coverage Status](https://coveralls.io/repos/github/openfoodfacts/openfoodfacts-ruby/badge.svg?branch=master)](https://coveralls.io/github/openfoodfacts/openfoodfacts-ruby?branch=master)
 [![Documentation](http://inch-ci.org/github/openfoodfacts/openfoodfacts-ruby.svg?branch=master)](http://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
 
@@ -79,7 +79,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

@@ -28,6 +28,7 @@ require 'open-uri'
 module Openfoodfacts
 
   DEFAULT_LOCALE = Locale::GLOBAL
+  DEFAULT_DOMAIN = 'openfoodfacts.org'
 
   class << self
 
@@ -56,4 +57,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')
@@ -28,7 +28,7 @@ module Openfoodfacts
               "url" => URI.join(page_url, link.attr('href')).to_s,
               "products_count" => columns[1].text.to_i,
             }
-            
+
             riskiness = columns[2].attr('class')
             if riskiness
               attributes["riskiness"] = riskiness[/level_(\d+)/, 1].to_i
@@ -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/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 = 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/locale.rb

@@ -7,8 +7,8 @@ module Openfoodfacts
 
       # Get locales
       #
-      def all
-        url = "http://openfoodfacts.org/"
+      def all(domain: DEFAULT_DOMAIN)
+        url = "https://#{domain}/"
         body = open(url).read
         dom = Nokogiri.parse(body)
 

data/lib/openfoodfacts/manufacturing_place.rb

@@ -15,9 +15,9 @@ module Openfoodfacts
 
       # Get manufacturing places
       #
-      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/origin.rb

@@ -15,9 +15,9 @@ module Openfoodfacts
 
       # Get origins
       #
-      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/packager_code.rb

@@ -15,9 +15,9 @@ module Openfoodfacts
 
       # Get packager codes
       #
-      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/packaging.rb

@@ -15,9 +15,9 @@ module Openfoodfacts
 
       # Get packagings
       #
-      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/press.rb

@@ -16,17 +16,17 @@ module Openfoodfacts
 
     LOCALE_DATE_FORMATS = {
       'fr' => '%d/%m/%Y',
-      'uk' => '%m/%d/%Y',
-      'us' => '%m/%d/%Y',
-      'world' => '%m/%d/%Y'
+      'uk' => '%d/%m/%Y',
+      'us' => '%d/%m/%Y',
+      'world' => '%d/%m/%Y'
     }
 
     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 = open("https://#{locale}.#{domain}/#{path}").read
           dom = Nokogiri::HTML.fragment(html)
-          
+
           titles = dom.css('#main_column li')
           titles.each_with_index.map do |item, index|
             data = item.inner_html.split(' - ')
@@ -53,4 +53,4 @@ module Openfoodfacts
     end
 
   end
-end
+end

data/lib/openfoodfacts/product.rb

@@ -16,20 +16,9 @@ module Openfoodfacts
 
     class << self
 
-      # Products from API
-      #
-      def from_api(api_url, page: -1)
-        if url
-          body = open(api_url).read
-          json = JSON.parse(body)
-          json_products = json['products']
-          json_products.map(&method(:new))
-        end
-      end
-
       # Get product
       #
-      def get(code, locale: Openfoodfacts::DEFAULT_LOCALE)
+      def get(code, locale: DEFAULT_LOCALE)
         if code
           product_url = url(code, locale: locale)
           json = open(product_url).read
@@ -42,15 +31,19 @@ module Openfoodfacts
 
       # Return product API URL
       #
-      def url(code, locale: Openfoodfacts::DEFAULT_LOCALE)
-        "http://#{locale}.openfoodfacts.org/api/v0/produit/#{code}.json" if code
+      def url(code, locale: DEFAULT_LOCALE, domain: DEFAULT_DOMAIN)
+        if code
+          path = "api/v0/produit/#{code}.json"
+          "https://#{locale}.#{domain}/#{path}"
+        end
       end
 
       # Search products
       #
-      def search(terms, locale: Openfoodfacts::DEFAULT_LOCALE, page: 1, page_size: 20, sort_by: 'unique_scans_n')
+      def search(terms, locale: DEFAULT_LOCALE, page: 1, page_size: 20, sort_by: 'unique_scans_n', domain: DEFAULT_DOMAIN)
         terms = URI::encode(terms)
-        url = "http://#{locale}.openfoodfacts.org/cgi/search.pl?search_terms=#{terms}&jqm=1&page=#{page}&page_size=#{page_size}&sort_by=#{sort_by}"
+        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
         hash = JSON.parse(json)
         html = hash["jqm"]
@@ -154,10 +147,11 @@ module Openfoodfacts
     # User can be nil
     # Tested not updatable fields: countries, ingredients_text, purchase_places, purchase_places_tag, purchase_places_tags
     #
-    def update(user: nil)
+    def update(user: nil, domain: DEFAULT_DOMAIN)
       if self.code && self.lc
         subdomain = self.lc == 'world' ? 'world' : "world-#{self.lc}"
-        uri = URI("http://#{subdomain}.openfoodfacts.org/cgi/product_jqm.pl")
+        path = 'cgi/product_jqm.pl'
+        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)
@@ -172,17 +166,18 @@ module Openfoodfacts
 
     # Return Product API URL
     #
-    def url(locale: Openfoodfacts::DEFAULT_LOCALE)
+    def url(locale: DEFAULT_LOCALE)
       self.class.url(self.code, locale: locale)
     end
 
     # Return Product web URL according to locale
     #
-    def weburl(locale: nil)
-      locale ||= self.lc || Openfoodfacts::DEFAULT_LOCALE
+    def weburl(locale: nil, domain: DEFAULT_DOMAIN)
+      locale ||= self.lc || DEFAULT_LOCALE
 
       if self.code && prefix = LOCALE_WEBURL_PREFIXES[locale]
-        "http://#{locale}.openfoodfacts.org/#{prefix}/#{self.code}"
+        path = "#{prefix}/#{self.code}"
+        "https://#{locale}.#{domain}/#{path}"
       end
     end