ruby-duration 0.3.0 → 0.5.0

data/.gitignore

@@ -1,24 +1,11 @@
-## MAC OS
 .DS_Store
-
-## TEXTMATE
-*.tmproj
-tmtags
-
-## EMACS
+.idea
+.bundle
 *~
-\#*
-.\#*
-
-## VIM
-*.swp
-
-## PROJECT::GENERAL
-coverage
-rdoc
-pkg
+#*
+*.gem
+.yardoc/*
+coverage/*
+doc/*
+pkg/*
 
-## PROJECT::SPECIFIC
-.document
-.yardoc
-doc

data/Gemfile

@@ -0,0 +1,4 @@
+source :gemcutter
+
+# Specify your gem's dependencies in ruby-duration.gemspec
+gemspec

data/Gemfile.lock

@@ -0,0 +1,32 @@
+PATH
+  remote: .
+  specs:
+    ruby-duration (0.5.0)
+      i18n
+
+GEM
+  remote: http://rubygems.org/
+  specs:
+    activesupport (3.0.1)
+    bluecloth (2.0.9)
+    i18n (0.4.1)
+    minitest (1.7.2)
+    rake (0.8.7)
+    simplecov (0.3.6)
+      simplecov-html (>= 0.3.7)
+    simplecov-html (0.3.8)
+    yard (0.6.1)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  activesupport (>= 3.0.0)
+  bluecloth (>= 0.3.5)
+  bundler (>= 1.0.0)
+  i18n
+  minitest
+  rake
+  ruby-duration!
+  simplecov (>= 0.3.5)
+  yard

data/Rakefile

@@ -1,22 +1,7 @@
-require 'rubygems'
-require 'rake'
+require 'bundler'
+Bundler::GemHelper.install_tasks
 
-begin
-  require 'jeweler'
-  Jeweler::Tasks.new do |gem|
-    gem.name = "ruby-duration"
-    gem.summary = %Q{Duration type}
-    gem.description = %Q{Duration type}
-    gem.email = "jose@peleteiro.net"
-    gem.homepage = "http://github.com/peleteiro/ruby-duration"
-    gem.authors = ["Jose Peleteiro"]
-    gem.add_development_dependency "minitest", ">= 0"
-    gem.add_development_dependency "yard", ">= 0"
-  end
-  Jeweler::GemcutterTasks.new
-rescue LoadError
-  puts "Jeweler (or a dependency) not available. Install it with: gem install jeweler"
-end
+task :default => :test
 
 require 'rake/testtask'
 Rake::TestTask.new(:test) do |test|
@@ -25,45 +10,5 @@ Rake::TestTask.new(:test) do |test|
   test.verbose = true
 end
 
-begin
-  require 'rcov/rcovtask'
-  Rcov::RcovTask.new do |test|
-    test.libs << 'test'
-    test.pattern = 'test/**/test_*.rb'
-    test.rcov_opts << %w{--exclude /Library,.bundle,test,gems,.rvm}
-    test.verbose = true
-  end
-rescue LoadError
-  task :rcov do
-    abort "RCov is not available. In order to run rcov, you must: sudo gem install spicycode-rcov"
-  end
-end
-
-namespace(:test) do
-  desc "Run tests on multiple ruby versions"
-  task(:portability) do
-    versions = %w{system 1.8.7 ree-1.8.7 1.9.2 jruby rubinius}
-    versions.each do |version|
-      system <<-BASH
-        bash -c 'source ~/.rvm/scripts/rvm;
-                 rvm use #{version};
-                 echo "-------- `ruby -v` ---------\n";
-                 gem install jeweler activesupport minitest yard i18n
-                 rake -s test'
-      BASH
-    end
-  end
-end
-
-task :test => :check_dependencies
-
-task :default => :test
-
-begin
-  require 'yard'
-  YARD::Rake::YardocTask.new
-rescue LoadError
-  task :yardoc do
-    abort "YARD is not available. In order to run yardoc, you must: sudo gem install yard"
-  end
-end
+require 'yard'
+YARD::Rake::YardocTask.new

data/lib/duration/version.rb

@@ -0,0 +1,3 @@
+class Duration
+  VERSION = "0.5.0"
+end

data/lib/duration.rb

