@@ -1,119 +1,54 @@ require File.expand_path(File.dirname(__FILE__) + '/spec_helper') -describe "Fractional", "to_f" do - - it "should parse '1/2' to 0.5" do - Fractional.to_f('1/2').should == 0.5 - end - - it "should parse '1 2/4' to 1.5" do - Fractional.to_f('1 2/4').should == 1.5 - end - - it "should parse '1.5' to 1.5" do - Fractional.to_f('1.5').should == 1.5 - end +describe "Fractional" do - it "should parse 1.5 to 1.5" do - Fractional.to_f(1.5).should == 1.5 - end - - it "should parse '1100 7/8' to 1100.875" do - Fractional.to_f("1100 7/8").should == 1100.875 - end - - it "should allow for negative mixed fractions" do - Fractional.to_f('-10 1/2').should == -10.5 - end - - it "should allow for negative single fractions" do - Fractional.to_f("-1/64").should == -0.015625 + it "should create a fractional object from a string" do + one_half = Fractional.new("1/2") end - -end -describe "Fractional", "to_s" do - - it "should return 0.5 as '1/2'" do - Fractional.to_s(0.5).should == '1/2' - end - - it "should return 1.5 as '1 1/2'" do - Fractional.to_s(1.5).should == '1 1/2' - end - - it "should parse 1100.875 to '1100 7/8'" do - Fractional.to_s(1100.875).should == "1100 7/8" + it "should create a fractional object from a string" do + one_half = Fractional.new("1/2") end - it "should not have a fraction if it's just a whole number" do - Fractional.to_s(1100).should == "1100" - end - - it "should round if passed 'to nearest'" do - Fractional.to_s(1100.14285714286, :to_nearest => "1/64").should == "1100 9/64" - end - - it "should round if passed 'to_nearest' that is a float" do - Fractional.to_s(1100.14285714286, :to_nearest => 0.015625).should == "1100 9/64" + it "should create a fractional object from a string" do + one_half = Fractional.new("1/2") end - it "should round if passed 'to_nearest' and is a simple fraction" do - Fractional.to_s(0.14285714286, :to_nearest => "1/64").should == "9/64" + it "should convert fractional to string" do + one_half = Fractional.new("1/2") + one_half.to_s.should == "1/2" end - it "should round if passed 'to_nearest' that rounds to nearest whole number" do - Fractional.to_s(1100.875, :to_nearest => "1/2").should == "1101" - Fractional.to_s(1100.2, :to_nearest => "1/2").should == "1100" + it "should convert fractional to float" do + one_half = Fractional.new("1/2") + one_half.to_f.should == 0.5 end - it "should allow for negative values for mixed fractions" do - Fractional.to_s(-1100.875).should == "-1100 7/8" - end - - it "should allow for negative values for single fractions" do - Fractional.to_s(-0.875).should == "-7/8" - end - - it "should allow for negative mixed fractions that that are rounded" do - Fractional.to_s(-101.140625, :to_nearest => "1/64").should == "-101 9/64" - end - - it "should allow for negative single fractions that that are rounded" do - Fractional.to_s(-0.140625, :to_nearest => "1/64").should == "-9/64" - end - - -end - -describe "Fractional", "round" do - - it "should round 0.142857142857143 to nearest 1/64th as 0.140625" do - Fractional.round_to_nearest_fraction(0.142857142857143, "1/64").should == 0.140625 + it "should add two fractionals together" do + one_half = Fractional.new("1/2") + another_one_half = Fractional.new("1/2") + + (one_half + another_one_half).to_f.should == 1.0 end - it "should round '1/7' to nearest 1/64th as '9/64'" do - Fractional.round_to_nearest_fraction('1/7', "1/64").should == '9/64' - end - - it "should round 0.125 to nearest 1/64th as 0.125" do - Fractional.round_to_nearest_fraction(0.125, "1/64").should == 0.125 + it "should minus a fractional from another fractional" do + one_and_a_half = Fractional.new("1 1/2") + one_quarter = Fractional.new("1/4") + + (one_and_a_half - one_quarter).to_f.should == 1.25 end - it "should round '1100 1/7' to nearest 1/64th as '1100 9/64'" do - Fractional.round_to_nearest_fraction('1100 1/7', "1/64").should == '1100 9/64' - end - - it "should round 1100.142857142857143 to nearest 1/64th as 1100.140625" do - Fractional.round_to_nearest_fraction(1100.142857142857143, "1/64").should == 1100.140625 - end - - it "should round if passed 'to_nearest' that rounds to nearest whole number" do - Fractional.round_to_nearest_fraction(1100.875, "1/2").should == 1101 - Fractional.round_to_nearest_fraction(1100.1, "1/2").should == 1100 + it "should multiply 2 fractionals together" do + first_fraction = Fractional.new("1 7/8") + second_fraction = Fractional.new("11 15/64") + + (first_fraction * second_fraction).to_f.should == 21.064453125 end - it "should round if passed a float" do - Fractional.round_to_nearest_fraction(1100.875, 0.5).should == 1101 + it "should divide 2 fractionals together" do + first_fraction = Fractional.new("1 7/8") + second_fraction = Fractional.new("21 33/512") + + (second_fraction / first_fraction).to_s.should == "11 15/64" end -end +end \ No newline at end of file spec/fractional_spec.rb spec/fractional_spec.rb.rb 2aef1a00433194e76366149770c49eed809705bb Chris O'Sullivan thechrisoshow@gmail.com http://github.com/thechrisoshow/fractional/commit/02adb359363b71aa6bc45f0940d587eb4e7a8d47 02adb359363b71aa6bc45f0940d587eb4e7a8d47 2009-10-16T03:34:49-07:00 2009-10-16T03:34:49-07:00 Woops - renamed fractional_spec d2d65fd2a0e9067a63b729426035adb070445126 Chris O'Sullivan thechrisoshow@gmail.com