ruby-units 1.4.2 → 1.4.3

data/CHANGELOG.txt

@@ -1,5 +1,12 @@
 Change Log for Ruby-units
 =========================
+2013-06-11  1.4.3   * Fix issue #70 -- Support passing Time objects to Time.at
+                    * Fix issue #72 -- Remove non-existent RakeFile from gemspec
+                    * Fix issue #71 -- Fix YAML test failure
+                    * Fix issue #49 -- Unit instances constructed using other Unit instances are incompatible within the framework
+                    * Fix issue #61 -- Fix failing case of subtraction losing Units class
+                    * Fix issue #63 -- fixes an issue with to_date on 1.8.7
+                    * Fix issue #64 -- Aliases aren't considered in Unit.defined? method
 2012-09-16  1.4.2   * Fix issue #54 -- pluralization of fluid-ounces
                     * Fix issue #53, 51 -- incorrect definition for gee
                     * Fix issue #52 -- add support for degree symbol

data/README.md

@@ -1,6 +1,6 @@
 # Ruby Units
 
-[![Dependency Status](https://gemnasium.com/olbrich/ruby-units.png)](https://gemnasium.com/olbrich/ruby-units)
+[![Build Status](https://secure.travis-ci.org/olbrich/ruby-units.png)](http://travis-ci.org/olbrich/ruby-units)
 
 Kevin C. Olbrich, Ph.D. 
 
@@ -170,4 +170,4 @@ This is useful for changing display names, adding aliases, etc.
     Unit.redefine!("cup") do |cup|
       cup.display_name  = "cup"
     end
-  
+  

data/VERSION

@@ -1 +1 @@
-1.4.2
+1.4.3

data/lib/ruby_units/time.rb

@@ -16,6 +16,8 @@ class Time
   # @return [Unit, Time]
   def self.at(arg,ms=0)
     case arg
+    when Time
+      unit_time_at(arg)
     when Unit
       unit_time_at(arg.convert_to("s").scalar, ms)
     else
@@ -29,14 +31,10 @@ class Time
   end
   alias :unit :to_unit
   alias :u :to_unit
-  
-  unless Time.instance_methods.include?(:to_date)
+
+  unless Time.public_method_defined?(:to_date)
     # :nocov_19:
-    # @return [Date]
-    def to_date
-      x=(Date.civil(1970,1,1)+((self.to_f+self.gmt_offset)/86400.0)-0.5)
-      Date.civil(x.year, x.month, x.day)
-    end
+    public :to_date
     # :nocov_19:
   end
   

data/lib/ruby_units/unit.rb

@@ -1,3 +1,4 @@
+# encoding: utf-8
 require 'date'
 if RUBY_VERSION < "1.9"
   # :nocov_19:
@@ -150,7 +151,7 @@ class Unit < Numeric
   # @param [String] unit
   # @return [Boolean]
   def self.defined?(unit)
-    return @@UNIT_VALUES.keys.include?("<#{unit}>")
+    self.definitions.values.any? {|d| d.aliases.include?(unit)}
   end
 
   # return the unit definition for a unit
@@ -249,7 +250,7 @@ class Unit < Numeric
   end
 
   # Used to copy one unit to another
-  # @param [Unit] from Unit to copy defintion from
+  # @param [Unit] from Unit to copy definition from
   # @return [Unit]
   def copy(from)
     @scalar      = from.scalar
@@ -312,7 +313,7 @@ class Unit < Numeric
     @base_scalar = nil
     @unit_name   = nil
     @signature   = nil
-    @output      = {}
+    @output      = { }
     raise ArgumentError, "Invalid Unit Format" if options[0].nil?
     if options.size == 2
       # options[0] is the scalar
@@ -338,31 +339,34 @@ class Unit < Numeric
     end
 
     case options[0]
-    when Hash
-      @scalar      = options[0][:scalar] || 1
-      @numerator   = options[0][:numerator] || UNITY_ARRAY
-      @denominator = options[0][:denominator] || UNITY_ARRAY
-      @signature   = options[0][:signature]
-    when Array
-      initialize(*options[0])
-      return
-    when Numeric
-      @scalar = options[0]
-      @numerator = @denominator = UNITY_ARRAY
-    when Time
-      @scalar = options[0].to_f
-      @numerator = ['<second>']
-      @denominator = UNITY_ARRAY
-    when DateTime, Date
-      @scalar = options[0].ajd
-      @numerator = ['<day>']
-      @denominator = UNITY_ARRAY
-    when /^\s*$/
-      raise ArgumentError, "No Unit Specified"
-    when String
-      parse(options[0])
-    else
-      raise ArgumentError, "Invalid Unit Format"
+      when Unit
+        copy(options[0])
+        return
+      when Hash
+        @scalar      = options[0][:scalar] || 1
+        @numerator   = options[0][:numerator] || UNITY_ARRAY
+        @denominator = options[0][:denominator] || UNITY_ARRAY
+        @signature   = options[0][:signature]
+      when Array
+        initialize(*options[0])
+        return
+      when Numeric
+        @scalar    = options[0]
+        @numerator = @denominator = UNITY_ARRAY
+      when Time
+        @scalar      = options[0].to_f
+        @numerator   = ['<second>']
+        @denominator = UNITY_ARRAY
+      when DateTime, Date
+        @scalar      = options[0].ajd
+        @numerator   = ['<day>']
+        @denominator = UNITY_ARRAY
+      when /^\s*$/
+        raise ArgumentError, "No Unit Specified"
+      when String
+        parse(options[0])
+      else
+        raise ArgumentError, "Invalid Unit Format"
     end
     self.update_base_scalar
     raise ArgumentError, "Temperatures must not be less than absolute zero" if self.is_temperature? &&  self.base_scalar < 0
@@ -733,7 +737,11 @@ class Unit < Numeric
       when Unit
         case
         when self.zero?
-          -other.dup
+          if other.zero?
+            other.dup * -1 # preserve Units class
+          else
+            -other.dup
+          end
         when self =~ other
           case
             when [self, other].all? {|x| x.is_temperature?}
@@ -1102,10 +1110,18 @@ class Unit < Numeric
     return Unit.new(@scalar.floor, @numerator, @denominator)
   end
 
-  # @return [Numeric,Unit]
-  def round(ndigits = 0)
-    return @scalar.round(ndigits) if self.unitless?
-    return Unit.new(@scalar.round(ndigits), @numerator, @denominator)
+  if RUBY_VERSION < '1.9'
+    # @return [Numeric,Unit]
+    def round
+      return @scalar.round if self.unitless?
+      return Unit.new(@scalar.round, @numerator, @denominator)
+    end
+  else
+    # @return [Numeric,Unit]
+    def round(ndigits = 0)
+      return @scalar.round(ndigits) if self.unitless?
+      return Unit.new(@scalar.round(ndigits), @numerator, @denominator)
+    end
   end
 
   # @return [Numeric, Unit]
@@ -1367,8 +1383,7 @@ class Unit < Numeric
     if unit_string =~ /\$\s*(#{NUMBER_REGEX})/
       unit_string = "#{$1} USD"
     end
-
-    unit_string.gsub!("\xC2\xB0".force_encoding('utf-8'), 'deg') unless RUBY_VERSION < '1.9'
+    unit_string.gsub!("\u00b0".force_encoding('utf-8'), 'deg') if RUBY_VERSION >= '1.9' && unit_string.encoding == Encoding::UTF_8
 
     unit_string.gsub!(/%/,'percent')
     unit_string.gsub!(/'/,'feet')
@@ -1572,5 +1587,5 @@ class Unit < Numeric
       @@UNIT_REGEX    = nil #invalidate the unit regex
     end
   end
-  
-end
+
+end

data/ruby-units.gemspec

@@ -1,15 +1,15 @@
 # Generated by jeweler
 # DO NOT EDIT THIS FILE DIRECTLY
-# Instead, edit Jeweler::Tasks in RakeFile, and run 'rake gemspec'
+# Instead, edit Jeweler::Tasks in Rakefile.rb, and run 'rake gemspec'
 # -*- encoding: utf-8 -*-
 
 Gem::Specification.new do |s|
   s.name = "ruby-units"
-  s.version = "1.4.2"
+  s.version = "1.4.3"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Kevin Olbrich, Ph.D."]
-  s.date = "2012-09-16"
+  s.date = "2013-06-12"
   s.description = "Provides classes and methods to perform unit math and conversions"
   s.email = ["kevin.olbrich+ruby_units@gmail.com"]
   s.extra_rdoc_files = [
@@ -21,7 +21,7 @@ Gem::Specification.new do |s|
     "CHANGELOG.txt",
     "LICENSE.txt",
     "README.md",
-    "RakeFile",
+    "Rakefile.rb",
     "TODO",
     "VERSION",
     "lib/ruby-units.rb",
@@ -48,7 +48,7 @@ Gem::Specification.new do |s|
   s.licenses = ["MIT"]
   s.post_install_message = "====================\nDeprecation Warning\n====================\n\nSeveral convenience methods that ruby-units added to the string class have\nbeen deprecated in this release.  These methods include String#to, String#from, String#ago, String#before and others.\nIf your code relies on these functions, they can be added back by adding this line to your code.\n\nrequire 'ruby-units/string/extras'\n# note that these methods do not play well with Rails, which is one of the reasons they are being removed.\n\nThe extra functions mostly work the same, but will no longer properly handle cases when they are called with strings..\n\n'min'.from(\"4-1-2011\") # => Exception\n\nPass in a Date, Time, or DateTime object to get the expected result.\n\nThey will go away completely in the next release, so it would be a good idea to refactor your code\nto avoid using them.  They will also throw deprecation warnings when they are used.\n"
   s.require_paths = ["lib"]
-  s.rubygems_version = "1.8.24"
+  s.rubygems_version = "1.8.25"
   s.summary = "A class that performs unit conversions and unit math"
 
   if s.respond_to? :specification_version then
@@ -56,29 +56,14 @@ Gem::Specification.new do |s|
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
       s.add_development_dependency(%q<bundler>, ["~> 1.0"])
-      s.add_development_dependency(%q<rcov>, [">= 0"])
-      s.add_development_dependency(%q<simplecov>, [">= 0"])
-      s.add_development_dependency(%q<simplecov-html>, [">= 0"])
       s.add_development_dependency(%q<jeweler>, [">= 0"])
-      s.add_development_dependency(%q<rspec>, ["~> 2.5"])
-      s.add_development_dependency(%q<autotest>, [">= 0"])
     else
       s.add_dependency(%q<bundler>, ["~> 1.0"])
-      s.add_dependency(%q<rcov>, [">= 0"])
-      s.add_dependency(%q<simplecov>, [">= 0"])
-      s.add_dependency(%q<simplecov-html>, [">= 0"])
       s.add_dependency(%q<jeweler>, [">= 0"])
-      s.add_dependency(%q<rspec>, ["~> 2.5"])
-      s.add_dependency(%q<autotest>, [">= 0"])
     end
   else
     s.add_dependency(%q<bundler>, ["~> 1.0"])
-    s.add_dependency(%q<rcov>, [">= 0"])
-    s.add_dependency(%q<simplecov>, [">= 0"])
-    s.add_dependency(%q<simplecov-html>, [">= 0"])
     s.add_dependency(%q<jeweler>, [">= 0"])
-    s.add_dependency(%q<rspec>, ["~> 2.5"])
-    s.add_dependency(%q<autotest>, [">= 0"])
   end
 end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ruby-units
 version: !ruby/object:Gem::Version
-  version: 1.4.2
+  version: 1.4.3
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-09-16 00:00:00.000000000 Z
+date: 2013-06-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -27,54 +27,6 @@ dependencies:
     - - ~>
       - !ruby/object:Gem::Version
         version: '1.0'
-- !ruby/object:Gem::Dependency
-  name: rcov
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: simplecov
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: simplecov-html
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
 - !ruby/object:Gem::Dependency
   name: jeweler
   requirement: !ruby/object:Gem::Requirement
@@ -91,38 +43,6 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: rspec
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '2.5'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '2.5'
-- !ruby/object:Gem::Dependency
-  name: autotest
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
 description: Provides classes and methods to perform unit math and conversions
 email:
 - kevin.olbrich+ruby_units@gmail.com
@@ -136,7 +56,7 @@ files:
 - CHANGELOG.txt
 - LICENSE.txt
 - README.md
-- RakeFile
+- Rakefile.rb
 - TODO
 - VERSION
 - lib/ruby-units.rb
@@ -210,7 +130,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -3013548990298419513
+      hash: -240639428179076096
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -219,7 +139,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.24
+rubygems_version: 1.8.25
 signing_key: 
 specification_version: 3
 summary: A class that performs unit conversions and unit math