temperature 1.1.1 → 1.2

data/History.txt

@@ -1,3 +1,10 @@
+=== 1.2 ===
+* 2 minor bug fix
+  * fix rakefile to do readme correctly
+  * fix a warning (thanks to Matt Nelson)
+* 1 major enhancement
+  * Add Rankine units (thanks to Matt Nelson)
+
 === 1.1.1 2010-03-14
 * 1 minor bug fix
   * ensure relative humidity works if passed as a string

data/README.rdoc

@@ -40,6 +40,11 @@ http://en.wikipedia.org/wiki/Dew_point#Closer_approximation
 
 sudo gem install temperature
 
+== AUTHORS:
+
+Sean Dague - maintainer
+Matt Nelson
+
 == LICENSE:
 
 (The MIT License)

data/Rakefile

@@ -16,6 +16,8 @@ $hoe = Hoe.spec 'temperature' do
   self.developer 'Sean Dague', 'sean@dague.net'
   self.post_install_message = 'PostInstall.txt' # TODO remove if post-install message not required
   self.rubyforge_name       = "sdaguegems" # TODO this is default value
+  self.extra_rdoc_files = ["README.rdoc"]
+  self.readme_file = "README.rdoc"
   # self.extra_deps         = [['activesupport','>= 2.0.2']]
 
 end

data/lib/temperature.rb

@@ -10,5 +10,5 @@ require 'temperature/string'
 # degrees 'F'.  Yes, I realize this is US centric, but that's where I
 # live.  In the future I'd like to auto detect that base on locale.
 module Temperature
-    VERSION = "1.1.1"
+    VERSION = "1.2"
 end

data/lib/temperature/numeric.rb

@@ -18,6 +18,8 @@ class Numeric
     FOffset = 32
     # The offset between K and C
     KOffset = 273.15
+    # The offset between R and F
+    ROffset = 459.67
 
     
     # Is this a Farenheit temperature, returns a boolean
@@ -35,6 +37,10 @@ class Numeric
         return self.units == "K"
     end
 
+    def is_R?
+        return self.units == "R"
+    end
+
     # Convert the temperature to Farenheit.  If it's already in F, it
     # returns itself.
     def to_F
@@ -42,6 +48,7 @@ class Numeric
         when "F" then return self
         when "C" then return self.c2f
         when "K" then return self.k2f
+        when "R" then return self.r2f
         end
     end
 
@@ -52,6 +59,7 @@ class Numeric
         when "F" then return self.f2c
         when "C" then return self
         when "K" then return self.k2c
+        when "R" then return self.r2c
         end
     end
         
@@ -62,8 +70,19 @@ class Numeric
         when "F" then return self.f2k
         when "C" then return self.c2k
         when "K" then return self
+        when "R" then return self.k2r
         end
     end
+
+    # Convert the temperature to Rankines.
+    def to_R
+      case self.units
+      when "F" then return self.f2r
+      when "C" then return self.c2r
+      when "K" then return self.k2r
+      when "R" then return self
+      end
+    end
         
     def c2f
         num = self * CScale + FOffset
@@ -97,6 +116,30 @@ class Numeric
         self.k2c.c2f
     end
 
+    def r2f
+      num = self - ROffset
+      num.units = "R"
+      return num
+    end
+
+    def f2r
+      num = self + ROffset
+      num.units = "R"
+      return num
+    end
+
+    def c2r
+      num = self * CScale + (ROffset + FOffset)
+      num.units = "R"
+      return num
+    end
+
+    def k2r
+      num = self * CScale
+      num.units = "R"
+      return num
+    end
+
     # Compute the dewpoint for the temperature given a relative
     # humidity.  This is using the NOAA approximation for dewpoint
     # calculation -
@@ -116,7 +159,7 @@ class Numeric
     # not specified.  Valid values are "C", "F", or "K" (R is not
     # currently support... no one really uses that anyway).
     def units
-        if @units
+        if defined?(@units) && @units
             return @units
         else
             # this should auto detect the env, but for now, I live in the US
@@ -125,7 +168,7 @@ class Numeric
     end
         
     def units=(units)
-        if units =~ /^(C|F|K)/
+        if units =~ /^(C|F|K|R)/
             @units = units
         end
         return @units

data/lib/temperature/string.rb

@@ -11,11 +11,11 @@ class String
     # be C, K, or F, and not have a space between the numer and the
     # units
     def to_degrees
-        if self =~ /^(-?)(\d+)\.(\d+)(F|C|K)$/
+        if self =~ /^(-?)(\d+)\.(\d+)(F|C|K|R)$/
             tmp = "#{$1}#{$2}.#{$3}".to_f
             tmp.units = $4
             return tmp
