richunits 0.6 → 0.6.1

data/HISTORY.rdoc

@@ -0,0 +1,68 @@
+= Release History
+
+== 0.6.1 / 2010-10-04
+
+Minor release simply add #to_int method to Duration so Time#+
+and Time#- will work with Durations in Ruby 1.9.2 (Ruby 1.8.x
+uses #to_f).
+
+Changes:
+
+* Add Duration#to_int for Ruby 1.9.2.
+
+
+== 0.6.0 / 2009-10-31
+
+This release tightens up the Duration interface a bit and fixed the
+`Duration#*` method which was accidently named `#+`.
+
+Changes:
+
+* More robust interface for Duration class.
+* Rename #+ method to #* (typo).
+* Update metadata for Gem Do POM.
+
+
+== 0.5.0 / 2009-05-30
+
+This release updates some extensions to Time for use with the
+Duration class, and standardizes the library on the name 'richunits',
+rather than using the underscored "rich_units". This means installation
+is now:
+
+  gem install richunits
+
+and loading the library is now:
+
+  require 'richunits'
+
+Though a backward compatible require is still present.
+
+The previous release contains a complete rewrite of the Duration
+class and integrates it into the rest of the system.
+
+Changes:
+
+* Rewrote Duration class and integrated into rest of system.
+* Name of gem and main require will be 'richunits' (no underscore).
+
+
+== 0.4.0 / 2008-09-09
+
+* Rewrote Duration class and integrated into rest of system.
+
+
+== 0.3.0 / 2008-09-08
+
+* Encapsulated entire library in RichUnits module.
+
+
+== 0.2.0 / 2008-08-01
+
+* Reorganized repository.
+
+
+== 0.1.0 / 2008-03-27
+
+* Initial version.
+

data/PROFILE

@@ -0,0 +1,26 @@
+--- 
+title  : RichUnits
+suite  : rubyworks
+summary: Simple LCD Unit System
+contact: Trans <transfire@gmail.com>
+license: MIT
+created: 2008-02-21
+authors:
+  - Thomas Sawyer
+  - Rich Kilmer
+
+description:
+  A Unit system, based on Rich Kilmer's original time.rb work,
+  which provides english-esque methods for working with common
+  units, such as days and bytes and multiplers like kilo, or mega.
+  It does so by reducing basic measures to a lower common denominator,
+  such as seconds for time measures and bits for byte measures.
+
+resources:
+  home: http://rubyworks.github.com/richunits
+  code: http://github.com/rubyworks/richunits
+  repo: git://github.com/rubyworks/richunits.git
+
+copyright:
+  Copyright (c) 2008 Thomas Sawyer
+

data/{README → README.rdoc}

@@ -2,7 +2,7 @@
 
 Easy Units for Ruby
 
-* http://rubyworks.github.com/richunits/
+* http://rubyworks.github.com/richunits
 * http://richunits.rubyforge.org/ (old site)
 
 

data/Rakefile

@@ -0,0 +1,12 @@
+# -*- ruby -*-
+
+desc "run unit tests"
+task :test do
+  $:.unshift('./lib')
+  Dir['test/*.rb'].each do |file|
+    load file
+  end
+end
+
+# vim: syntax=Ruby
+

data/VERSION

@@ -0,0 +1,7 @@
+name    : richunits
+date    : 2010-10-04
+version : 0.6.1
+
+requires:
+  - syckle (build)
+  - rspec  (test)

data/lib/richunits/duration.rb

@@ -70,6 +70,8 @@ module RichUnits
     def to_i ; @seconds.to_i ; end
     def to_f ; @seconds.to_f ; end
 
+    alias_method :to_int, :to_i
+
     public
 
     def to_a

data/lib/richunits/version.yml

@@ -0,0 +1,7 @@
+name    : richunits
+date    : 2010-10-04
+version : 0.6.1
+
+requires:
+  - syckle (build)
+  - rspec  (test)

data/spec/bytes_spec.rb

