dotiw 0.4.1 → 0.6.0

data/.bundle/config

@@ -0,0 +1,2 @@
+--- 
+BUNDLE_DISABLE_SHARED_GEMS: "1"

data/.gitignore

@@ -1,3 +1,4 @@
 tmp
 pkg
 spec/fixtures/database.yml
+.rvmrc

data/Gemfile

@@ -0,0 +1,3 @@
+source 'http://rubygems.org'
+
+gemspec

data/Gemfile.lock

@@ -0,0 +1,56 @@
+PATH
+  remote: .
+  specs:
+    dotiw (0.6.0)
+      actionpack (~> 3.0.0)
+
+GEM
+  remote: http://rubygems.org/
+  specs:
+    abstract (1.0.0)
+    actionpack (3.0.3)
+      activemodel (= 3.0.3)
+      activesupport (= 3.0.3)
+      builder (~> 2.1.2)
+      erubis (~> 2.6.6)
+      i18n (~> 0.4)
+      rack (~> 1.2.1)
+      rack-mount (~> 0.6.13)
+      rack-test (~> 0.5.6)
+      tzinfo (~> 0.3.23)
+    activemodel (3.0.3)
+      activesupport (= 3.0.3)
+      builder (~> 2.1.2)
+      i18n (~> 0.4)
+    activesupport (3.0.3)
+    builder (2.1.2)
+    diff-lcs (1.1.2)
+    erubis (2.6.6)
+      abstract (>= 1.0.0)
+    i18n (0.5.0)
+    rack (1.2.1)
+    rack-mount (0.6.13)
+      rack (>= 1.0.0)
+    rack-test (0.5.6)
+      rack (>= 1.0)
+    rspec (2.3.0)
+      rspec-core (~> 2.3.0)
+      rspec-expectations (~> 2.3.0)
+      rspec-mocks (~> 2.3.0)
+    rspec-core (2.3.1)
+    rspec-expectations (2.3.0)
+      diff-lcs (~> 1.1.2)
+    rspec-mocks (2.3.0)
+    tzinfo (0.3.23)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  actionpack (~> 3.0.0)
+  bundler (~> 1.0.0)
+  dotiw!
+  rspec (~> 2.0)
+
+METADATA
+  version: 1.0.6

data/README.markdown

