farski-systeme 0.2.1 → 0.3.0

data/VERSION.yml

@@ -1,4 +1,4 @@
 --- 
-:minor: 2
-:patch: 1
+:minor: 3
+:patch: 0
 :major: 0

data/lib/systeme/imperial.rb

@@ -7,53 +7,41 @@ module Systeme
     end
 
     module Units
-      IMPERIAL_MEASURES = Hash.new
+      Imperial = Hash.new
 
-      IMPERIAL_MEASURES['length'] = Hash.new
-      IMPERIAL_MEASURES['length'][:si] = 0.3048
-      IMPERIAL_MEASURES['length'][:units] = Array.new
-      IMPERIAL_MEASURES['length'][:units] << { :unit => "thou", :factor => (1.0/12000), :aliases => ["mil"] }
-      IMPERIAL_MEASURES['length'][:units] << { :unit => "inch", :factor => (1.0/12), :aliases => ["in", "inches"] }
-      IMPERIAL_MEASURES['length'][:units] << { :unit => "foot", :factor => 1, :aliases => ["feet", "ft"] }
-      IMPERIAL_MEASURES['length'][:units] << { :unit => "yard", :factor => 3, :aliases => ["yd"] }
-      IMPERIAL_MEASURES['length'][:units] << { :unit => "furlong", :factor => 660 }
-      IMPERIAL_MEASURES['length'][:units] << { :unit => "mile", :factor => 5280, :aliases => ["mi"] }
-      IMPERIAL_MEASURES['length'][:units] << { :unit => "league", :factor => 15840 }
+      Imperial['length'] = Hash.new
+      Imperial['length'][:si] = 0.3048
+      Imperial['length'][:units] = Array.new
+      Imperial['length'][:units] << { :unit => 'thou', :factor => (1.0/12000), :aliases => ['mil'] }
+      Imperial['length'][:units] << { :unit => 'inch', :factor => (1.0/12), :aliases => ['in', 'inches'] }
+      Imperial['length'][:units] << { :unit => 'foot', :factor => 1, :aliases => ['feet', 'ft'] }
+      Imperial['length'][:units] << { :unit => 'yard', :factor => 3, :aliases => ['yd'] }
+      Imperial['length'][:units] << { :unit => 'furlong', :factor => 660 }
+      Imperial['length'][:units] << { :unit => 'mile', :factor => 5280, :aliases => ['mi'] }
+      Imperial['length'][:units] << { :unit => 'league', :factor => 15840 }
       # maritime units
-      IMPERIAL_MEASURES['length'][:units] << { :unit => "fathom", :factor => 6 }
-      IMPERIAL_MEASURES['length'][:units] << { :unit => "cable", :factor => 608 }
-      IMPERIAL_MEASURES['length'][:units] << { :unit => "nautical_mile", :factor => 6080, :aliases => ["NM", "nmi", "M"] }
-      IMPERIAL_MEASURES['length'][:units] << { :unit => "link", :factor => (66.0/100), :aliases => ["lnk"] }
-      IMPERIAL_MEASURES['length'][:units] << { :unit => "rod", :factor => (66.0/4), :aliases => ["perch", "perches", "pole", "lug"] }
-      IMPERIAL_MEASURES['length'][:units] << { :unit => "chain", :factor => 66 }
+      Imperial['length'][:units] << { :unit => 'fathom', :factor => 6 }
+      Imperial['length'][:units] << { :unit => 'cable', :factor => 608 }
+      Imperial['length'][:units] << { :unit => 'nautical_mile', :factor => 6080, :aliases => ['NM', 'nmi', 'M'] }
+      Imperial['length'][:units] << { :unit => 'link', :factor => (66.0/100), :aliases => ['lnk'] }
+      Imperial['length'][:units] << { :unit => 'rod', :factor => (66.0/4), :aliases => ['perch', 'perches', 'pole', 'lug'] }
+      Imperial['length'][:units] << { :unit => 'chain', :factor => 66 }
       