@@ -10,17 +10,6 @@ class Duration
   include Comparable
 
   UNITS = [:seconds, :minutes, :hours, :days, :weeks]
-
-  UNIT_LABELS = {:second => 'second',
-                 :seconds => 'seconds',
-                 :minute => 'minute',
-                 :minutes => 'minutes',
-                 :hour => 'hour',
-                 :hours => 'hours',
-                 :day => 'day',
-                 :days => 'days',
-                 :week => 'week',
-                 :weeks => 'weeks'}
                  
   MULTIPLES = {:seconds => 1,
                :minutes => 60,
@@ -124,6 +113,25 @@ class Duration
   #   %~h => locale-dependent "hours" terminology
   #   %~d => locale-dependent "days" terminology
   #   %~w => locale-dependent "weeks" terminology
+  #
+  #   You can also use the I18n support.
+  #   Load you locale using I18n.load_path and set it up using I18n.locale= or I18n.default_locale=
+  #   If you are using Ruby on Rails, the support is ready out of the box, so just change your locale file.
+  #   
+  #   You must use the following structure (example):
+  #   pt:
+  #     ruby_duration:
+  #       second: segundo
+  #       seconds: segundos
+  #       minute: minuto
+  #       minutes: minutos
+  #       hour: hora
+  #       hours: horas
+  #       day: dia
+  #       days: dias
+  #       week: semana
+  #       weeks: semanas
+  #
   def format(format_str)
     identifiers = {
       'w'  => @weeks,
@@ -135,11 +143,11 @@ class Duration
       'H'  => @hours.to_s.rjust(2, '0'),
       'M'  => @minutes.to_s.rjust(2, '0'),
       'S'  => @seconds.to_s.rjust(2, '0'),
-      '~s' => @seconds == 1 ? UNIT_LABELS[:second] : UNIT_LABELS[:seconds],
-      '~m' => @minutes == 1 ? UNIT_LABELS[:minute] : UNIT_LABELS[:minutes],
-      '~h' => @hours   == 1 ? UNIT_LABELS[:hour] : UNIT_LABELS[:hours],
-      '~d' => @days    == 1 ? UNIT_LABELS[:day] : UNIT_LABELS[:days],
-      '~w' => @weeks   == 1 ? UNIT_LABELS[:week] : UNIT_LABELS[:weeks]}
+      '~s' => @seconds == 1 ? I18n.t(:second, :scope => :ruby_duration, :default => "second") : I18n.t(:seconds, :scope => :ruby_duration, :default => "seconds"),
+      '~m' => @minutes == 1 ? I18n.t(:minute, :scope => :ruby_duration, :default => "minute") : I18n.t(:minutes, :scope => :ruby_duration, :default => "minutes"),
+      '~h' => @hours   == 1 ? I18n.t(:hour, :scope => :ruby_duration, :default => "hour") : I18n.t(:hours, :scope => :ruby_duration, :default => "hours"),
+      '~d' => @days    == 1 ? I18n.t(:day, :scope => :ruby_duration, :default => "day") : I18n.t(:days, :scope => :ruby_duration, :default => "days"),
+      '~w' => @weeks   == 1 ? I18n.t(:week, :scope => :ruby_duration, :default => "week") : I18n.t(:weeks, :scope => :ruby_duration, :default => "weeks")}
 
     format_str.gsub(/%?%(w|d|h|m|s|t|H|M|S|~(?:s|m|h|d|w))/) do |match|
       match['%%'] ? match : identifiers[match[1..-1]]

data/ruby-duration.gemspec

@@ -1,60 +1,32 @@
-# Generated by jeweler
-# DO NOT EDIT THIS FILE DIRECTLY
-# Instead, edit Jeweler::Tasks in Rakefile, and run the gemspec command
 # -*- encoding: utf-8 -*-
+require File.expand_path("../lib/duration/version", __FILE__)
 
 Gem::Specification.new do |s|
-  s.name = %q{ruby-duration}
-  s.version = "0.3.0"
+  s.name        = "ruby-duration"
+  s.version     = Duration::VERSION
+  s.platform    = Gem::Platform::RUBY
+  s.authors     = ["Jose Peleteiro"]
+  s.email       = ["jose@peleteiro.net"]
+  s.homepage    = "http://github.com/peleteiro/ruby-duration"
+  s.summary     = "Duration type"
+  s.description = "Duration type"
 