@@ -0,0 +1,68 @@
+require 'richunits/bytes'
+#require 'test/unit'
+
+describe Numeric do
+
+  # bits
+
+  it "bits" do
+    8.bits.should == 8
+  end
+
+  it "kilobits" do
+    1.kilobit.should == 1024**1
+  end
+
+  it "megabits" do
+    1.megabit.should == 1024**2
+  end
+
+  it "gigabits" do
+    1.gigabit.should == 1024**3
+  end
+
+  it "terabits" do
+    1.terabit.should == 1024**4
+  end
+
+  # bytes
+
+  it "bytes" do
+    1024.bytes.should == 8192
+  end
+
+  it "kilobytes" do
+    1.kilobyte.should == 1024**1*8
+  end
+
+  it "megabytes" do
+    1.megabyte.should == 1024**2*8
+  end
+
+  it "gigabytes" do
+    1.gigabyte.should == 1024**3*8
+  end
+
+  it "terabytes" do
+    1.terabyte.should == 1024**4*8
+  end
+
+  # bits_to_s
+
+  it "strfbits" do
+    1024.strfbits.should == "1.00 kb"
+    1048576.strfbits.should == "1.00 mb"
+    1073741824.strfbits.should == "1.00 gb"
+    1099511627776.strfbits .should == "1.00 tb"
+  end
+
+  # bytes_to_s
+
+  it "strfbytes" do
+    1024.strfbytes.should == "1.00 KB"
+    1048576.strfbytes.should == "1.00 MB"
+    1073741824.strfbytes.should == "1.00 GB"
+    1099511627776.strfbytes.should == "1.00 TB"
+  end
+
+end

data/{test/test_duration.rb → spec/duration_spec.rb}

@@ -1,53 +1,52 @@
 require 'richunits/duration'
-require 'test/unit'
 
-class TestDuration < Test::Unit::TestCase
+describe RichUnits::Duration do
 
-  def test_to_a
+  it "to_a" do
     d = RichUnits::Duration.new(24*60*60 + 1)
     r = d.to_a
     x = [1, 0, 0, 1]
-    assert_equal(x, r)
+    r.should == x
 
     d = RichUnits::Duration.new(10*24*60*60 + 5)
     r = d.to_a
     x = [10, 0, 0, 5]
-    assert_equal(x, r)
+    r.should == x
   end
 
-  def test_segmented
+  it "segmented" do
     d = RichUnits::Duration.new(8*24*60*60 + 1)
     r = d.segmented(:week, :day, :hour, :minute, :second)
     x = [1, 1, 0, 0, 1]
-    assert_equal(x, r.to_a)
+    r.to_a.should == x
   end
 
-  def test_to_h
+  it "to_h" do
     d = RichUnits::Duration.new(24*60*60)
     r = d.to_h
     x = { :days=>1, :hours=>0, :minutes=>0, :seconds=>0 }
-    assert_equal(x, r)
+    r.should == x
   end
 
-  def test_repeated_numeric_days
+  it "repeated_numeric_days" do
     a = 10.days
     r = 10.days.days
     x = 10
-    assert_equal(x,r)
+    r.should == x
   end
 
-  def test_repeated_numeric_years
+  it "repeated_numeric_years" do
     a = 10.years
     r = 10.years.years
     x = 10
-    assert_equal(x,r)
+    r.should == x
   end
 
-  def test_repeated_strftime
+  it "repeated_strftime" do
     a = RichUnits::Duration[24*60*60 + 1]
     r = a.strftime('%d:%h:%m:%s')
     x = "1:0:0:1"
-    assert_equal(x,r)
+    r.should == x
   end
 
 end

data/spec/multipliers_spec.rb

@@ -0,0 +1,98 @@
+require 'richunits/multipliers'
+
+describe "Multipliers" do
+
+  it "deka" do
+    1.deka.should == 10
+  end
+
+  it "hecto" do
+    1.hecto.should == 100
+  end
+
+  it "kilo" do
+    1.kilo.should == 1000
+  end
+
+  it "mega" do
+    1.mega.should == 1000000
+  end
+
+  it "giga" do
+    1.giga.should == 1000000000
+  end
+
+  it "tera" do
+    1.tera.should == 1000000000000
+  end
+
+  it "peta" do
+    1.peta.should == 1000000000000000
+  end
+
+  it "exa" do
+    1.exa.should == 1000000000000000000
+  end
+
+  # Fractional
+
+  it "deci" do
+    1.deci.should == 0.1
+  end
+
+  it "centi" do
+    1.centi.should == 0.01
+  end
+
+  it "milli" do
+    1.milli.should == 0.001
+  end
+
+  it "milli" do
+    1.micro.should == 0.000001
+  end
+
+  it "nano" do
+    1.nano.should == 0.000000001
+  end
+
+  it "pico" do
+    1.pico.should == 0.000000000001
+  end
+
+  it "femto" do
+    1.femto.should == 0.000000000000001
+  end
+
+  it "atto" do
+    1.atto.should == 0.000000000000000001
+  end
+
+  # SI Binary
+
+  it "kibi" do
+    1.kibi.should == 1024
+  end
+
+  it "mebi" do
+    1.mebi.should == 1024**2
+  end
+
+  it "gibi" do
+    1.gibi.should == 1024**3
+  end
+
+  it "tebi" do
+    1.tebi.should == 1024**4
+  end
+
+  it "pebi" do
+    1.pebi.should == 1024**5
+  end
+
+  it "exbi" do
+    1.exbi.should == 1024**6
+  end
+
+end
+

