dietary_dsl 0.4.1 → 0.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ad41b81801c85ca443e980827a5406499051862a
-  data.tar.gz: b19ab754323d2a0ba736655eded800d933924e1b
+  metadata.gz: bb58c2b451ebba6d0ec9a96b33d91f3e467b2930
+  data.tar.gz: d98851c53f4a99e70980405269661a806357fe04
 SHA512:
-  metadata.gz: 56bc71fba5af55a4b199052b76ffe6035e03195b1c99cb4c74c8d7950e9dc688fb34f647f1d6031fbb8bc81aac6a80e8c07da49b658e8c3b2e17caa8992abfe9
-  data.tar.gz: b671ffe188c5ddb889980940c51876fbd4090abf2458cb81602e48785740ce46b9e815f2b427916d728ad8058282524f515a68423eb6bbdc7205ee64959cb04b
+  metadata.gz: e73448cbe33d56978b16c587cd3f87f0598c139b1dee4ac06e576522ea6031987a592af483e696fcbce2e7cd56d2e606bdd0d594e42c1a8fa8226d05946017e5
+  data.tar.gz: 0719f8c27917249157a6b9ecaac63f52da47af9ca2928764847de3e41e33a784678c8794b2b4a794be3f7bd93f699962ce4ac676f91b4742ea4928416428e695

data/lib/dietary_dsl/bedca_api/constants/relations.rb

@@ -4,8 +4,15 @@ module DietaryDsl
   # Módulo que agrupa las constantes y funciones útiles respecto a la base de datos BEDCA
   module BEDCA
     RELATIONS = {
+      not_equal: 'NOTEQUAL',
+      more: 'MORE',
+      like: 'LIKE',
       equal: 'EQUAL',
-      like: 'LIKE'
+      lessi: 'LESSI',
+      not_pattern: 'NOTPATTERN',
+      less: 'LESS',
+      begin_with: 'BEGINW',
+      morei: 'MOREI'
     }.freeze
   end
 end

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

@@ -67,6 +67,8 @@ module DietaryDsl
         data.each do |(key), value|
           where(b, key, relation, value)
         end
+        order(b, :nombre)
+        yield b if block_given?
       end
 
       data = sanitize_response request xml
@@ -75,6 +77,12 @@ module DietaryDsl
       Food.new(data)
     end
 
+    def self.order(b, field, direction = 'ASC')
+      b.order(ordtype: direction) do
+        b.atribute3(name: ATTRIBUTES.key(field))
+      end
+    end
+
     def self.find(id)
       find_by(id: id)
     end
@@ -84,7 +92,11 @@ module DietaryDsl
     end
 
     def self.find_by_like(data)
-      find_by_and_relation(data, RELATIONS[:like])
+      find_by_and_relation(data, RELATIONS[:equal]) do |b|
+        data.each do |(key), value|
+          where(b, key, RELATIONS[:begin_with], value[0])
+        end
+      end
     end
 
     def initialize(values)

data/lib/dietary_dsl/dsl/dia.rb

@@ -44,7 +44,7 @@ module DietaryDsl
     end
 
     def cena(menu)
-      @menus[:menu] = menu
+      @menus[:cena] = menu
     end
   end
 end

data/lib/dietary_dsl/dsl/menu.rb

@@ -5,13 +5,14 @@ require 'dietary_dsl/dsl/alimento'
 module DietaryDsl
   # Clase que representa un menú. Un menú se compone de distintos platos (entrantes, primeros platos, postres...)
   class Menu
-    attr_reader :title
+    attr_reader :title, :racion
 
     include Enumerable
 
     def initialize(title, &block)
       @title = title
       @platos = []
+      @racion = nil
       instance_eval(&block)
     end
 
@@ -23,9 +24,10 @@ module DietaryDsl
       @platos.each { |i| yield i }
     end
 
-    def plato(datos)
+    def plato(datos, options = {})
       return plato_single(datos) if datos.is_a?(Hash)
       @platos = @platos.push datos
+      @racion = options[:racion]
     end
 
     def plato_single(datos)
@@ -33,9 +35,21 @@ module DietaryDsl
     end
 
     def kcal
-      @platos.inject(0) do |sum, plato|
+      kilocalorias = @platos.inject(0) do |sum, plato|
         sum + plato.kcal
       end
+      return racionar(kilocalorias) unless @racion.nil?
+      kilocalorias
+    end
+
+    def masa
+      @platos.inject(0) do |sum, plato|
+        sum + plato.masa.to.g
+      end
+    end
+
+    def racionar(kilocalorias)
+      (@racion.to.g * kilocalorias) / masa
     end
   end
 end

data/lib/dietary_dsl/measures/mass.rb

@@ -21,6 +21,10 @@ module DietaryDsl
       DietaryDsl::Masa.new(number)
     end
 
+    def self.rodaja(number)
+      DietaryDsl::Masa.new(number * 20)
+    end
+
     # Métodos para heredar
 
     def big
@@ -90,4 +94,12 @@ class Numeric
   def kilogramos
     kg
   end
+
+  def rodaja
+    kg
+  end
+
+  def rodajas
+    kg
+  end
 end

data/lib/dietary_dsl/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dietary_dsl
 version: !ruby/object:Gem::Version
-  version: 0.4.1
+  version: 0.5.0
 platform: ruby
 authors:
 - Daniel Ramos
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-06-23 00:00:00.000000000 Z
+date: 2017-06-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: builder
@@ -164,6 +164,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '3.0'
+- !ruby/object:Gem::Dependency
+  name: wdm
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.1'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.1'
 description: Esta gema sirve para realizar una representación de menús dietéticos
   usando un lenguaje de dominio específico.
 email: