measurement 0.2.1 → 0.2.2

data/CHANGELOG

@@ -1,3 +1,5 @@
+v0.2.2 Better formatting functions
+
 v0.2.1 Added methods to Float, Fixnum and String - to_measurement
 
 v0.2 Documentation

data/lib/measurement/unit.rb

@@ -21,7 +21,8 @@ module Measurement
     end
   
     def format(amount, precision = 2)
-      prefix + ("%.#{precision}f" % to(amount)) + suffix
+      number = ("%.#{precision}f" % to(amount)).sub(/(\.\d*)0/, '\1')
+      prefix + number + suffix
     end
   
     def prefix

data/lib/measurement/weight.rb

@@ -17,7 +17,7 @@ require File.join(File.dirname(__FILE__), '..', 'measurement')
 #
 class Weight < Measurement::Base
   base :gram, :grams, :suffix => 'g'
-  unit 1000.0, :kilograms, :kg, :kgs, :suffix => 'kg'
+  unit 1000.0, :kilogram, :kilograms, :kg, :kgs, :suffix => 'kg'
   unit 453.59236, :pounds, :pound, :lbs, :suffix => 'lbs'
   unit 28.3495231, :ounces, :ounce, :oz, :suffix => 'oz'
   unit 6350.29318, :stone, :st, :suffix => 'st'

data/lib/measurement.rb

@@ -1,7 +1,18 @@
 require File.join(File.dirname(__FILE__), 'measurement', 'unit')
 
 module Measurement
-  class NoUnitFoundException < Exception; end
+  class NoUnitFoundException < Exception
+    attr_reader :unit
+    
+    def initialize(unit)
+      @unit = unit
+      super
+    end
+    
+    def to_s
+      "No unit found: #{@unit}"
+    end
+  end
 
   # The Measurement::Base class provides a basis for types of
   # measurement. For example, length or weight. It should
@@ -100,15 +111,21 @@ module Measurement
     end
   
     def self.fetch_scale(scale = nil) # :nodoc:
-      scale.nil? ? base : units.detect do |unit|
-        unit.has_name?(scale)
+      unit = (scale.nil? ? base : units.detect do |unit|
+        unit.has_name?(scale.to_sym)
+      end)
+      
+      unless unit
+        raise NoUnitFoundException.new(scale)
+      else
+        unit
       end
     end
     
     def self.find_scale(scale) # :nodoc:
       units.detect do |unit|
-        unit.has_name?(scale) ||
-          unit.suffix == scale
+        unit.has_name?(scale.to_sym) ||
+          unit.suffix == scale.to_s
       end
     end
   
@@ -135,7 +152,7 @@ module Measurement
     #
     # If a valid unit cannot be found an error is raised:
     #
-    #   Weight.parse("180cm") => Measurement::NoUnitException
+    #   Weight.parse("180cm") => Measurement::NoUnitFoundException
     #
     def self.parse(string)
       string = string.dup

data/measurement.gemspec

@@ -2,7 +2,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{measurement}
-  s.version = "0.2.1"
+  s.version = "0.2.2"
 
   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

@@ -17,6 +17,24 @@ describe Measurement::Base do
     end
   end
   
+  describe '::find_scale' do
+    it 'should be able to find the unit by name' do
+      Weight.find_scale(:kilogram).should_not be_nil
+      Weight.find_scale(:kilogram).has_name?(:kilogram).should be_true
+    end
+    it 'should be able to find the unit if the name passed is a string' do
+      Weight.find_scale("kilogram").should_not be_nil
+      Weight.find_scale(:kilogram).has_name?(:kilogram).should be_true
+    end
+    it 'should be able to find the unit by suffix' do
+      Weight.unit 2000, :quit, :qt, :suffix => 'q'
+      Weight.find_scale('q').should_not be_nil
+    end
+    it 'should return nil if no unit is found' do
+      Weight.find_scale('gigboot').should be_nil
+    end
+  end
+  
   describe '::parse' do
     it 'should parse in the base unit if no unit is specified' do
       Length.parse('113').to_f.should == 113.0

data/spec/lib/unit_spec.rb

@@ -28,6 +28,10 @@ describe Measurement::Unit do
         @unit.format(200,2).should == "1.33"
       end
       
+      it 'should remove the end 0' do
+        @unit.format(255, 2).should == '1.7'
+      end
+      
       it 'should apply the suffix' do
         @unit = Measurement::Unit.new(150.0, :test, :suffix => 'test')
         @unit.format(150, 0).should == "1test"

data/spec/lib/weight_spec.rb

@@ -1,7 +1,7 @@
 require 'spec_helper'
 
 describe Weight do
-  it 'should use metres as a base' do
+  it 'should use grams as a base' do
     Weight.new(1).to_s(nil, 0).should == '1g'
   end
 end

metadata

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