data/spec/times_spec.rb

@@ -0,0 +1,102 @@
+require 'richunits/times'
+
+describe "RichUnits::Times" do
+
+  #it "micro_seconds
+  #  1.microsecond.should == 0.000001
+  #end
+
+  #it "milli_seconds
+  #  1.millisecond.should == 0.001
+  #end
+
+  it "seconds" do
+    1.seconds.to_i.should == 60**0
+  end
+
+  it "minutes" do
+    1.minutes.to_i.should == 60**1
+  end
+
+  it "hours" do
+    1.hours.to_i.should == 60**2
+  end
+
+  it "days" do
+    1.days.to_i.should == 24*(60**2)
+  end
+
+  it "weeks" do
+    1.weeks.to_i.should == 7*24*(60**2)
+  end
+
+  it "fortnights" do
+    1.fortnights.to_i .should == 14*24*(60**2)
+  end
+
+  it "months" do
+    1.months.to_i.should == 30*24*(60**2)
+  end
+
+  it "years" do
+    1.years.to_i.should == 365*24*(60**2)
+  end
+
+
+  it "before" do
+    t = Time.now
+    1.day.before(t).should == t - 1.day
+  end
+
+  it "after" do
+    t = Time.now
+    1.day.after(t).should == t + 1.day
+  end
+
+  #
+
+  it "addition" do
+    (10.minutes + 1.minute).should == 11.minutes
+    (10.minutes + 1.minute).to_i.should == 11.minutes.to_i
+
+    (10.minutes + 60.seconds).should == 11.minutes
+    (10.minutes + 60.seconds).to_i.should == 11.minutes.to_i
+  end
+
+  it "multiplication" do
+    (10.minutes * 2).should == 20.minutes
+    (10.minutes * 2).to_i.should ==20.minutes.to_i
+  end
+
+end
+
+describe "Weekdays Test" do
+
+  MONDAY   = Time.at(1165250000)
+  THURSDAY = Time.at(1165500000)
+  FRIDAY   = Time.at(1165606025)
+
+  it "weekday after monday" do
+    1.weekday.since(MONDAY).wday.should == 2
+  end
+
+  it "weekday after friday" do
+    1.weekday.after(FRIDAY).wday.should == 1
+  end
+
+  it "weekdays before friday" do
+    3.weekdays.before(FRIDAY).wday.should == 2
+  end
+
+  #it "weekday before today" do
+  #  Time.expects(:now).returns(THURSDAY)
+  #  1.weekday.ago.wday.should == 3
+  #end
+
+  #it "weekdays after today" do
+  #  Time.expects(:now).returns(MONDAY)
+  #  2.weekday.from_now.wday.should == 3
+  #end
+
+end
+

metadata

@@ -1,97 +1,115 @@
 --- !ruby/object:Gem::Specification 
 name: richunits
 version: !ruby/object:Gem::Version 
-  version: "0.6"
+  hash: 5
+  prerelease: false
+  segments: 
+  - 0
+  - 6
+  - 1
+  version: 0.6.1
 platform: ruby
-authors: []
-
+authors: 
+- Thomas Sawyer
+- Rich Kilmer
 autorequire: 
 bindir: bin
 cert_chain: []
 
-date: 2009-10-31 00:00:00 -04:00
+date: 2010-11-04 00:00:00 -04:00
 default_executable: 
-dependencies: []
-
-description: |-
-  Rich Kilmer's Unit system provides english-esque methods
-  for working with common units, such as days and bytes and
-  multiplers like kilo, or mega. It does so by reducing basic
-  measures to a lower common denominator, such as seconds for
-  time measures and bits for byte measures.
-email: 7ransUnit <transfire@gmail.com>
+dependencies: 
+- !ruby/object:Gem::Dependency 
+  name: syckle
+  prerelease: false
+  requirement: &id001 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  type: :development
+  version_requirements: *id001
+- !ruby/object:Gem::Dependency 
+  name: rspec
+  prerelease: false
+  requirement: &id002 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  type: :development
+  version_requirements: *id002
+description: A Unit system, based on Rich Kilmer's original time.rb work, which provides english-esque methods for working with common units, such as days and bytes and multiplers like kilo, or mega. It does so by reducing basic measures to a lower common denominator, such as seconds for time measures and bits for byte measures.
+email: transfire@gmail.com
 executables: []
 
 extensions: []
 
 extra_rdoc_files: 
