stick 1.2.0 → 1.3.0

data/lib/stick/units/currency.rb

@@ -1,8 +1,8 @@
 require 'stick/units/base'
-
 require 'soap/wsdlDriver'
 
 module Stick
+module Units
 
   class CurrencyLoader < Loader
 
@@ -10,14 +10,14 @@ module Stick
 
     def ce_service(converter, name, &blk)
       old_service = Thread.current[:'Stick::ce_service']
-      Thread.current[:'Stick::ce_service'] = ::Stick::Converter::ExchangeRate.const_get(name)
+      Thread.current[:'Stick::Units::ce_service'] = ::Stick::Units::Converter::ExchangeRate.const_get(name)
       yield
     ensure
-      Thread.current[:'Stick::ce_service'] = old_service
+      Thread.current[:'Stick::Units::ce_service'] = old_service
     end
 
     def currency_unit(converter, name)
-      service = Thread.current[:'Stick::ce_service'] || ::Stick::Config::DEFAULT_CURRENCY_SERVICE
+      service = Thread.current[:'Stick::Units::ce_service'] || ::Stick::Units::Config::DEFAULT_CURRENCY_SERVICE
       converter.send(:register_unit, name, :equals => service.create_conversion(name, converter))
     end
 
@@ -36,11 +36,11 @@ module Stick
     # The only subclasses provided are currently XMethods and CachedXMethods.
     #
     # To be found automatically from YAML files, exchange services should
-    # be located under Stick::Converter::ExchangeRate.
+    # be located under Stick::Units::Converter::ExchangeRate.
     class ExchangeRate
 
       def self.create_conversion(curr, converter) # :nodoc:
-        {:unit => ::Stick::Unit.new({:'--base-currency--' => 1}, converter), :multiplier => self.new(curr)}
+        {:unit => ::Stick::Units::Unit.new({:'--base-currency--' => 1}, converter), :multiplier => self.new(curr)}
       end
 
       def initialize(curr) # :nodoc:
@@ -104,7 +104,7 @@ module Stick
         private
 
         def data
-          @@data ||= eval(File.read(File.join(::Stick::Config::CONFIGDIR, 'xmethods', 'mapping.rb')))
+          @@data ||= eval(File.read(File.join(::Stick::Units::Config::CONFIGDIR, 'xmethods', 'mapping.rb')))
         end
 
         def country_mapping
@@ -133,7 +133,7 @@ module Stick
         private
 
         def data
-          @@data ||= eval(File.read(File.join(::Stick::Config::CONFIGDIR, 'xmethods', 'cached.rb')))
+          @@data ||= eval(File.read(File.join(::Stick::Units::Config::CONFIGDIR, 'xmethods', 'cached.rb')))
         end
 
       end #class CachedXMethods
@@ -153,7 +153,8 @@ module Stick
   # Contains some configuration related constants
   module Config
     # The standard service used for looking up currency exchange rates
-    DEFAULT_CURRENCY_SERVICE = ::Stick::Converter::ExchangeRate::XMethods
+    DEFAULT_CURRENCY_SERVICE = ::Stick::Units::Converter::ExchangeRate::XMethods
   end
 
 end
+end

data/lib/stick/units/loaders.rb

@@ -1,4 +1,5 @@
 module Stick
+module Units
 
   class Loader
 
@@ -73,7 +74,7 @@ module Stick
       end
 
       def load_config(file, context)
-        data = File.read(File.join(::Stick::Config::CONFIGDIR, file)) rescue File.read(file)
+        data = File.read(File.join(::Stick::Units::Config::CONFIGDIR, file)) rescue File.read(file)
         context.instance_eval { eval data, nil, file }
       end
 
@@ -96,3 +97,4 @@ module Stick
   end
 
 end
+end

data/lib/stick/units/units.rb

@@ -1,6 +1,7 @@
 require 'stick/units/base'
 
 module Stick