-        elsif self =~ /^(-?)(\d+)(F|C|K)$/
+        elsif self =~ /^(-?)(\d+)(F|C|K|R)$/
             tmp = "#{$1}#{$2}".to_f
             tmp.units = $3
             return tmp

data/test/test_convert.rb

@@ -35,16 +35,29 @@ class ConversionTest < Test::Unit::TestCase
         end
     end
 
+    def test_from_string_R
+      numbers = [32.1, 23, -14.1, -7]
+      numbers.each do |num|
+        temp = "#{num}R".to_degrees
+        assert_kind_of(Numeric, temp)
+        assert_equal(temp, num)
+        assert_equal(temp.units, "R")
+        assert(temp.is_R?)
+      end
+    end
+
     def test_convert
         f = [32.0, 212.0, -40.0, 32, 212, -40]
         c = [0.0, 100.0, -40.0, 0, 100, -40]
         k = [273.15, 373.15, 233.15, 273.15, 373.15, 233.15]
+        r = [491.67, 671.67, 419.67, 491.67, 671.67, 419.67]
         
         f.each_with_index do |n, i|
             temp = "#{n}F".to_degrees
             assert_in_delta(temp.to_C, c[i], 0.00001)
             assert_in_delta(temp.to_F, f[i], 0.00001)
             assert_in_delta(temp.to_K, k[i], 0.00001)
+            assert_in_delta(temp.to_R, r[i], 0.00001)
         end
 
         c.each_with_index do |n, i|
@@ -52,6 +65,7 @@ class ConversionTest < Test::Unit::TestCase
             assert_in_delta(temp.to_C, c[i], 0.00001)
             assert_in_delta(temp.to_F, f[i], 0.00001)
             assert_in_delta(temp.to_K, k[i], 0.00001)
+            assert_in_delta(temp.to_R, r[i], 0.00001)
         end
 
         k.each_with_index do |n, i|
@@ -59,6 +73,7 @@ class ConversionTest < Test::Unit::TestCase
             assert_in_delta(temp.to_C, c[i], 0.00001)
             assert_in_delta(temp.to_F, f[i], 0.00001)
             assert_in_delta(temp.to_K, k[i], 0.00001)
+            assert_in_delta(temp.to_R, r[i], 0.00001)
         end
     end
     

data/test/test_num.rb

@@ -17,12 +17,14 @@ class NumTest < Test::Unit::TestCase
         f = [32.0, 212.0, -40.0, 32, 212, -40]
         c = [0.0, 100.0, -40.0, 0, 100, -40]
         k = [273.15, 373.15, 233.15, 273.15, 373.15, 233.15]
+        r = [491.67, 671.67, 419.67, 491.67, 671.67, 419.67]
         
         f.each_with_index do |n, i|
             temp = n
             assert_in_delta(temp.to_C, c[i], 0.00001)
             assert_in_delta(temp.to_F, f[i], 0.00001)
             assert_in_delta(temp.to_K, k[i], 0.00001)
+            assert_in_delta(temp.to_R, r[i], 0.00001)
         end
     end
 end

metadata

@@ -1,7 +1,12 @@
 --- !ruby/object:Gem::Specification 
 name: temperature
 version: !ruby/object:Gem::Version 
-  version: 1.1.1
+  hash: 11
+  prerelease: false
+  segments: 
+  - 1
+  - 2
+  version: "1.2"
 platform: ruby
 authors: 
 - Sean Dague
@@ -9,39 +14,57 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-03-13 23:00:00 -05:00
+date: 2010-11-01 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: rubyforge
-  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: 9
+        segments: 
+        - 2
+        - 0
+        - 3
         version: 2.0.3
-    version: 
+  type: :development
+  version_requirements: *id001
 - !ruby/object:Gem::Dependency 
   name: gemcutter
-  type: :development
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id002 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 19
+        segments: 
+        - 0
+        - 3
+        - 0
         version: 0.3.0
-    version: 
+  type: :development
+  version_requirements: *id002
 - !ruby/object:Gem::Dependency 
   name: hoe
-  type: :development
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id003 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 27
+        segments: 
+        - 2
+        - 5
+        - 0
         version: 2.5.0
-    version: 
+  type: :development
+  version_requirements: *id003
 description: |-
   Temperature makes it easy to deal with temperatures in Ruby, but
   adding mixin methods to numbers and strings.  
@@ -59,6 +82,7 @@ extra_rdoc_files:
 - History.txt
 - Manifest.txt
 - PostInstall.txt
+- README.rdoc
 files: 
 - COPYING
 - History.txt
@@ -89,21 +113,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: sdaguegems
-rubygems_version: 1.3.5
+rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
 summary: Temperature makes it easy to deal with temperatures in Ruby, but adding mixin methods to numbers and strings