-- README
-- MANIFEST
-- CHANGES
-- RELEASE
-- TODO
-- COPYING
+- README.rdoc
 files: 
-- CHANGES
-- COPYING
-- MANIFEST
-- README
-- RELEASE
-- TODO
 - lib/rich_units.rb
-- lib/richunits.rb
 - lib/richunits/bytes.rb
 - lib/richunits/duration.rb
 - lib/richunits/multipliers.rb
 - lib/richunits/times.rb
+- lib/richunits/version.yml
 - lib/richunits/weekdays.rb
-- meta/abstract
-- meta/anthology
-- meta/contact
-- meta/created
-- meta/homepage
-- meta/license
-- meta/name
-- meta/repository
-- meta/title
-- meta/version
-- test/test_bytes.rb
-- test/test_duration.rb
-- test/test_multipliers.rb
-- test/test_times.rb
+- lib/richunits.rb
+- spec/bytes_spec.rb
+- spec/duration_spec.rb
+- spec/multipliers_spec.rb
+- spec/times_spec.rb
+- Rakefile
+- HISTORY.rdoc
+- PROFILE
+- README.rdoc
+- VERSION
+- COPYING
 has_rdoc: true
-homepage: http://tigerops.rubyforge.org/richunits
-licenses: []
-
+homepage: http://rubyworks.github.com/richunits
+licenses: 
+- MIT
 post_install_message: 
 rdoc_options: 
 - --title
 - RichUnits API
 - --main
-- README
+- README.rdoc
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
       version: "0"
-  version: 
 required_rubygems_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
       version: "0"
-  version: 
 requirements: []
 
-rubyforge_project: tigerops
-rubygems_version: 1.3.5
+rubyforge_project: richunits
+rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
-summary: Rich Kilmer's Unit system provides english-esque methods
-test_files: 
-- test/test_bytes.rb
-- test/test_duration.rb
-- test/test_multipliers.rb
-- test/test_times.rb
+summary: Simple LCD Unit System
+test_files: []
+

data/CHANGES

@@ -1,20 +0,0 @@
-=== 0.5.0 / 2009-05-30
-
-* Name of gem and main require will be 'richunits' (no underscore).
-
-=== 0.4.0 / 2008-09-09
-
-* Rewrote Duration class and integrated into rest of system.
-
-=== 0.3.0 / 2008-09-08
-
-* Encapsulated entire library in RichUnits module.
-
-=== 0.2.0 / 2008-08-01
-
-* Reorganized repository.
-
-=== 0.1.0 / 2008-03-27
-
-* Initial version.
-

data/MANIFEST

@@ -1,28 +0,0 @@
-CHANGES
-COPYING
-MANIFEST
-README
-RELEASE
-TODO
-lib/rich_units.rb
-lib/richunits
-lib/richunits.rb
-lib/richunits/bytes.rb
-lib/richunits/duration.rb
-lib/richunits/multipliers.rb
-lib/richunits/times.rb
-lib/richunits/weekdays.rb
-meta/abstract
-meta/anthology
-meta/contact
-meta/created
-meta/homepage
-meta/license
-meta/name
-meta/repository
-meta/title
-meta/version
-test/test_bytes.rb
-test/test_duration.rb
-test/test_multipliers.rb
-test/test_times.rb

data/RELEASE

@@ -1,21 +0,0 @@
-This release updates some extensions to Time for use with the
-Duration class, and standardizes the library on the name 'richunits',
-rather than using the underscored "rich_units". This means installation
-is now:
-
-  gem install richunits
-
-and loading the library is now:
-
-  require 'richunits'
-
-Though a backward compatible require is still present.
-
-The previous release contains a complete rewrite of the Duration
-class and integrates it into the rest of the system.
-
-
-### 0.5.0 / 2009-05-30
-
-* Rewrote Duration class and integrated into rest of system.
-

data/TODO

