seamusabshere-conversions 1.2.2 → 1.3.0

data/conversions.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |spec|
   spec.name = "conversions"
-  spec.version = "1.2.2"
+  spec.version = "1.3.0"
   
   spec.author = "Manfred Stienstra"
   spec.email = "manfred@fngtps.com"

data/lib/conversions.rb

@@ -1,5 +1,18 @@
 module Conversions
-  CONVERSION = {
+  mattr_accessor :conversions
+  self.conversions = {}
+
+  def self.register(from, to, rate)
+    conversions[from] ||= {}
+    conversions[from][to] ||= {}
+    conversions[from][to] = rate
+    conversions[to] ||= {}
+    conversions[to][from] ||= {}
+    conversions[to][from] = 1 / rate
+  end
+  
+  # This is ugly
+  {
     :miles => {
       :kilometres => 1.609344
     },
@@ -21,7 +34,11 @@ module Conversions
     :miles_per_gallon => {
       :kilometres_per_litre => 0.425143707
     }
-  }
+  }.each do |from_unit, to_units|
+    to_units.each do |to_unit, rate|
+      register(from_unit, to_unit, rate)
+    end
+  end
 end
 
 require 'conversions/unit'

data/lib/conversions/active_record_accessors.rb

@@ -39,10 +39,10 @@ module Conversions #:nodoc:
       end
       define_method "#{attribute}_in_#{options[:external]}" do
         v = send(attribute)
-        v ? v.send(options[:internal]).to(options[:external], options[:scale]) : nil
+        v ? v.send(:convert, options[:internal], options[:external], :scale => options[:scale]) : nil
       end
       define_method "#{attribute}_in_#{options[:external]}=" do |v|
-        send("#{attribute}=", v.to_f.send(options[:external]).to(options[:internal]))
+        send("#{attribute}=", v.to_f.send(:convert, options[:external], options[:internal]))
       end
     end
   end

data/lib/conversions/ext.rb

@@ -1,10 +1,7 @@
 module Conversions #:nodoc:
-  # Defines all the conversion methods (miles, kilometers, etc…)
   module Ext
-    Unit.conversion.each do |method, _|
-      define_method method do
-        Unit.new self, method
-      end unless respond_to? method
+    def convert(from, to, options={})
+      Unit.new(self, from).to(to, options)
     end
   end
 end

data/lib/conversions/unit.rb

@@ -14,43 +14,19 @@ module Conversions #:nodoc
     #
     # * _to_: The unit to convert to (ie. :kilometers)
     # * _scale_: The number of digits behind the decimal point to you want to keep (Optional)
-    def to(to, scale=nil)
+    def to(to, options = {})
+      scale = options.delete(:scale)
       value = @value * self.class.exchange_rate(@from, to)
       scale.nil? ? value : (value * (10 ** scale)).round / (10 ** scale).to_f
     end
 
     def self.exchange_rate(from_unit, to_unit) #:nodoc:
       return 1 if from_unit == to_unit
-      from = conversion[from_unit]
+      from = Conversions.conversions[from_unit]
       raise ArgumentError, "Can't convert from `#{from}', unknown unit" if from.nil?
       to = from[to_unit]
       raise ArgumentError, "Can't convert from `#{from_unit}' to `#{to_unit}', unknown unit" if to.nil?
       to
     end
-    
-    def self.conversion #:nodoc:
-      map_conversion if !defined? @@conversion
-      @@conversion
-    end
-    
-    def self.register(from, to, value)
-      CONVERSION.merge!(from.to_sym => { to.to_sym => value.to_f })
-      map_conversion
-      Numeric.send :include, Conversions::Ext
-    end
-    
-    private
-    
-    def self.map_conversion
-      @@conversion = {}
-      CONVERSION.each do |from, conversion|
-        conversion.each do |to, value|
-          @@conversion[from] ||= {}
-          @@conversion[from][to] = value
-          @@conversion[to] ||= {}
-          @@conversion[to][from] = 1.0 / value
-        end
-      end
-    end
   end
 end

data/test/accessor_test.rb

@@ -5,6 +5,9 @@ class Flight
   attr_accessor :distance, :fuel_consumption
   conversion_accessor :distance, :internal => :kilometres, :external => :miles
   conversion_accessor :fuel_consumption, :internal => :litres, :external => :gallons, :scale => 2
+  
+  Conversions.register(:kilometres, :leagues, 0.179985601)
+  conversion_accessor :distance, :internal => :kilometres, :external => :leagues, :scale => 2
 end
 
 class AccessorTest < Test::Unit::TestCase
