quantitymanager 0.9.0 → 0.9.1

data/lib/quantity.rb

@@ -25,6 +25,7 @@
 
 $:.unshift(File.dirname(__FILE__))
 
+require "unitmanager/utils"
 require "unitmanager/simple_unit"
 require "unitmanager/unit_composition"
 require "unitmanager/quantity"

data/lib/unitmanager/calculator.rb

@@ -2,7 +2,6 @@ module Quantity
 
   class Calculator
     include Quantifiable
-    include Unit::SymbolConverter
     
     attr_reader :units, :conversions
     
@@ -87,9 +86,9 @@ module Quantity
       
       unit = Unit::ComposedUnit.new({
         :dividends => 
-          convert(first_operand[:dividends] + second_operand[:dividends]),
+          @units.collect_for(first_operand[:dividends] + second_operand[:dividends]),
         :divisors => 
-          convert(first_operand[:divisors] + second_operand[:divisors])          
+          @units.collect_for(first_operand[:divisors] + second_operand[:divisors])          
       })  
       
       Quantity.new(self, {:value => value, :unit => unit})      
@@ -100,9 +99,9 @@ module Quantity
  
       unit = Unit::ComposedUnit.new({
         :dividends => 
-          convert(first_operand[:dividends] + second_operand[:divisors]),
+          @units.collect_for(first_operand[:dividends] + second_operand[:divisors]),
         :divisors => 
-          convert(first_operand[:divisors] + second_operand[:dividends])          
+          @units.collect_for(first_operand[:divisors] + second_operand[:dividends])          
       })  
       
       Quantity.new(self, {:value => value, :unit => unit})      
@@ -156,8 +155,8 @@ module Quantity
       from, to = params[:from], params[:to]
       
       target = Unit::ComposedUnit.new({ 
-        :dividends => convert(to[:dividends] + from[:divisors]), 
-        :divisors => convert(to[:divisors] + from[:dividends]) 
+        :dividends => @units.collect_for(to[:dividends] + from[:divisors]), 
+        :divisors => @units.collect_for(to[:divisors] + from[:dividends]) 
       }) 
      
       if (conversion = direct_conversion(target))

data/lib/unitmanager/simple_unit.rb

@@ -1,64 +1,5 @@
-#Extension to standard Array class. 
-#Added functionality to compare array content regardless element order.
-class Array
-    def contains?(other_array)
-      copy = dup
-      other_array.each {|item| 
-        return false unless i = copy.index(item)
-        copy[i] = nil
-      }
-      true
-    end
-    
-    def same?(other_array)
-      length == other_array.length &&
-      contains?(other_array)
-    end
-
-end
-
 module Unit
   
-  class BaseUnit
-
-    class << self
-
-      def once (*methods) #:nodoc:
-        methods.each {|method| 
-         
-          module_eval <<-"end;"
-            alias_method :__#{method.to_i}__ , :#{method.to_s}
-
-            def #{method.to_s}(*args, &block)
-              
-              def self.#{method.to_s}(*args, &block)
-                @__#{method.to_i}__ 
-              end
-            
-              @__#{method.to_i}__ = __#{method.to_i}__(*args, &block)
-            end
-            private :__#{method.to_i}__
-            
-          end;
-          
-        }
-      end
-      
-      private :once
-    end
- 
-    # This method allows to retrieve symbolic portions of the unit definition.
-    # Supported values are:
-    # 	:dividends - returns an array of symbols representing dividend part of 
-    #                  unit definition.
-    # 	:divisors - returns an array of symbols representing divisor part of 
-    #                  unit definition.
-    # 	:string - string representation of the unit of measure. 
-    def [] (symbol)
-      unit_sym[symbol]
-    end
-  end
-  
   # Adds comparing capabilities to  unit implementations
   module Comparable
 
@@ -87,7 +28,7 @@ module Unit
   # simple unit with linear coefficient.
   # Example:  :cm is based on :mm with coefficient equal 10.
   # In other words X cm = 10 * Y mm. 
-  class SimpleUnit < BaseUnit
+  class SimpleUnit
   
       include Unit::Comparable
   
@@ -99,17 +40,16 @@ module Unit
         @unit = args[:unit]
         @based_on = args[:based_on] || nil
         @coefficient = args[:coefficient] || 1
+        @unit_sym = {:dividends => [@unit], :divisors => [], :string => @unit.to_s}
       end
   
       def to_base(value)
         value = @based_on.to_base(value) if derived?
-        
         value *= @coefficient
       end
   
       def from_base(value)
         value = @based_on.from_base(value) if derived?
-        
         value /= @coefficient
       end
       
@@ -140,16 +80,19 @@ module Unit
         self == other
       end
 
