units-system 0.0.4 → 0.0.5

data/VERSION

@@ -1 +1 @@
-0.0.4
+0.0.5

data/lib/units-system.rb

@@ -556,18 +556,17 @@ module Units
   end
   
   
-  # Constant look-up was different in Ruby before 1.9.1
-  # In older Ruby versions, this must be included in any module or class from which units expressions
+  # This must be included in any module or class from which units expressions
   # are to be used in units or u blocks.
+  # It is not needed in Ruby 1.9.1 due to they way constant loop-up is done in that version,
+  # but Ruby 1.9.2 has changed that an requires this again.
   module UseBlocks
-    if RUBY_VERSION<"1.9"
-      def self.append_features(target)
-        def target.const_missing(name)
-          begin
-            Units.Measure(name)
-          rescue ArgumentError
-            super
-          end
+    def self.append_features(target)
+      def target.const_missing(name)
+        begin
+          Units.Measure(name)
+        rescue ArgumentError
+          super
         end
       end
     end
@@ -586,7 +585,7 @@ module Units
   si_units :luminous_intensity, :cd      # Iv
   si_units :amount_of_substance, :mol    # n
 
-  # base units definitions
+  # define base units
   define :g, 'gram',   :mass, 1E-3
   define :m, 'meter',  :length, 1.0
   define :s, 'second', :time, 1.0
@@ -595,76 +594,77 @@ module Units
   define :cd,'candela',:luminous_intensity, 1.0
   define :mol,'mole',  :amount_of_substance, 1.0
 
-  define :min, 'minute', 60, :s
-  define :h, 'hour', 60, :min
-  define :d,  'day', 24, :h
-  define :mi, 'mile', 1.609344, :km
-  define :in, 'inch', 2.54, :cm
-  define :ft, 'foot', 0.3048, :m
-  # in is a Ruby keyword; to avoid having to use self.in we'll define:
-  define :inch, 'inch', 1, :in
-  define :lb, 'pound', 0.45359237, :kg
-
-  # declare derived quantities without named units
-  si_units :speed, u{m/s}
+  # declare derived quantities with no named units
+  si_units :speed,        u{m/s}
   si_units :acceleration, u{m/s**2}
-  si_units :area, u{m**2}
-  si_units :volume, u{m**3}
-
-  # named derived units
-  define :W, 'Watt', :power, u{kg*m**2/s**3} # J/s
-  define :Hz, 'herz', :frequency, u{1/s}
-  define :N, 'newton', :force, u{m*kg/s**2}
-  define :Pa, 'pascal', :pressure, u{N/m**2}
-  define :J, 'joule', :energy, u{N*m}
-  define :C, 'coulomb', :electric_charge, u{s*A}
-  define :V, 'volt', :voltage, u{W/A}
-  define :F, 'farad', :electric_capacitance, u{C/V}
-  define :Ω, 'ohm', :electric_resistance, u{V/A} # ohm: Ω  omega: Ω
-  define :S, 'siemens', :electric_condctance, u{1/Ω}
-  define :Wb,'weber', :magnetic_flux, u{J/A}
-  define :T, 'tesla', :magnetic_field, u{N/(A*m)}
-  define :H, 'henry', :inductance, u{Wb/A}
-  define :rad, 'radian', :angle, u{m/m} # maybe more useful as base unit: define :rad, 'radian', :angle, 1.0
-  define :sr, 'steradian', :solid_angle, u{m**2/m**2}
-  define :lm, 'lumen', :luminous_flux, u{cd*sr}
-  define :lx, 'lux', :illuminance, u{lm/m**2}
-  define :Bq, 'bequerel', :radioactivity, u{1/s}
-  define :Gy, 'gray', :absorbed_dose, u{J/kg}
-  define :Sv, 'sievert', :equivalent_dose, u{J/kg}
-  define :kat, 'katal', :catalytic_activity, u{mol/s}
-
-  define :°C, 'degree Celsius', 1, :K, +273.15
+  si_units :area,         u{m**2}
+  si_units :volume,       u{m**3}
+
+  # derived quantities with named units
+  define :W,   'Watt',      :power,                u{kg*m**2/s**3} # J/s
+  define :Hz,  'herz',      :frequency,            u{1/s}
+  define :N,   'newton',    :force,                u{m*kg/s**2}
+  define :Pa,  'pascal',    :pressure,             u{N/m**2}
+  define :J,   'joule',     :energy,               u{N*m}
+  define :C,   'coulomb',   :electric_charge,      u{s*A}
+  define :V,   'volt',      :voltage,              u{W/A}
+  define :F,   'farad',     :electric_capacitance, u{C/V}
+  define :Ω,   'ohm',       :electric_resistance,  u{V/A} # ohm: Ω  omega: Ω
+  define :S,   'siemens',   :electric_condctance,  u{1/Ω}
+  define :Wb,  'weber',     :magnetic_flux,        u{J/A}
+  define :T,   'tesla',     :magnetic_field,       u{N/(A*m)}
+  define :H,   'henry',     :inductance,           u{Wb/A}
+  define :rad, 'radian',    :angle,                u{m/m}
+  define :sr,  'steradian', :solid_angle,          u{m**2/m**2}
+  define :lm,  'lumen',     :luminous_flux,        u{cd*sr}
+  define :lx,  'lux',       :illuminance,          u{lm/m**2}
+  define :Bq,  'bequerel',  :radioactivity,        u{1/s}
+  define :Gy,  'gray',      :absorbed_dose,        u{J/kg}
+  define :Sv,  'sievert',   :equivalent_dose,      u{J/kg}
+  define :kat, 'katal',     :catalytic_activity,   u{mol/s}
+
+  # Other units
+
+  define :min,  'minute', 60, :s
+  define :h,    'hour',   60, :min
+  define :d,    'day',    24, :h
+  define :mi,   'mile',    1.609344, :km
+  define :in,   'inch',    2.54, :cm
+  define :ft,   'foot',    0.3048, :m
+  define :inch, 'inch',    1, :in # alternative to avoid having to use self.in (in is a Ruby keyword)
+  define :lb,   'pound',   0.45359237, :kg
+
+  define :°C, 'degree Celsius',          1, :K, +273.15
   define :°F, 'degree Fahrenheit', 5.0/9.0, :K, +459.67
