ruby-units 1.3.2 → 1.4.0

data/lib/ruby_units/version.rb

@@ -1,4 +1,5 @@
 class Unit < Numeric
+  # Pull the version number from the VERSION file
   module Version
     STRING = File.read(File.dirname(__FILE__) + "/../../VERSION")
   end

data/ruby-units.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "ruby-units"
-  s.version = "1.3.2"
+  s.version = "1.4.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Kevin Olbrich, Ph.D."]
-  s.date = "2011-11-21"
+  s.date = "2012-01-02"
   s.description = "Provides classes and methods to perform unit math and conversions"
   s.email = ["kevin.olbrich+ruby_units@gmail.com"]
   s.extra_rdoc_files = [
@@ -19,19 +19,17 @@ Gem::Specification.new do |s|
   ]
   s.files = [
     "CHANGELOG.txt",
-    "Gemfile",
     "LICENSE.txt",
-    "Manifest.txt",
     "README.md",
     "RakeFile",
     "TODO",
     "VERSION",
-    "autotest/discover.rb",
     "lib/ruby-units.rb",
     "lib/ruby_units.rb",
     "lib/ruby_units/array.rb",
     "lib/ruby_units/cache.rb",
     "lib/ruby_units/date.rb",
+    "lib/ruby_units/definition.rb",
     "lib/ruby_units/fixnum.rb",
     "lib/ruby_units/math.rb",
     "lib/ruby_units/numeric.rb",
@@ -41,24 +39,15 @@ Gem::Specification.new do |s|
     "lib/ruby_units/time.rb",
     "lib/ruby_units/unit.rb",
     "lib/ruby_units/unit_definitions.rb",
+    "lib/ruby_units/unit_definitions/base.rb",
+    "lib/ruby_units/unit_definitions/prefix.rb",
+    "lib/ruby_units/unit_definitions/standard.rb",
     "lib/ruby_units/version.rb",
-    "ruby-units.gemspec",
-    "spec/ruby-units/array_spec.rb",
-    "spec/ruby-units/complex_spec.rb",
-    "spec/ruby-units/date_spec.rb",
-    "spec/ruby-units/math_spec.rb",
-    "spec/ruby-units/numeric_spec.rb",
-    "spec/ruby-units/object_spec.rb",
-    "spec/ruby-units/string/extra_spec.rb",
-    "spec/ruby-units/string_spec.rb",
-    "spec/ruby-units/time_spec.rb",
-    "spec/ruby-units/unit_spec.rb",
-    "spec/spec_helper.rb",
-    "test/test_cache.rb",
-    "test/test_ruby-units.rb"
+    "ruby-units.gemspec"
   ]
   s.homepage = "https://github.com/olbrich/ruby-units"
-  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 probably go away completely in an upcoming 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.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.10"
   s.summary = "A class that performs unit conversions and unit math"
@@ -69,6 +58,8 @@ 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"])
@@ -77,6 +68,8 @@ Gem::Specification.new do |s|
     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"])
@@ -86,6 +79,8 @@ Gem::Specification.new do |s|
   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"])

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ruby-units
 version: !ruby/object:Gem::Version
-  version: 1.3.2
+  version: 1.4.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-11-21 00:00:00.000000000Z
+date: 2012-01-02 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &2153419120 !ruby/object:Gem::Requirement
+  requirement: &2157320760 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,10 +21,10 @@ dependencies:
         version: '1.0'
   type: :development
   prerelease: false
-  version_requirements: *2153419120
+  version_requirements: *2157320760
 - !ruby/object:Gem::Dependency
   name: rcov
-  requirement: &2153418640 !ruby/object:Gem::Requirement
+  requirement: &2157320240 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,32 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2153418640
+  version_requirements: *2157320240
+- !ruby/object:Gem::Dependency
+  name: simplecov
+  requirement: &2157319660 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: *2157319660
+- !ruby/object:Gem::Dependency
+  name: simplecov-html
+  requirement: &2157319100 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: *2157319100
 - !ruby/object:Gem::Dependency
   name: jeweler