+    # This method allows to retrieve symbolic portions of the unit definition.
+    # Supported values are:
+    # 	:dividends - returns an array of symbols representing dividend part of 
+    #                  unit definition.
+    # 	:string - string representation of the unit of measure. 
+    def [] (symbol)
+      @unit_sym[symbol]
+    end
+
   private        
       def derived?
         @based_on != nil
       end
-  
-      def unit_sym
-        {:dividends => [@unit], :divisors => [], :string => @unit.to_s}
-      end
-  
-  once :unit_sym    
   end
 
 end

data/lib/unitmanager/unit_composition.rb

@@ -1,27 +1,14 @@
 module Unit
 
-  module SymbolConverter
-
-    def convert(symbols)
-      units = []
-      symbols.each {|symbol| 
-        unit = @units[symbol]
-        raise "Invalid Unit Name: #{symbol.to_s}" if unit.nil?
-        units << unit
-      }
-      return units
-    end
-  
-  end
-
-
   # Implementation of what is called ‘composed unit of measure’. 
   # This is a result of performing multiplication or division of
   # quantities with simple units.
   # Example:  1 lb per in or 70 mi per hour
-  class ComposedUnit < BaseUnit
+  class ComposedUnit
   
     include Unit::Comparable
+
+    self.extend ExecControl
   
     attr_reader :dividends, :divisors, :coefficient
   
@@ -82,9 +69,20 @@ module Unit
       self == other
     end
     
+    # This method allows to retrieve symbolic portions of the unit definition.
+    # Supported values are:
+    # 	:dividends - returns an array of symbols representing dividend part of 
+    #                  unit definition.
+    # 	:divisors - returns an array of symbols representing divisor part of 
+    #                  unit definition.
+    # 	:string - string representation of the unit of measure. 
+    def [] (symbol)
+      unit_sym[symbol]
+    end
+
   private    
     
-    def collect(array)
+    def collect(array, &block)
       result = []
       
       array.each {|item| result += (yield(item) || []) }
@@ -151,7 +149,6 @@ module Unit
 
 
   class Parser 
-    include SymbolConverter
   
     def initialize(units)
       @units = units
@@ -163,8 +160,8 @@ module Unit
        raise "Invalid Number of Operands in : #{unit_spec}" if operands.size > 2
        
        {
-          :dividends => convert(parse_operand_symbols(operands[0])),
-          :divisors => convert(parse_operand_symbols(operands[1]))
+          :dividends => @units.collect_for(parse_operand_symbols(operands[0])),
+          :divisors => @units.collect_for(parse_operand_symbols(operands[1]))
        }   
     end
     

data/lib/unitmanager/utils.rb

@@ -0,0 +1,63 @@
+module ExecControl
+
+  def once (*methods) #:nodoc:
+    methods.each {|method| 
+         
+      module_eval <<-"end;"
+        alias_method :__#{method.to_i}__ , :#{method.to_s}
+
+        def #{method.to_s}(*args, &block)
+              
+          def self.#{method.to_s}(*args, &block)
+            @__#{method.to_i}__ 
+          end
+            
+          @__#{method.to_i}__ = __#{method.to_i}__(*args, &block)
+        end
+            private :__#{method.to_i}__
+            
+      end;
+          
+    }
+  end
+      
+  private :once
+
+end
+
+
+class Hash
+  
+  def collect_for(keys) 
+    results = []
+      
+    keys.each {|key|
+      value = self[key] 
+      raise "Invalid Key : #{key.to_s}" if value.nil?
+      results << value
+    }
+    results
+  end
+  
+end
+  
+  
+#Extension to standard Array class. 
+#Added functionality to compare array content regardless element order.
+class Array
+    def contains?(other_array)
+      copy = dup
+      other_array.each {|item| 
+        return false unless i = copy.index(item)
+        copy[i] = nil
+      }
+      true
+    end
+    
+    def same?(other_array)
+      length == other_array.length &&
+      contains?(other_array)
+    end
+
+end
+  

metadata

@@ -3,8 +3,8 @@ rubygems_version: 0.8.11
 specification_version: 1
 name: quantitymanager
 version: !ruby/object:Gem::Version 
-  version: 0.9.0
-date: 2006-06-06 00:00:00 -05:00
+  version: 0.9.1
+date: 2006-07-19 00:00:00 -05:00
 summary: "Unit of measure, quantity framework"
 require_paths: 
   - lib
@@ -34,6 +34,7 @@ files:
   - lib/quantity.rb
   - lib/config/default_configuration.rb
   - lib/unitmanager/configuration.rb
+  - lib/unitmanager/utils.rb
   - lib/unitmanager/quantity.rb
   - lib/unitmanager/simple_unit.rb
   - lib/unitmanager/unit_composition.rb