openbeautyfacts 0.6.0 → 0.10.0

data/lib/openbeautyfacts/label.rb

@@ -1,33 +1,25 @@
-require 'hashie'
+# frozen_string_literal: true
 
 module Openbeautyfacts
-  class Label < Hashie::Mash
-
-    # TODO: Add more locales
-    LOCALE_PATHS = {
-      'fr' => 'labels',
-      'uk' => 'labels',
-      'us' => 'labels',
-      'world' => 'labels'
-    }
+  class Label < Openfoodfacts::Label
+    # Override constants for openbeautyfacts domain
+    DEFAULT_LOCALE = Locale::GLOBAL
+    DEFAULT_DOMAIN = 'openbeautyfacts.org'
 
     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
+      # Override all method to use openbeautyfacts domain if it exists
+      def all(locale: DEFAULT_LOCALE, domain: DEFAULT_DOMAIN, **options)
+        super(locale: locale, domain: domain, **options)
+      rescue NoMethodError
+        # Method doesn't exist in parent class, skip
       end
-
     end
 
-    # Get products with label
-    #
+    # Override products method to use openbeautyfacts domain if it exists
     def products(page: -1)
-      Product.from_website_page(url, page: page, products_count: products_count) if url
+      super(page: page)
+    rescue NoMethodError
+      # Method doesn't exist in parent class, skip
     end
-
   end
 end

data/lib/openbeautyfacts/last_edit_date.rb

@@ -1,33 +1,25 @@
-require 'hashie'
+# frozen_string_literal: true
 
 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 LastEditDate < Openfoodfacts::LastEditDate
+    # Override constants for openbeautyfacts domain
+    DEFAULT_LOCALE = Locale::GLOBAL
+    DEFAULT_DOMAIN = 'openbeautyfacts.org'
 
     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
+      # Override all method to use openbeautyfacts domain if it exists
+      def all(locale: DEFAULT_LOCALE, domain: DEFAULT_DOMAIN, **options)
+        super(locale: locale, domain: domain, **options)
+      rescue NoMethodError
+        # Method doesn't exist in parent class, skip
       end
-
     end
 
-    # Get products with last edit date
-    #
+    # Override products method to use openbeautyfacts domain if it exists
     def products(page: -1)
-      Product.from_website_page(url, page: page, products_count: products_count) if url
+      super(page: page)
+    rescue NoMethodError
+      # Method doesn't exist in parent class, skip
     end
-
   end
-end
+end

data/lib/openbeautyfacts/locale.rb

@@ -1,44 +1,21 @@
-require 'open-uri'
+# frozen_string_literal: true
 
 module Openbeautyfacts
-  class Locale < String
-
+  class Locale < Openfoodfacts::Locale
+    # Override constants for openbeautyfacts domain
     GLOBAL = 'world'
+    DEFAULT_DOMAIN = 'openbeautyfacts.org'
 
     class << self
-
-      # Get locales
-      #
+      # Override all method to use openbeautyfacts domain
       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
+        super(domain: domain)
       end
 
-      # Return locale from link
-      #
-      def locale_from_link(link)
-        locale = link[/^https?:\/\/([^.]+)\./i, 1]
-        locale unless locale.nil? || locale == 'static'
-      end
-
-      # Return locale from pair
-      #
+      # Override locale_from_pair method to use openbeautyfacts domain
       def locale_from_pair(pair, domain: DEFAULT_DOMAIN)
-        code = pair.first
-        {
-          "name" => pair.last.strip,
-          "code" => code,
-          "url" => "https://#{code}.#{domain}"
-        } if code
+        super(pair, domain: domain)
       end
-
     end
-
   end
 end

data/lib/openbeautyfacts/manufacturing_place.rb

@@ -1,33 +1,25 @@
-require 'hashie'
+# frozen_string_literal: true
 
 module Openbeautyfacts