-  requirement: &2153418060 !ruby/object:Gem::Requirement
+  requirement: &2157318340 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +65,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2153418060
+  version_requirements: *2157318340
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &2153417460 !ruby/object:Gem::Requirement
+  requirement: &2157317580 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -54,10 +76,10 @@ dependencies:
         version: '2.5'
   type: :development
   prerelease: false
-  version_requirements: *2153417460
+  version_requirements: *2157317580
 - !ruby/object:Gem::Dependency
   name: autotest
-  requirement: &2153416880 !ruby/object:Gem::Requirement
+  requirement: &2157316680 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,10 +87,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2153416880
+  version_requirements: *2157316680
 - !ruby/object:Gem::Dependency
   name: autotest-growl
-  requirement: &2153416340 !ruby/object:Gem::Requirement
+  requirement: &2157316020 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,10 +98,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2153416340
+  version_requirements: *2157316020
 - !ruby/object:Gem::Dependency
   name: autotest-fsevent
-  requirement: &2153415780 !ruby/object:Gem::Requirement
+  requirement: &2157315280 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -87,7 +109,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2153415780
+  version_requirements: *2157315280
 description: Provides classes and methods to perform unit math and conversions
 email:
 - kevin.olbrich+ruby_units@gmail.com
@@ -99,19 +121,17 @@ extra_rdoc_files:
 - TODO
 files:
 - CHANGELOG.txt
-- Gemfile
 - LICENSE.txt
-- Manifest.txt
 - README.md
 - RakeFile
 - TODO
 - VERSION
-- autotest/discover.rb
 - lib/ruby-units.rb
 - lib/ruby_units.rb
 - lib/ruby_units/array.rb
 - lib/ruby_units/cache.rb
 - lib/ruby_units/date.rb
+- lib/ruby_units/definition.rb
 - lib/ruby_units/fixnum.rb
 - lib/ruby_units/math.rb
 - lib/ruby_units/numeric.rb
@@ -121,23 +141,14 @@ files:
 - lib/ruby_units/time.rb
 - lib/ruby_units/unit.rb
 - lib/ruby_units/unit_definitions.rb
+- lib/ruby_units/unit_definitions/base.rb
+- lib/ruby_units/unit_definitions/prefix.rb
+- lib/ruby_units/unit_definitions/standard.rb
 - lib/ruby_units/version.rb
 - ruby-units.gemspec
-- spec/ruby-units/array_spec.rb
-- spec/ruby-units/complex_spec.rb
-- spec/ruby-units/date_spec.rb
-- spec/ruby-units/math_spec.rb
-- spec/ruby-units/numeric_spec.rb
-- spec/ruby-units/object_spec.rb
-- spec/ruby-units/string/extra_spec.rb
-- spec/ruby-units/string_spec.rb
-- spec/ruby-units/time_spec.rb
-- spec/ruby-units/unit_spec.rb
-- spec/spec_helper.rb
-- test/test_cache.rb
-- test/test_ruby-units.rb
 homepage: https://github.com/olbrich/ruby-units
-licenses: []
+licenses:
+- MIT
 post_install_message: ! '====================
 
   Deprecation Warning
@@ -170,8 +181,8 @@ post_install_message: ! '====================
   Pass in a Date, Time, or DateTime object to get the expected result.
 
 
-  They will probably go away completely in an upcoming release, so it would be a good
-  idea to refactor your code
+  They will go away completely in the next release, so it would be a good idea to
+  refactor your code
 
   to avoid using them.  They will also throw deprecation warnings when they are used.
 

data/Gemfile

@@ -1,12 +0,0 @@
-source "http://rubygems.org"
-
-group :development do
-  gem 'bundler', '~> 1.0'
-  gem 'rcov', :platforms => :mri_18
-  gem 'jeweler'
-  gem 'rspec', '~>2.5'
-  gem 'autotest', :platforms => [:mri_18, :mri_19]
-  gem 'autotest-growl', :platforms => [:mri_18, :mri_19]
-  gem 'autotest-fsevent', :platforms => [:mri_18, :mri_19]
-end
-

data/Manifest.txt

@@ -1,19 +0,0 @@
-CHANGELOG.txt
-Manifest.txt
-README.md
-LICENSE.txt
-Rakefile
-lib/ruby-units.rb
-lib/ruby_units.rb
-lib/ruby_units/units.rb
-lib/ruby_units/math.rb
-lib/ruby_units/date.rb
-lib/ruby_units/time.rb
-lib/ruby_units/string.rb
-lib/ruby_units/array.rb
-lib/ruby_units/numeric.rb
-lib/ruby_units/object.rb
-lib/ruby_units/array.rb
-lib/ruby_units/complex.rb
-lib/ruby_units/ruby-units.rb
-test/test_ruby-units.rb

data/autotest/discover.rb

@@ -1 +0,0 @@
-Autotest.add_discovery { "rspec2" }

data/spec/ruby-units/array_spec.rb

@@ -1,14 +0,0 @@
-require File.dirname(__FILE__) + '/../spec_helper'
-
-describe Array do
-  
-  subject { [1, 'cm'] }
-  
-  it {should be_kind_of Array}
-  it {should respond_to :to_unit}
-  
-  specify { subject.to_unit.should be_instance_of Unit}
-  specify { subject.to_unit.should == "1 cm".to_unit }
-  specify { subject.to_unit('mm').should == "10 mm".to_unit}
-  
-end

data/spec/ruby-units/complex_spec.rb

@@ -1,37 +0,0 @@
-require File.dirname(__FILE__) + '/../spec_helper'
-
-# Complex numbers are a bit strange
-# Technically you can't really compare them using <=>, and ruby 1.9 does not implement this method for them
-# so it stands to reason that complex units should also not support :> or :<
-
-describe Complex do
-  subject { Complex(1,1) }
-  it { should respond_to :to_unit }
-end
-
-describe "Complex Unit" do
-  subject { Complex(1.0, -1.0).to_unit }
-  
-  it { should be_instance_of Unit}
-  it(:scalar) { should be_kind_of Complex }
-
-  it { should == "1-1i".to_unit }
-  it { should === "1-1i".to_unit }
-
-  if RUBY_VERSION < "1.9"
-    context "in Ruby < 1.9" do
-      it "is comparable" do
-        subject.should > "1+0.5i".to_unit
-        subject.should < "2+1i".to_unit
-      end
-    end
-  else
-    context "in Ruby >= 1.9" do
-      it "is not comparable" do 
-        expect { subject > "1+1i".to_unit }.to raise_error(NoMethodError)
-        expect { subject < "1+1i".to_unit }.to raise_error(NoMethodError) 
-      end
-    end
-  end
-  
-end

data/spec/ruby-units/date_spec.rb

@@ -1,38 +0,0 @@
-require File.dirname(__FILE__) + '/../spec_helper'
-
-describe Date do
-  subject { Date.new(2011,4,1) }
-  
-  it {should be_instance_of Date}
-  it {should respond_to :to_unit}
-  it {should respond_to :to_time}
-  it {should respond_to :to_date}  
-  
-  specify { (subject + "5 days".unit).should == Date.new(2011,4,6) }
-  specify { (subject - "5 days".unit).should == Date.new(2011,3,27) }
-  # 2012 is a leap year...
-  specify { (subject + "1 year".unit).should == Date.new(2012,3,31) }
-  specify { (subject - "1 year".unit).should == Date.new(2010,4,1) }
-end
-
-describe "Date Unit" do
-
-  subject { Date.new(2011,4,1).to_unit }
-
-  it { should be_instance_of Unit }
-  its(:scalar) { should be_kind_of Rational }
-  its(:units) { should == "d" }
-  its(:kind) { should == :time }
-
-  specify { (subject + "5 days".unit).should == Date.new(2011,4,6) }
-  specify { (subject - "5 days".unit).should == Date.new(2011,3,27) }
-
-  specify { expect { subject + Date.new(2011,4,1) }.to raise_error(ArgumentError) }
-  specify { expect { subject + DateTime.new(2011,4,1,12,00,00) }.to raise_error(ArgumentError) }
-  specify { expect { subject + Time.parse("2011-04-01 12:00:00") }.to raise_error(ArgumentError) }
-
-  specify { (subject - Date.new(2011,4,1)).should be_zero }
-  specify { (subject - DateTime.new(2011,4,1,00,00,00)).should be_zero }
-  specify { expect {(subject - Time.parse("2011-04-01 00:00"))}.to raise_error(ArgumentError) }
-  specify { (Date.new(2011,4,1) + 1).should == Date.new(2011,4,2)}
-end

