alchemist 0.0.9 → 0.1.0

data/Rakefile

@@ -6,7 +6,7 @@ PKG_FILES = %w(Rakefile) +
        
 gem_spec = Gem::Specification.new do |gem_spec|
   gem_spec.name = 'alchemist'
-  gem_spec.version = '0.0.9'
+  gem_spec.version = '0.1.0'
   gem_spec.summary = 'Conversions... like you\'ve never seen them before!'
   gem_spec.description = 'Conversions... like you\'ve never seen them before!!'
   gem_spec.email = 'matt@toastyapps.com'
@@ -20,4 +20,17 @@ task :gemspec do
   File.open("#{gem_spec.name}.gemspec", "w") do |f|
     f.write gem_spec.to_yaml
   end
-end
+end
+
+
+task :default => [:test]
+task :test => ['test:units']
+
+namespace :test do
+	Rake::TestTask.new(:units) do |test|
+		test.libs << 'test'
+		test.ruby_opts << '-rubygems'
+		test.pattern = 'test/*.rb'
+		test.verbose = true
+	end
+end

data/lib/alchemist.rb

@@ -8,6 +8,7 @@ module Alchemist
   @@si_units += %w[joule joules J newton newtons N lux lx henry henrys H b B bits bytes bit byte lumen lumens lm candela candelas cd]
   @@si_units += %w[tesla teslas T gauss Gs G gram gramme grams grammes g watt watts W pascal pascals Pa]
   @@si_units += %w[becquerel becquerels Bq curie curies Ci]
+  @@operator_actions = {}
   @@conversion_table = {
     :absorbed_radiation_dose => {
       :gray => 1.0, :grays => 1.0, :Gy => 1.0,
@@ -338,6 +339,10 @@ module Alchemist
     @@conversion_table
   end
   
+  def self.operator_actions
+    @@operator_actions
+  end
+  
   class NumericConversion
     include Comparable
     
@@ -358,6 +363,10 @@ module Alchemist
       end
     end
     
+    def unit_name
+      @unit_name
+    end
+    
     def to_s
       @value.to_s
     end
@@ -367,7 +376,7 @@ module Alchemist
     end
     
     def <=>(other)
-      (self.to_f * @exponent) <=> other.to(@unit_name).to_f
+      (self.to_f * @exponent).to_f <=> other.to(@unit_name).to_f
     end
     
     private 
@@ -391,9 +400,24 @@ module Alchemist
           raise Exception, "Incompatible Types"
         end
       else
+        if args[0] && args[0].is_a?(NumericConversion) && Alchemist.operator_actions[unit_name]
+          t1 = Conversions[ @unit_name ][0]
+          t2 = Conversions[ args[0].unit_name ][0]
+          Alchemist.operator_actions[unit_name].each do |s1, s2, new_type|
+            if t1 == s1 && t2 == s2
+              return (@value * args[0].to_f).send(new_type)
+            end
+          end
+        end
+        raise Exception, "Incompatible Types" if unit_name == :*
+        if unit_name == :/ && args[0].is_a?(NumericConversion)
+          raise Exception, "Incompatible Types" unless (Conversions[@unit_name] & Conversions[args[0].unit_name]).length > 0  
+        end
         args.map!{|a| a.is_a?(NumericConversion) ? a.send(@unit_name).to_f / @exponent : a }
         @value = @value.send( unit_name, *args, &block )
-        self
+        
+        
+        unit_name == :/ ? @value : self
       end
     end
   end
@@ -414,6 +438,11 @@ module Alchemist
       Alchemist.conversion_table[type][name] = value
     end
   end
+
+	def self.register_operation_conversions type, other_type, operation, converted_type
+	  @@operator_actions[operation] ||= []
+    @@operator_actions[operation] << [type, other_type, converted_type]
+	end
   
   def self.parse_prefix(unit)
     @@unit_prefixes.each do |prefix, value|
@@ -437,4 +466,8 @@ end
 
 class Numeric
   include Alchemist
-end
+end
+
+require 'alchemist/compound'
+
+3.seconds * 3.seconds

data/lib/alchemist/compound.rb

@@ -0,0 +1,6 @@
+Alchemist.register_operation_conversions(:distance, :distance, :*, :square_meters)
+Alchemist.register_operation_conversions(:area, :distance, :*, :cubic_meters)
+Alchemist.register_operation_conversions(:distance, :area, :*, :cubic_meters)
+Alchemist.register_operation_conversions(:area, :distance, :/, :meters)
+Alchemist.register_operation_conversions(:volume, :distance, :/, :square_meters)
+Alchemist.register_operation_conversions(:volume, :area, :/, :meters)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: alchemist
 version: !ruby/object:Gem::Version 
-  version: 0.0.9
+  version: 0.1.0
 platform: ruby
 authors: 
 - Matthew Mongeau
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-11-11 00:00:00 -05:00
+date: 2009-11-16 00:00:00 -05:00
 default_executable: 
 dependencies: []
 
@@ -23,6 +23,7 @@ extra_rdoc_files: []
 
 files: 
 - Rakefile
+- lib/alchemist/compound.rb
 - lib/alchemist.rb
 has_rdoc: true
 homepage: http://github.com/toastyapps/alchemist