dietary_dsl 0.3.1 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c7023482dea93f772dec13950d0e46d6aef4a093
-  data.tar.gz: 8852fd20bdefbb42bb306c1ea1cee6e127558a0f
+  metadata.gz: f57eda75d75d970e6bdbdccff368bc9898837f0d
+  data.tar.gz: 3b5f5c21628fdcd6bc936bdfced6a88164432ad6
 SHA512:
-  metadata.gz: 984c088bba7bf45aa3e3c0ec5ce1f9210e77e7fc36128d61749ae144e221e28142c9795e3892356423e61fd28215bc195ee4bbbaf417896c6d67099c632eaaec
-  data.tar.gz: 9ee29715cf8ed7929ad1d76c4898ff7d1c0f95f2c87a384c13934348c7f77596a7bcdbf516fe574ac1f1232fb7f2d2fbd57e5674fa1abeabf2be53f8299a2564
+  metadata.gz: 26296bfdff40667c3bfae669c164c53c2efcd663afb6713fdc7fb7ddd4630b4edea22208070cc5f9543ece75ca9ea6ecbd1f75fd69ba256304e9600e0c73b538
+  data.tar.gz: 54a05961f6a61e9b33334a7b3019b90ddf8432d05aff902eddcf2975a7a3e358aab4ba461857dc75b30f8cde3ce5838d6e22d477b35e8639980d60668c1f3aa2

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

@@ -102,6 +102,7 @@ module DietaryDsl
     end
 
     def [](key)
+      return @data[key].delete(',') if key === :nombre or key === :name
       @data[key]
     end
 

data/lib/dietary_dsl/dsl/plato.rb

@@ -67,5 +67,9 @@ module DietaryDsl
         #{alimentos}
       OUTPUT
     end
+
+    def single?
+      @alimentos.length == 1
+    end
   end
 end

data/lib/dietary_dsl/measures/mass.rb

@@ -7,6 +7,8 @@ module DietaryDsl
   class Masa < Measure
     def initialize(en_gramos)
       super(en_gramos)
+      @small_postfix = "g"
+      @big_postfix = "kg"
     end
 
     # Métodos de clase para instanciarlo
@@ -19,6 +21,16 @@ module DietaryDsl
       DietaryDsl::Masa.new(number)
     end
 
+    # Métodos para heredar
+
+    def big
+      kg
+    end
+
+    def small
+      g
+    end
+
     # Métodos de conversión
 
     def g

data/lib/dietary_dsl/measures/measure.rb

@@ -12,5 +12,17 @@ module DietaryDsl
     def to
       self
     end
+
+    def to_s
+      if @cantidad < 1000
+        "#{small.to_i}#{@small_postfix}"
+      else
+        if big == big.to_i
+          "#{big.to_i}#{@big_postfix}"
+        else
+          "#{big.round(1)}#{@big_postfix}"
+        end
+      end
+    end
   end
 end

data/lib/dietary_dsl/measures/volume.rb

@@ -5,53 +5,65 @@ require 'dietary_dsl/measures/measure'
 module DietaryDsl
   # Esta clase nos permite representar unidades de volumen, como litros o cucharadas.
   class Volumen < Measure
-    def initialize(en_litros)
-      super(en_litros)
+    def initialize(en_ml)
+      super(en_ml)
       @cantidad = cantidad.to_f
+      @small_postfix = "ml"
+      @big_postfix = "L"
     end
 
     def self.l(number)
-      Volumen.new(number)
+      Volumen.new(number * 1000.0)
     end
 
     def self.ml(number)
-      Volumen.new(number / 1000.0)
+      Volumen.new(number)
     end
 
     def self.cm3(number)
-      Volumen.new(number / 1000.0)
+      Volumen.new(number)
     end
 
     def self.cucharada(number)
-      Volumen.new((number * 3.0) / 200.0)
+      Volumen.new(number *  15.0)
     end
 
     def self.vaso(number)
-      Volumen.new(number / 5.0)
+      Volumen.new(number * 200)
     end
 
     def self.chorrito(number)
-      Volumen.new(number / 16.0)
+      Volumen.new(number * 62.5)
+    end
+
+    # Métodos para heredar
+
+    def big
+      l
+    end
+
+    def small
+      ml
     end
 
     def l
-      @cantidad
+      @cantidad / 1000
     end
 
     def litros
-      @cantidad
+      l
     end
 
     def cm3
-      @cantidad * 1000
+      @cantidad
     end
 
-    def cucharada
-      @cantidad * 50
+    def ml
+      @cantidad
     end
 
     def cucharadas
-      cucharada
+      @cantidad / 20
     end
 
     def coerce(arg)

data/lib/dietary_dsl/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: dietary_dsl
 version: !ruby/object:Gem::Version
-  version: 0.3.1
+  version: 0.4.0
 platform: ruby
 authors:
 - Daniel Ramos