data/spec/ruby-units/math_spec.rb

@@ -1,63 +0,0 @@
-require File.dirname(__FILE__) + '/../spec_helper'
-
-describe Math do
-  context "with '1 mm^6'" do
-    subject { '1 mm^6'.to_unit }
-    
-    specify { Math.sqrt(subject).should == '1 mm^3'.to_unit }
-    specify { Math.sqrt(4).should == 2 }
-    
-    if RUBY_VERSION > "1.9"
-      # cbrt is only defined in Ruby > 1.9
-      specify { Math.cbrt(subject).should == '1 mm^2'.to_unit }
-      specify { Math.cbrt(8).should == 2 }
-    end
-
-  end
-  
-  context "Trigonometry functions" do
-    
-    context "with '45 deg' unit" do
-      subject { "45 deg".unit }
-      specify { Math.sin(subject).should be_within(0.01).of(0.70710678) }
-      specify { Math.cos(subject).should be_within(0.01).of(0.70710678) }
-      specify { Math.tan(subject).should be_within(0.01).of(1) }
-      specify { Math.sinh(subject).should be_within(0.01).of(0.8686709614860095) }
-      specify { Math.cosh(subject).should be_within(0.01).of(1.3246090892520057) }
-      specify { Math.tanh(subject).should be_within(0.01).of(0.6557942026326724) }
-    end
-
-    context "with 'PI/4 radians' unit" do
-      subject { (Math::PI/4).unit('radians') }
-      specify { Math.sin(subject).should be_within(0.01).of(0.70710678) }
-      specify { Math.cos(subject).should be_within(0.01).of(0.70710678) }
-      specify { Math.tan(subject).should be_within(0.01).of(1) }
-      specify { Math.sinh(subject).should be_within(0.01).of(0.8686709614860095) }
-      specify { Math.cosh(subject).should be_within(0.01).of(1.3246090892520057) }
-      specify { Math.tanh(subject).should be_within(0.01).of(0.6557942026326724) }
-    end
-
-    context "with 'PI/4' continues to work" do
-      subject { (Math::PI/4) }
-      specify { Math.sin(subject).should be_within(0.01).of(0.70710678) }
-      specify { Math.cos(subject).should be_within(0.01).of(0.70710678) }
-      specify { Math.tan(subject).should be_within(0.01).of(1) }
-      specify { Math.sinh(subject).should be_within(0.01).of(0.8686709614860095) }
-      specify { Math.cosh(subject).should be_within(0.01).of(1.3246090892520057) }
-      specify { Math.tanh(subject).should be_within(0.01).of(0.6557942026326724) }
-    end
-
-    specify { Math.hypot("1 m".unit, "2 m".unit).should be_within("0.01 m".unit).of("2.23607 m".unit) }
-    specify { Math.hypot("1 m".unit, "2 ft".unit).should be_within("0.01 m".unit).of("1.17116 m".unit) }
-    specify { expect {Math.hypot("1 m".unit, "2 lbs".unit) }.to raise_error(ArgumentError) }
-    
-    specify { Math.atan2("1 m".unit, "2 m".unit).should be_within(0.01).of(0.4636476090008061) }
-    specify { Math.atan2("1 m".unit, "2 ft".unit).should be_within(0.01).of(1.0233478888629426) }
-    specify { Math.atan2(1,1).should be_within(0.01).of(0.785398163397448)}
-    specify { expect {Math.atan2("1 m".unit, "2 lbs".unit)}.to raise_error(ArgumentError) }
-    
-  end
-  
-  
-  
-end