precise_distance_of_time_in_words 0.0.2 → 0.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 99dd828ec9a6f3f8f69ea60589d4b4953fafa992
-  data.tar.gz: ae89385c82b3ca4f3187781f0ad46b6c795b9b1a
+  metadata.gz: 9d25a687e5063796fa37d0dfd752d0c9457ecc2e
+  data.tar.gz: 2b80e575d14c0f54d6da86d03115f154d399a672
 SHA512:
-  metadata.gz: c5b2cae2c84abfd3f546d21958613095efbbcee2cf3827fef7b66892777188f63fd7655df30302e1441927e1c5614433f3e9fab0422fcc6794ce26835448bc3a
-  data.tar.gz: ddb4af9acac237e2148748d56fdecfb3c6bf0e56b51aa90d6a41e120417c475495053cce5865611fca63495433d64b7c8b4a863f4dfcaf0884501d8a39a2a420
+  metadata.gz: 7e509e143d85a514c407f8ff5abbbfdb563946b8fd0acdd5b6379ca589ab1300d34a99241a72983b71378bb6453d4d36edeaf484d022f045b62aa1abb577f9e3
+  data.tar.gz: a2c750241b44862c82e07b073f8583d98da4f4a815eaca0028390e8ae125e19960421614c8c104361958800c866a1d0697e7cc47fa5be4a3cdb8eeb14d6a166f

data/README.md

@@ -2,27 +2,61 @@
 
 This gem offers a more precise "distance_of_time_in_words"
 
+
 ## Installation
 
 Add this line to your application's Gemfile:
 
-    gem 'precise_distance_of_time_in_words'
+``` ruby
+gem 'precise_distance_of_time_in_words'
+```
 
 And then execute:
 
-    $ bundle
+``` shell
+$ bundle
+```
+
+Or install it standalone:
 
-Or install it yourself as:
+``` shell
+$ gem install precise_distance_of_time_in_words
+```
 
-    $ gem install precise_distance_of_time_in_words
 
 ## Usage
 
-    This gem offers to you a method called "precise_distance_of_time_in_words(from, to)"
-    To you user it just puts that method in where you want (console, view, model) with the times.
-    For exemple:
-      precise_distance_of_time_in_words(0, 1) #return '1 second'
-      precise_distance_of_time_in_words(Time.now, Time.now + 1.hour + 1.minute) #return '1 hour and 1 minute'
+This gem offers you the ```precise_distance_of_time_in_words(from, to)"``` method, that you can
+use anywhere (views, helpers, controllers, models, console). For exemple:
+
+``` ruby
+precise_distance_of_time_in_words(0, 1) # return '1 second'
+precise_distance_of_time_in_words(Time.now, Time.now + 1.hour + 1.minute) # return '1 hour and 1 minute'
+```
+
+## I18n
+
+The default labels for 'hours', 'minutes', 'seconds' and 'and' are stored in the
+I18n yaml inside the gem. You can switch the value per I18n.locale for your
+internationalized application. Keys and the default values are the following.
+You can override them by adding to a YAML file in your <tt>Rails.root/config/locales</tt>
+directory.
+
+``` yml
+  en:
+    datetime:
+      precise_distance_in_words:
+        x_minutes:
+          one: '%{count} minute'
+          other: '%{count} minutes'
+        x_seconds:
+          one: '%{count} second'
+          other: '%{count} seconds'
+        x_hours:
+          one: '%{count} hour'
+          other: '%{count} hours'
+        and: and
+```
 
 ## Contributing
 

data/lib/precise_distance_of_time_in_words.rb

@@ -1,7 +1,18 @@
 require "precise_distance_of_time_in_words/version"
 
 module PreciseDistanceOfTimeInWords
-  def precise_distance_of_time_in_words(from_time, to_time)
+  def precise_distance_of_time_in_words(from_time, to_time=0, options = {})
+    options = {
+      scope: :'datetime.precise_distance_in_words'
+    }.merge!(options)
+
+    # using to_time casting method of objects when presented
+    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)
+
+    # make sure distance is positive
+    from_time, to_time = to_time, from_time if from_time > to_time
+
     dist = (to_time - from_time).round
 
     hours = dist / 3600
@@ -10,22 +21,22 @@ module PreciseDistanceOfTimeInWords
 
     words = ''
 
-    words << "#{hours} #{hours > 1 ? 'hours' : 'hour' }" if hours > 0
-    add_and_between?(words, hours, minutes)
-    words << "#{minutes} #{minutes > 1 ? 'minutes' : 'minute' }" if minutes > 0
+    I18n.with_options( locale: options[:locale], scope: options[:scope] ) do |locale|
+      words << locale.t(:x_hours, count: hours) if hours > 0
+      words << " #{locale.t(:and)} " if (hours > 0 && minutes > 0) # add_and_between?
+      words << locale.t(:x_minutes, count: minutes) if minutes > 0
 
