openfoodfacts 0.3.1 → 0.6.0

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/mission.rb

@@ -0,0 +1,72 @@
+require 'hashie'
+require 'open-uri'
+
+module Openfoodfacts
+  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/openfoodfacts/number_of_ingredients.rb

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

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

@@ -8,44 +8,34 @@ module Openfoodfacts
 
     # TODO: Add more locales
     LOCALE_PATHS = {
-      'fr' => 'presse',
-      'uk' => 'press',
-      'us' => 'press',
-      'world' => 'press'
+      'fr' => 'revue-de-presse-fr'
     }
 
     LOCALE_DATE_FORMATS = {
-      'fr' => '%d/%m/%Y',
-      'uk' => '%m/%d/%Y',
-      'us' => '%m/%d/%Y',
-      'world' => '%m/%d/%Y'
+      'fr' => '%d/%m/%Y'
     }
 
     class << self
-      def items(locale: Openfoodfacts::DEFAULT_LOCALE)
+      def items(locale: 'fr', domain: DEFAULT_DOMAIN)
         if path = LOCALE_PATHS[locale]
-          html = open("http://#{locale}.openfoodfacts.org/#{path}").read
+          date_format = LOCALE_DATE_FORMATS[locale]
+
+          html = URI.open("https://#{locale}.#{domain}/#{path}").read
           dom = Nokogiri::HTML.fragment(html)
-          
-          titles = dom.css('#main_column li')
+
+          titles = dom.css('#press_table tbody tr')
           titles.each_with_index.map do |item, index|
-            data = item.inner_html.split(' - ')
+            colums = item.css('td')
 
-            link = Nokogiri::HTML.fragment(data.first).css('a')
+            link = colums[1].css('a')
             attributes = {
-              "title" => link.text.strip,
-              "url" => link.attr('href').value
+              "type" => colums[0].text,
+              "title" => colums[1].text.strip,
+              "url" => link && link.attr('href') && link.attr('href').value,
+              "source" => colums[2].text.strip,
+              "date" => (DateTime.strptime(colums[3].text, date_format) rescue nil)
             }
 
-            last = Nokogiri::HTML.fragment(data.last)
-            if date_format = LOCALE_DATE_FORMATS[locale] and date = last.text.strip[/\d+\/\d+\/\d+\z/, 0]
-              attributes["date"] = DateTime.strptime(date, date_format)
-            end
-
-            if data.length >= 3
-              attributes["source"] = Nokogiri::HTML.fragment(data[-2]).text.strip
-            end
-
             new(attributes)
           end
         end
@@ -53,4 +43,4 @@ module Openfoodfacts
     end
 
   end
-end
+end

data/lib/openfoodfacts/product.rb

@@ -1,3 +1,4 @@
+require 'cgi'
 require 'hashie'
 require 'net/http'
 require 'nokogiri'
@@ -16,23 +17,12 @@ 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
+          json = URI.open(product_url).read
           hash = JSON.parse(json)
 
           new(hash["product"]) if !hash["status"].nil? && hash["status"] == 1
@@ -42,16 +32,20 @@ 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')
-        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}"
-        json = open(url).read
+      def search(terms, locale: DEFAULT_LOCALE, page: 1, page_size: 20, sort_by: 'unique_scans_n', domain: DEFAULT_DOMAIN)
+        terms = CGI.escape(terms)
+        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 = URI.open(url).read
         hash = JSON.parse(json)
         html = hash["jqm"]
 
@@ -85,11 +79,11 @@ module Openfoodfacts
       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
@@ -97,7 +91,7 @@ module Openfoodfacts
         if page == -1
           if products_count # Avoid one call
             pages_count = (products_count.to_f / 20).ceil
-            (1..pages_count).map { |page| from_website_page(page_url, page: page) }.flatten
+            (1..pages_count).map { |page_i| from_website_page(page_url, page: page_i) }.flatten
           else
             products = []
 
@@ -111,13 +105,13 @@ module Openfoodfacts
             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|
@@ -154,10 +148,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 +167,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
 

data/lib/openfoodfacts/product_state.rb

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

@@ -15,9 +15,9 @@ module Openfoodfacts
 
       # Get purchase 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