-      IMPERIAL_MEASURES['weight'] = Hash.new
-      IMPERIAL_MEASURES['weight'][:si] = 0.45359237
-      IMPERIAL_MEASURES['weight'][:units] = Array.new
-      IMPERIAL_MEASURES['weight'][:units] << { :unit => "grain", :factor => (1.0/7000) }
-      IMPERIAL_MEASURES['weight'][:units] << { :unit => "drachm", :factor => (1.0/256) }
-      IMPERIAL_MEASURES['weight'][:units] << { :unit => "ounce", :factor => (1.0/16), :aliases => ["oz"] }
-      IMPERIAL_MEASURES['weight'][:units] << { :unit => "pound", :factor => 1, :aliases => ["lb", "lbm", "lbs"] }
-      IMPERIAL_MEASURES['weight'][:units] << { :unit => "stone", :factor => 14, :aliases => ["st"] }
-      IMPERIAL_MEASURES['weight'][:units] << { :unit => "quarter", :factor => 28 }
-      IMPERIAL_MEASURES['weight'][:units] << { :unit => "hundredweight", :factor => 112, :aliases => ["cwt"] }
-      IMPERIAL_MEASURES['weight'][:units] << { :unit => "ton", :factor => 2240 }
+      Imperial['weight'] = Hash.new
+      Imperial['weight'][:si] = 0.45359237
+      Imperial['weight'][:units] = Array.new
+      Imperial['weight'][:units] << { :unit => 'grain', :factor => (1.0/7000) }
+      Imperial['weight'][:units] << { :unit => 'drachm', :factor => (1.0/256) }
+      Imperial['weight'][:units] << { :unit => 'ounce', :factor => (1.0/16), :aliases => ['oz'] }
+      Imperial['weight'][:units] << { :unit => 'pound', :factor => 1, :aliases => ['lb', 'lbm', 'lbs'] }
+      Imperial['weight'][:units] << { :unit => 'stone', :factor => 14, :aliases => ['st'] }
+      Imperial['weight'][:units] << { :unit => 'quarter', :factor => 28 }
+      Imperial['weight'][:units] << { :unit => 'hundredweight', :factor => 112, :aliases => ['cwt'] }
+      Imperial['weight'][:units] << { :unit => 'ton', :factor => 2240 }
     end # Units
     
     module Declarations
-      Systeme::Imperial::Units::IMPERIAL_MEASURES.each do |measure, data|
-        data[:units].each do |unit|
-          define_method(unit[:unit].to_sym) { self * unit[:factor].to_f * data[:si] }
-          class_eval("alias :" + unit[:unit] + "s :" + unit[:unit])
-          Systeme::Registration::names << unit[:unit] << unit[:unit]+"s"
-          if unit[:aliases]
-            unit[:aliases].each do |aka|
-               class_eval("alias :" + aka + " :" + unit[:unit])
-               Systeme::Registration::names << aka
-             end
-          end
-        end
-      end
-    end # Declarations
+      Systeme::Localize::declare_system(Systeme::Imperial::Units::Imperial)
+    end
   end
 end

data/lib/systeme/international.rb

