richunits 0.2.0 → 0.5.0

data/lib/richunits/weekdays.rb

@@ -0,0 +1,65 @@
+module RichUnits
+
+  # = Weekdays
+  #
+  # The Weekdays class provides useful weekday terminology.
+
+  class Weekdays
+
+    WEEKDAYS = 1..5 # Monday is wday 1
+    ONE_DAY  = 60 * 60 * 24
+
+    def initialize(n)
+      @n = n
+    end
+
+    def ago(time = ::Time.now)
+      step :down, time
+    end
+    alias_method :until, :ago
+    alias_method :before, :ago
+
+    def since(time = ::Time.now)
+      step :up, time
+    end
+    alias_method :from_now, :since
+    alias_method :after, :since
+
+    private
+
+    def step(direction, original_time)
+      result = original_time
+      time = ONE_DAY
+
+      compare = direction == :up ? ">" : "<"
+      time *= -1 if direction == :down
+
+      @n.times do
+        result += time until result.send(compare, original_time) && WEEKDAYS.member?(result.wday)
+        original_time = result
+      end
+      result
+    end
+
+    # = Numeric Weekday Extensions
+    #
+    module Numeric
+
+      # Works with day in terms of weekdays.
+      def weekdays
+        Weekdays.new(self)
+      end
+
+      alias_method :weekday, :weekdays
+
+    end#module Numeric
+
+  end#class Weekdays
+
+end#module RichUnits
+
+
+class Numeric #:nodoc:
+  include RichUnits::Weekdays::Numeric
+end
+

data/meta/version

@@ -0,0 +1 @@
+0.5.0

data/test/test_bytes.rb

@@ -1,4 +1,4 @@
-require 'rich_units/bytes.rb'
+require 'richunits/bytes'
 require 'test/unit'
 
 class TC_Numeric < Test::Unit::TestCase

data/test/test_duration.rb

@@ -0,0 +1,54 @@
+require 'richunits/duration'
+require 'test/unit'
+
+class TestDuration < Test::Unit::TestCase
+
+  def test_to_a
+    d = RichUnits::Duration.new(24*60*60 + 1)
+    r = d.to_a
+    x = [1, 0, 0, 1]
+    assert_equal(x, r)
+
+    d = RichUnits::Duration.new(10*24*60*60 + 5)
+    r = d.to_a
+    x = [10, 0, 0, 5]
+    assert_equal(x, r)
+  end
+
+  def test_segmented
+    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)
+  end
+
+  def test_to_h
+    d = RichUnits::Duration.new(24*60*60)
+    r = d.to_h
+    x = { :days=>1, :hours=>0, :minutes=>0, :seconds=>0 }
+    assert_equal(x, r)
+  end
+
+  def test_repeated_numeric_days
+    a = 10.days
+    r = 10.days.days
+    x = 10
+    assert_equal(x,r)
+  end
+
+  def test_repeated_numeric_years
+    a = 10.years
+    r = 10.years.years
+    x = 10
+    assert_equal(x,r)
+  end
+
+  def test_repeated_strftime
+    a = RichUnits::Duration[24*60*60 + 1]
+    r = a.strftime('%d:%h:%m:%s')
+    x = "1:0:0:1"
+    assert_equal(x,r)
+  end
+
+end
+

data/test/test_multipliers.rb

@@ -1,4 +1,4 @@
-require 'rich_units/multipliers.rb'
+require 'richunits/multipliers'
 require 'test/unit'
 
 class TC_Multipliers < Test::Unit::TestCase

data/test/test_times.rb

@@ -1,4 +1,4 @@
-require 'rich_units/times.rb'
+require 'richunits/times'
 require 'test/unit'
 
 class TC_Times < Test::Unit::TestCase
@@ -12,37 +12,38 @@ class TC_Times < Test::Unit::TestCase
   #end
 
   def test_seconds
-    assert_equal( 60**0, 1.seconds )
+    assert_equal( 60**0, 1.seconds.to_i )
   end
 
   def test_minutes
-    assert_equal( 60**1, 1.minutes )
+    assert_equal( 60**1, 1.minutes.to_i )
   end
 
   def test_hours
-    assert_equal( 60**2, 1.hours )
+    assert_equal( 60**2, 1.hours.to_i )
   end
 
   def test_days
-    assert_equal( 24*(60**2), 1.days )
+    assert_equal( 24*(60**2), 1.days.to_i )
   end
 
   def test_weeks
-    assert_equal( 7*24*(60**2), 1.weeks )
+    assert_equal( 7*24*(60**2), 1.weeks.to_i )
   end
 
   def test_fortnights
