ruby-measurement 0.0.1 → 1.0.0

data/lib/ruby-measurement/measurement.rb

@@ -2,17 +2,26 @@ require 'ruby-measurement/unit'
 require 'ruby-measurement/version'
 
 class Measurement
-  SCIENTIFIC_NUMBER = %r{([+-]?\d*[.]?\d+(?:[Ee][+-]?)?\d*)}.freeze
-  RATIONAL_NUMBER   = /\A\(?([+-]?\d+)\/(\d+)\)?\z/.freeze
-  COMPLEX_NUMBER    = /\A#{SCIENTIFIC_NUMBER}?#{SCIENTIFIC_NUMBER}i\b\z/.freeze
+  UNIT_REGEX        = /([a-zA-Z].*)/.freeze
+  SCIENTIFIC_NUMBER = /([+-]?\d*\.?\d+(?:[Ee][+-]?)?\d*)/.freeze
+  SCIENTIFIC_REGEX  = /\A#{SCIENTIFIC_NUMBER}\s*#{UNIT_REGEX}?\z/.freeze
+  RATIONAL_REGEX    = /\A([+-]?\d+\s+)?((\d+)\/(\d+))?\s*#{UNIT_REGEX}?\z/.freeze
+  COMPLEX_REGEX     = /\A#{SCIENTIFIC_NUMBER}?#{SCIENTIFIC_NUMBER}i\s*#{UNIT_REGEX}?\z/.freeze
   
   attr_reader :quantity, :unit
   
   class << self;  attr_accessor :units end
   @units = {}
   
-  def initialize(str)
-    parse(str)
+  def initialize(quantity, unit_name = :count)
+    unit = unit_name
+    unit = self.class.units[unit_name.to_s] if unit_name.kind_of?(Symbol) || unit_name.kind_of?(String)
+    
+    raise ArgumentError, "Invalid quantity: #{quantity}" unless quantity.kind_of?(Numeric)
+    raise ArgumentError, "Invalid unit: #{unit_name}" unless unit.kind_of?(Unit)
+    
+    @quantity = quantity
+    @unit = unit
   end
   
   def inspect
@@ -26,10 +35,10 @@ class Measurement
   def +(obj)
     case obj
     when Numeric
-      self.class.new("#{quantity + obj.to_f} #{unit}")
+      self.class.new(quantity + obj.to_f, unit)
     when self.class
       if obj.unit == unit
-        self.class.new("#{quantity + obj.quantity} #{unit}")
+        self.class.new(quantity + obj.quantity, unit)
       else
         self + obj.convert_to(unit)
       end
@@ -41,10 +50,10 @@ class Measurement
   def -(obj)
     case obj
     when Numeric
-      self.class.new("#{quantity - obj.to_f} #{unit}")
+      self.class.new(quantity - obj.to_f, unit)
     when self.class
       if obj.unit == unit
-        self.class.new("#{quantity - obj.quantity} #{unit}")
+        self.class.new(quantity - obj.quantity, unit)
       else
         self - obj.convert_to(unit)
       end
@@ -56,10 +65,10 @@ class Measurement
   def *(obj)
     case obj
     when Numeric
-      self.class.new("#{quantity * obj.to_f} #{unit}")
+      self.class.new(quantity * obj.to_f, unit)
     when self.class
       if obj.unit == unit
-        self.class.new("#{quantity * obj.quantity} #{unit}")
+        self.class.new(quantity * obj.quantity, unit)
       else
         self * obj.convert_to(unit)
       end
@@ -71,10 +80,10 @@ class Measurement
   def /(obj)
     case obj
     when Numeric
-      self.class.new("#{quantity / obj.to_f} #{unit}")
+      self.class.new(quantity / obj.to_f, unit)
     when self.class
       if obj.unit == unit
-        self.class.new("#{quantity / obj.quantity} #{unit}")
+        self.class.new(quantity / obj.quantity, unit)
       else
         self / obj.convert_to(unit)
       end
@@ -86,7 +95,7 @@ class Measurement
   def **(obj)
     case obj
     when Numeric
-      self.class.new("#{quantity ** obj.to_f} #{unit}")
+      self.class.new(quantity ** obj.to_f, unit)
     else
       raise ArgumentError, "Invalid arithmetic: #{self} ** #{obj}"
     end