+module Units
 
   class SILoader < Loader
 
@@ -107,3 +108,4 @@ module Stick
   end
 
 end
+end

data/meta/MANIFEST

@@ -2,12 +2,14 @@
 CHANGES
 COPYING
 README
+RELEASE
 lib
 lib/stick
 lib/stick/constants
 lib/stick/constants/cgs.rb
 lib/stick/constants/mks.rb
 lib/stick/constants/number.rb
+lib/stick/constants/typeless.rb
 lib/stick/constants/typeless_cgs.rb
 lib/stick/constants/typeless_mks.rb
 lib/stick/constants.rb

data/meta/ROLLRC

@@ -1,2 +1,2 @@
-stick 1.2.0 stable 2007-12-11
+stick 1.3.0 stable 2007-12-11
 lib/stick

data/meta/project.yaml

@@ -12,7 +12,7 @@ contact     : Trans <transfire at gmail.com>
 author      : Peter Vanbroekhoven
 created     : '2005-11-26'
 
-exclude: [ pkg, dev, doc ]
+exclude: [ pkg, work, doc ]
 dependency  :
   - [ facets, '>= 2.1.0' ]
 

data/test/test_currency.rb

@@ -5,7 +5,7 @@ require 'stick/currency'
 
 class TestUnits < Test::Unit::TestCase
 
-  include ::Stick
+  include ::Stick::Units
 
   def test_typerror
     assert_raises(TypeError) do

data/test/test_units.rb

@@ -9,7 +9,7 @@ class TestUnits < Test::Unit::TestCase
     assert( v2 * (1 - d) <= v1 && v1 <= v2 * (1 + d), "<#{v1}> expected but was\n<#{v2}>" )
   end
 
-  include ::Stick
+  include ::Stick::Units
 
   def test_bit_and_bytes
     assert_equal( 65.bit/s,  1.bit/s + 8.bytes/s )

metadata

@@ -3,8 +3,8 @@ rubygems_version: 0.9.4.6
 specification_version: 2
 name: stick
 version: !ruby/object:Gem::Version 
-  version: 1.2.0
-date: 2007-12-14 00:00:00 -05:00
+  version: 1.3.0
+date: 2007-12-15 00:00:00 -05:00
 summary: Stick is an comprehensive science library including a units system providing bot
 require_paths: 
 - lib
@@ -62,6 +62,7 @@ files:
 - lib/stick/constants/typeless_mks.rb
 - lib/stick/constants/number.rb
 - lib/stick/constants/typeless_cgs.rb
+- lib/stick/constants/typeless.rb
 - lib/stick/currency.rb
 - lib/stick/units
 - lib/stick/units/currency.rb
@@ -100,16 +101,13 @@ files:
 - lib/stick/mapcar.rb
 - CHANGES
 - COPYING
-- work
-- work/bytes.rb
-- work/TODO
-- work/multipliers.rb
 - meta
 - meta/MANIFEST
 - meta/ROLLRC
 - meta/project.yaml
 - meta/icli.yaml
 - README
+- RELEASE
 test_files: 
 - test/test_currency.rb
 - test/test_units.rb

data/work/TODO

@@ -1,20 +0,0 @@
-= To Do List -- Stick
-
-== Current
-
-* times.rb mainly serves as a reminder that it would be nice if the units
-  system could have an extra set of conversions for handling calander nomencalture.
-  Of course times.rb can be used too, it's just not really inteded to be used
-  alonde side units.rb.
-
-== Pre-Stick List
-
-file://lib/facets/bytes.rb
-* TODO Currently kilo, mega, etc. are all powers of two and not ten,
-  which technically isn't corrent even though it is common usage. (30)
-* TODO The in_* notation is weak. If a better nomentclature is thought
-  of then consider changing this. (33)
-
-file://lib/facets/times.rb
-* TODO Extra Add in_* methods, like in_days, in_hours, etc. (35)
-

data/work/bytes.rb

