dietary_dsl 0.1.2 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 651b234879ecc76f0c70595a4afdf213395a9f98
-  data.tar.gz: 9c81ff86c69d62073a0b7740b7b779fdbd405e56
+  metadata.gz: beddb338f7ac88922780c7d5733a7abe12e50e32
+  data.tar.gz: af2be559f92b65796ea233b75815568e59278b7d
 SHA512:
-  metadata.gz: bf6269b03deab7b95b91de36d253452c0b245765deedd2c40e2a0c7c5ed58beaf6470e7030f6f4f1c5bdeb6ad7eef4d6c89671445dc11f4dab0a9e59398a0230
-  data.tar.gz: 14866e3d9c0eea790d71c4d2a20165e2c3e01a14607d50e70a26fe99df1c5ffc836c5bb2b1a21a04ceb6017785ed4b7ff9bae285b4afcabf67d54300fcd7b51f
+  metadata.gz: e062e6cb85ff878a37ce18948f6b65fed04f7fc303dba6bb5bdbe975e98632e1451d57d8b300758ab58e6130c4b1357a205d178cfc21334f1a505e4aecb4fb36
+  data.tar.gz: dbf188edc36dd412824a74f46f60b64a0bc5befdb41306db94bcfa69c3fa6746a29a65529fd56f227f32de8d0642f0b8d93d5944bd35d81f5fd67fdac92d5fd6

data/README.md

@@ -1,5 +1,6 @@
 # DietaryDsl
 
+[![Gem](https://img.shields.io/gem/v/dietary_dsl.svg)](https://rubygems.org/gems/dietary_dsl)
 [![Build status](https://gitlab.com/DanielRamosAcosta/dietary_dsl/badges/master/build.svg)](httpshttps://gitlab.com/DanielRamosAcosta/dietary_dsl/pipelines)
 [![Overall test coverage](https://gitlab.com/DanielRamosAcosta/dietary_dsl/badges/master/coverage.svg)](http://danielramosacosta.gitlab.io/dietary_dsl/coverage)
 

data/lib/dietary_dsl/bedca_api/food/orm.rb

@@ -0,0 +1,120 @@
+# frozen_string_literal: true
+
+require 'uri'
+require 'net/http'
+require 'builder'
+require 'active_support/all'
+require 'dietary_dsl/bedca_api/constants'
+require 'dietary_dsl/bedca_api/food_value'
+require 'dietary_dsl/bedca_api/food_values'
+require 'pp'
+
+module DietaryDsl
+  # Parte de la clase que interactúa con la base de datos
+  class Food
+    attr_reader :raw, :nombre, :name, :values
+
+    include BEDCA
+
+    @http = Net::HTTP.new(URL.host, URL.port)
+
+    class << self
+      attr_accessor :http
+    end
+
+    def self.request(xml)
+      response = @http.request_post URL, XML_HEADER + xml, 'Content-Type' => 'text/xml'
+      body = response.read_body
+      return Hash.from_xml body
+    rescue
+      raise 'Hay un problema con la conexión'
+    end
+
+    def self.sanitize_response(response)
+      response.dig 'foodresponse', 'food'
+    end
+
+    def self.build_attributes(b, attributes)
+      attributes
+        .reject { |(key)| key == 'foodvalue' }
+        .each do |(key)|
+          b.atribute name: key
+        end
+    end
+
+    def self.query(attributes = ATTRIBUTES)
+      Builder::XmlMarkup.new.foodquery do |b|
+        b.type level: 2
+        b.selection do
+          build_attributes(b, attributes)
+        end
+        yield b
+      end
+    end
+
+    def self.where(b, field, relation, value)
+      b.condition do
+        b.cond1 do
+          b.atribute1(name: ATTRIBUTES.key(field))
+        end
+        b.relation(type: relation)
+        b.cond3(value)
+      end
+    end
+
+    def self.find_by_and_relation(data, relation)
+      xml = query do |b|
+        data.each do |(key), value|
+          where(b, key, relation, value)
+        end
+      end
+
+      data = sanitize_response request xml
+      return nil if data.nil?
+
+      Food.new(data)
+    end
+
+    def self.find(id)
+      find_by(id: id)
+    end
+
+    def self.find_by(data)
+      find_by_and_relation(data, RELATIONS[:equal])
+    end
+
+    def self.find_by_like(data)
+      find_by_and_relation(data, RELATIONS[:like])
+    end
+
+    def initialize(values)
+      @data = rehash(values)
+      @groups = @data[:foodvalue]
+                .group_by { |value| value['cg_descripcion'] }
+                .each_with_object({}) do |(key, vals), hash|
+                  hash[CATEGORIES[key]] = FoodValues.new(vals.first['cg_descripcion'], vals)
+                end
+
+      @data.delete(:foodvalue)
+      @data[:groups] = @groups
+
+      @general_values = download_general_values
+    end
+
+    def [](key)
+      @data[key]
+    end
+
+    def download_general_values
+      body = (Food.http.request_get "http://www.bedca.net/cocoon/svg/response#{self[:id]}langes.svg").read_body
+      parse_svg body
+    end
+
+    def parse_svg(svg)
+      (svg.scan SVG_REGEX).each_with_object({}) do |value, hash|
+        hash[COMPONENTS[value.last]] = value.first.delete(' ')
+        hash
+      end
+    end
+  end
+end

data/lib/dietary_dsl/bedca_api/food/others.rb

@@ -0,0 +1,46 @@
+# frozen_string_literal: true
+
+require 'uri'
+require 'net/http'
+require 'builder'
+require 'active_support/all'
+require 'dietary_dsl/bedca_api/constants'
+require 'dietary_dsl/bedca_api/food_value'
+require 'dietary_dsl/bedca_api/food_values'
+require 'pp'
+
+module DietaryDsl
+  # Parte de la clase que presenta sus datos
+  class Food
+    def kcal
+      @data[:groups][:proximales][:energia_total][:cantidad]
+        .gsub(/.+kJ/, '')
+        .to_f * 0.238846
+    end
+
+    def to_s
+      tables = @data[:groups]
+               .map do |(_key, group)|
+                 group.to_table
+               end
+               .join("\n")
+
+      <<~TO_MARKDOWN
+        # #{self[:nombre]}
+
+        > #{self[:scientific_name]}
+
+        ## Distribución de la Energía total
+
+        Proteínas: #{@general_values[:proteina_total]}
+        Grasas: #{@general_values[:grasa_total]}
+        Carbohidratos: #{@general_values[:carbohidratos]}
+        Alcohol: #{@general_values[:alcohol]}
+
+        ## Información de composición (por 100 g de porción comestible)
+
+        #{tables}
+      TO_MARKDOWN
+    end
+  end
+end

data/lib/dietary_dsl/bedca_api/food.rb

@@ -1,145 +1,4 @@
 # frozen_string_literal: true
 
-require 'uri'
-require 'net/http'
-require 'builder'
-require 'active_support/all'
-require 'dietary_dsl/bedca_api/constants'
-require 'dietary_dsl/bedca_api/food_value'
-require 'dietary_dsl/bedca_api/food_values'
-require 'pp'
-
-module DietaryDsl
-  # Class that wraps Bedca database API
-  class Food
-    attr_reader :raw, :nombre, :name, :values
-
-    include BEDCA
-
-    @http = Net::HTTP.new(URL.host, URL.port)
-
-    class << self
-      attr_accessor :http
-    end
-
-    def self.request(xml)
-      response = @http.request_post URL, XML_HEADER + xml, 'Content-Type' => 'text/xml'
-      body = response.read_body
-      return Hash.from_xml body
-    rescue
-      raise 'Hay un problema con la conexión'
-    end
-
-    def self.sanitize_response(response)
-      response.dig 'foodresponse', 'food'
-    end
-
-    def self.build_attributes(b, attributes)
-      attributes
-        .reject { |(key)| key == 'foodvalue' }
-        .each do |(key)|
-          b.atribute name: key
-        end
-    end
-
-    def self.query(attributes = ATTRIBUTES)
-      Builder::XmlMarkup.new.foodquery do |b|
-        b.type level: 2
-        b.selection do
-          build_attributes(b, attributes)
-        end
-        yield b
-      end
-    end
-
-    def self.where(b, field, relation, value)
-      b.condition do
-        b.cond1 do
-          b.atribute1(name: ATTRIBUTES.key(field))
-        end
-        b.relation(type: relation)
-        b.cond3(value)
-      end
-    end
-
-    def self.find_by_and_relation(data, relation)
-      xml = query do |b|
-        data.each do |(key), value|
-          where(b, key, relation, value)
-        end
-      end
-
-      data = sanitize_response request xml
-      return nil if data.nil?
-
-      Food.new(data)
-    end
-
-    def self.find(id)
-      find_by(id: id)
-    end
-
-    def self.find_by(data)
-      find_by_and_relation(data, RELATIONS[:equal])
-    end
-
-    def self.find_by_like(data)
-      find_by_and_relation(data, RELATIONS[:like])
-    end
-
-    def initialize(values)
-      @data = rehash(values)
-      @groups = @data[:foodvalue]
-                .group_by { |value| value['cg_descripcion'] }
-                .each_with_object({}) do |(key, vals), hash|
-                  hash[CATEGORIES[key]] = FoodValues.new(vals.first['cg_descripcion'], vals)
-                end
-
-      @data.delete(:foodvalue)
-      @data[:groups] = @groups
-
-      @general_values = download_general_values
-    end
-
-    def [](key)
-      @data[key]
-    end
-
-    def download_general_values
-      body = (Food.http.request_get "http://www.bedca.net/cocoon/svg/response#{self[:id]}langes.svg").read_body
-      parse_svg body
-    end
-
-    def parse_svg(svg)
-      (svg.scan SVG_REGEX).each_with_object({}) do |value, hash|
-        hash[COMPONENTS[value.last]] = value.first.delete(' ')
-        hash
-      end
-    end
-
-    def to_s
-      tables = @data[:groups]
-               .map do |(_key, group)|
-                 group.to_table
-               end
-               .join("\n")
-
-      <<~TO_MARKDOWN
-        # #{self[:nombre]}
-
-        > #{self[:scientific_name]}
-
-        ## Distribución de la Energía total
-
-        Proteínas: #{@general_values[:proteina_total]}
-        Grasas: #{@general_values[:grasa_total]}
-        Carbohidratos: #{@general_values[:carbohidratos]}
-        Alcohol: #{@general_values[:alcohol]}
-
-        ## Información de composición (por 100 g de porción comestible)
-
-        #{tables}
-      TO_MARKDOWN
-    end
-  end
-end
+require 'dietary_dsl/bedca_api/food/orm'
+require 'dietary_dsl/bedca_api/food/others'

data/lib/dietary_dsl/dsl/alimento.rb

@@ -0,0 +1,26 @@
+# frozen_string_literal: true
+
+require 'dietary_dsl/bedca_api/food'
+
+module DietaryDsl
+  # Clase que representa un menú. Un menú se compone de distintos platos (entrantes, primeros platos, postres...)
+  class Alimento
+    def initialize(nombre, options = {})
+      @alimento = DietaryDsl::Food.find_by(nombre: nombre) unless options[:exact].nil?
+      @alimento = DietaryDsl::Food.find_by_like(nombre: nombre) if options[:exact].nil?
+      raise "El alimento #{nombre} no existe" if @alimento.nil?
+    end
+
+    def [](key)
+      @alimento[key]
+    end
+
+    def kcal
+      @alimento.kcal
+    end
+
+    def masa
+      @alimento.masa
+    end
+  end
+end

data/lib/dietary_dsl/dsl/dia.rb

@@ -0,0 +1,48 @@
+# frozen_string_literal: true
+
+module DietaryDsl
+  # Clase que representa un día completo, con los menús correspondientes para cada comida
+  class Dia
+    include Enumerable
+
+    def initialize(title = nil, &block)
+      @title = title
+      @menus = {}
+      instance_eval(&block)
+    end
+
+    def [](key)
+      @menus[key]
+    end
+
+    def kcal
+      @menus.inject(0) do |sum, (_, menu)|
+        sum + menu.kcal
+      end
+    end
+
+    def each
+      @menus.each { |i| yield i }
+    end
+
+    def desayuno(menu)
+      @menus[:desayuno] = menu
+    end
+
+    def media_maniana(menu)
+      @menus[:media_mañana] = menu
+    end
+
+    def almuerzo(menu)
+      @menus[:almuerzo] = menu
+    end
+
+    def merienda(menu)
+      @menus[:merienda] = menu
+    end
+
+    def cena(menu)
+      @menus[:menu] = menu
+    end
+  end
+end

data/lib/dietary_dsl/dsl/menu.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require 'dietary_dsl/bedca_api/food'
+require 'dietary_dsl/dsl/alimento'
 
 module DietaryDsl
   # Clase que representa un menú. Un menú se compone de distintos platos (entrantes, primeros platos, postres...)
@@ -16,7 +16,18 @@ module DietaryDsl
     end
 
     def plato(datos)
+      return plato_single(datos) if datos.is_a?(Hash)
       @platos = @platos.push datos
     end
+
+    def plato_single(datos)
+      @platos = @platos.push(DietaryDsl::Plato.new(datos[:food]) { alimento(datos) })
+    end
+
+    def kcal
+      @platos.inject(0) do |sum, plato|
+        sum + plato.kcal
+      end
+    end
   end
 end

data/lib/dietary_dsl/dsl/plato.rb

@@ -5,6 +5,10 @@ require 'dietary_dsl/bedca_api/food'
 module DietaryDsl
   # Clase que representa un plato. Un plato es una comida específica, como pulpo a la gallega, o un potaje
   class Plato
+    include Enumerable
+
+    attr_reader :title
+
     def initialize(title, &block)
       @title = title
       @alimentos = []
@@ -15,13 +19,44 @@ module DietaryDsl
       @alimentos[key]
     end
 
+    def each
+      @alimentos.each { |i| yield i }
+    end
+
     def alimento(datos)
-      alimento = DietaryDsl::Food.find_by_like(nombre: datos[:food])
-      raise "El alimento #{datos[:food]} no existe" if alimento.nil?
+      alimento = DietaryDsl::Alimento.new(datos[:food], datos)
       cantidad = datos[:cantidad]
       @alimentos = @alimentos.push food: alimento, cantidad: cantidad
     end
 
+    def kcal
+      @alimentos.inject(0) do |sum, item|
+        cantidad = item[:cantidad]
+        kilocalorias = item[:food].kcal
+
+        is_mass = cantidad.instance_of? DietaryDsl::Masa
+        gramos = cantidad.to.g if is_mass
+        gramos = cantidad.to.cm3 unless is_mass
+        kcal_totales = ((gramos * kilocalorias) / 100)
+        sum + kcal_totales
+      end
+    end
+
+    def kcal_por_cada(cantidad)
+      (kcal * cantidad.to.g) / masa.to.g
+    end
+
+    def masa
+      gr = @alimentos.inject(0) do |sum, item|
+        is_mass = item[:cantidad].instance_of? DietaryDsl::Masa
+        gramos = item[:cantidad].to.g if is_mass
+        gramos = item[:cantidad].to.cm3 unless is_mass
+        sum + gramos
+      end
+
+      DietaryDsl::Masa.new(gr)
+    end
+
     def to_s
       alimentos = @alimentos
                   .map { |data| "* #{data[:food][:nombre]}" }

data/lib/dietary_dsl/measures/mass.rb

@@ -46,6 +46,10 @@ module DietaryDsl
     def *(other)
       Masa.new(@cantidad * other.cantidad)
     end
+
+    def +(other)
+      Masa.new(@cantidad + other.cantidad)
+    end
   end
 end
 

data/lib/dietary_dsl/measures/volume.rb

@@ -14,16 +14,20 @@ module DietaryDsl
       Volumen.new(number)
     end
 
+    def self.ml(number)
+      Volumen.new(number / 1000.0)
+    end
+
     def self.cm3(number)
-      Volumen.new(number / 1000)
+      Volumen.new(number / 1000.0)
     end
 
     def self.cucharada(number)
-      Volumen.new(number / 50.0)
+      Volumen.new((number * 3.0) / 200.0)
     end
 
     def self.vaso(number)
-      Volumen.new(number / 4.0)
+      Volumen.new(number / 5.0)
     end
 
     def self.chorrito(number)
@@ -74,6 +78,18 @@ class Numeric
     l
   end
 
+  def ml
+    DietaryDsl::Volumen.ml(self)
+  end
+
+  def mililitro
+    ml
+  end
+
+  def mililitros
+    ml
+  end
+
   def cucharada
     DietaryDsl::Volumen.cucharada(self)
   end

data/lib/dietary_dsl/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module DietaryDsl
-  VERSION = '0.1.2'
+  VERSION = '0.2.0'
 end

data/lib/dietary_dsl.rb

@@ -2,8 +2,10 @@
 
 require 'dietary_dsl/version'
 require 'dietary_dsl/bedca_api/food'
+require 'dietary_dsl/dsl/alimento'
 require 'dietary_dsl/dsl/plato'
 require 'dietary_dsl/dsl/menu'
+require 'dietary_dsl/dsl/dia'
 require 'dietary_dsl/measures'
 
 # Module that encolses the gem

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dietary_dsl
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.2.0
 platform: ruby
 authors:
 - Daniel Ramos
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-06-21 00:00:00.000000000 Z
+date: 2017-06-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: builder
@@ -211,8 +211,12 @@ files:
 - lib/dietary_dsl/bedca_api/constants/relations.rb
 - lib/dietary_dsl/bedca_api/constants/utils.rb
 - lib/dietary_dsl/bedca_api/food.rb
+- lib/dietary_dsl/bedca_api/food/orm.rb
+- lib/dietary_dsl/bedca_api/food/others.rb
 - lib/dietary_dsl/bedca_api/food_value.rb
 - lib/dietary_dsl/bedca_api/food_values.rb
+- lib/dietary_dsl/dsl/alimento.rb
+- lib/dietary_dsl/dsl/dia.rb
 - lib/dietary_dsl/dsl/menu.rb
 - lib/dietary_dsl/dsl/plato.rb
 - lib/dietary_dsl/measures.rb