@@ -0,0 +1,62 @@
+require 'systeme/registration'
+
+module Systeme
+  module International
+    def self.included(caller)
+      caller.send :include, Systeme::International::Declarations
+    end    
+
+    module Units
+      SI = Hash.new
+      SI[:meter] = { :symbol => :m, :measure => "length" }
+      SI[:gram] = { :symbol => :g, :measure => "mass", :factor_offset => -3 }
+      SI[:second] = { :symbol => :s, :measure => "time" }
+      SI[:ampere] = { :symbol => :A, :measure => "electric current" }
+      SI[:kelvin] = { :symbol => :K, :measure => "thermodynamic temperature" }
+
+      Prefixes = Hash.new
+      Prefixes[:yocto] = { :factor => -24, :symbol_prefix => "y" }
+      Prefixes[:zepto] = { :factor => -21, :symbol_prefix => "z" }
+      Prefixes[:atto] = { :factor => -18, :symbol_prefix => "a" }
+      Prefixes[:femto] = { :factor => -15, :symbol_prefix => "f" }
+      Prefixes[:pico] = { :factor => -12, :symbol_prefix => "p" }
+      Prefixes[:nano] = { :factor => -9, :symbol_prefix => "n" }
+      Prefixes[:micro] = { :factor => -6, :symbol_prefix => "u" } # use of 'µ' should be supported with unicode?
+      Prefixes[:milli] = { :factor => -3, :symbol_prefix => "m" }
+      Prefixes[:centi] = { :factor => -2, :symbol_prefix => "c" }
+      Prefixes[:deci] = { :factor => -1, :symbol_prefix => "d" }
+      Prefixes[:deca] = { :factor => 1, :symbol_prefix => "da" }
+      Prefixes[:hecto] = { :factor => 2, :symbol_prefix => "h" }
+      Prefixes[:kilo] = { :factor => 3, :symbol_prefix => "k" }
+      Prefixes[:mega] = { :factor => 6, :symbol_prefix => "M" }
+      Prefixes[:giga] = { :factor => 9, :symbol_prefix => "G" }
+      Prefixes[:tera] = { :factor => 12, :symbol_prefix => "T" }
+      Prefixes[:peta] = { :factor => 15, :symbol_prefix => "P" }
+      Prefixes[:exa] = { :factor => 18, :symbol_prefix => "E" }
+      Prefixes[:zetta] = { :factor => 21, :symbol_prefix => "Z" }
+      Prefixes[:yotta] = { :factor => 24, :symbol_prefix => "Y" }
+    end # Units
+    
+    module Declarations
+      Systeme::International::Units::SI.each do |unit, unit_data|
+        unit_factor_offset = (unit_data[:factor_offset] ? unit_data[:factor_offset] : 0 )
+        plural_unit_name = unit.to_s + "s"
+        
+        define_method(plural_unit_name.to_sym) { self * (10**(unit_factor_offset)) }
+        class_eval("alias :" + unit_data[:symbol].to_s + " :" + plural_unit_name)
+        class_eval("alias :" + plural_unit_name.chop + " :" + plural_unit_name)
+        Systeme::Registration::names << plural_unit_name << unit_data[:symbol].to_s << plural_unit_name.chop
+    
+        Systeme::International::Units::Prefixes.each do |prefix, prefix_data|
+          plural_prefixed_unit_name = prefix.to_s + plural_unit_name 
+          prefixed_symbol = prefix_data[:symbol_prefix] + unit_data[:symbol].to_s
+      
+          define_method(plural_prefixed_unit_name.to_sym) { self * (10**(prefix_data[:factor] + unit_factor_offset)) }
+          class_eval("alias :" + prefixed_symbol + " :" + plural_prefixed_unit_name)
+          class_eval("alias :" + plural_prefixed_unit_name.chop + " :" + plural_prefixed_unit_name)          
+          Systeme::Registration::names << plural_prefixed_unit_name << prefixed_symbol << plural_prefixed_unit_name.chop
+        end
+      end      
+    end # Declarations
+  end
+end

data/lib/systeme/localize.rb

@@ -0,0 +1,21 @@
+require 'systeme/registration'
+
+module Systeme
+  module Localize
+    def self.declare_system(dictionary)
+      dictionary.each do |measure, data|
+        data[:units].each do |unit|
+          define_method(unit[:unit].to_sym) { self * unit[:factor].to_f * data[:si] }
+          class_eval("alias :" + unit[:unit] + "s :" + unit[:unit])
+          Systeme::Registration::names << unit[:unit] << unit[:unit]+"s"
+          if unit[:aliases]
+            unit[:aliases].each do |aka|
+               class_eval("alias :" + aka + " :" + unit[:unit])
+               Systeme::Registration::names << aka
+             end
+          end
+        end
+      end
+    end
+  end
+end

data/lib/systeme/metric.rb