@@ -1,22 +0,0 @@
-= TODO List
-
-== Achieve 99.9% drop-in compatability with ActiveSupport.
-
-* Duration may be the big difficulty here.
-
-
-== Better TimeZone support
-
-* tgzinfo?
-
-
-== Documentation
-
-I was looking through the rdoc at
-
-http://tigerops.rubyforge.org/rich_units/rdoc/index.html
-
-and found that the names generated by rdoc for the bit and byte human readable string methods is out of synch with the examples in the documentation for each of the methods. The actual method names Numeric#strfbits and Numeric#strfbytes work but the method names Numeric#bits_to_s and Numeric#bytes_to_s that are shown in the examples for each method do not work.
-
-(from Larry Baltz)
-

data/meta/abstract

@@ -1,5 +0,0 @@
-Rich Kilmer's Unit system provides english-esque methods
-for working with common units, such as days and bytes and
-multiplers like kilo, or mega. It does so by reducing basic
-measures to a lower common denominator, such as seconds for
-time measures and bits for byte measures.

data/meta/anthology

@@ -1 +0,0 @@
-rubyworks

data/meta/contact

@@ -1 +0,0 @@
-7ransUnit <transfire@gmail.com>

data/meta/created

@@ -1 +0,0 @@
-2008-02-21

data/meta/homepage

@@ -1,2 +0,0 @@
-http://tigerops.rubyforge.org/richunits
-

data/meta/license

@@ -1 +0,0 @@
-MIT

data/meta/name

@@ -1 +0,0 @@
-richunits

data/meta/repository

@@ -1 +0,0 @@
-git://github.com/rubyworks/richunits.git

data/meta/title

@@ -1 +0,0 @@
-RichUnits

data/meta/version

@@ -1 +0,0 @@
-0.6

data/test/test_bytes.rb

@@ -1,69 +0,0 @@
-require 'richunits/bytes'
-require 'test/unit'
-
-class TC_Numeric < Test::Unit::TestCase
-
-  # bits
-
-  def test_bits
-    assert_equal( 8, 8.bits )
-  end
-
-  def test_kilobits
-    assert_equal( 1024**1, 1.kilobit )
-  end
-
-  def test_megabits
-    assert_equal( 1024**2, 1.megabit )
-  end
-
-  def test_gigabits
-    assert_equal( 1024**3, 1.gigabit )
-  end
-
-  def test_terabits
-    assert_equal( 1024**4, 1.terabit )
-  end
-
-  # bytes
-
-  def test_bytes
-    assert_equal( 8192, 1024.bytes )
-  end
-
-  def test_kilobytes
-    assert_equal( 1024**1*8, 1.kilobyte )
-  end
-
-  def test_megabytes
-    assert_equal( 1024**2*8, 1.megabyte )
-  end
-
-  def test_gigabytes
-    assert_equal( 1024**3*8, 1.gigabyte )
-  end
-
-  def test_terabytes
-    assert_equal( 1024**4*8, 1.terabyte )
-  end
-
-  # bits_to_s
-
-  def test_strfbits
-    assert_equal( "1.00 kb", 1024.strfbits )
-    assert_equal( "1.00 mb", 1048576.strfbits )
-    assert_equal( "1.00 gb", 1073741824.strfbits )
-    assert_equal( "1.00 tb", 1099511627776.strfbits )
-  end
-
-  # bytes_to_s
-
-  def test_strfbytes
-    assert_equal( "1.00 KB", 1024.strfbytes )
-    assert_equal( "1.00 MB", 1048576.strfbytes )
-    assert_equal( "1.00 GB", 1073741824.strfbytes )
-    assert_equal( "1.00 TB", 1099511627776.strfbytes )
-  end
-
-end
-

data/test/test_multipliers.rb