-    assert_equal( 14*24*(60**2), 1.fortnights )
+    assert_equal( 14*24*(60**2), 1.fortnights.to_i )
   end
 
   def test_months
-    assert_equal( 30*24*(60**2), 1.months )
+    assert_equal( 30*24*(60**2), 1.months.to_i )
   end
 
   def test_years
-    assert_equal( 365*24*(60**2), 1.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) )

metadata

@@ -1,17 +1,15 @@
 --- !ruby/object:Gem::Specification 
 name: richunits
 version: !ruby/object:Gem::Version 
-  version: 0.2.0
+  version: 0.5.0
 platform: ruby
 authors: 
-- |
-  7ransUnit <transfire@gmail.com>
-
+- 7ransUnit <transfire@gmail.com>
 autorequire: 
 bindir: bin
 cert_chain: []
 
-date: 2008-09-06 00:00:00 -04:00
+date: 2009-06-01 00:00:00 -04:00
 default_executable: 
 dependencies: []
 
@@ -25,38 +23,54 @@ extra_rdoc_files:
 - README
 - MANIFEST
 - CHANGES
+- RELEASE
+- TODO
 - VERSION
-- NEWS
+- COPYING
 files: 
 - doc
-- MANIFEST
+- lib
+- meta
 - test
-- test/test_bytes.rb
-- test/test_multipliers.rb
-- test/test_times.rb
 - CHANGES
+- RELEASE
+- TODO
 - README
-- meta
+- VERSION
+- COPYING
+- doc/ads
+- doc/index.css
+- doc/index.html
+- doc/images
+- doc/ads/rdoc.html
+- doc/images/ruby.png
+- doc/images/ruby-md.png
+- doc/images/tiger_logo.png
+- doc/images/ruby-sm.png
+- doc/images/tiger-sm.png
+- lib/rich_units.rb
+- lib/richunits
+- lib/richunits.rb
+- lib/richunits/times.rb
+- lib/richunits/duration.rb
+- lib/richunits/multipliers.rb
+- lib/richunits/weekdays.rb
+- lib/richunits/bytes.rb
 - meta/created
 - meta/repository
 - meta/homepage
 - meta/abstract
 - meta/title
+- meta/version
 - meta/license
 - meta/contact
-- lib
-- lib/rich_units.rb
-- lib/rich_units
-- lib/rich_units/times.rb
-- lib/rich_units/multipliers.rb
-- lib/rich_units/weekdays.rb
-- lib/rich_units/bytes.rb
-- VERSION
-- NEWS
+- test/test_duration.rb
+- test/test_bytes.rb
+- test/test_multipliers.rb
+- test/test_times.rb
+- MANIFEST
 has_rdoc: true
-homepage: |+
-  http://tigerops.rubyforge.org/richunits
-  
+homepage: http://tigerops.rubyforge.org/richunits
 post_install_message: 
 rdoc_options: 
 - --inline-source
@@ -86,6 +100,7 @@ signing_key:
 specification_version: 2
 summary: Rich Kilmer's Unit system provides english-esque methods
 test_files: 
+- test/test_duration.rb
 - test/test_bytes.rb
 - test/test_multipliers.rb
 - test/test_times.rb

data/NEWS

@@ -1,3 +0,0 @@
-This is the initial standalone release of the Rich Kilmer's Units
-system, spun out of Facets.
-

data/lib/rich_units/bytes.rb