@@ -1,62 +1,19 @@
 require 'systeme/registration'
+require 'systeme/localize'
 
 module Systeme
   module Metric
     def self.included(caller)
       caller.send :include, Systeme::Metric::Declarations
-    end    
-
+    end
+    
     module Units
-      SI_BASE_UNITS = Hash.new
-      SI_BASE_UNITS[:meter] = { :symbol => :m, :measure => "length" }
-      SI_BASE_UNITS[:gram] = { :symbol => :g, :measure => "mass", :factor_offset => -3 }
-      SI_BASE_UNITS[:second] = { :symbol => :s, :measure => "time" }
-      SI_BASE_UNITS[:ampere] = { :symbol => :A, :measure => "electric current" }
-      SI_BASE_UNITS[:kelvin] = { :symbol => :K, :measure => "thermodynamic temperature" }
-
-      SI_UNIT_PREFIXES = Hash.new
-      SI_UNIT_PREFIXES[:yocto] = { :factor => -24, :symbol_prefix => "y" }
-      SI_UNIT_PREFIXES[:zepto] = { :factor => -21, :symbol_prefix => "z" }
-      SI_UNIT_PREFIXES[:atto] = { :factor => -18, :symbol_prefix => "a" }
-      SI_UNIT_PREFIXES[:femto] = { :factor => -15, :symbol_prefix => "f" }
-      SI_UNIT_PREFIXES[:pico] = { :factor => -12, :symbol_prefix => "p" }
-      SI_UNIT_PREFIXES[:nano] = { :factor => -9, :symbol_prefix => "n" }
-      SI_UNIT_PREFIXES[:micro] = { :factor => -6, :symbol_prefix => "u" } # use of 'µ' should be supported with unicode?
-      SI_UNIT_PREFIXES[:milli] = { :factor => -3, :symbol_prefix => "m" }
-      SI_UNIT_PREFIXES[:centi] = { :factor => -2, :symbol_prefix => "c" }
-      SI_UNIT_PREFIXES[:deci] = { :factor => -1, :symbol_prefix => "d" }
-      SI_UNIT_PREFIXES[:deca] = { :factor => 1, :symbol_prefix => "da" }
-      SI_UNIT_PREFIXES[:hecto] = { :factor => 2, :symbol_prefix => "h" }
-      SI_UNIT_PREFIXES[:kilo] = { :factor => 3, :symbol_prefix => "k" }
-      SI_UNIT_PREFIXES[:mega] = { :factor => 6, :symbol_prefix => "M" }
-      SI_UNIT_PREFIXES[:giga] = { :factor => 9, :symbol_prefix => "G" }
-      SI_UNIT_PREFIXES[:tera] = { :factor => 12, :symbol_prefix => "T" }
-      SI_UNIT_PREFIXES[:peta] = { :factor => 15, :symbol_prefix => "P" }
-      SI_UNIT_PREFIXES[:exa] = { :factor => 18, :symbol_prefix => "E" }
-      SI_UNIT_PREFIXES[:zetta] = { :factor => 21, :symbol_prefix => "Z" }
-      SI_UNIT_PREFIXES[:yotta] = { :factor => 24, :symbol_prefix => "Y" }
-    end # Units
+      Metric = Hash.new
+      Metric['carat'] = { :si => 0.0002, :units => [ { :unit => 'carat', :factor => 1, :aliases => ['CD'] } ] }
+    end
     
     module Declarations