@@ -1,231 +0,0 @@
-# = bytes.rb
-#
-# == Copyright (c) 2005 Rich Kilmer, Thomas Sawyer
-#
-#  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.
-#
-# == Special Thanks
-#
-# 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 and Contributors
-#
-# * Rich Kilmer
-# * Thomas Sawyer
-#
-# == Developer Notes
-#
-#   TODO Currently kilo, mega, etc. are all powers of two and not ten,
-#        which technically isn't corrent even though it is common usage.
-#
-#   TODO The in_* notation is weak. If a better nomentclature is thought
-#        of then consider changing this.
-
-# Author::    Rich Kilmer, Thomas Sawyer
-# Copyright:: Copyright (c) 2005 Thomas Sawyer, Rich Kilmer
-# License::   Ruby License
-
-# = 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
-
-
-
-#  _____         _
-# |_   _|__  ___| |_
-#   | |/ _ \/ __| __|
-#   | |  __/\__ \ |_
-#   |_|\___||___/\__|
-#
-
-=begin testing
-
-  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
-
-=end

data/work/multipliers.rb

@@ -1,195 +0,0 @@
-# = multipliers.rb
-#
-# == Copyright (c) 2005 Thomas Sawyer
-#
-#   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.
-#
-# == Special Thanks
-#
-# Thanks to Rich Kilmer and bytes.rb which inspired this library.
-#
-# == Author(s)
-#
-# * Thomas Sawyer
-
-# Author::    Thomas Sawyer
-# Copyright:: Copyright (c) 2005 Thomas Sawyer
-# License::   Ruby License
-
-# = Multipliers
-#
-# Adds methods to Numeric to make working with
-# magnitudes (kilo, mega, giga, milli, micro, etc.)
-# as well as bits and bytes easier.
-#
-#   1.kilo               #=> 1000
-#   1.milli              #=> 0.001
-#   1.kibi               #=> 1024
-#
-# To display a value in a certain denomination, simply 
-# perform the inverse operation by placing the 
-# multiplier called on unit (1) in the denominator.
-#
-#   1000 / 1.kilo        #=> 1
-#   1024 / 1.kibi        #=> 1
-#
-
-class Numeric
-
-  # SI Multipliers
-
-  def deka  ; self * 10 ; end
-  def hecto ; self * 100 ; end
-  def kilo  ; self * 1000 ; end
-  def mega  ; self * 1000000 ; end
-  def giga  ; self * 1000000000 ; end
-  def tera  ; self * 1000000000000 ; end
-  def peta  ; self * 1000000000000000 ; end
-  def exa   ; self * 1000000000000000000 ; end
-
-  # SI Fractional
-
-  def deci  ; self.to_f / 10 ; end
-  def centi ; self.to_f / 100 ; end
-  def milli ; self.to_f / 1000 ; end
-  def micro ; self.to_f / 1000000 ; end
-  def nano  ; self.to_f / 1000000000 ; end
-  def pico  ; self.to_f / 1000000000000 ; end
-  def femto ; self.to_f / 1000000000000000 ; end
-  def atto  ; self.to_f / 1000000000000000000 ; end
-
-  # SI Binary
-
-  def kibi ; self * 1024 ; end
-  def mebi ; self * 1024**2 ; end
-  def gibi ; self * 1024**3 ; end
-  def tebi ; self * 1024**4 ; end
-  def pebi ; self * 1024**5 ; end
-  def exbi ; self * 1024**6 ; end
-
-  # Bits and Bytes
-
-  def bit   ; self ; end
-  def bits  ; self ; end
-  def byte  ; self * 8 ; end
-  def bytes ; self * 8 ; end
-
-end
-
-
-
-#  _____         _
-# |_   _|__  ___| |_
-#   | |/ _ \/ __| __|
-#   | |  __/\__ \ |_
-#   |_|\___||___/\__|
-#
-
-=begin testing
-
-  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
-
-=end