ruby-duration 0.1.2 → 0.1.4

data/Rakefile

@@ -30,7 +30,7 @@ begin
   Rcov::RcovTask.new do |test|
     test.libs << 'test'
     test.pattern = 'test/**/test_*.rb'
-    test.rcov_opts << %w{--exclude /Library,.bundle,test}
+    test.rcov_opts << %w{--exclude /Library,.bundle,test,gems,.rvm}
     test.verbose = true
   end
 rescue LoadError

data/VERSION

@@ -1 +1 @@
-0.1.2
+0.1.4

data/lib/duration.rb

@@ -8,13 +8,12 @@
 # of themselves or perhaps provide a countdown until a certain event.
 class Duration
   include Comparable
-  include Enumerable
 
   # Unit names
   UNITS = [:seconds, :minutes, :hours, :days, :weeks]
 
   # Unit labels
-  UNIT_LABELS = {:second => 'seconds',
+  UNIT_LABELS = {:second => 'second',
                  :seconds => 'seconds',
                  :minute => 'minute',
                  :minutes => 'minutes',
@@ -38,8 +37,8 @@ class Duration
                :week    => 604800}
 
 
-  attr_reader :total, *UNITS
-
+  attr_reader :total, :seconds, :minutes, :hours, :days, :weeks
+  
   # Initialize a duration. 'args' can be a hash or anything else.  If a hash is
   # passed, it will be scanned for a key=>value pair of time units such as those
   # listed in the Duration::UNITS array or Duration::MULTIPLES hash.
@@ -53,7 +52,7 @@ class Duration
       @seconds = 0
       MULTIPLES.each do |unit, multiple|
         unit = unit.to_sym
-        @seconds += args[unit] * multiple if args.key?(unit)
+        @seconds += args[unit].to_i * multiple if args.key?(unit)
       end
     else
       @seconds = args.to_i
@@ -130,4 +129,4 @@ private
     @weeks, @days, @hours, @minutes, @seconds = units
   end
 
-end
+end

data/lib/duration/mongoid.rb

@@ -2,17 +2,17 @@
 require 'duration'
 
 class Duration
-  def get
-    total
+  def self.get(seconds)
+    Duration.new(seconds)
   end
 
   def self.set(args)
     if args.is_a?(Hash)
-      Duration.new(args)
+      Duration.new(args).to_i
     elsif args.respond_to?(:to_i)
-      Duration.new(seconds.to_i)
+      args.to_i
     else
-      Duration.new(0)
+      0
     end
   end
 end

data/lib/ruby-duration.rb

@@ -1 +1,2 @@
+# -*- encoding:  utf-8 -*-
 require 'duration'

data/ruby-duration.gemspec

@@ -0,0 +1,60 @@
+# Generated by jeweler
+# DO NOT EDIT THIS FILE DIRECTLY
+# Instead, edit Jeweler::Tasks in Rakefile, and run the gemspec command
+# -*- encoding: utf-8 -*-
+
+Gem::Specification.new do |s|
+  s.name = %q{ruby-duration}
+  s.version = "0.1.4"
+
+  s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
+  s.authors = ["Jose Peleteiro"]
+  s.date = %q{2010-09-15}
+  s.description = %q{Duration type}
+  s.email = %q{jose@peleteiro.net}
+  s.extra_rdoc_files = [
+    "LICENSE",
+     "README.rdoc"
+  ]
+  s.files = [
+    ".gitignore",
+     "LICENSE",
+     "README.rdoc",
+     "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/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"
+  ]
+
+  if s.respond_to? :specification_version then
+    current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
+    s.specification_version = 3
+
+    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
+

data/test/duration/test_mongoid.rb

@@ -5,11 +5,12 @@ class Duration::TestMongoid < MiniTest::Unit::TestCase
 
   # Returns seconds to serialization
   def test_get
-    assert_equal 90, Duration.new(90).get
+    assert_equal Duration.new(90), Duration.get(90)
   end
 
   def test_set_default
     zero = Duration.new(0)
+    assert_equal zero, Duration.set([1,2,3])
     assert_equal zero, Duration.set("string")
     assert_equal zero, Duration.set(nil)
   end

data/test/test_duration.rb

@@ -23,4 +23,14 @@ class TestDuration < MiniTest::Unit::TestCase
     assert_equal 90, d.total
   end
 
+  def test_format_plural
+    d = Duration.new(:weeks => 2, :days => 3, :hours => 4, :minutes => 5, :seconds => 6)
+    assert_equal("2 weeks 3 days 4 hours 5 minutes 6 seconds", d.format("%w %~w %d %~d %h %~h %m %~m %s %~s"))
+  end
+
+  def test_format_singular
+    d = Duration.new(:weeks => 1, :days => 1, :hours => 1, :minutes => 1, :seconds => 1)
+    assert_equal("1 week 1 day 1 hour 1 minute 1 second", d.format("%w %~w %d %~d %h %~h %m %~m %s %~s"))
+  end
+
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: ruby-duration
 version: !ruby/object:Gem::Version 
-  hash: 31
+  hash: 19
   prerelease: false
   segments: 
   - 0
   - 1
-  - 2
-  version: 0.1.2
+  - 4
+  version: 0.1.4
 platform: ruby
 authors: 
 - Jose Peleteiro
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-09-14 00:00:00 -03:00
+date: 2010-09-15 00:00:00 -03:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -64,6 +64,7 @@ files:
 - 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