@@ -27,4 +30,9 @@ class AccessorTest < Test::Unit::TestCase
     @flight.fuel_consumption = 3400
     assert_equal 898.18, @flight.fuel_consumption_in_gallons, DELTA
   end
+  
+  def test_register
+    @flight.distance = 1200
+    assert_in_delta 215.98, @flight.distance_in_leagues, DELTA
+  end
 end

data/test/ext_test.rb

@@ -1,13 +1,17 @@
 require File.dirname(__FILE__) + '/test_helper'
 
 class ExtTest < Test::Unit::TestCase
-  
   def test_conversions
-    assert_in_delta 1.609344, 1.miles.to(:kilometres), DELTA
-    assert_in_delta 1.609344, 1.0.miles.to(:kilometres), DELTA
-    assert_in_delta 0.45359237, 1.pounds.to(:kilograms), DELTA
-    assert_in_delta 0.00110231131092439, 1.kilograms.to(:tons), DELTA
-    assert_in_delta 2.20462262184878, 1.kilograms.to(:pounds), DELTA
-    assert_in_delta 1, ( 1.kilograms.to(:pounds) * 1.pounds.to(:kilograms) ), DELTA
+    assert_in_delta 1.609344, 1.convert(:miles, :kilometres), DELTA
+    assert_in_delta 1.609344, 1.0.convert(:miles, :kilometres), DELTA
+    assert_in_delta 0.45359237, 1.convert(:pounds, :kilograms), DELTA
+    assert_in_delta 0.00110231131092439, 1.convert(:kilograms, :tons), DELTA
+    assert_in_delta 2.20462262184878, 1.convert(:kilograms, :pounds), DELTA
+    assert_in_delta 1, ( 1.convert(:kilograms, :pounds) * 1.convert(:pounds, :kilograms) ), DELTA
+  end
+  
+  def test_register
+    Conversions.register(:dollars, :cents, 100.0)
+    assert_in_delta 1000.0, 10.convert(:dollars, :cents), DELTA
   end
 end

data/test/unit_test.rb

@@ -11,7 +11,7 @@ class UnitTest < Test::Unit::TestCase
   end
   
   def test_exchange_rate_for_identity_transform
-    Conversions::Unit.conversion.keys.each do |unit|
+    Conversions.conversions.keys.each do |unit|
       assert_equal 1, Conversions::Unit.exchange_rate(unit, unit)
     end
   end
@@ -21,28 +21,28 @@ class UnitTest < Test::Unit::TestCase
     assert_in_delta 16.09344, amount.to(:kilometres), DELTA
     
     amount = Conversions::Unit.new(10.0, :miles)
-    assert_equal 16.09, amount.to(:kilometres, 2), DELTA
+    assert_equal 16.09, amount.to(:kilometres, :scale => 2), DELTA
     
     amount = Conversions::Unit.new(10.0, :kilograms)
     assert_in_delta 22.0462262184878, amount.to(:pounds), DELTA
     
     amount = Conversions::Unit.new(10.0, :kilograms)
-    assert_equal 22.05, amount.to(:pounds, 2), DELTA
+    assert_equal 22.05, amount.to(:pounds, :scale => 2), DELTA
     
     amount = Conversions::Unit.new(10.0, :miles_per_gallon)
-    assert_equal 4.25, amount.to(:kilometres_per_litre, 2), DELTA
+    assert_equal 4.25, amount.to(:kilometres_per_litre, :scale => 2), DELTA
   end
   
   def test_identity_transforms
-    Conversions::Unit.conversion.keys.each do |unit|
-      assert_equal 1.0, Conversions::Unit.new(1.0, unit).to(unit, 2)
+    Conversions.conversions.each do |unit|
+      assert_equal 1.0, Conversions::Unit.new(1.0, unit).to(unit, :scale => 2)
     end
   end
   
   def test_register
-    Conversions::Unit.register(:dollars, :cents, 100.0)
+    Conversions.register(:dollars, :cents, 100.0)
     assert_in_delta 0.01, Conversions::Unit.exchange_rate(:cents, :dollars), DELTA
     amount = Conversions::Unit.new(10.0, :dollars)
-    assert_equal 1000.0, amount.to(:cents, 2), DELTA
+    assert_equal 1000.0, amount.to(:cents, :scale => 2), DELTA
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: seamusabshere-conversions
 version: !ruby/object:Gem::Version 
-  version: 1.2.2
+  version: 1.3.0
 platform: ruby
 authors: 
 - Manfred Stienstra