-    if seconds > 0 && (minutes <= 0 && hours <= 0)
-      words << "#{seconds} #{seconds > 1 ? 'seconds' : 'second' }"
+      if seconds > 0 && (minutes <= 0 && hours <= 0)
+        words << locale.t(:x_seconds, count: seconds)
+      end
     end
 
     return words
   end
-
-  private
-
-  def add_and_between?(words, time_1, time_2)
-    words << ' and ' if (time_1 > 0 && time_2 > 0)
-  end
 end
 
-include PreciseDistanceOfTimeInWords
+include PreciseDistanceOfTimeInWords
+
+Dir["#{File.dirname(__FILE__)}/precise_distance_of_time_in_words/locales/*.yml"].each do |file|
+  I18n.load_path << file
+end

data/lib/precise_distance_of_time_in_words/locales/de.yml

@@ -0,0 +1,13 @@
+de:
+  datetime:
+    precise_distance_in_words:
+      x_minutes:
+        one: eine Minute
+        other: '%{count} Minuten'
+      x_seconds:
+        one: eine Sekunde
+        other: '%{count} Sekunden'
+      x_hours:
+        one: eine Stunde
+        other: '%{count} Stunden'
+      and: und

data/lib/precise_distance_of_time_in_words/locales/en.yml

@@ -0,0 +1,13 @@
+en:
+  datetime:
+    precise_distance_in_words:
+      x_minutes:
+        one: '%{count} minute'
+        other: '%{count} minutes'
+      x_seconds:
+        one: '%{count} second'
+        other: '%{count} seconds'
+      x_hours:
+        one: '%{count} hour'
+        other: '%{count} hours'
+      and: and

data/lib/precise_distance_of_time_in_words/version.rb

@@ -1,3 +1,3 @@
 module PreciseDistanceOfTimeInWords
-  VERSION = "0.0.2"
+  VERSION = "0.0.3"
 end

data/precise_distance_of_time_in_words.gemspec

@@ -21,5 +21,5 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency 'bundler', '~> 1.3'
   spec.add_development_dependency 'rake'
   spec.add_development_dependency 'rspec'
-  spec.add_development_dependency 'active_support'
+  spec.add_development_dependency 'activesupport'
 end

data/spec/precise_distance_of_time_in_words_spec.rb

@@ -12,6 +12,7 @@ describe PreciseDistanceOfTimeInWords do
     end
 
     it 'calculates time differences properly' do
+      precise_distance_of_time_in_words(1.second).should == '1 second'
       precise_distance_of_time_in_words(@time1, @time1).should == ''
       precise_distance_of_time_in_words(@time1, @time2).should == '1 second'
       precise_distance_of_time_in_words(@time1, @time3).should == '1 minute'
@@ -19,5 +20,9 @@ describe PreciseDistanceOfTimeInWords do
       precise_distance_of_time_in_words(@time1, @time5).should == '1 hour and 5 minutes'
       precise_distance_of_time_in_words(@time1, @time6).should == '1 hour and 5 minutes'
     end
+
+    it 'support other languages' do
+      precise_distance_of_time_in_words(2.second, 0, locale: :de).should == '2 Sekunden'
+    end
   end
 end

data/spec/spec_helper.rb

@@ -1,5 +1,7 @@
 require 'rubygems'
 require 'bundler/setup'
 require 'active_support/core_ext/numeric/time'
+require 'active_support/core_ext/object/with_options.rb'
+I18n.locale = :en
 
 require 'precise_distance_of_time_in_words.rb'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: precise_distance_of_time_in_words
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
 platform: ruby
 authors:
 - Pedro Henrique Passalini
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-08-26 00:00:00.000000000 Z
+date: 2014-04-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -53,7 +53,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: active_support
+  name: activesupport
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
@@ -79,6 +79,8 @@ files:
 - README.md
 - Rakefile
 - lib/precise_distance_of_time_in_words.rb
+- lib/precise_distance_of_time_in_words/locales/de.yml
+- lib/precise_distance_of_time_in_words/locales/en.yml
 - lib/precise_distance_of_time_in_words/version.rb
 - precise_distance_of_time_in_words.gemspec
 - spec/precise_distance_of_time_in_words_spec.rb
@@ -103,7 +105,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.3
+rubygems_version: 2.0.14
 signing_key: 
 specification_version: 4
 summary: A more precise "distance_of_time_in_words"