-  s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
-  s.authors = ["Jose Peleteiro"]
-  s.date = %q{2010-09-22}
-  s.description = %q{Duration type}
-  s.email = %q{jose@peleteiro.net}
-  s.extra_rdoc_files = [
-    "LICENSE",
-     "README.md"
-  ]
-  s.files = [
-    ".gitignore",
-     "LICENSE",
-     "README.md",
-     "Rakefile",
-     "VERSION",
-     "lib/duration.rb",
-     "lib/duration/mongoid.rb",
-     "lib/ruby-duration.rb",
-     "ruby-duration.gemspec",
-     "test/duration/test_mongoid.rb",
-     "test/helper.rb",
-     "test/test_duration.rb"
-  ]
-  s.homepage = %q{http://github.com/peleteiro/ruby-duration}
-  s.rdoc_options = ["--charset=UTF-8"]
-  s.require_paths = ["lib"]
-  s.rubygems_version = %q{1.3.7}
-  s.summary = %q{Duration type}
-  s.test_files = [
-    "test/duration/test_mongoid.rb",
-     "test/helper.rb",
-     "test/test_duration.rb"
-  ]
+  s.required_rubygems_version = ">= 1.3.6"
+  s.rubyforge_project         = "ruby-duration"
 
-  if s.respond_to? :specification_version then
-    current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
-    s.specification_version = 3
+  s.add_dependency "i18n", ">= 0"
 
-    if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
-      s.add_development_dependency(%q<minitest>, [">= 0"])
-      s.add_development_dependency(%q<yard>, [">= 0"])
-    else
-      s.add_dependency(%q<minitest>, [">= 0"])
-      s.add_dependency(%q<yard>, [">= 0"])
-    end
-  else
-    s.add_dependency(%q<minitest>, [">= 0"])
-    s.add_dependency(%q<yard>, [">= 0"])
-  end
-end
+  s.add_development_dependency "bundler", ">= 1.0.0"
+  s.add_development_dependency "minitest", ">= 0"
+  s.add_development_dependency "yard", ">= 0"
+  s.add_development_dependency "rake", ">= 0"
+  s.add_development_dependency "activesupport", ">= 3.0.0"
+  s.add_development_dependency "simplecov", ">= 0.3.5"
+  s.add_development_dependency "bluecloth", ">= 0.3.5"
+
+  s.files        = `git ls-files`.split("\n")
+  s.executables  = `git ls-files`.split("\n").map{|f| f =~ /^bin\/(.*)/ ? $1 : nil}.compact
+  s.require_path = 'lib'
 
+  s.rdoc_options = ["--charset=UTF-8"]
+end

data/test/duration/test_i18n.rb

@@ -0,0 +1,52 @@
+# -*- encoding:  utf-8 -*-
+require 'helper'
+
+I18n.load_path << File.join(File.dirname(__FILE__), '..', 'fixtures', 'locales', 'pt.yml')
+
+describe "I18n" do
+  describe "when the locale is pt" do
+    before do
+      I18n.locale = :pt
+    end
+
+    it "should translate to segundo" do
+      assert_equal "segundo", Duration.new(:second => 1).format("%~s")
+    end
+
+    it "should translate to segundos" do
+      assert_equal "segundos", Duration.new.format("%~s")
+    end
+
+    it "should translate to minuto" do
+      assert_equal "minuto", Duration.new(:minute => 1).format("%~m")
+    end
+
+    it "should translate to minutos" do
+      assert_equal "minutos", Duration.new.format("%~m")
+    end
+
+    it "should translate to hora" do
+      assert_equal "hora", Duration.new(:hour => 1).format("%~h")
+    end
+
+    it "should translate to horas" do
+      assert_equal "horas", Duration.new.format("%~h") 
+    end
+
+    it "should translate to dia" do
+      assert_equal "dia", Duration.new(:day => 1).format("%~d")
+    end
+
+    it "should translate to dias" do
+      assert_equal "dias", Duration.new.format("%~d")
+    end
+
+    it "should translate to semana" do
+      assert_equal "semana", Duration.new(:week => 1).format("%~w")
+    end
+
+    it "should translate to semanas" do
+      assert_equal "semanas", Duration.new.format("%~w")
+    end
+  end
+end

data/test/fixtures/locales/pt.yml

@@ -0,0 +1,12 @@
+pt:
+  ruby_duration:
+    second: segundo
+    seconds: segundos
+    minute: minuto
+    minutes: minutos
+    hour: hora
+    hours: horas
+    day: dia
+    days: dias
+    week: semana
+    weeks: semanas

data/test/helper.rb

@@ -1,6 +1,12 @@
 # -*- encoding:  utf-8 -*-
 require 'rubygems'
 require 'minitest/spec'
+begin
+  require 'simplecov'
+  SimpleCov.start do
+  end
+rescue LoadError
+end
 
 $LOAD_PATH.unshift(File.dirname(__FILE__))
 $LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))

