measurement 0.2 → 0.2.1

data/CHANGELOG

@@ -1,3 +1,5 @@
+v0.2.1 Added methods to Float, Fixnum and String - to_measurement
+
 v0.2 Documentation
 
 v0.1 First version

data/lib/measurement.rb

@@ -22,6 +22,8 @@ module Measurement
   # Length.new(10).to_s(:qt, 3) => 0.005qt
   #
   class Base
+    include Comparable
+    
     # Define the base measurement unit. This method accepts
     # a list of names for the base measurement, followed
     # by the standard unit options. See #unit
@@ -39,14 +41,33 @@ module Measurement
     # base unit.
     #
     def self.base(*args)
-      if args.any?
+      if args.any? || !@base
         @base = Unit.new(1.0, *args)
         add_unit(@base)
+        register_measurement
       else
         @base
       end
     end
     
+    def self.register_measurement
+      method_name = name.gsub(/\s/, '_').gsub(/.[A-Z]/) do |s|
+        s[0,1] + '_' + s[1,1].downcase
+      end.downcase
+      
+      [Fixnum, Float].each do |klass|
+        klass.class_eval %Q{
+        def to_#{method_name}
+          #{name}.new(self)
+        end}
+      end
+      
+      String.class_eval %Q{
+        def to_#{method_name}
+          #{name}.parse(self)
+        end}
+    end
+    
     def self.units # :nodoc:
       @units ||= []
     end
@@ -70,8 +91,8 @@ module Measurement
     # * <tt>prefix</tt> - A prefix to use when formatting the unit.
     # * <tt>suffix</tt> - A suffix to use when formatting the unit.
     #
-    def self.unit(scale, *args)
-      add_unit(Unit.new(scale, *args))
+    def self.unit(unit, *args)
+      add_unit(Unit.new(unit, *args))
     end
   
     def self.add_unit(unit) # :nodoc:
@@ -91,16 +112,16 @@ module Measurement
       end
     end
   
-    def self.from(amount, scale) # :nodoc:
-      fetch_scale(scale).from(amount)
+    def self.from(amount, unit) # :nodoc:
+      fetch_scale(unit).from(amount)
     end
   
-    def self.to(amount, scale = nil) # :nodoc:
-      fetch_scale(scale).to(amount)
+    def self.to(amount, unit = nil) # :nodoc:
+      fetch_scale(unit).to(amount)
     end
   
-    def self.format(amount, scale = nil, precision = 2) #:nodoc:
-      fetch_scale(scale).format(amount, precision)
+    def self.format(amount, unit = nil, precision = 2) #:nodoc:
+      fetch_scale(unit).format(amount, precision)
     end
     
     # Parse a string containing this measurement. The string
@@ -114,7 +135,7 @@ module Measurement
     #
     # If a valid unit cannot be found an error is raised:
     #
-    #   Weight.parse("180cm") => Measurement::NoScaleException
+    #   Weight.parse("180cm") => Measurement::NoUnitException
     #
     def self.parse(string)
       string = string.dup
@@ -122,15 +143,15 @@ module Measurement
       
       while string =~ /(\d+(\.\d+)?)([^\d]*)/
         amount = $1.to_f
-        scale = $3 && $3.strip
+        unit = $3 && $3.strip
         
-        if scale && scale.length > 0
-          scale = find_scale(scale)
+        if unit && unit.length > 0
+          unit = find_scale(unit)
           
-          if scale.nil?
-            raise NoUnitFoundException.new(scale)
+          if unit.nil?
+            raise NoUnitFoundException.new(unit)
           else
-            base_amount += scale.from(amount)
+            base_amount += unit.from(amount)
           end
         else
           base_amount += amount
@@ -142,8 +163,8 @@ module Measurement
       self.new(base_amount)
     end
   
-    def initialize(amount = 0, scale = nil)
-      @amount = self.class.from(amount, scale)
+    def initialize(amount = 0, unit = nil)
+      @amount = self.class.from(amount, unit)
     end
   
     # The base unit as an integer
@@ -155,6 +176,18 @@ module Measurement
     def to_f
       @amount.to_f
     end
+    
+    def <=>(anOther)
+      to_f <=> anOther.to_f
+    end
+    
+    %w(+ - / *).each do |operator|
+      class_eval %Q{
+        def #{operator}(anOther)
+          self.class.new(self.to_f #{operator} anOther.to_f)
+        end
+      }
+    end
   
     # This measurement converted to the specified unit.
     #
@@ -173,11 +206,11 @@ module Measurement
     
     def method_missing(method, *args) # :nodoc:
       if method.to_s =~ /^(as|in)_(.*)/
-        scale = $2
-        if scale =~ /and/
-          to_s(scale, *args)
+        unit = $2
+        if unit =~ /and/
+          to_s(unit, *args)
         else
-          as(scale.to_sym, *args)
+          as(unit.to_sym, *args)
         end
       else
         super

data/measurement.gemspec

@@ -2,11 +2,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{measurement}
-  s.version = "0.2"
+  s.version = "0.2.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 1.2") if s.respond_to? :required_rubygems_version=
   s.authors = ["Jeremy Wells"]
-  s.date = %q{2010-02-27}
+  s.date = %q{2010-02-28}
   s.description = %q{A library for holding, converting and formatting measurements}
   s.email = %q{jemmyw@gmail.com}
   s.extra_rdoc_files = ["CHANGELOG", "LICENSE", "README.rdoc", "lib/measurement.rb", "lib/measurement/length.rb", "lib/measurement/unit.rb", "lib/measurement/weight.rb"]

data/spec/lib/measurement_spec.rb

@@ -1,6 +1,22 @@
 require 'spec_helper'
 
 describe Measurement::Base do
+  describe '::base' do
+    it 'should define to_measurement on Fixnum and Float' do
+      Length
+      1.to_length.should be_a(Length)
+      1.to_length.to_f.should == 1.0
+      1.5.to_length.should be_a(Length)
+      1.5.to_length.to_f.should == 1.5
+    end
+    
+    it 'should define to_measurement on String' do
+      Length
+      "10cm".to_length.should be_a(Length)
+      "10cm".to_length.to_s(:metre, 1).should == "0.1m"
+    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
@@ -33,6 +49,30 @@ describe Measurement::Base do
     end
   end
   
+  describe 'operators' do
+    before do
+      @length_1 = Length.new(1)
+      @length_2 = Length.new(2)
+    end
+    
+    %w(+ - / *).each do |operator|
+      it 'should return a new object of the same type' do
+        @length_1.send(operator, @length_2).should be_a(Length)
+      end
+      
+      it 'should perform the operator' do
+        @value = @length_1.to_f.send(operator, @length_2.to_f)
+        @length_1.send(operator, @length_2).to_f.should == @value
+      end
+    end
+  end
+  
+  describe '#<=>' do
+    it 'should return the difference between the objects' do
+      (Length.new(1) <=> Length.new(2)).should == (1.0 <=> 2.0)
+    end
+  end
+  
   describe '#method_missing' do
     it 'should call as if passed in_scale' do
       Length.new(10).in_cm.should == Length.new(10).as(:cm)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: measurement
 version: !ruby/object:Gem::Version 
-  version: "0.2"
+  version: 0.2.1
 platform: ruby
 authors: 
 - Jeremy Wells
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-02-27 00:00:00 +13:00
+date: 2010-02-28 00:00:00 +13:00
 default_executable: 
 dependencies: []