@@ -1,99 +0,0 @@
-require 'richunits/multipliers'
-require 'test/unit'
-
-class TC_Multipliers < Test::Unit::TestCase
-
-  def test_deka
-    assert_equal( 10, 1.deka )
-  end
-
-  def test_hecto
-    assert_equal( 100, 1.hecto )
-  end
-
-  def test_kilo
-    assert_equal( 1000, 1.kilo )
-  end
-
-  def test_mega
-    assert_equal( 1000000, 1.mega )
-  end
-
-  def test_giga
-    assert_equal( 1000000000, 1.giga )
-  end
-
-  def test_tera
-    assert_equal( 1000000000000, 1.tera )
-  end
-
-  def test_peta
-    assert_equal( 1000000000000000, 1.peta )
-  end
-
-  def test_exa
-    assert_equal( 1000000000000000000, 1.exa )
-  end
-
-  # Fractional
-
-  def test_deci
-    assert_equal( 0.1, 1.deci )
-  end
-
-  def test_centi
-    assert_equal( 0.01, 1.centi )
-  end
-
-  def test_milli
-    assert_equal( 0.001, 1.milli )
-  end
-
-  def test_milli
-    assert_equal( 0.000001, 1.micro )
-  end
-
-  def test_nano
-    assert_equal( 0.000000001, 1.nano )
-  end
-
-  def test_pico
-    assert_equal( 0.000000000001, 1.pico )
-  end
-
-  def test_femto
-    assert_equal( 0.000000000000001, 1.femto )
-  end
-
-  def test_atto
-    assert_equal( 0.000000000000000001, 1.atto )
-  end
-
-  # SI Binary
-
-  def test_kibi
-    assert_equal( 1024, 1.kibi )
-  end
-
-  def test_mebi
-    assert_equal( 1024**2, 1.mebi )
-  end
-
-  def test_gibi
-    assert_equal( 1024**3, 1.gibi )
-  end
-
-  def test_tebi
-    assert_equal( 1024**4, 1.tebi )
-  end
-
-  def test_pebi
-    assert_equal( 1024**5, 1.pebi )
-  end
-
-  def test_exbi
-    assert_equal( 1024**6, 1.exbi )
-  end
-
-end
-

data/test/test_times.rb

@@ -1,103 +0,0 @@
-require 'richunits/times'
-require 'test/unit'
-
-class TC_Times < Test::Unit::TestCase
-
-  #def test_micro_seconds
-  #  assert_equal( 0.000001, 1.microsecond )
-  #end
-
-  #def test_milli_seconds
-  #  assert_equal( 0.001, 1.millisecond )
-  #end
-
-  def test_seconds
-    assert_equal( 60**0, 1.seconds.to_i )
-  end
-
-  def test_minutes
-    assert_equal( 60**1, 1.minutes.to_i )
-  end
-
-  def test_hours
-    assert_equal( 60**2, 1.hours.to_i )
-  end
-
-  def test_days
-    assert_equal( 24*(60**2), 1.days.to_i )
-  end
-
-  def test_weeks
-    assert_equal( 7*24*(60**2), 1.weeks.to_i )
-  end
-
-  def test_fortnights
-    assert_equal( 14*24*(60**2), 1.fortnights.to_i )
-  end
-
-  def test_months
-    assert_equal( 30*24*(60**2), 1.months.to_i )
-  end
-
-  def test_years
-    assert_equal( 365*24*(60**2), 1.years.to_i )
-  end
-
-
-  def test_before
-    t = Time.now
-    assert_equal( t - 1.day, 1.day.before(t) )
-  end
-
-  def test_after
-    t = Time.now
-    assert_equal( t + 1.day, 1.day.after(t) )
-  end
-
-  #
-
-  def test_addition
-    assert_equal(11.minutes, 10.minutes + 1.minute)
-    assert_equal(11.minutes.to_i, (10.minutes + 1.minute).to_i)
-
-    assert_equal(11.minutes, 10.minutes + 60.seconds)
-    assert_equal(11.minutes.to_i, (10.minutes + 60.seconds).to_i)
-  end
-
-  def test_multiplication
-    assert_equal(20.minutes, 10.minutes * 2)
-    assert_equal(20.minutes.to_i, (10.minutes * 2).to_i)
-  end
-
-end
-
-class WeekdaysTest < Test::Unit::TestCase
-
-  MONDAY = Time.at(1165250000)
-  THURSDAY = Time.at(1165500000)
-  FRIDAY = Time.at(1165606025)
-
-  def test_weekday_after_monday
-    assert_equal 2, 1.weekday.since(MONDAY).wday
-  end
-
-  def test_weekday_after_friday
-    assert_equal 1, 1.weekday.after(FRIDAY).wday
-  end
-
-  def test_weekdays_before_friday
-    assert_equal 2, 3.weekdays.before(FRIDAY).wday
-  end
-
-  #def test_weekday_before_today
-  #  Time.expects(:now).returns(THURSDAY)
-  #  assert_equal 3, 1.weekday.ago.wday
-  #end
-
-  #def test_weekdays_after_today
-  #  Time.expects(:now).returns(MONDAY)
-  #  assert_equal 3, 2.weekday.from_now.wday
-  #end
-
-end
-