metadata

@@ -1,13 +1,12 @@
 --- !ruby/object:Gem::Specification 
 name: ruby-duration
 version: !ruby/object:Gem::Version 
-  hash: 19
   prerelease: false
   segments: 
   - 0
-  - 3
+  - 5
   - 0
-  version: 0.3.0
+  version: 0.5.0
 platform: ruby
 authors: 
 - Jose Peleteiro
@@ -15,57 +14,145 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-09-22 00:00:00 -03:00
+date: 2010-10-23 00:00:00 -02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  name: minitest
+  name: i18n
   prerelease: false
   requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 3
         segments: 
         - 0
         version: "0"
-  type: :development
+  type: :runtime
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
-  name: yard
+  name: bundler
   prerelease: false
   requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 3
         segments: 
+        - 1
         - 0
-        version: "0"
+        - 0
+        version: 1.0.0
   type: :development
   version_requirements: *id002
+- !ruby/object:Gem::Dependency 
+  name: minitest
+  prerelease: false
+  requirement: &id003 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        segments: 
+        - 0
+        version: "0"
+  type: :development
+  version_requirements: *id003
+- !ruby/object:Gem::Dependency 
+  name: yard
+  prerelease: false
+  requirement: &id004 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        segments: 
+        - 0
+        version: "0"
+  type: :development
+  version_requirements: *id004
+- !ruby/object:Gem::Dependency 
+  name: rake
+  prerelease: false
+  requirement: &id005 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        segments: 
+        - 0
+        version: "0"
+  type: :development
+  version_requirements: *id005
+- !ruby/object:Gem::Dependency 
+  name: activesupport
+  prerelease: false
+  requirement: &id006 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        segments: 
+        - 3
+        - 0
+        - 0
+        version: 3.0.0
+  type: :development
+  version_requirements: *id006
+- !ruby/object:Gem::Dependency 
+  name: simplecov
+  prerelease: false
+  requirement: &id007 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        segments: 
+        - 0
+        - 3
+        - 5
+        version: 0.3.5
+  type: :development
+  version_requirements: *id007
+- !ruby/object:Gem::Dependency 
+  name: bluecloth
+  prerelease: false
+  requirement: &id008 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        segments: 
+        - 0
+        - 3
+        - 5
+        version: 0.3.5
+  type: :development
+  version_requirements: *id008
 description: Duration type
-email: jose@peleteiro.net
+email: 
+- jose@peleteiro.net
 executables: []
 
 extensions: []
 
-extra_rdoc_files: 
-- LICENSE
-- README.md
+extra_rdoc_files: []
+
 files: 
 - .gitignore
+- Gemfile
+- Gemfile.lock
 - LICENSE
 - README.md
 - Rakefile
-- VERSION
 - lib/duration.rb
 - lib/duration/mongoid.rb
+- lib/duration/version.rb
 - lib/ruby-duration.rb
 - ruby-duration.gemspec
+- test/duration/test_i18n.rb
 - test/duration/test_mongoid.rb
+- test/fixtures/locales/pt.yml
 - test/helper.rb
 - test/test_duration.rb
 has_rdoc: true
@@ -82,7 +169,6 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 3
       segments: 
       - 0
       version: "0"
@@ -91,18 +177,17 @@ 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: 
+rubyforge_project: ruby-duration
 rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
 summary: Duration type
-test_files: 
-- test/duration/test_mongoid.rb
-- test/helper.rb
-- test/test_duration.rb
+test_files: []
+

data/VERSION

@@ -1 +0,0 @@
-0.3.0