@@ -1,164 +0,0 @@
-# TITLE:
-#
-#   Bytes
-#
-# DESCRIPTION:
-#
-#   Additional methods for Numeric class to make working with
-#   bits and bytes easier.
-#
-# COPYRIGHT:
-#
-#   Copyright (c) 2005 Rich Kilmer
-#
-# LICENSE:
-#
-#   Ruby License
-#
-#   This module is free software. You may use, modify, and/or redistribute this
-#   software under the same terms as Ruby.
-#
-#   This program is distributed in the hope that it will be useful, but WITHOUT
-#   ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
-#   FOR A PARTICULAR PURPOSE.
-#
-# HISTORY:
-#
-#   Special thanks to Richard Kilmer for the orignal work.
-#   This library is based on the original library bytes.rb
-#   Copyright (c) 2004 by Rich Kilmer.
-#
-#   Also thanks to Alexander Kellett for suggesting it be
-#   included in Facets.
-#
-# AUTHORS:
-#
-#   - Rich Kilmer
-#   - Thomas Sawyer
-#
-# NOTES:
-#
-#   - This library is not compatible with STICK's units.rb (an spin-off
-#     of Facets old units.rb library). Do not attempt to use both at the same time.
-#
-# TODOs:
-#
-#   - Currently kilo, mega, etc. are all powers of two and not ten,
-#     which technically isn't corrent even though it is common usage.
-#
-#   - The in_* notation is weak. If a better nomentclature is thought
-#     of then consider changing this.
-
-
-# = Binary Multipliers
-#
-# Additional methods for Numeric class to make working with
-# bits and bytes easier. Bits are used as the base value and
-# these methods can be used to convert between different
-# magnitudes.
-#
-# == Synopisis
-#
-#   1.byte               #=> 8
-#   2.bytes              #=> 16
-#   1.kilobit            #=> 1024
-#   1.kilobyte           #=> 8192
-#
-# Use the in_* methods to perform the inverse operations.
-#
-#   8192.in_kilobytes    #=> 1
-#   1024.in_kilobits     #=> 1
-#
-
-class Numeric
-
-  def bit   ; self ; end
-  def bits  ; self ; end
-  def byte  ; self * 8 ; end
-  def bytes ; self * 8 ; end
-
-  [ 'kilo', 'mega', 'giga', 'tera', 'peta', 'exa' ].each_with_index do |m, i|
-    j = i + 1
-    class_eval %{
-      def #{m}bit  ; self * #{1024**j} ; end
-      def #{m}byte ; self * #{1024**j*8} ; end
-      def in_#{m}bits  ; self / #{1024**j} ; end
-      def in_#{m}bytes ; self / #{1024**j*8} ; end
-      alias_method :#{m}bits,  :#{m}bit
-      alias_method :#{m}bytes, :#{m}byte
-    }
-  end
-
-  [ 'kibi', 'mebi', 'gibi', 'tebi', 'pebi', 'exbi' ].each_with_index do |m, i|
-    j = i + 1
-    class_eval %{
-      def #{m}bit  ; self * #{1024**j} ; end
-      def #{m}byte ; self * #{1024**j*8} ; end
-      def in_#{m}bits  ; self / #{1024**j} ; end
-      def in_#{m}bytes ; self / #{1024**j*8} ; end
-      alias_method :#{m}bits,  :#{m}bit
-      alias_method :#{m}bytes, :#{m}byte
-    }
-  end
-
-  # Formated string of bits proportial to size.
-  #
-  #   1024.bits_to_s            #=> "1.00 kb"
-  #   1048576.bits_to_s         #=> "1.00 mb"
-  #   1073741824.bits_to_s      #=> "1.00 gb"
-  #   1099511627776.bits_to_s   #=> "1.00 tb"
-  #
-  # Takes a format string to adjust output.
-  #
-  #   1024.bits_to_s('%.0f')    #=> "1 kb"
-  #
-  def strfbits(fmt='%.2f')
-    case
-    when self < 1024
-      "#{self} bits"
-    when self < 1024**2
-      "#{fmt % (self.to_f / 1024)} kb"
-    when self < 1024**3
-      "#{fmt % (self.to_f / 1024**2)} mb"
-    when self < 1024**4
-      "#{fmt % (self.to_f / 1024**3)} gb"
-    when self < 1024**5
-      "#{fmt % (self.to_f / 1024**4)} tb"
-    else
-      "#{self} bits"
-    end
-  end
-
-  # Formated string of bytes proportial to size.
-  #
-  #   1024.bytes_to_s            #=> "1.00 KB"
-  #   1048576.bytes_to_s         #=> "1.00 MB"
-  #   1073741824.bytes_to_s      #=> "1.00 GB"
-  #   1099511627776.bytes_to_s   #=> "1.00 TB"
-  #
-  # Takes a format string to adjust output.
-  #
-  #   1024.bytes_to_s('%.0f')    #=> "1 KB"
-  #
-  def strfbytes(fmt='%.2f')
-    case
-    when self < 1024
-      "#{self} bytes"
-    when self < 1024**2
-      "#{fmt % (self.to_f / 1024)} KB"
-    when self < 1024**3
-      "#{fmt % (self.to_f / 1024**2)} MB"
-    when self < 1024**4
-      "#{fmt % (self.to_f / 1024**3)} GB"
-    when self < 1024**5
-      "#{fmt % (self.to_f / 1024**4)} TB"
-    else
-      "#{self} bytes"
-    end
-  end
-
-  # deprecated
-  alias_method :octet_units, :strfbytes
-
-end
-