@@ -137,5 +137,6 @@ If you want to calculate a distance of time in percent, use `distance_of_time_in
 
 ## Contributors
 
-chendo - for talking through it with me and drawing on the whiteboard
-Derander - correct Spanish translations
+* [chendo][http://github.com/chendo] - for talking through it with me and drawing on the whiteboard
+* [Derander][http://github.com/derander] - correct Spanish translations
+* [DBA][http://github.com/dba] - Commits leading up to the 0.6 release. 

data/Rakefile

@@ -1,50 +1,13 @@
 require 'rubygems'
 require 'rake'
+require 'bundler'
+Bundler::GemHelper.install_tasks
+
 
 begin
-  require 'jeweler'
-  Jeweler::Tasks.new do |gem|
-    gem.name = "dotiw"
-    gem.summary = %Q{Better distance_of_time_in_words for Rails}
-    gem.description = %Q{Better distance_of_time_in_words for Rails}
-    gem.email = "radarlistener@gmail.com"
-    gem.homepage = "http://github.com/radar/dotiw"
-    gem.authors = ["Ryan Bigg"]
-    gem.add_development_dependency "rspec"
-    # gem is a Gem::Specification... see http://www.rubygems.org/read/chapter/20 for additional settings
-  end
-  Jeweler::GemcutterTasks.new
+  require 'rspec/core/rake_task'
+  [:spec, :rcov].each { |task| RSpec::Core::RakeTask.new(task) }
+  task :default => :spec
 rescue LoadError
-  puts "Jeweler (or a dependency) not available. Install it with: sudo gem install jeweler"
-end
-
-require 'spec/rake/spectask'
-Spec::Rake::SpecTask.new(:spec) do |spec|
-  spec.libs << 'lib' << 'spec'
-  spec.spec_files = FileList['spec/**/*_spec.rb']
-end
-
-Spec::Rake::SpecTask.new(:rcov) do |spec|
-  spec.libs << 'lib' << 'spec'
-  spec.pattern = 'spec/**/*_spec.rb'
-  spec.rcov = true
-end
-
-task :spec => :check_dependencies
-
-task :default => :spec
-
-require 'rake/rdoctask'
-Rake::RDocTask.new do |rdoc|
-  if File.exist?('VERSION')
-    version = File.read('VERSION')
-  else
-    version = ""
-  end
-
-  rdoc.rdoc_dir = 'rdoc'
-  rdoc.title = "dotiw #{version}"
-  rdoc.rdoc_files.include('README*')
-  rdoc.rdoc_files.include('lib/**/*.rb')
-end
-
+  raise 'RSpec could not be loaded. Run `bundle install` to get all development dependencies.'
+end

data/dotiw.gemspec

@@ -1,55 +1,28 @@
-# Generated by jeweler
-# DO NOT EDIT THIS FILE DIRECTLY
-# Instead, edit Jeweler::Tasks in Rakefile, and run the gemspec command
+# dotiw.gemspec
 # -*- encoding: utf-8 -*-
 
-Gem::Specification.new do |s|
-  s.name = %q{dotiw}
-  s.version = "0.4.1"
+$:.unshift File.join(File.dirname(__FILE__), 'lib') unless $:.include? File.join(File.dirname(__FILE__), 'lib')
+require 'dotiw/version'
 
-  s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
+Gem::Specification.new do |s|
+  s.name = 'dotiw'
+  s.version = DOTIW::VERSION
+  s.platform = Gem::Platform::RUBY
+  s.required_rubygems_version = '>= 1.3.6'
   s.authors = ["Ryan Bigg"]
-  s.date = %q{2010-10-02}
-  s.description = %q{Better distance_of_time_in_words for Rails}
-  s.email = %q{radarlistener@gmail.com}
-  s.extra_rdoc_files = [
-    "README.markdown"
-  ]
-  s.files = [
-    ".gitignore",
-     "MIT-LICENSE",
-     "README.markdown",
-     "Rakefile",
-     "VERSION",
-     "dotiw.gemspec",
-     "lib/dotiw.rb",
-     "rails/init.rb",
-     "spec/dotiw_spec.rb",
-     "spec/spec_helper.rb",
-     "spec/translations/en.yml",
-     "spec/translations/es.yml"
-  ]
-  s.homepage = %q{http://github.com/radar/dotiw}
-  s.rdoc_options = ["--charset=UTF-8"]
-  s.require_paths = ["lib"]
-  s.rubygems_version = %q{1.3.7}
-  s.summary = %q{Better distance_of_time_in_words for Rails}
-  s.test_files = [
-    "spec/dotiw_spec.rb",
-     "spec/spec_helper.rb"
-  ]
+  s.date = %q{2010-12-23}
+  s.description = "Better distance_of_time_in_words for Rails"
+  s.summary = "Better distance_of_time_in_words for Rails"
+  s.email = "radarlistener@gmail.com"
 
-  if s.respond_to? :specification_version then
-    current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
-    s.specification_version = 3
+  s.add_dependency "actionpack", "~> 3.0.0"
+  
+  s.add_development_dependency "bundler", "~> 1.0.0"
+  s.add_development_dependency "rspec", "~> 2.0"
 
-    if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
-      s.add_development_dependency(%q<rspec>, [">= 0"])
-    else
-      s.add_dependency(%q<rspec>, [">= 0"])
-    end
-  else
-    s.add_dependency(%q<rspec>, [">= 0"])
-  end
+  s.files         = `git ls-files`.split("\n")
+  s.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")
+  s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
+  s.require_paths = ["lib"]
 end
 

data/init.rb

@@ -0,0 +1,3 @@
+# encoding: utf-8
+
+require 'rails/init'

data/lib/dotiw.rb

@@ -1,122 +1,77 @@
 # encoding: utf-8
+
+module DOTIW
+  autoload :VERSION, 'dotiw/version'
+  autoload :TimeHash, 'dotiw/time_hash'
+end # DOTIW
+
 module ActionView
   module Helpers
     module DateHelper
-      def distance_of_time_in_words_hash(from_time, to_time, options={})
-        from_time = from_time.to_time if from_time.respond_to?(:to_time)
-        to_time = to_time.to_time if to_time.respond_to?(:to_time)
-        
-        distance = (from_time - to_time).abs
-        distance_of_time_hash(distance, from_time, to_time, options)
-      end
-      
-      def distance_of_time_hash(distance, from_time = nil, to_time = nil, options={})
-        output = HashWithIndifferentAccess.new
-        from_time ||= Time.now
-        to_time ||= from_time + distance.seconds
-        I18n.with_options :locale => options[:locale] do |locale|
-          while distance > 0
-            if distance < 1.minute
-              output[locale.t(:seconds, :default => "seconds")] = distance.to_i
-              distance = 0
-            elsif distance < 1.hour
-              output[locale.t(:minutes, :default => "minutes")], distance = distance.divmod(1.minute)
-            elsif distance < 1.day
-              output[locale.t(:hours, :default => "hours")], distance = distance.divmod(1.hour)
-            elsif distance < 28.days
-              output[locale.t(:days, :default => "days")], distance = distance.divmod(1.day)
-              # Time has to be greater than a month
-            else
-              smallest, largest = from_time < to_time ? [from_time, to_time] : [to_time, from_time]   
-            
-              months = (largest.year - smallest.year) * 12 + (largest.month - smallest.month)
-              years, months = months.divmod(12)
-            
-              days = largest.day - smallest.day
-              
-              # Will otherwise incorrectly say one more day if our range goes over a day. 
-              days -= 1 if largest.hour < smallest.hour
-            
-              if days < 0
-                # Convert the last month to days and add to total
-                months -= 1
-                last_month = largest.advance(:months => -1)
-                days += Time.days_in_month(last_month.month, last_month.year)
-              end
-            
-              if months < 0
-                # Convert a year to months
-                years -= 1
-                months += 12
-              end
-            
-              output[locale.t(:years, :default => "years")] = years
-              output[locale.t(:months, :default => "months")] = months
-              output[locale.t(:days, :default => "days")] = days
-            
-              total_days, distance = distance.divmod(1.day)
-            end
-          end
-        end
-        output
-      end
-      
       alias_method :old_distance_of_time_in_words, :distance_of_time_in_words
-      
+
+      def distance_of_time_in_words_hash(from_time, to_time, options = {})
+        from_time = from_time.to_time if !from_time.is_a?(Time) && from_time.respond_to?(:to_time)
+        to_time   = to_time.to_time   if !to_time.is_a?(Time)   && to_time.respond_to?(:to_time)
+
+        DOTIW::TimeHash.new((from_time - to_time).abs, from_time, to_time, options).to_hash
+      end
+
       def distance_of_time(seconds, options = {})
-        display_time_in_words(distance_of_time_hash(seconds), options)
+        display_time_in_words DOTIW::TimeHash.new(seconds).to_hash, options
       end
-      
+
       def display_time_in_words(hash, include_seconds = false, options = {})
         options.symbolize_keys!
-        hash.delete(:seconds) if !include_seconds && hash[:minutes]
-        I18n.with_options :locale => options[:locale] do |locale|
-          # Remove all the values that are nil.
-          time_measurements = [locale.t(:years, :default => "years"),
-                               locale.t(:months, :default => "months"),
-                               locale.t(:weeks, :default => "weeks"),
-                               locale.t(:days, :default => "days"),
-                               locale.t(:hours, :default => "hours"),
-                               locale.t(:minutes, :default => "minutes"),
-                               locale.t(:seconds, :default => "seconds")].delete_if do |key|
-            hash[key].nil? || hash[key].zero? || 
-            # Remove the keys that we don't want.
-            (!options[:except].nil? && options[:except].include?(key)) ||
-            # keep the keys we only want.
+        I18n.locale = options[:locale] if options[:locale]
+
+        time_measurements = { :years    => I18n.t(:years,   :default => "years"),
+                              :months   => I18n.t(:months,  :default => "months"),
+                              :weeks    => I18n.t(:weeks,   :default => "weeks"),
+                              :days     => I18n.t(:days,    :default => "days"),
+                              :hours    => I18n.t(:hours,   :default => "hours"),
+                              :minutes  => I18n.t(:minutes, :default => "minutes"),
+                              :seconds  => I18n.t(:seconds, :default => "seconds") }
+
+        hash.delete(time_measurements[:seconds]) if !include_seconds && hash[time_measurements[:minutes]]
+
+        # Remove all the values that are nil or excluded. Keep the required ones.
+        time_measurements.delete_if do |measure, key|
+          hash[key].nil? || hash[key].zero? || (!options[:except].nil? && options[:except].include?(key)) ||
             (options[:only] && !options[:only].include?(key))
-          end
-          
-          options.delete(:except)
-          options.delete(:only)
-          output = []
-          time_measurements.each do |key|
-            name = hash[key] > 1 ? key : key.singularize
-            output += ["#{hash[key]} #{name}"]
-          end
-          
-          # maybe only grab the first few values
-          if options[:precision]
-            output = output[0...options[:precision]]
-            options.delete(:precision)
-          end
-        
-        
-          output.to_sentence(options)
         end
+
+        options.delete(:except)
+        options.delete(:only)
+
+        output = []
+
+        time_measurements.each do |measure, key|
+          name = hash[key] > 1 ? key : key.singularize
+          output += ["#{hash[key]} #{name}"]
+        end
+
+        # maybe only grab the first few values
+        if options[:precision]
+          output = output[0...options[:precision]]
+          options.delete(:precision)
+        end
+
+        output.to_sentence(options)
       end
-      
+
       def distance_of_time_in_words(from_time, to_time, include_seconds = false, options = {})
         return old_distance_of_time_in_words(from_time, to_time, include_seconds, options) if options.delete(:vague)
         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 + "%"
+        result = ((current_time - from_time) / distance) * 100
+        number_with_precision(result, options).to_s + "%"
       end
-    end
-  end
-end
-       
+    end # DateHelper
+  end # Helpers
+end # ActionView

data/lib/dotiw/time_hash.rb

@@ -0,0 +1,106 @@
+# encoding: utf-8
+
+module DOTIW
+  class TimeHash
+    TIME_FRACTIONS = [:seconds, :minutes, :hours, :days, :months, :years]
+
+    attr_accessor :distance, :smallest, :largest, :from_time, :to_time, :options
+
+    def initialize(distance, from_time = nil, to_time = nil, options = {})
+      self.output     = {}
+      self.options    = options
+      self.distance   = distance
+      self.from_time  = from_time || Time.now
+      self.to_time    = to_time   || (self.from_time + self.distance.seconds)
+      self.smallest, self.largest = [self.from_time, self.to_time].minmax
+
+      I18n.locale = options[:locale] if options[:locale]
+
+      build_time_hash
+    end
+
+    def to_hash
+      output
+    end
+
+    private
+      attr_accessor :options, :output
+
+      def build_time_hash
+        if accumulate_on = options.delete(:accumulate_on)
+          return build_time_hash if accumulate_on == :years
+          TIME_FRACTIONS.index(accumulate_on).downto(0) { |i| self.send("build_#{TIME_FRACTIONS[i]}") }
+        else
+          while distance > 0
+            if distance < 1.minute
+              build_seconds
+            elsif distance < 1.hour
+              build_minutes
+            elsif distance < 1.day
+              build_hours
+            elsif distance < 28.days
+              build_days
+            else # greater than a month
+              build_years_months_days
+            end
+          end
+        end
+
+        output
+      end
+
+      def build_seconds
+        output[I18n.t(:seconds, :default => "seconds")] = distance.to_i
+        self.distance = 0
+      end
+
+      def build_minutes
+        output[I18n.t(:minutes, :default => "minutes")], self.distance = distance.divmod(1.minute)
+      end
+
+      def build_hours
+        output[I18n.t(:hours, :default => "hours")], self.distance = distance.divmod(1.hour)
+      end
+
+      def build_days
+        output[I18n.t(:days, :default => "days")], self.distance = distance.divmod(1.day)
+      end
+
+      def build_months
+        build_years_months_days
+
+        if (years = output.delete(I18n.t(:years, :default => "years"))) > 0
+          output[I18n.t(:months, :default => "months")] += (years * 12)
+        end
+      end
+
+      def build_years_months_days
+        months = (largest.year - smallest.year) * 12 + (largest.month - smallest.month)
+        years, months = months.divmod(12)
+
+        days = largest.day - smallest.day
+
+        # Will otherwise incorrectly say one more day if our range goes over a day.
+        days -= 1 if largest.hour < smallest.hour
+
+        if days < 0
+          # Convert the last month to days and add to total
+          months -= 1
+          last_month = largest.advance(:months => -1)
+          days += Time.days_in_month(last_month.month, last_month.year)
+        end
+
+        if months < 0
+          # Convert a year to months
+          years -= 1
+          months += 12
+        end
+
+        output[I18n.t(:years,   :default => "years")]   = years
+        output[I18n.t(:months,  :default => "months")]  = months
+        output[I18n.t(:days,    :default => "days")]    = days
+
+        total_days, self.distance = (from_time - to_time).abs.divmod(1.day)
+      end
+  end # TimeHash
+end # DOTIW

data/lib/dotiw/version.rb

@@ -0,0 +1,5 @@
+# encoding: utf-8
+
+module DOTIW
+  VERSION = "0.6.0"
+end

data/spec/lib/dotiw_spec.rb

@@ -0,0 +1,235 @@
+# encoding: utf-8
+
+require 'spec_helper'
+
+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
+    time = "01-08-2009".to_time
+    Time.stub!(:now).and_return(time)
+    Time.zone.stub!(:now).and_return(time)
+  end
+
+  describe "distance of time" do
+    [
+      [5.minutes.to_i, "5 minutes"],
+      [10.minutes.to_i, "10 minutes"],
+      [1.hour.to_i, "1 hour"],
+      [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)
+      end
+    end
+  end
+
+  describe "hash version" do
+    describe "giving correct numbers of" do
+
+      [:years, :months, :days, :minutes, :seconds].each do |name|
+        describe name do
+          it "exactly" do
+            hash = distance_of_time_in_words_hash(Time.now, Time.now + 1.send(name))
+            hash[name.to_s].should eql(1)
+          end
+
+          it "two" do
+            hash = distance_of_time_in_words_hash(Time.now, Time.now + 2.send(name))
+            hash[name.to_s].should eql(2)
+          end
+        end
+      end
+
+      it "should be happy with lots of measurements" do
+        hash = distance_of_time_in_words_hash(Time.now,
+                                              Time.now + 1.year + 2.months + 3.days + 4.hours + 5.minutes + 6.seconds)
+        hash["years"].should eql(1)
+        hash["months"].should eql(2)
+        hash["days"].should eql(3)
+        hash["hours"].should eql(4)
+        hash["minutes"].should eql(5)
+        hash["seconds"].should eql(6)
+      end
+
+      it "debe estar contento con las mediciones en español" do
+        hash = distance_of_time_in_words_hash(Time.now,
+                                              Time.now + 1.year + 2.months + 3.days + 4.hours + 5.minutes + 6.seconds,
+                                              :locale => "es")
+        hash["años"].should eql(1)
+        hash["meses"].should eql(2)
+        hash["días"].should eql(3)
+        hash["horas"].should eql(4)
+        hash["minutos"].should eql(5)
+        hash["segundos"].should eql(6)
+      end
+
+      it "debe hablar español" do
+        I18n.locale = :es
+        hash = distance_of_time_in_words_hash(Time.now, Time.now + 5.days)
+        hash["días"].should eql(5)
+      end
+    end
+  end
+
+  describe "real version" do
+    it "debe hablar español" do
+      distance_of_time_in_words(Time.now, Time.now + 5.days, true, :locale => "es").should eql("5 días")
+    end
+
+    [
+      [Time.now, Time.now + 5.days + 3.minutes, "5 days and 3 minutes"],
+      [Time.now, Time.now + 1.minute, "1 minute"],
+      [Time.now, Time.now + 3.years, "3 years"],
+      [Time.now, Time.now + 10.years, "10 years"],
+      [Time.now, Time.now + 3.hour, "3 hours"],
+      # 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 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"],
+      ["2009-3-16".to_time + 1.minute, "2008-4-14".to_time, "11 months, 2 days, and 1 minute"],
+      ["2009-4-14".to_time, "2008-3-16".to_time, "1 year and 29 days"],
+      ["2009-2-01".to_time, "2009-3-01".to_time, "1 month"],
+      ["2008-2-01".to_time, "2008-3-01".to_time, "1 month"]
+    ].each do |start, finish, output|
+      it "should be #{output}" do
+        distance_of_time_in_words(start, finish, true).should eql(output)
+      end
+    end
+
+    describe "accumulate on" do
+      [
+        [Time.now,
+         Time.now + 10.minute,
+         :seconds,
+         "600 seconds"],
+        [Time.now,
+         Time.now + 10.hour + 10.minute + 1.second,
+         :minutes,
+         "610 minutes and 1 second"],
+        [Time.now,
+         Time.now + 2.day + 10000.hour + 10.second,
+         :hours,
+         "10048 hours and 10 seconds"],
+        [Time.now,
+         Time.now + 2.day + 10000.hour + 10.second,
+         :days,
+         "418 days, 16 hours, and 10 seconds"],
+        [Time.now,
+         Time.now + 2.day + 10000.hour + 10.second,
+         :months,
+         "13 months, 16 hours, and 10 seconds"],
+        [Time.now,
+         Time.now + 2.day + 10000.hour + 10.second,
+         :years,
+         "1 year, 1 month, 22 days, 16 hours, and 10 seconds"]
+      ].each do |start, finish, accumulator, output|
+        it "should be #{output}" do
+          distance_of_time_in_words(start, finish, true, :accumulate_on => accumulator).should eql(output)
+        end
+      end
+    end # :accumulate_on
+  end
+
+  describe "with output options" do
+    [
+      # Any numeric sequence is merely coincidental.
+      [Time.now,
+       Time.now + 1.year + 2.months + 3.days + 4.hours + 5.minutes + 6.seconds,
+       { :words_connector => " - " },
+       "1 year - 2 months - 3 days - 4 hours - 5 minutes, and 6 seconds"],
+      [Time.now,
+       Time.now + 5.minutes + 6.seconds,
+       { :two_words_connector => " - " },
+       "5 minutes - 6 seconds"],
+      [Time.now,
+       Time.now + 4.hours +  5.minutes + 6.seconds,
+       { :last_word_connector => " - " },
+       "4 hours, 5 minutes - 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"],
+      [Time.now,
+       Time.now + 1.hour + 1.minute,
+       { :except => "minutes"}, "1 hour"],
+      [Time.now,
+       Time.now + 1.hour + 1.day + 1.minute,
+       { :except => ["minutes", "hours"]},
+       "1 day"],
+      [Time.now,
+       Time.now + 1.hour + 1.day + 1.minute,
+       { :only => ["minutes", "hours"]},
+       "1 hour and 1 minute"],
+      [Time.now,
+       Time.now + 1.year + 2.months + 3.days + 4.hours + 5.minutes + 6.seconds,
+       { :precision => 2 },
+       "1 year and 2 months"],
+      [Time.now,
+       Time.now + 1.year + 2.months + 3.days + 4.hours + 5.minutes + 6.seconds,
+       { :precision => 3 },
+       "1 year, 2 months, and 3 days"],
+      [Time.now,
+       Time.now + 1.year + 2.months + 3.days + 4.hours + 5.minutes + 6.seconds,
+       { :precision => 10 },
+       "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 => true },
+       "about 1 year"],
+      [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
+
+    describe "include_seconds" do
+      it "is ignored if only seconds have passed" do
+        distance_of_time_in_words(Time.now, Time.now + 1.second, false).should eql("1 second")
+      end
+
+      it "removes seconds in all other cases" do
+        distance_of_time_in_words(Time.now,
+                                  Time.now + 1.year + 2.months + 3.days + 4.hours + 5.minutes + 6.seconds,
+                                  false).should eql("1 year, 2 months, 3 days, 4 hours, and 5 minutes")
+      end
+    end # include_seconds
+  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,19 +1,19 @@
 # encoding: utf-8
-require 'rubygems'
-$:.unshift(File.join(File.dirname(__FILE__), "../lib"))
 
-require 'action_controller'
-require 'active_support'
-require 'dotiw'
-require 'spec'
+ROOT_PATH = File.join(File.dirname(__FILE__), '..')
+$:.unshift ROOT_PATH unless $:.include? ROOT_PATH
 
-# Define time zone before loading, just like in the real world
-zone = "UTC"
-Time.zone = zone
+# Files that are usually required by Rails, but in a testing context will not be.
+require 'erb'
 
+require 'active_support/all'
+
+require 'action_view/context'
+require 'action_view/helpers'
+
+require 'init' # require dotiw through init (like a plugin would)
+
+Time.zone = 'UTC'
+I18n.load_path.clear
 I18n.load_path << Dir[File.join(File.dirname(__FILE__), "translations", "*")]
 I18n.locale = :en
-
-# bootstraping the plugin through init.rb
-# tests how it would load in a real application
-load File.dirname(__FILE__) + "/../rails/init.rb"

data/spec/translations/en.yml

@@ -7,3 +7,18 @@ en:
   months: months
   years: years
   
+  support:
+    array:
+      two_words_connector: " and "
+      words_connector: ", "
+      last_word_connector: ", and "
+      
+  datetime:
+    distance_in_words:
+      about_x_years:
+        one: "about 1 year"
+        many: "about %{count} years"
+        
+  number:
+      format:
+        separator: "."

metadata

@@ -1,13 +1,12 @@
 --- !ruby/object:Gem::Specification 
 name: dotiw
 version: !ruby/object:Gem::Version 
-  hash: 13
   prerelease: false
   segments: 
   - 0
-  - 4
-  - 1
-  version: 0.4.1
+  - 6
+  - 0
+  version: 0.6.0
 platform: ruby
 authors: 
 - Ryan Bigg
@@ -15,51 +14,86 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-10-02 00:00:00 +10:00
+date: 2010-12-23 00:00:00 +10:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  name: rspec
+  name: actionpack
   prerelease: false
   requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ">="
+    - - ~>
       - !ruby/object:Gem::Version 
-        hash: 3
         segments: 
+        - 3
         - 0
-        version: "0"
-  type: :development
+        - 0
+        version: 3.0.0
+  type: :runtime
   version_requirements: *id001
+- !ruby/object:Gem::Dependency 
+  name: bundler
+  prerelease: false
+  requirement: &id002 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        segments: 
+        - 1
+        - 0
+        - 0
+        version: 1.0.0
+  type: :development
+  version_requirements: *id002
+- !ruby/object:Gem::Dependency 
+  name: rspec
+  prerelease: false
+  requirement: &id003 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        segments: 
+        - 2
+        - 0
+        version: "2.0"
+  type: :development
+  version_requirements: *id003
 description: Better distance_of_time_in_words for Rails
 email: radarlistener@gmail.com
 executables: []
 
 extensions: []
 
-extra_rdoc_files: 
-- README.markdown
+extra_rdoc_files: []
+
 files: 
+- .bundle/config
 - .gitignore
+- Gemfile
+- Gemfile.lock
 - MIT-LICENSE
 - README.markdown
 - Rakefile
-- VERSION
 - dotiw.gemspec
+- init.rb
 - lib/dotiw.rb
+- lib/dotiw/time_hash.rb
+- lib/dotiw/version.rb
 - rails/init.rb
-- spec/dotiw_spec.rb
+- spec/lib/dotiw_spec.rb
 - spec/spec_helper.rb
 - spec/translations/en.yml
 - spec/translations/es.yml
 has_rdoc: true
-homepage: http://github.com/radar/dotiw
+homepage: 
 licenses: []
 
 post_install_message: 
-rdoc_options: 
-- --charset=UTF-8
+rdoc_options: []
+
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
@@ -67,7 +101,6 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 3
       segments: 
       - 0
       version: "0"
@@ -76,10 +109,11 @@ required_rubygems_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 3
       segments: 
-      - 0
-      version: "0"
+      - 1
+      - 3
+      - 6
+      version: 1.3.6
 requirements: []
 
 rubyforge_project: 
@@ -88,5 +122,7 @@ signing_key:
 specification_version: 3
 summary: Better distance_of_time_in_words for Rails
 test_files: 
-- spec/dotiw_spec.rb
+- spec/lib/dotiw_spec.rb
 - spec/spec_helper.rb
+- spec/translations/en.yml
+- spec/translations/es.yml

data/VERSION

@@ -1 +0,0 @@
-0.3.3

data/spec/dotiw_spec.rb

@@ -1,157 +0,0 @@
-# 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
-    time = "01-08-2009".to_time
-    Time.stub!(:now).and_return(time)
-    Time.zone.stub!(:now).and_return(time)
-  end
-  
-  describe "distance of time" do
-    [
-      [5.minutes.to_i, "5 minutes"],
-      [10.minutes.to_i, "10 minutes"],
-      [1.hour.to_i, "1 hour"],
-      [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)
-      end
-    end
-  end
-  
-  describe "hash version" do
-    describe "giving correct numbers of" do
-      
-      [:years, :months, :days, :minutes, :seconds].each do |name|
-        describe name do
-          it "exactly" do
-            hash = distance_of_time_in_words_hash(Time.now, Time.now + 1.send(name))
-            hash[name].should eql(1)    
-          end
-
-          it "two" do
-            hash = distance_of_time_in_words_hash(Time.now, Time.now + 2.send(name))
-            hash[name].should eql(2)
-          end    
-        end
-      end
-      
-      it "should be happy with lots of measurements" do
-        hash = distance_of_time_in_words_hash(Time.now, Time.now + 1.year + 2.months + 3.days + 4.hours + 5.minutes + 6.seconds)
-        hash[:years].should eql(1)
-        hash[:months].should eql(2)
-        hash[:days].should eql(3)
-        hash[:hours].should eql(4)
-        hash[:minutes].should eql(5)
-        hash[:seconds].should eql(6)
-      end
-      
-      it "debe estar contento con las mediciones en español" do
-        hash = distance_of_time_in_words_hash(Time.now, Time.now + 1.year + 2.months + 3.days + 4.hours + 5.minutes + 6.seconds, :locale => "es")
-        hash[:años].should eql(1)
-        hash[:meses].should eql(2)
-        hash[:días].should eql(3)
-        hash[:horas].should eql(4)
-        hash[:minutos].should eql(5)
-        hash[:segundos].should eql(6)
-      end
-        
-    
-      it "debe hablar español" do
-        I18n.locale = :es
-        hash = distance_of_time_in_words_hash(Time.now, Time.now + 5.days)  
-        hash["días"].should eql(5)
-      end
-    end
-  end
-  
-  describe "real version" do
-    it "debe hablar español" do
-      distance_of_time_in_words(Time.now, Time.now + 5.days, true, :locale => "es").should eql("5 días")
-    end
-    
-    [
-      [Time.now, Time.now + 5.days + 3.minutes, "5 days and 3 minutes"],
-      [Time.now, Time.now + 1.minute, "1 minute"],
-      [Time.now, Time.now + 3.years, "3 years"],
-      [Time.now, Time.now + 10.years, "10 years"],
-      [Time.now, Time.now + 3.hour, "3 hours"],
-      # 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"],
-      ["2009-3-16".to_time + 1.minute, "2008-4-14".to_time, "11 months, 2 days, and 1 minute"],
-      ["2009-4-14".to_time, "2008-3-16".to_time, "1 year and 29 days"],
-      ["2009-2-01".to_time, "2009-3-01".to_time, "1 month"],
-      ["2008-2-01".to_time, "2008-3-01".to_time, "1 month"]
-    ].each do |start, finish, output|
-      it "should be #{output}" do
-        distance_of_time_in_words(start, finish, true).should eql(output)
-      end
-    end
-  end
-  
-  describe "with output options" do
-   [
-      # Any numeric sequence is merely coincidental.
-      [Time.now, Time.now + 1.year + 2.months + 3.days + 4.hours + 5.minutes + 6.seconds, { :words_connector => " - " }, "1 year - 2 months - 3 days - 4 hours - 5 minutes, and 6 seconds"],
-      
-      [Time.now, Time.now + 5.minutes + 6.seconds, { :two_words_connector => " - " }, "5 minutes - 6 seconds"],
-      
-      [Time.now, Time.now + 4.hours +  5.minutes + 6.seconds, { :last_word_connector => " - " }, "4 hours, 5 minutes - 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"],
-      [Time.now, Time.now + 1.hour + 1.minute, { :except => "minutes"}, "1 hour"],
-      [Time.now, Time.now + 1.hour + 1.day + 1.minute, { :except => ["minutes", "hours"]}, "1 day"],
-      
-      [Time.now, Time.now + 1.hour + 1.day + 1.minute, { :only => ["minutes", "hours"]}, "1 hour and 1 minute"],
-      
-      [Time.now, Time.now + 1.year + 2.months + 3.days + 4.hours + 5.minutes + 6.seconds, { :precision => 2 }, "1 year and 2 months"],
-      [Time.now, Time.now + 1.year + 2.months + 3.days + 4.hours + 5.minutes + 6.seconds, { :precision => 3 }, "1 year, 2 months, and 3 days"],
-      [Time.now, Time.now + 1.year + 2.months + 3.days + 4.hours + 5.minutes + 6.seconds, { :precision => 10 }, "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 => true }, "about 1 year"],
-      [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
-    
-    it "outputs seconds regardless of include_seconds setting if only seconds have passed" do
-      distance_of_time_in_words(Time.now, Time.now + 1.second).should eql("1 second")
-    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