measurement 0.2.3.1 → 0.2.4

data/CHANGELOG

@@ -1,3 +1,5 @@
+v0.2.4 Suggested units for parsing
+
 v0.2.3.1 Fix for missing file
 
 v0.2.3 Group formats

data/lib/measurement/length.rb

@@ -22,9 +22,9 @@ require File.join(File.dirname(__FILE__), '..', 'measurement')
 #
 class Length < Measurement::Base
   base :metre, :metres, :suffix => 'm', :group => :metric
-  unit 1000, :kilometre, :kilometres, :km, :suffix => 'km', :group => :metric
-  unit 0.01, :centimetre, :centimetres, :cm, :suffix => 'cm', :group => :metric
-  unit 0.001, :millimetre, :mm, :suffix => 'mm', :group => :metric
+  unit 1000, :kilometre, :kilometres, :km, :suffix => 'km'
+  unit 0.01, :centimetre, :centimetres, :cm, :suffix => 'cm'
+  unit 0.001, :millimetre, :mm, :suffix => 'mm'
   
   unit 0.0254, :inch, :inches, :suffix => '"', :group => :imperial
   unit 0.3048, :feet, :foot, :suffix => "'", :group => :imperial

data/lib/measurement/unit_group.rb

@@ -6,9 +6,14 @@ module Measurement
       @units = units.sort.reverse
     end
     
+    def base
+      @units.first
+    end
+    
     def format(amount, precision = 0)
       units = @units.dup
       strs = []
+      precision = 0 if units.size > 1
       
       while unit = units.shift
         n_in = unit.to(amount)
@@ -20,5 +25,13 @@ module Measurement
       
       strs.join(' ')
     end
+    
+    def from(amount)
+      @units.first.from(amount)
+    end
+    
+    def to(amount)
+      @units.first.to(amount)
+    end
   end
 end

data/lib/measurement/weight.rb

@@ -16,10 +16,10 @@ require File.join(File.dirname(__FILE__), '..', 'measurement')
 #   puts Length.parse('100kg').in_lbs_and_oz => 220lbs 7oz
 #
 class Weight < Measurement::Base
-  base :gram, :grams, :suffix => 'g', :group => :metric
+  base :gram, :grams, :suffix => 'g'
   unit 1000.0, :kilogram, :kilograms, :kg, :kgs, :suffix => 'kg', :group => :metric
   
-  unit 453.59236, :pounds, :pound, :lbs, :suffix => 'lbs', :group => [:imperial, :us]
+  unit 453.59236, :pounds, :pound, :lbs, :suffix => 'lb', :group => [:imperial, :us]
   unit 28.3495231, :ounces, :ounce, :oz, :suffix => 'oz', :group => :us
   unit 6350.29318, :stone, :st, :suffix => 'st', :group => :imperial
 end

data/lib/measurement.rb

@@ -145,7 +145,7 @@ module Measurement
       units.detect do |unit|
         unit.has_name?(scale.to_sym) ||
           unit.suffix == scale.to_s
-      end
+      end || fetch_group(scale)
     end
   
     def self.from(amount, unit) # :nodoc:
@@ -169,13 +169,17 @@ module Measurement
     #   Length.parse("180cm").in_cm => 180
     #   Length.parse("10m 11cm 12mm").in_metres => 10.122
     #
+    # If the string does not specify the unit then the base
+    # unit will be used unless a unit is suggested.
+    #
     # If a valid unit cannot be found an error is raised:
     #
     #   Weight.parse("180cm") => Measurement::NoUnitFoundException
     #
-    def self.parse(string)
-      string = string.dup
+    def self.parse(string, suggested_unit = nil)
+      string = string.to_s.dup # Make sure we have a string and duplicate it
       base_amount = 0.0
+      suggested_unit = suggested_unit ? find_scale(suggested_unit) : base
       
       while string =~ /(\d+(\.\d+)?)([^\d]*)/
         amount = $1.to_f
@@ -190,7 +194,7 @@ module Measurement
             base_amount += unit.from(amount)
           end
         else
-          base_amount += amount
+          base_amount += suggested_unit.from(amount)
         end
         
         string.sub!(/(\d+(\.\d+)?)([^\d]*)/, '')

data/measurement.gemspec

@@ -2,7 +2,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{measurement}
-  s.version = "0.2.3.1"
+  s.version = "0.2.4"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 1.2") if s.respond_to? :required_rubygems_version=
   s.authors = ["Jeremy Wells"]

data/spec/lib/measurement_spec.rb

@@ -40,6 +40,14 @@ describe Measurement::Base do
       Length.parse('113').to_f.should == 113.0
     end
     
+    it 'should parse in the suggest unit if no unit is in the text' do
+      Length.parse('113', :inches).to_f.should == 2.8702
+    end
+    
+    it 'should parse the group base unit if the suggest unit is a group and no unit is in the text' do
+      Length.parse('113', :metric).to_f.should == 113.0
+    end
+    
     it 'should parse floating point numbers' do
       Length.parse('113.43').to_f.should == 113.43
     end
@@ -67,6 +75,26 @@ describe Measurement::Base do
     end
   end
   
+  describe '#initialize' do
+    before do
+      @klass = Class.new(Measurement::Base)
+      @klass.base :grams
+      @klass.unit 1000, :kilograms, :group => :metric
+    end
+    
+    it 'should initialize to the base value' do
+      @klass.new(1000).to_f.should == 1000.0
+    end
+    
+    it 'should initialize to the specified unit' do
+      @klass.new(1000, :kilograms).to_f.should == 1000000.0
+    end
+    
+    it 'should initialize to the base unit of the specified group' do
+      @klass.new(1000, :metric).to_f.should == 1000000.0
+    end
+  end
+  
   describe 'operators' do
     before do
       @length_1 = Length.new(1)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: measurement
 version: !ruby/object:Gem::Version 
-  version: 0.2.3.1
+  version: 0.2.4
 platform: ruby
 authors: 
 - Jeremy Wells