sinatra-hexacta 0.9.12 → 1.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: cc4e539f65371ebb4d52b73e185f6d41bf0576d568ca371150b6bbe9e4d0c49c
-  data.tar.gz: 841dc6b738b38f5afcdbf7b73dc23c9d57a7d7111d890c6f7457ee7fb8cfb82b
+  metadata.gz: 235207ce86479d51ab5c1852a286ab92d5b4de8fbd159d584bc79234bcafd5dc
+  data.tar.gz: 933097a5eca58c05479cb29e93543c9e9ca292eb45c61b940be4ab9c4cf80f9c
 SHA512:
-  metadata.gz: 2240105d063c417614628c4ae4da5e9e4271d4d9e290d1aafba2421c9c7fff265bc5b519f99ff6281fb193755f166ae85ee657c23167ddf68f856c0ac83fe5cc
-  data.tar.gz: 643d0ac518473058ba06466037125019ff852fe03cfaf71b0b9cd1700c224fee5e80b77cc9df42a564c6d5d4102c87d33456e64a91881d947b3c6b3a5c21fa9e
+  metadata.gz: c57ec64f35c7f71a043278ffc15e8e131f53cc8a29dfcb353475baa4763a27b09e323eacb16c0f652b209eb44d22383f8e91096403e42e35cfd73f08c5ec10ef
+  data.tar.gz: 2bfb5b976a50e30124bce1b534953b68e4c95f7398b4d34dace6afee55204b32adaec6bf67ac892f2cd33554a048a4f98be171a0ad17ac72581ef19aa32b8e5e

data/lib/sinatra/extensions/antiquity.rb

@@ -5,16 +5,16 @@ class Antiquity
     @periods = periods.sort { |a,b| a.start_date <=> b.start_date }
   end
 
-  def days
-    @periods.inject(0) { |total, period| total + period.days }
+  def days(upto_date=Date.today)
+    @periods.inject(0) { |total, period| total + period.days(upto_date) }
   end
 
-  def months
-    @periods.inject(0) { |total, period| total + period.months }
+  def months(upto_date=Date.today)
+    @periods.inject(0) { |total, period| total + period.months(upto_date) }
   end
 
-  def years
-    months.divmod(12).first
+  def years(upto_date=Date.today)
+    months(upto_date).divmod(12).first
   end
 
   def to_s(upto_date=Date.today)
@@ -22,11 +22,13 @@ class Antiquity
     result = ""
     return result if @periods.empty?
     if date >= @periods.first.start_date
-      result += years > 1 ? "#{years} años" : "#{years} año" unless years == 0
-      result += ", " if years >= 1 && !(months.modulo(12).eql?(0))
-      result += months.modulo(12) > 1 ? "#{months.modulo(12)} meses" : "#{months.modulo(12)} mes" unless months.modulo(12) == 0
-      result += "#{(date - @periods.last.start_date).to_i} dias" if months.modulo(12) == 0 && years == 0 && date > @periods.last.start_date
-      result += "Hoy!" if months.modulo(12) == 0 && date == @periods.last.start_date
+      years_upto_date = years(date)
+      months_upto_date = months(date)
+      result += years_upto_date > 1 ? "#{years_upto_date} años" : "#{years_upto_date} año" unless years_upto_date == 0
+      result += ", " if years_upto_date >= 1 && !(months_upto_date.modulo(12).eql?(0))
+      result += months_upto_date.modulo(12) > 1 ? "#{months_upto_date.modulo(12)} meses" : "#{months_upto_date.modulo(12)} mes" unless months_upto_date.modulo(12) == 0
+      result += "#{(date - @periods.last.start_date).to_i} dias" if months_upto_date.modulo(12) == 0 && years_upto_date == 0 && date > @periods.last.start_date
+      result += "Hoy!" if months_upto_date.modulo(12) == 0 && date == @periods.last.start_date
     end
     result += "En unos días..." if date < @periods.first.start_date
     result

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sinatra-hexacta
 version: !ruby/object:Gem::Version
-  version: 0.9.12
+  version: 1.0.0
 platform: ruby
 authors:
 - Marco Zanger
@@ -163,7 +163,6 @@ files:
 - lib/sinatra/public/vendors/malihu-custom-scrollbar-plugin/mCSB_buttons.png
 - lib/sinatra/public/vendors/material-design-iconic-font/css/material-design-iconic-font.css
 - lib/sinatra/public/vendors/material-design-iconic-font/css/material-design-iconic-font.min.css
-- lib/sinatra/public/vendors/material-design-iconic-font/fonts/Material-Design-Iconic-Font.eot
 - lib/sinatra/public/vendors/material-design-iconic-font/fonts/Material-Design-Iconic-Font.svg
 - lib/sinatra/public/vendors/material-design-iconic-font/fonts/Material-Design-Iconic-Font.ttf
 - lib/sinatra/public/vendors/material-design-iconic-font/fonts/Material-Design-Iconic-Font.woff