Merge branch 'remove_tests'

RakeFile

@@ -41,16 +41,6 @@ rescue LoadError
   puts "Jeweler (or a dependency) not available. Install it with: gem install jeweler"
 end
 
-begin
-  require 'rcov/rcovtask'
-  desc "Generate code coverage"
-  Rcov::RcovTask.new do |t|
-    t.test_files = FileList['test/test*.rb']
-    #t.verbose = true     # uncomment to see the executed command
-  end
-rescue LoadError
-end
-
 begin
   require 'simplecov'
   desc "code coverage report using simplecov (ruby 1.9+)"
@@ -79,41 +69,23 @@ begin
 rescue LoadError
 end
 
-
-desc "Run unit tests"
-Rake::TestTask.new do |t|
-  t.libs << "test"
-  t.test_files = FileList['test/test*.rb']
-end
-
 task :specs => :spec
 
-desc "Run tests against several ruby versions, requires rvm"
-task :multitest do
-  rubies = %w{
-      ruby-1.8.7-p352@ruby-units
-      ruby-1.8.7-p352@ruby-units-with-chronic
-      ruby-1.9.2-p290@ruby-units
-      ruby-1.9.2-p290@ruby-units-with-chronic
-      rbx-head@ruby-units
-      jruby-1.6.5@ruby-units
-      }
-  exec "rvm #{rubies.join(',')} do rake tests"
+rubies = {
+      "ruby-1.8.7" => %w{ruby-1.8.7-p357@ruby-units ruby-1.8.7-p357@ruby-units-with-chronic},
+      "ruby-1.9.2" => %w{ruby-1.9.2-p290@ruby-units ruby-1.9.2-p290@ruby-units-with-chronic},
+      "rbx"        => %w{rbx-head@ruby-units},
+      "jruby"      => %w{jruby-1.6.5.1@ruby-units}
+    }
+
+rubies.each do |name, ruby|
+  desc "Run Spec against #{name}"
+  task "spec:#{name}" do
+    sh "rvm #{ruby.join(',')} do rake spec"
+  end
 end
 
 desc "Run specs against several ruby versions, requires rvm"
-task :multispec do
-  rubies = %w{
-      ruby-1.8.7-p352@ruby-units
-      ruby-1.8.7-p352@ruby-units-with-chronic
-      ruby-1.9.2-p290@ruby-units
-      ruby-1.9.2-p290@ruby-units-with-chronic
-      rbx-head@ruby-units
-      jruby-1.6.5@ruby-units
-      }
-  exec "rvm #{rubies.join(',')} do rake spec"
-end
-
-task :default => :test
+task "spec:all" => rubies.keys.map {|name| "spec:#{name}"}
 
-task :tests => :test
+task :default => :spec

lib/ruby_units/unit.rb

@@ -427,10 +427,6 @@ def to_unit
   # @return [Boolean]
   def is_base?
     return @is_base if defined? @is_base
-    # return @is_base = true if self.degree? && 
-    #                           self.numerator.size == 1 && 
-    #                           self.denominator == UNITY_ARRAY && 
-    #                           self.units =~ /(?:deg|temp)K/
     @is_base = (@numerator + @denominator).compact.uniq.
                                             map {|unit| Unit.definition(unit)}.
                                             all? {|element| element.unity? || element.base? }

spec/ruby-units/cache_spec.rb

@@ -0,0 +1,31 @@
+require File.dirname(__FILE__) + '/../spec_helper'
+
+describe Unit::Cache do
+  subject { Unit::Cache }
+  let(:unit) { Unit('1 m') }
+
+  before(:each) do
+    subject.clear
+    subject.set("m", unit)
+  end
+
+  context ".clear" do    
+    it "should clear the cache" do
+      subject.clear
+      subject.get('m').should be_nil
+    end
+  end
+
+  context ".get" do
+    it "should retrieve values already in the cache" do
+      subject.get['m'].should == unit
+    end
+  end
+
+  context ".set" do
+    it "should put a unit into the cache" do
+      subject.set('kg', Unit('1 kg'))
+      subject.get['kg'].should == Unit('1 kg')
+    end
+  end
+end

spec/ruby-units/definition_spec.rb

@@ -12,7 +12,7 @@
   its(:name)          {should == "<eV>"}
   its(:aliases)       {should == %w{eV electron-volt}}
   its(:scalar)        {should == 1.602E-19}
-  its(:numerator)     {should == %w{<kilogram> <meter> <meter>}}
-  its(:denominator)   {should == %w{<second> <second>}}
+  its(:numerator)     {should include("<kilogram>", "<meter>", "<meter>")}
+  its(:denominator)   {should include("<second>", "<second>")}
   its(:display_name)  {should == "electron-volt"}
 end

spec/ruby-units/math_spec.rb

@@ -1,24 +1,25 @@
 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 }
+
+  describe "#sqrt" do
+    specify { Math.sqrt(Unit('1 mm^6')).should == Unit('1 mm^3') }
     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.sqrt(Unit("-9 mm^2")).should be_kind_of(Complex) }
+  end
+
+  if RUBY_VERSION > "1.9"
+  # cbrt is only defined in Ruby > 1.9
+    describe '#cbrt' do
+      specify { Math.cbrt(Unit('1 mm^6')).should == Unit('1 mm^2') }
       specify { Math.cbrt(8).should == 2 }
     end
-
   end
-  
+
   context "Trigonometry functions" do
-    
+
     context "with '45 deg' unit" do
-      subject { "45 deg".unit }
+      subject { Unit("45 deg") }
       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) }
@@ -28,7 +29,7 @@
     end
 
     context "with 'PI/4 radians' unit" do
-      subject { (Math::PI/4).unit('radians') }
+      subject { Unit((Math::PI/4),'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) }
@@ -47,17 +48,14 @@
       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.hypot(Unit("1 m"), Unit("2 m")).should be_within(Unit("0.01 m")).of(Unit("2.23607 m")) }
+    specify { Math.hypot(Unit("1 m"), Unit("2 ft")).should be_within(Unit("0.01 m")).of(Unit("1.17116 m")) }
+    specify { Math.hypot(3,4).should == 5}
+    specify { expect {Math.hypot(Unit("1 m"), Unit("2 lbs")) }.to raise_error(ArgumentError) }
+
+    specify { Math.atan2(Unit("1 m"), Unit("2 m")).should be_within(0.01).of(0.4636476090008061) }
+    specify { Math.atan2(Unit("1 m"), Unit("2 ft")).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) }
-
+    specify { expect {Math.atan2(Unit("1 m"), Unit("2 lbs"))}.to raise_error(ArgumentError) }
   end
-
-
-
 end

spec/ruby-units/range_spec.rb

@@ -0,0 +1,16 @@
+require File.dirname(__FILE__) + '/../spec_helper'
+
+describe "Range" do
+
+  context "of integer units" do
+    subject { (Unit('1 mm')..Unit('3 mm')) }
+    it { should include(Unit('2 mm')) }
+    its(:to_a) { should == [ Unit('1 mm'), Unit('2 mm'), Unit('3 mm') ] }
+  end
+
+  context "of floating point units" do
+    subject { (Unit('1.5 mm')..Unit('3.5 mm')) }
+    it { should include(Unit('2.0 mm')) }
+    specify { expect { subject.to_a }.to raise_exception(ArgumentError)}
+  end
+end