-      Systeme::Metric::Units::SI_BASE_UNITS.each do |unit, unit_data|
-        unit_factor_offset = (unit_data[:factor_offset] ? unit_data[:factor_offset] : 0 )
-        plural_unit_name = unit.to_s + "s"
-        
-        define_method(plural_unit_name.to_sym) { self * (10**(unit_factor_offset)) }
-        class_eval("alias :" + unit_data[:symbol].to_s + " :" + plural_unit_name)
-        class_eval("alias :" + plural_unit_name.chop + " :" + plural_unit_name)
-        Systeme::Registration::names << plural_unit_name << unit_data[:symbol].to_s << plural_unit_name.chop
-    
-        Systeme::Metric::Units::SI_UNIT_PREFIXES.each do |prefix, prefix_data|
-          plural_prefixed_unit_name = prefix.to_s + plural_unit_name 
-          prefixed_symbol = prefix_data[:symbol_prefix] + unit_data[:symbol].to_s
-      
-          define_method(plural_prefixed_unit_name.to_sym) { self * (10**(prefix_data[:factor] + unit_factor_offset)) }
-          class_eval("alias :" + prefixed_symbol + " :" + plural_prefixed_unit_name)
-          class_eval("alias :" + plural_prefixed_unit_name.chop + " :" + plural_prefixed_unit_name)          
-          Systeme::Registration::names << plural_prefixed_unit_name << prefixed_symbol << plural_prefixed_unit_name.chop
-        end
-      end      
-    end # Declarations
+      Systeme::Localize::declare_system(Systeme::Metric::Units::Metric)
+    end
   end
 end

data/lib/systeme.rb

@@ -1,12 +1,17 @@
+require 'systeme/international'
 require 'systeme/metric'
 require 'systeme/imperial'
 require 'systeme/conversions'
 require 'systeme/registration'
 
 module Systeme
+  include Systeme::International
+  include Systeme::Localize
   include Systeme::Metric
   include Systeme::Imperial
   include Systeme::Conversions
 end
 
-Numeric.send :include, Systeme
+Numeric.send :include, Systeme
+
+puts 1.carat

data/test/international_test.rb

@@ -0,0 +1,23 @@
+require File.dirname(__FILE__) + '/test_helper'
+
+class InternationalTest < Test::Unit::TestCase
+  should "maintain base unit value through declaration" do
+    assert_equal 1, 1.kg
+    assert_equal 1, 1.m
+  end
+  
+  should "express non-base unit value in the base unit" do
+    assert_equal 0.001, 1.g
+    assert_equal 1000, 1.km
+  end
+  
+  should "convert value from base unit to any other unit" do
+    assert_equal 1000, 1.kg.in_g
+    assert_equal 100, 1.m.in_cm
+  end
+  
+  should "convert value between arbitrary units" do
+    assert_equal 1, 1000.mg.in_g
+    assert_equal 10, 1.cm.in_mm
+  end
+end

data/test/metric_test.rb

@@ -1,23 +1,7 @@
 require File.dirname(__FILE__) + '/test_helper'
 
-class MetricTest < Test::Unit::TestCase
-  should "maintain base unit value through declaration" do
-    assert_equal 1, 1.kg
-    assert_equal 1, 1.m
-  end
-  
-  should "express non-base unit value in the base unit" do
-    assert_equal 0.001, 1.g
-    assert_equal 1000, 1.km
-  end
-  
-  should "convert value from base unit to any other unit" do
-    assert_equal 1000, 1.kg.in_g
-    assert_equal 100, 1.m.in_cm
-  end
-  
-  should "convert value between arbitrary units" do
-    assert_equal 1, 1000.mg.in_g
-    assert_equal 10, 1.cm.in_mm
+class ImperialTest < Test::Unit::TestCase
+  should "convert carat to kilogram" do
+    assert_equal 0.0002, 1.carat
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: farski-systeme
 version: !ruby/object:Gem::Version 
-  version: 0.2.1
+  version: 0.3.0
 platform: ruby
 authors: 
 - Chris Kalafarski
@@ -26,10 +26,13 @@ files:
 - lib/systeme
 - lib/systeme/conversions.rb
 - lib/systeme/imperial.rb
+- lib/systeme/international.rb
+- lib/systeme/localize.rb
 - lib/systeme/metric.rb
 - lib/systeme/registration.rb
 - lib/systeme.rb
 - test/imperial_test.rb
+- test/international_test.rb
 - test/metric_test.rb
 - test/test_helper.rb
 has_rdoc: false