dimensional 0.0.3 → 0.0.4

data/Rakefile

@@ -16,7 +16,7 @@ Rake::Task['test'].comment = "Run all tests in test/*_test.rb"
 spec = Gem::Specification.new do |s|
   s.platform = Gem::Platform::RUBY
   s.name = %q{dimensional}
-  s.version = "0.0.3"
+  s.version = "0.0.4"
   s.required_ruby_version = '>= 1.6.8'
   s.date = %q{2009-10-09}
   s.authors = ["Chris Hapgood"]

data/lib/dimensional.rb

@@ -4,5 +4,5 @@ require 'dimensional/unit'
 require 'dimensional/measure'
 
 module Dimensional
-  VERSION = "0.0.3"
+  VERSION = "0.0.4"
 end

data/lib/dimensional/measure.rb

@@ -22,7 +22,7 @@ module Dimensional
       units = metric.units
       elements = str.to_s.scan(NUMERIC_REGEXP).map do |(v, us)|
         units = units.select{|u| system == u.system} if system
-        unit = us.nil? ? units.first : units.detect{|u| u.match(us.to_s)}
+        unit = us.nil? ? units.first : units.detect{|u| u.match(us)}
         raise ArgumentError, "Unit cannot be determined (#{us})" unless unit
         system = unit.system
         value = unit.dimension.nil? ? v.to_i : v.to_f

data/lib/dimensional/metric.rb

@@ -40,7 +40,7 @@ module Dimensional
 
     def units
       baseline = parent ? parent.units : @units.keys
-      baseline.sort_by{|u| 1.0 - preference(u)}
+      baseline.sort_by{|u| [1.0 - preference(u), u.name, u.system]}
     end
   
     def preferences(u)

data/lib/dimensional/system.rb

@@ -1,14 +1,16 @@
+require 'delegate'
+
 module Dimensional
   # Represents a set of units for comprehensive measurement of physical quantities.
-  class System
+  class System < DelegateClass(String)
     @registry = Hash.new
     @abbreviation_registry = Hash.new
 
     def self.register(*args)
       s = new(*args)
-      raise "System #{s.name} already exists" if @registry[s.name]
-      raise "System #{s.name}'s abbreviation already exists" if @abbreviation_registry[s.abbreviation]
-      @registry[s.name.to_sym] = s
+      raise "System #{s} already exists" if @registry[s.to_sym]
+      raise "System #{s}'s abbreviation already exists" if @abbreviation_registry[s.abbreviation]
+      @registry[s.to_sym] = s
       @abbreviation_registry[s.abbreviation.to_sym] = s if s.abbreviation
       const_set(s.abbreviation, s) rescue nil # Not all symbols strings are valid constant names
       s
@@ -20,11 +22,6 @@ module Dimensional
       @abbreviation_registry[sym] || @registry[sym]
     end
     
-    # Systems are expected to be declared 'universally' and always be in context so we only dump the name
-    def self._load(str)
-      @registry[str.to_sym]
-    end
-
     # Purge all systems from storage.
     def self.reset!
       constants.each {|d| remove_const(d)}
@@ -35,17 +32,8 @@ module Dimensional
     attr_reader :name, :abbreviation
 
     def initialize(name, abbreviation = nil)
-      @name = name.to_s.freeze
       @abbreviation = abbreviation && abbreviation.to_s
-    end
-    
-    # Systems are expected to be declared 'universally' and always be in context so we only dump the name
-    def _dump(depth)
-      name
-    end
-
-    def to_s
-      name rescue super
+      super(name)
     end
   end
 end

data/test/system_test.rb

@@ -10,13 +10,13 @@ class SystemTest < Test::Unit::TestCase
 
   def test_create_new_measurement_system
     assert_instance_of System, s = System.new('British Admiralty')
-    assert_equal 'British Admiralty', s.name
+    assert_equal 'British Admiralty', s
     assert_nil s.abbreviation
   end
   
   def test_create_new_measurement_system_with_abbreviation
     assert_instance_of System, s = System.new('British Admiralty', 'BA')
-    assert_equal 'British Admiralty', s.name
+    assert_equal 'British Admiralty', s
     assert_equal 'BA', s.abbreviation
   end
   

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: dimensional
 version: !ruby/object:Gem::Version 
-  version: 0.0.3
+  version: 0.0.4
 platform: ruby
 authors: 
 - Chris Hapgood