-  class ManufacturingPlace < Hashie::Mash
-
-    # TODO: Add more locales
-    LOCALE_PATHS = {
-      'fr' => 'lieux-de-fabrication',
-      'uk' => 'manufacturing-places',
-      'us' => 'manufacturing-places',
-      'world' => 'manufacturing-places'
-    }
+  class ManufacturingPlace < Openfoodfacts::ManufacturingPlace
+    # Override constants for openbeautyfacts domain
+    DEFAULT_LOCALE = Locale::GLOBAL
+    DEFAULT_DOMAIN = 'openbeautyfacts.org'
 
     class << self
-
-      # Get manufacturing places
-      #
-      def all(locale: DEFAULT_LOCALE, domain: DEFAULT_DOMAIN)
-        if path = LOCALE_PATHS[locale]
-          Product.tags_from_page(self, "https://#{locale}.#{domain}/#{path}")
-        end
+      # Override all method to use openbeautyfacts domain if it exists
+      def all(locale: DEFAULT_LOCALE, domain: DEFAULT_DOMAIN, **options)
+        super(locale: locale, domain: domain, **options)
+      rescue NoMethodError
+        # Method doesn't exist in parent class, skip
       end
-
     end
 
-    # Get products from manufacturing place
-    #
+    # Override products method to use openbeautyfacts domain if it exists
     def products(page: -1)
-      Product.from_website_page(url, page: page, products_count: products_count) if url
+      super(page: page)
+    rescue NoMethodError
+      # Method doesn't exist in parent class, skip
     end
-
   end
 end

data/lib/openbeautyfacts/mission.rb

@@ -1,72 +1,25 @@
-require 'hashie'
-require 'open-uri'
+# frozen_string_literal: true
 
 module Openbeautyfacts
-  class Mission < Hashie::Mash
-
-    # TODO: Add more locales
-    LOCALE_PATHS = {
-      'fr' => 'missions',
-      'uk' => 'missions',
-      'us' => 'missions',
-      'world' => 'missions'
-    }
+  class Mission < Openfoodfacts::Mission
+    # Override constants for openbeautyfacts domain
+    DEFAULT_LOCALE = Locale::GLOBAL
+    DEFAULT_DOMAIN = 'openbeautyfacts.org'
 
     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
+      # Override all method to use openbeautyfacts domain if it exists
+      def all(locale: DEFAULT_LOCALE, domain: DEFAULT_DOMAIN, **options)
+        super(locale: locale, domain: domain, **options)
+      rescue NoMethodError
+        # Method doesn't exist in parent class, skip
       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
+    # Override products method to use openbeautyfacts domain if it exists
+    def products(page: -1)
+      super(page: page)
+    rescue NoMethodError
+      # Method doesn't exist in parent class, skip
     end
-    alias_method :reload, :fetch
-
   end
-end
+end

data/lib/openbeautyfacts/number_of_ingredients.rb

@@ -1,33 +1,25 @@
-require 'hashie'
+# frozen_string_literal: true
 
 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 NumberOfIngredients < Openfoodfacts::NumberOfIngredients
+    # Override constants for openbeautyfacts domain
+    DEFAULT_LOCALE = Locale::GLOBAL
+    DEFAULT_DOMAIN = 'openbeautyfacts.org'
 
     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
+      # Override all method to use openbeautyfacts domain if it exists
+      def all(locale: DEFAULT_LOCALE, domain: DEFAULT_DOMAIN, **options)
+        super(locale: locale, domain: domain, **options)
+      rescue NoMethodError
+        # Method doesn't exist in parent class, skip
       end
-
     end
 
-    # Get products with last edit date
-    #
+    # Override products method to use openbeautyfacts domain if it exists
     def products(page: -1)
-      Product.from_website_page(url, page: page, products_count: products_count) if url
+      super(page: page)
+    rescue NoMethodError
+      # Method doesn't exist in parent class, skip
     end
-
   end
-end
+end

data/lib/openbeautyfacts/origin.rb

@@ -1,33 +1,25 @@
-require 'hashie'
+# frozen_string_literal: true
 
 module Openbeautyfacts
