fractional 0.0.3 → 0.1.0

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: 1fef2bf465e3f0fb5a870268e07e3f5587d772bf
+  data.tar.gz: b1a895f28cc4138b09f7ef67570a18689a1771b3
+SHA512:
+  metadata.gz: 078854ddb0cb3b5aa76b2407fef374bef578e456ff9978da0a1794e37422fe12703a90ffa40a364040551f86354492273fc20aafa246672e999ef10cd9c32992
+  data.tar.gz: 34812c79b93d3f3b7ab1153e6cee209a17978906363d7ee3527f7e335fcee86c0c23eb3b7d3416f72e9eb14b5ef76833c27a144f64495444d72fc1cded18a135

data/.gitignore

@@ -1,5 +1,18 @@
-*.sw?
 .DS_Store
+*.gem
+*.rbc
+.bundle
+.config
+.yardoc
+Gemfile.lock
+InstalledFiles
+_yardoc
 coverage
-rdoc
+doc/
+lib/bundler/man
 pkg
+rdoc
+spec/reports
+test/tmp
+test/version_tmp
+tmp

data/Gemfile

@@ -0,0 +1,3 @@
+source "https://rubygems.org"
+
+gemspec

data/LICENSE

@@ -1,4 +1,6 @@
-Copyright (c) 2009 Chris O'Sullivan
+Copyright (c) 2013 Chris O'Sullivan
+
+MIT License
 
 Permission is hereby granted, free of charge, to any person obtaining
 a copy of this software and associated documentation files (the

data/README.rdoc

@@ -14,7 +14,7 @@ Round a value to the nearest fraction:
  Fractional.round_to_nearest_fraction(1100.142857142857143, "1/64") #=> 1100.140625
 
 == Note on Patches/Pull Requests
- 
+
 * Fork the project.
 * Make your feature addition or bug fix.
 * Add tests for it. This is important so I don't break it in a
@@ -24,8 +24,13 @@ Round a value to the nearest fraction:
 * Send me a pull request. Bonus points for topic branches.
 
 == Special thanks
-Thanks to Jannis Harder for his hardcore float to rational method I nicked from http://markmail.org/message/nqgrsmaixwbrvsno 
+Thanks to Jannis Harder for his hardcore float to rational method I nicked from http://markmail.org/message/nqgrsmaixwbrvsno
+
+= Contributors
+Joey Aghion https://github.com/joeyAghion
+muff1nman https://github.com/muff1nman
+
 
 == Copyright
 
-Copyright (c) 2009 Chris O'Sullivan. See LICENSE for details.
+Copyright (c) 2009-2013 Chris O'Sullivan. See LICENSE for details.

data/Rakefile

@@ -1,49 +1,7 @@
-require 'rubygems'
-require 'rake'
+require "bundler/gem_tasks"
 
-begin
-  require 'jeweler'
-  Jeweler::Tasks.new do |gem|
-    gem.name = "fractional"
-    gem.summary = %Q{Fractional is a Ruby library for parsing fractions}
-    gem.description = %Q{Fractional is a Ruby library for parsing fractions.}
-    gem.email = "thechrisoshow@gmail.com"
-    gem.homepage = "http://github.com/thechrisoshow/fractional"
-    gem.authors = ["Chris O'Sullivan"]
-    gem.add_development_dependency "rspec"
-    # gem is a Gem::Specification... see http://www.rubygems.org/read/chapter/20 for additional settings
-  end
-  Jeweler::GemcutterTasks.new
-rescue LoadError
-  puts "Jeweler (or a dependency) not available. Install it with: sudo gem install jeweler"
-end
+require "bundler/gem_tasks"
+require 'rspec/core/rake_task'
 
-require 'spec/rake/spectask'
-Spec::Rake::SpecTask.new(:spec) do |spec|
-  spec.libs << 'lib' << 'spec'
-  spec.spec_files = FileList['spec/**/*_spec.rb']
-end
-
-Spec::Rake::SpecTask.new(:rcov) do |spec|
-  spec.libs << 'lib' << 'spec'
-  spec.pattern = 'spec/**/*_spec.rb'
-  spec.rcov = true
-end
-
-task :spec => :check_dependencies
-
-task :default => :spec
-
-require 'rake/rdoctask'
-Rake::RDocTask.new do |rdoc|
-  if File.exist?('VERSION')
-    version = File.read('VERSION')
-  else
-    version = ""
-  end
-
-  rdoc.rdoc_dir = 'rdoc'
-  rdoc.title = "fractional #{version}"
-  rdoc.rdoc_files.include('README*')
-  rdoc.rdoc_files.include('lib/**/*.rb')
-end
+RSpec::Core::RakeTask.new(:spec)
+task default: :spec

data/VERSION

@@ -1 +1 @@
-0.0.3
+0.3.0

data/fractional.gemspec

@@ -1,53 +1,19 @@
-# Generated by jeweler
-# DO NOT EDIT THIS FILE
-# Instead, edit Jeweler::Tasks in Rakefile, and run `rake gemspec`
-# -*- encoding: utf-8 -*-
+Gem::Specification.new do |spec|
+  spec.name          = "fractional"
+  spec.version       = "0.1.0"
+  spec.authors       = ["Chris O'Sullivan"]
+  spec.email         = ["thechrisoshow@gmail.com"]
+  spec.description   = %q{Fractional is a Ruby library for parsing fractions.}
+  spec.summary       = %q{You can use fractional to convert decimal numbers to string representations of fractions. e.g: Fractional.to_s(1.5) #=> "1 1/2"}
+  spec.homepage      = "http://github.com/thechrisoshow/fractional"
+  spec.license       = "MIT"
 
-Gem::Specification.new do |s|
-  s.name = %q{fractional}
-  s.version = "0.0.3"
+  spec.files         = `git ls-files`.split($/)
+  spec.executables   = spec.files.grep(%r{^bin/}) { |f| File.basename(f) }
+  spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
+  spec.require_paths = ["lib"]
 
-  s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
-  s.authors = ["Chris O'Sullivan"]
-  s.date = %q{2009-10-14}
-  s.description = %q{Fractional is a Ruby library for parsing fractions.}
-  s.email = %q{thechrisoshow@gmail.com}
-  s.extra_rdoc_files = [
-    "LICENSE",
-     "README.rdoc"
-  ]
-  s.files = [
-    ".document",
-     ".gitignore",
-     "LICENSE",
-     "README.rdoc",
-     "Rakefile",
-     "VERSION",
-     "fractional.gemspec",
-     "lib/fractional.rb",
-     "spec/fractional_spec.rb",
-     "spec/spec_helper.rb"
-  ]
-  s.homepage = %q{http://github.com/thechrisoshow/fractional}
-  s.rdoc_options = ["--charset=UTF-8"]
-  s.require_paths = ["lib"]
-  s.rubygems_version = %q{1.3.5}
-  s.summary = %q{Fractional is a Ruby library for parsing fractions}
-  s.test_files = [
-    "spec/fractional_spec.rb",
-     "spec/spec_helper.rb"
-  ]
-
-  if s.respond_to? :specification_version then
-    current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
-    s.specification_version = 3
-
-    if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
-      s.add_development_dependency(%q<rspec>, [">= 0"])
-    else
-      s.add_dependency(%q<rspec>, [">= 0"])
-    end
-  else
-    s.add_dependency(%q<rspec>, [">= 0"])
-  end
+  spec.add_development_dependency "bundler", "~> 1.3"
+  spec.add_development_dependency "rake"
+  spec.add_development_dependency "rspec"
 end

data/lib/fractional.rb

@@ -1,15 +1,35 @@
 require 'rational'
 
-module Fractional
+class Fractional
+  SINGLE_FRACTION = /^\s*(\-?\d+)\/(\-?\d+)\s*$/
+  MIXED_FRACTION = /^\s*(\-?\d*)\s+(\d+)\/(\d+)\s*$/
+
+  def initialize(value)
+    @value = value
+  end
+
+  def to_s
+    @value
+  end
+
+  def to_f
+    Fractional.to_f(@value)
+  end
+
+  [:+, :-, :*, :/].each do |math_operator|
+    define_method(math_operator) do |another_fractional|
+      Fractional.new(Fractional.to_s(self.to_f.send(math_operator, another_fractional.to_f)))
+    end
+  end
 
   def self.to_f(value)
     result = 0
-    
+
     if mixed_fraction?(value)
-      whole, numerator, denominator = value.scan(/(\-?\d*)\s(\d+)\/(\d+)/).flatten
-      
+      whole, numerator, denominator = value.scan(MIXED_FRACTION).flatten
+
       result = (numerator.to_f / denominator.to_f) + whole.to_f.abs
-      
+
       result = whole.to_f > 0 ? result : -result
     elsif single_fraction?(value)
       numerator, denominator = value.split("/")
@@ -17,29 +37,29 @@ module Fractional
     else
       result = value.to_f
     end
-    
+
     result
   end
 
   def self.to_s(value, args={})
     whole_number = value.to_f.truncate.to_i
-    
+
     if whole_number == 0 # Single fraction
       fractional_part_to_string(value, args[:to_nearest])
     else # Mixed fraction
       decimal_point_value = get_decimal_point_value(value.to_f)
       return whole_number.to_s if decimal_point_value == 0
-      
+
       fractional_part = fractional_part_to_string(decimal_point_value.abs, args[:to_nearest])
-      
+
       if (fractional_part == "1") || (fractional_part == "0")
         (whole_number + fractional_part.to_i).to_s
       else
         whole_number.to_s + " " + fractional_part
       end
-    end 
+    end
   end
-  
+
   def self.round_to_nearest_fraction(value, to_nearest_fraction)
     if value.is_a? String
       to_nearest_float = to_f(to_nearest_fraction)
@@ -48,52 +68,52 @@ module Fractional
     else
       to_nearest_float = to_f(to_nearest_fraction)
 
-      (value / to_nearest_float).round * to_nearest_float      
+      (value / to_nearest_float).round * to_nearest_float
     end
-    
+
   end
 
   private
-    
+
   def self.fraction?(value)
-    value.to_s.count('/') == 1
+    value.is_a? String and (value.match(SINGLE_FRACTION) or value.match(MIXED_FRACTION))
   end
 
   def self.single_fraction?(value)
-    fraction?(value) and !mixed_fraction?(value)
+    fraction?(value) and value.match(SINGLE_FRACTION)
   end
 
   def self.mixed_fraction?(value)
-    fraction?(value) and value.match(/\-?\d*\s+\d+\/\d+/)
+    fraction?(value) and value.match(MIXED_FRACTION)
   end
-  
+
   def self.get_decimal_point_value(value)
     value - value.truncate
   end
-  
+
   def self.fractional_part_to_string(value, round)
     if round
       round_to_nearest_fraction(float_to_rational(value.to_f).to_s, round)
     else
-      float_to_rational(value.to_f).to_s  
+      float_to_rational(value.to_f).to_s
     end
   end
 
   # Whoa this method is crazy
   # I nicked it from Jannis Harder at http://markmail.org/message/nqgrsmaixwbrvsno
   def self.float_to_rational(value)
-    if value.nan? 
-      return Rational(0,0) # Div by zero error 
-    elsif value.infinite? 
-      return Rational(value<0 ? -1 : 1,0) # Div by zero error 
-    end 
-    s,e,f = [value].pack("G").unpack("B*").first.unpack("AA11A52") 
-    s = (-1)**s.to_i 
-    e = e.to_i(2) 
+    if value.nan?
+      return Rational(0,0) # Div by zero error
+    elsif value.infinite?
+      return Rational(value<0 ? -1 : 1,0) # Div by zero error
+    end
+    s,e,f = [value].pack("G").unpack("B*").first.unpack("AA11A52")
+    s = (-1)**s.to_i
+    e = e.to_i(2)
     if e.nonzero? and e<2047
-      Rational(s)* Rational(2)**(e-1023)*Rational("1#{f}".to_i(2),0x10000000000000) 
-    elsif e.zero? 
-      Rational(s)* Rational(2)**(-1024)*Rational("0#{f}".to_i(2),0x10000000000000) 
-    end 
-  end 
+      Rational(s)* Rational(2)**(e-1023)*Rational("1#{f}".to_i(2),0x10000000000000)
+    elsif e.zero?
+      Rational(s)* Rational(2)**(-1024)*Rational("0#{f}".to_i(2),0x10000000000000)
+    end
+  end
 end

data/spec/fractional_class_methods_spec.rb

@@ -0,0 +1,219 @@
+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
+
+  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
+  end
+
+  it "should allow for negative denominators in single fractions" do
+    Fractional.to_f("1/-64").should == -0.015625
+    Fractional.to_f("-1/-64").should == 0.015625
+  end
+
+  it "should ignore repeated whitespace" do
+    Fractional.to_f("6 5/8").should == Fractional.to_f("6  5/8")
+  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"
+  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"
+  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"
+  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"
+  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
+  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
+  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
+  end
+
+  it "should round if passed a float" do
+    Fractional.round_to_nearest_fraction(1100.875, 0.5).should == 1101
+  end
+end
+
+describe "Fractional", "fraction?" do
+  it "should recognize a simple fraction" do
+    Fractional.fraction?("3/4").should be_true
+  end
+
+  it "should recognize a mixed fraction" do
+    Fractional.fraction?("1 11/12").should be_true
+  end
+
+  it "should recognize a negative fraction" do
+    Fractional.fraction?("-3/4").should be_true
+  end
+
+  it "should recognize a negative mixed fraction" do
+    Fractional.fraction?("-6 2/9").should be_true
+  end
+
+  it "should accept more than one space between the whole number and fractional part" do
+    Fractional.fraction?("1  2/3").should be_true
+    Fractional.fraction?("3               1/2").should be_true
+  end
+
+  it "should accept fractions with front and rear padding" do
+    Fractional.fraction?("     2/3").should be_true
+    Fractional.fraction?("2/3      ").should be_true
+    Fractional.fraction?("      2/3     ").should be_true
+    Fractional.fraction?("   1 2/3").should be_true
+    Fractional.fraction?("1 2/3      ").should be_true
+    Fractional.fraction?("    1 2/3   ").should be_true
+  end
+
+  it "should not recognize decimals" do
+    Fractional.fraction?("2.3").should be_false
+  end
+
+  it "should not recognize two consecutive fractions" do
+    Fractional.fraction?("2/3 9/5").should be_false
+  end
+
+  it "should not recognize a string with a slash" do
+    Fractional.fraction?("n/a").should be_false
+  end
+
+  it "should not recognize a fraction mixed with non-decimals" do
+    Fractional.fraction?("3a/4").should be_false
+    Fractional.fraction?("a2/3").should be_false
+    Fractional.fraction?("1 2/3a").should be_false
+  end
+
+  it "should not recognize fractions with improper spacing" do
+    Fractional.fraction?("2 /2").should be_false
+    Fractional.fraction?("1/ 3").should be_false
+    Fractional.fraction?("1  2/  3").should be_false
+    Fractional.fraction?("1 2    /3").should be_false
+  end
+
+end
+
+describe "Fractional", "single_fraction?" do
+  it "should recognize a single fraction" do
+    Fractional.single_fraction?("3/4").should be_true
+  end
+
+  it "should recognize a negative numerator with a single fraction" do
+    Fractional.single_fraction?("-3/4").should be_true
+  end
+
+  it "should not recognize a mixed fraction" do
+    Fractional.single_fraction?("1 11/12").should be_false
+  end
+
+  it "should allow for negative denominators in single fractions" do
+    Fractional.single_fraction?("1/-64").should be_true
+    Fractional.single_fraction?("-1/-64").should be_true
+  end
+
+end
+
+describe "Fractional", "mixed_fraction?" do
+  it "should recognize a mixed fraction" do
+    Fractional.mixed_fraction?("1 11/12").should be_true
+  end
+
+  it "should recognize a negative mixed fraciton" do
+    Fractional.mixed_fraction?("-1 11/12").should be_true
+  end
+
+  it "should not recognize a single fraction" do
+    Fractional.mixed_fraction?("3/4").should be_false
+  end
+end

data/spec/fractional_spec.rb

@@ -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

data/spec/spec_helper.rb

@@ -1,9 +1,8 @@
-$LOAD_PATH.unshift(File.dirname(__FILE__))
 $LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
 require 'fractional'
-require 'spec'
-require 'spec/autorun'
 
-Spec::Runner.configure do |config|
-  
+RSpec.configure do |config|
+  config.treat_symbols_as_metadata_keys_with_true_values = true
+  config.run_all_when_everything_filtered = true
+  config.filter_run :focus
 end

metadata

@@ -1,75 +1,101 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: fractional
-version: !ruby/object:Gem::Version 
-  version: 0.0.3
+version: !ruby/object:Gem::Version
+  version: 0.1.0
 platform: ruby
-authors: 
+authors:
 - Chris O'Sullivan
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2009-10-14 00:00:00 +01:00
-default_executable: 
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2013-05-11 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
+  name: bundler
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '1.3'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '1.3'
+- !ruby/object:Gem::Dependency
+  name: rake
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
   name: rspec
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
-    version: 
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: Fractional is a Ruby library for parsing fractions.
-email: thechrisoshow@gmail.com
+email:
+- thechrisoshow@gmail.com
 executables: []
-
 extensions: []
-
-extra_rdoc_files: 
-- LICENSE
-- README.rdoc
-files: 
-- .document
+extra_rdoc_files: []
+files:
 - .gitignore
+- Gemfile
 - LICENSE
 - README.rdoc
 - Rakefile
 - VERSION
 - fractional.gemspec
 - lib/fractional.rb
+- spec/fractional_class_methods_spec.rb
 - spec/fractional_spec.rb
 - spec/spec_helper.rb
-has_rdoc: true
 homepage: http://github.com/thechrisoshow/fractional
-licenses: []
-
+licenses:
+- MIT
+metadata: {}
 post_install_message: 
-rdoc_options: 
-- --charset=UTF-8
-require_paths: 
+rdoc_options: []
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      version: "0"
-  version: 
-required_rubygems_version: !ruby/object:Gem::Requirement 
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      version: "0"
-  version: 
+required_ruby_version: !ruby/object:Gem::Requirement
+  requirements:
+  - - '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
+  requirements:
+  - - '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: 
-rubygems_version: 1.3.5
+rubygems_version: 2.0.3
 signing_key: 
-specification_version: 3
-summary: Fractional is a Ruby library for parsing fractions
-test_files: 
+specification_version: 4
+summary: 'You can use fractional to convert decimal numbers to string representations
+  of fractions. e.g: Fractional.to_s(1.5) #=> "1 1/2"'
+test_files:
+- spec/fractional_class_methods_spec.rb
 - spec/fractional_spec.rb
 - spec/spec_helper.rb

data/.document

@@ -1,5 +0,0 @@
-README.rdoc
-lib/**/*.rb
-bin/*
-features/**/*.feature
-LICENSE