@@ -105,7 +114,7 @@ class Measurement
     conversion = @unit.conversion(unit.name)
     raise ArgumentError, "Invalid conversion: '#@unit' to '#{unit.name}'" unless conversion
     
-    self.class.new("#{conversion.call(@quantity)} #{unit.name}")
+    self.class.new(conversion.call(@quantity), unit.name)
   end
   
   def convert_to!(unit_name)
@@ -120,7 +129,33 @@ class Measurement
   end
   
   def self.parse(str = '0')
-    new(str)
+    str = str.strip
+    
+    if str =~ COMPLEX_REGEX
+      real, imaginary, unit_name = str.scan(COMPLEX_REGEX).first
+      quantity = Complex(real.to_f, imaginary.to_f).to_f
+    elsif str =~ SCIENTIFIC_REGEX
+      whole, unit_name = str.scan(SCIENTIFIC_REGEX).first
+      quantity = whole.to_f
+    elsif str =~ RATIONAL_REGEX
+      whole, _, numerator, denominator, unit_name = str.scan(RATIONAL_REGEX).first
+
+      if numerator && denominator
+        numerator = numerator.to_f + (denominator.to_f * whole.to_f)
+        denominator = denominator.to_f
+        quantity = Rational(numerator, denominator).to_f
+      else
+        quantity = whole.to_f
+      end
+    else
+      raise ArgumentError, "Unable to parse: '#{str}'"
+    end
+    
+    unit_name ||= 'count'
+    unit = units[unit_name.strip.downcase]
+    raise ArgumentError, "Invalid unit: '#{unit_name}'" unless unit
+    
+    new(quantity, unit)
   end
   
   def self.define(unit_name, &block)
@@ -128,29 +163,6 @@ class Measurement
     unit.aliases.each { |a| @units[a.downcase] = unit }
   end
   
-  private
-  
-  def parse(str)
-    value = str.strip
-    
-    quantity, unit_name = value.split(/\s+/, 2)
-    unit_name ||= 'count'
-    raise ArgumentError, "Missing quantity: '#{str}'" if !quantity || quantity.empty?
-    
-    @unit = self.class.units[unit_name.downcase]
-    raise ArgumentError, "Invalid unit: '#{unit_name}'" unless @unit
-    
-    if quantity =~ COMPLEX_NUMBER
-      real, imaginary = quantity.scan(COMPLEX_NUMBER).first
-      @quantity = Complex(real.to_f, imaginary.to_f).to_f
-    elsif quantity =~ RATIONAL_NUMBER
-      numerator, denominator = quantity.scan(RATIONAL_NUMBER).first
-      @quantity = Rational(numerator.to_i, denominator.to_i).to_f
-    else
-      @quantity = quantity.to_f
-    end
-  end
-  
   define(:count) do |unit|
     unit.convert_to(:dozen) { |value| value / 12.0 }
   end

data/lib/ruby-measurement/version.rb

@@ -1,3 +1,3 @@
 class Measurement
-  VERSION = '0.0.1'
+  VERSION = '1.0.0'
 end

data/ruby-measurement.gemspec

@@ -10,7 +10,7 @@ Gem::Specification.new do |gem|
   gem.email         = 'matt.huggins@gmail.com'
   gem.description   = 'Simple gem for calculating and converting measurements'
   gem.summary       = 'Simple gem for calculating and converting measurements'
-  gem.homepage      = 'https://github.com/mhuggins/measurement'
+  gem.homepage      = 'https://github.com/mhuggins/ruby-measurement'
   
   gem.files         = `git ls-files`.split($/)
   gem.executables   = gem.files.grep(%r{^bin/}).map{ |f| File.basename(f) }

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ruby-measurement
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 1.0.0
   prerelease: 
 platform: ruby
 authors:
@@ -13,7 +13,7 @@ date: 2013-01-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &2160164820 !ruby/object:Gem::Requirement
+  requirement: &2156250560 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,7 +21,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2160164820
+  version_requirements: *2156250560
 description: Simple gem for calculating and converting measurements
 email: matt.huggins@gmail.com
 executables: []
@@ -51,7 +51,7 @@ files:
 - lib/ruby-measurement/version.rb
 - ruby-measurement.gemspec
 - tasks/debug.rake
-homepage: https://github.com/mhuggins/measurement
+homepage: https://github.com/mhuggins/ruby-measurement
 licenses: []
 post_install_message: 
 rdoc_options: []