-  define :R, 'rankine', 5.0/9.0, :K
+  define :R,  'rankine',           5.0/9.0, :K
 
   define :l, 'litre', u{dm**3}
   define :L, 'litre', 1, :l
 
-  define :°, 'degree', ::Math::PI/180.0, :rad
+  define :°, 'degree',     ::Math::PI/180.0, :rad
   define :′, 'arc-minute', ::Math::PI/180.0/60.0, :rad
   define :″, 'arc-second', ::Math::PI/180.0/3600.0, :rad
   # not so cool, but easier to type alternatives:
-  define :deg, 'degree', 1, :°
+  define :deg,    'degree',     1, :°
   define :arcmin, 'arc-minute', 1, :′
   define :arcsec, 'arc-second', 1, :″
 
   define :g0, 'standard gravity', u{9.80665*m/s**2}
 
-  define :bar, 'bar', 1E5, :Pa
-  define :atm, 'atmosphere',  101325.0, :Pa
-  define :mWC, 'meters of water column', u{1E3*kg*g0/m**2}
-  define :Torr, 'torricelli', u{atm/760}
-  define :mHg, 'mHg', u{13.5951E3*kg*g0/m**2}
+  define :bar,  'bar',                    1E5, :Pa
+  define :atm,  'atmosphere',             101325.0, :Pa
+  define :mWC,  'meters of water column', u{1E3*kg*g0/m**2}
+  define :Torr, 'torricelli',             u{atm/760}
+  define :mHg,  'mHg',                    u{13.5951E3*kg*g0/m**2}
 
   # define :kp, 'kilopond', :force, u{kg*g0} # or define pond?
-  define :gf, 'gram-force', u{g*g0} # kilopond kp = kgf
+  define :gf,  'gram-force',  u{g*g0} # kilopond kp = kgf
   define :lbf, 'pound-force', u{lb*g0}
 
-  define :dyn, 'dyne', 10, :µN # u{1*g*cm/s**2}
+  define :dyn,   'dyne', 10, :µN # u{1*g*cm/s**2}
   define :galUS, 'U.S. liquid gallon', u{231*self.in**3}
   define :galUK, 'Imperial gallon', 4.546092, :l
-  define :hp, 'horsepower', u{550*ft*lbf/s}
+  define :hp,    'horsepower', u{550*ft*lbf/s}
 
   define :psi, 'pounds-force per square inch', u{lbf/self.in**2}
 

data/units-system.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{units-system}
-  s.version = "0.0.4"
+  s.version = "0.0.5"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Javier Goizueta"]
-  s.date = %q{2010-02-01}
+  s.date = %q{2010-06-01}
   s.description = %q{Experimental unit conversion & arithmetic for Ruby 1.9}
   s.email = %q{jgoizueta@gmail.com}
   s.extra_rdoc_files = [
@@ -31,7 +31,7 @@ Gem::Specification.new do |s|
   s.homepage = %q{http://github.com/jgoizueta/units-system}
   s.rdoc_options = ["--charset=UTF-8"]
   s.require_paths = ["lib"]
-  s.rubygems_version = %q{1.3.5}
+  s.rubygems_version = %q{1.3.7}
   s.summary = %q{Arithmetic with units of measure}
   s.test_files = [
     "test/helper.rb",
@@ -42,7 +42,7 @@ Gem::Specification.new do |s|
     current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
     s.specification_version = 3
 
-    if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
+    if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
       s.add_development_dependency(%q<thoughtbot-shoulda>, [">= 0"])
     else
       s.add_dependency(%q<thoughtbot-shoulda>, [">= 0"])

metadata

@@ -1,7 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: units-system
 version: !ruby/object:Gem::Version 
-  version: 0.0.4
+  hash: 21
+  prerelease: false
+  segments: 
+  - 0
+  - 0
+  - 5
+  version: 0.0.5
 platform: ruby
 authors: 
 - Javier Goizueta
@@ -9,19 +15,23 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-02-01 00:00:00 +01:00
+date: 2010-06-01 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: thoughtbot-shoulda
-  type: :development
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id001 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
         version: "0"
-    version: 
+  type: :development
+  version_requirements: *id001
 description: Experimental unit conversion & arithmetic for Ruby 1.9
 email: jgoizueta@gmail.com
 executables: []
@@ -52,21 +62,27 @@ rdoc_options:
 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: 
-rubygems_version: 1.3.5
+rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
 summary: Arithmetic with units of measure