pueri 0.11.2 → 0.11.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5f588e2eede9595531d3c3f974ce6abb71089180353ffd2934d2c1e3604d56b1
-  data.tar.gz: fb14b72c9c15fa964a360a9552ed017eb580ad619b03337951a488d256c55a96
+  metadata.gz: e6ba46055aa80656a2d982c5a80dd70a38f51706bc7eb7d6cf53f327e4695522
+  data.tar.gz: 27d0d365013582129131ae72f3b40f77300c31ed897f89669618b5411e282e0a
 SHA512:
-  metadata.gz: 4a2387fa2b80b88101e62d4851d550009b95b19b65a9ac853951f4205d7e600908b82ade84e47a3dde3953b35f5c92d74bd9a6f9cd0d9f0984f46d7786e6eb15
-  data.tar.gz: 82ef5c2a79e5c8beacc6c7091ea7d3d9724b30eb8fa601b96d0cfd79d4add59da653ea3142cb72ba1071a12331d0fafa3215eda5fb08cb00a01efc1feba94334
+  metadata.gz: 3485877c8725ba9632fc168f919a44794cce1859413f65ea2fdec8018d767f99e52a1d1236baf285aa9973f36cfedf76e95773de4f1bc621bf061f0a0266acfc
+  data.tar.gz: 584bf81e59ab7b87d7ba7496adfdf3e2b961a5129d0fc0d3ecfc1e6561ce0492f39d191b096c5ce2d5ff3399aa250eff341184aabf78b8c660ce836c1a897765

data/CHANGELOG.md

@@ -7,6 +7,12 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+## [0.11.4] - `2019-10-28`
+
+### Changed
+* Included prettified output for `DoseCalc`'s `to_s` method.
+* Included prettified output for `DoseCheck`'s `to_s` method.
+
 ## [0.11.2] - `2019-10-28`
 
 ### Added
@@ -37,6 +43,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 [PNI]: http://www.saude.gov.br/saude-de-a-z/vacinacao/calendario-vacinacao
 [DNPM]: https://www.fcm.unicamp.br/fcm/neuropediatria-conteudo-didatico/desenvolvimento-neuropsicomotor
 
-[Unreleased]: https://github.com/Nereare/pueri/compare/v0.11.2...HEAD
+[Unreleased]: https://github.com/Nereare/pueri/compare/v0.11.4...HEAD
+[0.11.4]: https://github.com/Nereare/pueri/compare/v0.11.2...v0.11.4
 [0.11.2]: https://github.com/Nereare/pueri/compare/v0.7.0...v0.11.2
 [0.7.0]: https://github.com/Nereare/pueri/releases/tag/v0.7.0

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    pueri (0.11.2)
+    pueri (0.11.4)
       pastel (~> 0.7.3)
       tty-table (~> 0.11.0)
 

data/lib/pueri/dosecalc.rb

@@ -28,11 +28,16 @@ module Pueri
     # Outputs the calculated dosage into a prescription string.
     #
     # @return [String] The prescription string.
-    def to_s
-      [
-        "- #{@name} #{@concentration.to_i}#{@conc_unit.join '/'}",
-        "Tomar #{@result}#{@conc_unit[1]} #{time_to_s} #{days_to_s}."
-      ].join "\n"
+    def to_s(pretty = false)
+      if pretty
+        pretty_to_s
+      else
+        [
+          '',
+          "- #{@name} #{@concentration.to_i}#{@conc_unit.join '/'}",
+          "Tomar #{@result}#{@conc_unit[1]} #{time_to_s} #{days_to_s}."
+        ].join "\n"
+      end
     end
 
     # Outputs the calculated dosage for each taking. _E.g._ +3.7+, as in _use
@@ -45,6 +50,27 @@ module Pueri
 
     private
 
+    def pre_pretty_to_s
+      p = Pastel.new
+      qtt = p.cyan(@result, @conc_unit[1])
+      time = @time.to_i.to_s.rjust(2, '0')
+      time = p.cyan(time, '/', time, 'h')
+      days = p.cyan(@days.to_s.rjust(2, '0'), ' dias')
+
+      [qtt, time, days]
+    end
+
+    def pretty_to_s
+      p = Pastel.new
+      qtt, time, days = pre_pretty_to_s
+      [
+        '',
+        "#{p.cyan('1.')} #{@name} #{@concentration.to_i}"\
+        "#{@conc_unit.join('/')} ".ljust(90, '-'),
+        "   Dar #{qtt} de #{time} por #{days}."
+      ].join("\n")
+    end
+
     def time_to_s
       if @time == 24.0
         'uma vez por dia'

data/lib/pueri/dosecheck.rb

@@ -28,11 +28,16 @@ module Pueri
     # Outputs the calculated dosage as a string.
     #
     # @return [String] The dosage-per-weight-day string.
-    def to_s
-      [
-        "#{@name} #{@concentration.to_i}#{@conc_unit.join '/'} (#{usage})",
-        "-> Dose de #{@result}#{@conc_unit[0]}/kg/d."
-      ].join "\n"
+    def to_s(pretty = false)
+      if pretty
+        pretty_to_s
+      else
+        [
+          '',
+          "#{@name} #{@concentration.to_i}#{@conc_unit.join '/'} (#{usage})",
+          " - Dose de #{@result}#{@conc_unit[0]}/kg/d."
+        ].join "\n"
+      end
     end
 
     # Outputs the calculated dosage-per-weight-day as a float.
@@ -44,6 +49,16 @@ module Pueri
 
     private
 
+    def pretty_to_s
+      p = Pastel.new
+      [
+        '',
+        "#{p.cyan(@name, ' ', @concentration.to_i, @conc_unit.join('/'))} "\
+        "(#{usage}) ".ljust(90, '-'),
+        " - Dose de #{p.cyan(@result, @conc_unit[0], '/kg/d')}."
+      ].join("\n")
+    end
+
     def usage
       time = @time.to_i
       "#{@dose}#{@dose_unit} #{@way} #{time}/#{time}h por #{@days.to_i}d"

data/lib/pueri/version.rb

@@ -6,7 +6,7 @@
 # of Immunization (PNI), using the 2019 uptade.
 module Pueri
   # Sets the current version of the gem
-  @version = '0.11.2'
+  @version = '0.11.4'
 
   # Returns the Gem's current version.
   #

data/package.json

@@ -1,7 +1,7 @@
 {
   "name": "Pueri",
   "description": "Um script em Ruby para ajudar o dia-a-dia de médicos e enfermeiros de Atenção Básica.",
-  "version": "0.11.2",
+  "version": "0.11.4",
   "maintainers": [
     {
       "name": "Igor Padoim",

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: pueri
 version: !ruby/object:Gem::Version
-  version: 0.11.2
+  version: 0.11.4
 platform: ruby
 authors:
 - Igor Padoim