-  class Origin < Hashie::Mash
-
-    # TODO: Add more locales
-    LOCALE_PATHS = {
-      'fr' => 'origines',
-      'uk' => 'origins',
-      'us' => 'origins',
-      'world' => 'origins'
-    }
+  class Origin < Openfoodfacts::Origin
+    # Override constants for openbeautyfacts domain
+    DEFAULT_LOCALE = Locale::GLOBAL
+    DEFAULT_DOMAIN = 'openbeautyfacts.org'
 
     class << self
-
-      # Get origins
-      #
-      def all(locale: DEFAULT_LOCALE, domain: DEFAULT_DOMAIN)
-        if path = LOCALE_PATHS[locale]
-          Product.tags_from_page(self, "https://#{locale}.#{domain}/#{path}")
-        end
+      # Override all method to use openbeautyfacts domain if it exists
+      def all(locale: DEFAULT_LOCALE, domain: DEFAULT_DOMAIN, **options)
+        super(locale: locale, domain: domain, **options)
+      rescue NoMethodError
+        # Method doesn't exist in parent class, skip
       end
-
     end
 
-    # Get products with origin
-    #
+    # Override products method to use openbeautyfacts domain if it exists
     def products(page: -1)
-      Product.from_website_page(url, page: page, products_count: products_count) if url
+      super(page: page)
+    rescue NoMethodError
+      # Method doesn't exist in parent class, skip
     end
-
   end
 end

data/lib/openbeautyfacts/packager_code.rb

@@ -1,33 +1,25 @@
-require 'hashie'
+# frozen_string_literal: true
 
 module Openbeautyfacts
-  class PackagerCode < Hashie::Mash
-
-    # TODO: Add more locales
-    LOCALE_PATHS = {
-      'fr' => 'codes-emballeurs',
-      'uk' => 'packager-codes',
-      'us' => 'packager-codes',
-      'world' => 'packager-codes'
-    }
+  class PackagerCode < Openfoodfacts::PackagerCode
+    # Override constants for openbeautyfacts domain
+    DEFAULT_LOCALE = Locale::GLOBAL
+    DEFAULT_DOMAIN = 'openbeautyfacts.org'
 
     class << self
-
-      # Get packager codes
-      #
-      def all(locale: DEFAULT_LOCALE, domain: DEFAULT_DOMAIN)
-        if path = LOCALE_PATHS[locale]
-          Product.tags_from_page(self, "https://#{locale}.#{domain}/#{path}")
-        end
+      # Override all method to use openbeautyfacts domain if it exists
+      def all(locale: DEFAULT_LOCALE, domain: DEFAULT_DOMAIN, **options)
+        super(locale: locale, domain: domain, **options)
+      rescue NoMethodError
+        # Method doesn't exist in parent class, skip
       end
-
     end
 
-    # Get products with packager code
-    #
+    # Override products method to use openbeautyfacts domain if it exists
     def products(page: -1)
-      Product.from_website_page(url, page: page, products_count: products_count) if url
+      super(page: page)
+    rescue NoMethodError
+      # Method doesn't exist in parent class, skip
     end
-
   end
 end

data/lib/openbeautyfacts/packaging.rb

@@ -1,33 +1,25 @@
-require 'hashie'
+# frozen_string_literal: true
 
 module Openbeautyfacts
-  class Packaging < Hashie::Mash
-
-    # TODO: Add more locales
-    LOCALE_PATHS = {
-      'fr' => 'conditionnements',
-      'uk' => 'packaging',
-      'us' => 'packaging',
-      'world' => 'packaging'
-    }
+  class Packaging < Openfoodfacts::Packaging
+    # Override constants for openbeautyfacts domain
+    DEFAULT_LOCALE = Locale::GLOBAL
+    DEFAULT_DOMAIN = 'openbeautyfacts.org'
 
     class << self
-
-      # Get packagings
-      #
-      def all(locale: DEFAULT_LOCALE, domain: DEFAULT_DOMAIN)
-        if path = LOCALE_PATHS[locale]
-          Product.tags_from_page(self, "https://#{locale}.#{domain}/#{path}")
-        end
+      # Override all method to use openbeautyfacts domain if it exists
+      def all(locale: DEFAULT_LOCALE, domain: DEFAULT_DOMAIN, **options)
+        super(locale: locale, domain: domain, **options)
+      rescue NoMethodError
+        # Method doesn't exist in parent class, skip
       end
-
     end
 
-    # Get products with packaging
-    #
+    # Override products method to use openbeautyfacts domain if it exists
     def products(page: -1)
-      Product.from_website_page(url, page: page, products_count: products_count) if url
+      super(page: page)
+    rescue NoMethodError
+      # Method doesn't exist in parent class, skip
     end
-
   end
 end

data/lib/openbeautyfacts/period_after_opening.rb

@@ -1,33 +1,25 @@
-require 'hashie'
+# frozen_string_literal: true
 
 module Openbeautyfacts
-  class PeriodAfterOpening < Hashie::Mash
-
-    # TODO: Add more locales
-    LOCALE_PATHS = {
-      'fr' => 'durees-d-utilisation-apres-ouverture',
-      'uk' => 'periods-after-opening',
-      'us' => 'periods-after-opening',
-      'world' => 'periods-after-opening'
-    }
+  class PeriodAfterOpening < Openfoodfacts::PeriodAfterOpening
+    # Override constants for openbeautyfacts domain
+    DEFAULT_LOCALE = Locale::GLOBAL
+    DEFAULT_DOMAIN = 'openbeautyfacts.org'
 
     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
+      # Override all method to use openbeautyfacts domain if it exists
+      def all(locale: DEFAULT_LOCALE, domain: DEFAULT_DOMAIN, **options)
+        super(locale: locale, domain: domain, **options)
+      rescue NoMethodError
+        # Method doesn't exist in parent class, skip
       end
-
     end
 
-    # Get products with label
-    #
+    # Override products method to use openbeautyfacts domain if it exists
     def products(page: -1)
-      Product.from_website_page(url, page: page, products_count: products_count) if url
+      super(page: page)
+    rescue NoMethodError
+      # Method doesn't exist in parent class, skip
     end
-
   end
 end

data/lib/openbeautyfacts/press.rb

@@ -1,56 +1,25 @@
-require 'hashie'
-require 'nokogiri'
-require 'open-uri'
-require 'time'
+# frozen_string_literal: true
 
 module Openbeautyfacts
-  class Press < Hashie::Mash
-
-    # TODO: Add more locales
-    LOCALE_PATHS = {
-      'fr' => 'presse',
-      'uk' => 'press',
-      'us' => 'press',
-      'world' => 'press'
-    }
-
-    LOCALE_DATE_FORMATS = {
-      'fr' => '%d/%m/%Y',
-      'uk' => '%m/%d/%Y',
-      'us' => '%m/%d/%Y',
-      'world' => '%m/%d/%Y'
-    }
+  class Press < Openfoodfacts::Press
+    # Override constants for openbeautyfacts domain
+    DEFAULT_LOCALE = Locale::GLOBAL
+    DEFAULT_DOMAIN = 'openbeautyfacts.org'
 
     class << self
-      def items(locale: DEFAULT_LOCALE, domain: DEFAULT_DOMAIN)
-        if path = LOCALE_PATHS[locale]
-          html = URI.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(' - ')
-
-            link = Nokogiri::HTML.fragment(data.first).css('a')
-            attributes = {
-              "title" => link.text.strip,
-              "url" => link.attr('href').value
-            }
-
-            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
+      # Override all method to use openbeautyfacts domain if it exists
+      def all(locale: DEFAULT_LOCALE, domain: DEFAULT_DOMAIN, **options)
+        super(locale: locale, domain: domain, **options)
+      rescue NoMethodError
+        # Method doesn't exist in parent class, skip
       end
     end
 
+    # Override products method to use openbeautyfacts domain if it exists
+    def products(page: -1)
+      super(page: page)
+    rescue NoMethodError
+      # Method doesn't exist in parent class, skip
+    end
   end
 end