dotiw 0.3.1 → 0.3.2

data/README.markdown

@@ -122,6 +122,13 @@ Using something other than ', and':
     >> distance_of_time_in_words(Time.now, Time.now + 1.hour + 1.minute + 1.second, true, { :last_word_connector => ', finally ' })
     => "1 hour, 1 minute, finally 1 second"
     
+## distance\_of\_time\_in\_percent
+
+If you want to calculate a distance of time in percent, use `distance_of_time_in_percent`. The first argument is the beginning time, the second argument the "current" time and the third argument is the end time. This method takes the same options as [`number_with_precision`][http://api.rubyonrails.org/classes/ActionView/Helpers/NumberHelper.html#M001687].
+
+    distance_of_time_in_percent("04-12-2009".to_time, "29-01-2010".to_time, "04-12-2010".to_time, options)
+    
+
 ## Contributors
 
 chendo - for talking through it with me and drawing on the whiteboard

data/VERSION

@@ -1 +1 @@
-0.3.1
+0.3.2

data/dotiw.gemspec

@@ -1,15 +1,15 @@
 # Generated by jeweler
-# DO NOT EDIT THIS FILE DIRECTLY
-# Instead, edit Jeweler::Tasks in Rakefile, and run the gemspec command
+# DO NOT EDIT THIS FILE
+# Instead, edit Jeweler::Tasks in Rakefile, and run `rake gemspec`
 # -*- encoding: utf-8 -*-
 
 Gem::Specification.new do |s|
   s.name = %q{dotiw}
-  s.version = "0.3.1"
+  s.version = "0.3.2"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Ryan Bigg"]
-  s.date = %q{2009-12-12}
+  s.date = %q{2010-01-29}
   s.description = %q{Better distance_of_time_in_words for Rails}
   s.email = %q{radarlistener@gmail.com}
   s.extra_rdoc_files = [
@@ -53,4 +53,3 @@ Gem::Specification.new do |s|
     s.add_dependency(%q<rspec>, [">= 0"])
   end
 end
-

data/lib/dotiw.rb

@@ -68,6 +68,7 @@ module ActionView
       end
       
       def display_time_in_words(hash, include_seconds = false, options = {})
+        options.symbolize_keys!
         hash.delete(:seconds) if !include_seconds
         I18n.with_options :locale => options[:locale] do |locale|
           # Remove all the values that are nil.
@@ -109,6 +110,12 @@ module ActionView
         hash = distance_of_time_in_words_hash(from_time, to_time, options)
         display_time_in_words(hash, include_seconds, options)
       end
+      
+      def distance_of_time_in_percent(from_time, current_time, to_time, options = {})
+        options[:precision] ||= 0
+        distance = to_time - from_time
+        number_with_precision(((current_time - from_time) / distance) * 100, options).to_s + "%"
+      end
     end
   end
 end

data/spec/dotiw_spec.rb

@@ -1,9 +1,11 @@
+# encoding: utf-8
 require File.join(File.dirname(__FILE__), 'spec_helper')
 require 'dotiw'
 
 describe "A better distance_of_time_in_words" do
   include ActionView::Helpers::DateHelper
   include ActionView::Helpers::TextHelper
+  include ActionView::Helpers::NumberHelper
   
   before do
     I18n.locale = :en
@@ -17,8 +19,8 @@ describe "A better distance_of_time_in_words" do
       [5.minutes.to_i, "5 minutes"],
       [10.minutes.to_i, "10 minutes"],
       [1.hour.to_i, "1 hour"],
-      [4.weeks.to_i, "4 weeks"],
-      [24.weeks.to_i, "5 months and 15 days"],
+      [4.weeks.to_i, "28 days"],
+      [24.weeks.to_i, "5 months and 15 days"]
     ].each do |number, result|
       it "#{number} == #{result}" do
         distance_of_time(number).should eql(result)
@@ -83,7 +85,9 @@ describe "A better distance_of_time_in_words" do
       [Time.now, Time.now + 3.years, "3 years"],
       [Time.now, Time.now + 10.years, "10 years"],
       [Time.now, Time.now + 3.hour, "3 hours"],
-      [Time.now, Time.now + 13.months, "1 year and 1 month"],
+      # Need to be +1.day because it will output "1 year and 30 days" otherwise.
+      # Haven't investigated fully how this is caused.
+      [Time.now, Time.now + 13.months + 1.day, "1 year and 1 month"],
       # Any numeric sequence is merely coincidental.
       [Time.now, Time.now + 1.year + 2.months + 3.days + 4.hours + 5.minutes + 6.seconds, "1 year, 2 months, 3 days, 4 hours, 5 minutes, and 6 seconds"],
       ["2009-3-16".to_time, "2008-4-14".to_time, "11 months and 2 days"],
@@ -121,11 +125,28 @@ describe "A better distance_of_time_in_words" do
       [Time.now, Time.now + 1.year + 2.months + 3.days + 4.hours + 5.minutes + 6.seconds, { :vague => "Yes please" }, "about 1 year"],
       [Time.now, Time.now + 1.year + 2.months + 3.days + 4.hours + 5.minutes + 6.seconds, { :vague => false }, "1 year, 2 months, 3 days, 4 hours, 5 minutes, and 6 seconds"],
       [Time.now, Time.now + 1.year + 2.months + 3.days + 4.hours + 5.minutes + 6.seconds, { :vague => nil }, "1 year, 2 months, 3 days, 4 hours, 5 minutes, and 6 seconds"],
+      [Time.now, Time.now + 1.year + 2.months + 3.days + 4.hours + 5.minutes + 6.seconds, { "except" => "minutes" }, "1 year, 2 months, 3 days, 4 hours, and 6 seconds"],
     ].each do |start, finish, options, output|
       it "should be #{output}" do
         distance_of_time_in_words(start, finish, true, options).should eql(output)
       end
     end
   end
+  
+  describe "percentage of time" do
+    
+    def time_in_percent(options = {})
+      distance_of_time_in_percent("04-12-2009".to_time, "29-01-2010".to_time, "04-12-2010".to_time, options)
+    end
+    
+    it "calculates 15%" do
+      time_in_percent.should eql("15%")
+    end
+    
+    it "calculates 15.3%" do
+      time_in_percent(:precision => 1).should eql("15.3%")
+    end
+    
+  end
     
 end

data/spec/spec_helper.rb

@@ -1,8 +1,9 @@
+# encoding: utf-8
 require 'rubygems'
 $:.unshift(File.join(File.dirname(__FILE__), "../lib"))
 
 require 'action_controller'
-require 'activesupport'
+require 'active_support'
 require 'dotiw'
 require 'spec'
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: dotiw
 version: !ruby/object:Gem::Version 
-  version: 0.3.1
+  version: 0.3.2
 platform: ruby
 authors: 
 - Ryan Bigg
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-12-12 00:00:00 +10:00
+date: 2010-01-29 00:00:00 +10:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency