fraction_parser 0.0.3 → 0.1.0

data/VERSION

@@ -1 +1 @@
-0.0.3
+0.1.0

data/fraction_parser.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{fraction_parser}
-  s.version = "0.0.3"
+  s.version = "0.1.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Steve Hoeksema"]
-  s.date = %q{2010-04-16}
+  s.date = %q{2010-04-21}
   s.description = %q{Parses fractions and converts them to Rational}
   s.email = %q{steve@seven.net.nz}
   s.extra_rdoc_files = [

data/lib/fraction_parser.rb

@@ -1,13 +1,34 @@
+require "rational"
+
 class FractionParser
 
   def self.parse(string)
     string = string.strip
     if string =~ /^((\d+)\s+)?((\d+)\/(\d+))$/
-      sum = Rational($4, $5)
+      sum = Rational($4.to_i, $5.to_i)
       sum += $2.to_i if $2
       sum
     else
-      sum = Rational(string.to_f, 1)
+      sum = self.float_to_rational(string.to_f)
+    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 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
 

data/spec/fraction_parser_spec.rb

@@ -2,20 +2,21 @@ require File.expand_path(File.dirname(__FILE__) + '/spec_helper')
 
 describe "FractionParser" do
 
-  def should_parse(string, float)
-    FractionParser.parse(string).to_f.should eql(float)
+  def should_parse_fraction(string, float)
+    fp = FractionParser.parse(string)
+    fp.to_f.should eql(float)
   end
 
   it "should parse fractions" do
-    should_parse("3/4", 0.75)
-    should_parse("2 1/16", 2.0625)
-    should_parse("8", 8.0)
-    should_parse("8.25", 8.25)
+    should_parse_fraction("3/4", 0.75)
+    should_parse_fraction("2 1/16", 2.0625)
+    should_parse_fraction("8", 8.0)
+    should_parse_fraction("8.25", 8.25)
   end
 
   it "should otherwise just convert to a float" do
-    should_parse("2.0 3/4", 2.0)
-    should_parse("2 3 /4", 2.0)
+    should_parse_fraction("2.0 3/4", 2.0)
+    should_parse_fraction("2 3 /4", 2.0)
   end
 
 end

metadata

@@ -4,9 +4,9 @@ version: !ruby/object:Gem::Version
   prerelease: false
   segments: 
   - 0
+  - 1
   - 0
-  - 3
-  version: 0.0.3
+  version: 0.1.0
 platform: ruby
 authors: 
 - Steve Hoeksema
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-04-16 00:00:00 +12:00
+date: 2010-04-21 00:00:00 +12:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency