unit 0.4.0 → 0.4.1

data/.travis.yml

@@ -1,9 +1,7 @@
 rvm:
   - 1.8.7
-  - 1.9.2
   - 1.9.3
   - ruby-head
   - jruby
-  - rbx-2.0
-notifications:
-  email: false
+  - rbx-18mode
+  - rbx-19mode

data/lib/unit/class.rb

@@ -57,9 +57,12 @@ class Unit < Numeric
   def /(other)
     if Numeric === other
       other = coerce_numeric(other)
-      Unit.new(Integer === value && Integer === other.value ?
-               Rational(value, other.value) : value / other.value,
-               unit + Unit.power_unit(other.unit, -1), system)
+      result = if Integer === value && Integer === other.value
+                 other.value == 1 ? value : Rational(value, other.value)
+               else
+                 value / other.value
+               end
+      Unit.new(result, unit + Unit.power_unit(other.unit, -1), system)
     else
       apply_through_coercion(other, __method__)
     end
@@ -150,7 +153,7 @@ class Unit < Numeric
     unit = coerce_object(unit)
     result = self.in(unit)
     unless result.unit == unit.unit
-      raise TypeError, "Unexpected #{result.inspect}, expected to be in #{other_unit.unit_string}"
+      raise TypeError, "Unexpected #{result.inspect}, expected to be in #{unit.unit_string}"
     end
     result
   end
@@ -179,6 +182,10 @@ class Unit < Numeric
     Unit.new(self.to_f, unit, system)
   end
 
+  def round
+    Unit.new(value.round, unit, system)
+  end
+
   def coerce(other)
     [coerce_numeric(other), self]
   end
@@ -231,16 +238,17 @@ class Unit < Numeric
     end
 
     # Reduce factors
-    @unit.each_with_index do |(factor1, unit1, exp1), k|
-      next if exp1 < 0
-      @unit.each_with_index do |(factor2, unit2, exp2), j|
-        if exp2 < 0 && exp2 == -exp1
-          q, r = @system.factor[factor1][:value].divmod @system.factor[factor2][:value]
-          if r == 0 && new_factor = @system.factor_value[q]
-            @unit[k] = @unit[k].dup
-            @unit[j] = @unit[j].dup
-            @unit[k][0] = new_factor
-            @unit[j][0] = :one
+    @unit.each_with_index do |(factor1, _, exp1), k|
+      if exp1 > 0
+        @unit.each_with_index do |(factor2, _, exp2), j|
+          if exp2 == -exp1
+            q, r = @system.factor[factor1][:value].divmod @system.factor[factor2][:value]
+            if r == 0 && new_factor = @system.factor_value[q]
+              @unit[k] = @unit[k].dup
+              @unit[j] = @unit[j].dup
+              @unit[k][0] = new_factor
+              @unit[j][0] = :one
+            end
           end
         end
       end

data/lib/unit/system.rb

@@ -15,56 +15,42 @@ class Unit < Numeric
       @factor_symbol = {'one' => :one}
       @factor_value = {1 => :one}
 
+      @loaded_systems = []
+      @loaded_filenames = []
+
       yield(self) if block_given?
     end
 
     def load(input)
       case input
       when Hash
-        raise "Invalid hash format to load system" unless (input["units"] && input["units"].first.last['def']) || input.first.last['def']
-        data = input['units'] || input
+        data = input
       when IO
         data = YAML.load(input.read)
       when String
         if File.exist?(input)
+          return if @loaded_filenames.include?(input)
           data = YAML.load_file(input)
+          @loaded_filenames << input
         else
-          data = YAML.load_file(File.join(File.dirname(__FILE__), 'systems', "#{input}.yml"))
+          load(input.to_sym)
+          return
         end
       when Symbol
+        return if @loaded_systems.include?(input)
         data = YAML.load_file(File.join(File.dirname(__FILE__), 'systems', "#{input}.yml"))
+        @loaded_systems << input
       end
 
-      (data['factors'] || {}).each do |name, factor|
-        name = name.to_sym
-        symbols = [factor['sym'] || []].flatten
-        factor['def'] =~ /^(\d+)\^(-?\d+)$/
-        base = $1.to_i
-        exp = $2.to_i
-        value = base ** exp
-        $stderr.puts "Factor #{name} already defined" if @factor[name]
-        @factor[name] = { :symbol => symbols.first, :value => value }
-        symbols.each do |sym|
-          $stderr.puts "Factor symbol #{sym} for #{name} already defined" if @factor_symbol[name]
-          @factor_symbol[sym] = name
-        end
-        @factor_symbol[name.to_s] = @factor_value[value] = name
-      end
+      load_factors(data['factors']) if data['factors']
+      load_units(data['units']) if data['units']
 
-      (data['units'] || {}).each do |name, unit|
-        name = name.to_sym
-        symbols = [unit['sym'] || []].flatten
-        $stderr.puts "Unit #{name} already defined" if @unit[name]
-        @unit[name] = { :symbol => symbols.first, :def => parse_unit(unit['def'])  }
-        symbols.each do |sym|
-          $stderr.puts "Unit symbol #{sym} for #{name} already defined" if @unit_symbol[name]
-          @unit_symbol[sym] = name
-        end
-        @unit_symbol[name.to_s] = name
+      @unit.each do |name, unit|
+        defs = unit.delete(:defs)
+        unit[:def] = parse_unit(defs) if defs
+        validate_unit(unit[:def])
       end
 
-      @unit.each {|name, unit| validate_unit(unit[:def]) }
-
       true
     end
 
@@ -112,7 +98,7 @@ class Unit < Numeric
 
     REAL   = /^-?(?:(?:\d*\.\d+|\d+\.\d*)(?:[eE][-+]?\d+)?|\d+[eE][-+]?\d+)$/
     DEC    = /^-?\d+$/
-    SYMBOL = /^[a-zA-Z_°'"][\w_°'"]*$/
+    SYMBOL = /^[a-zA-Z_°'"][\w°'"]*$/
     OPERATOR = { '/' => ['/', 1], '*' => ['*', 1], '·' => ['*', 1], '^' => ['^', 2], '**' => ['^', 2] }
     OPERATOR_TOKENS = OPERATOR.keys.sort_by {|x| -x.size }. map {|x| Regexp.quote(x) }
     VALUE_TOKENS = [REAL.source[1..-2], DEC.source[1..-2], SYMBOL.source[1..-2]]
@@ -146,7 +132,37 @@ class Unit < Numeric
                 end
     end
 
-    public
+    def load_factors(factors)
+      factors.each do |name, factor|
+        name = name.to_sym
+        symbols = [factor['sym'] || []].flatten
+        base, exp = factor["def"].to_s.split("^").map { |value| Integer(value) }
+        exp ||= 1
+        raise "Invalid definition for factor #{name}" unless base
+        value = base ** exp
+        $stderr.puts "Factor #{name} already defined" if @factor[name]
+        @factor[name] = { :symbol => symbols.first, :value => value }
+        symbols.each do |sym|
+          $stderr.puts "Factor symbol #{sym} for #{name} already defined" if @factor_symbol[name]
+          @factor_symbol[sym] = name
+        end
+        @factor_symbol[name.to_s] = @factor_value[value] = name
+      end
+    end
+
+    def load_units(units)
+      units.each do |name, unit|
+        name = name.to_sym
+        symbols = [unit['sym'] || []].flatten
+        $stderr.puts "Unit #{name} already defined" if @unit[name]
+        @unit[name] = { :symbol => symbols.first, :defs => unit['def'] }
+        symbols.each do |sym|
+          $stderr.puts "Unit symbol #{sym} for #{name} already defined" if @unit_symbol[name]
+          @unit_symbol[sym] = name
+        end
+        @unit_symbol[name.to_s] = name
+      end
+    end
 
     SI = new('SI') do |system|
       system.load(:si)

data/lib/unit/systems/imperial.yml

@@ -35,3 +35,19 @@ units:
   knot:
     sym: kt
     def: nauticalmile / hour
+
+  gallon:
+    sym: [gal, gallons]
+    def: 231 inch^3
+  quart:
+    sym: [qt, quarts]
+    def: 1 gallon / 4
+  pint:
+    sym: [pt, pints]
+    def: 1 gallon / 8
+  cup:
+    sym: cups
+    def: 1 gallon / 16
+  fluid_ounce:
+    sym: [fl_oz, fluid_ounces]
+    def: 1 gallon / 128

data/lib/unit/systems/misc.yml

@@ -9,10 +9,6 @@ units:
   carat:
     def: 200 milligram
 
-  liter:
-    sym: [l, L]
-    def: 1 decimeter^3
-
   calorie:
     sym: cal
     def: 4184 millijoule

data/lib/unit/systems/si.yml

@@ -24,6 +24,9 @@ units:
     def: candela
 
   # Derived SI units
+  liter:
+    sym: [l, L]
+    def: 1 decimeter^3
   radiant:
     sym: [rad, radian]
     def: 1

data/lib/unit/version.rb

@@ -1,3 +1,3 @@
 class Unit < Numeric
-  VERSION = '0.4.0'
+  VERSION = '0.4.1'
 end

data/spec/error_spec.rb

@@ -13,14 +13,16 @@ describe "Errors" do
   describe "TypeError when trying to convert incompatible unit using #in!" do
     it "should have a nice error message" do
       unit = Unit(1000, "m / s")
-      lambda { unit.in!("seconds") }.should
-        raise_error(TypeError, %{Unexpected Unit("1000/1 m.s^-1"), expected to be in s})
+      expect { unit.in!("seconds") }.to(
+        raise_error(TypeError, %{Unexpected #{unit.inspect}, expected to be in s})
+      )
     end
 
     it "should have a nice error message using the DSL", :dsl => true do
       unit = Unit(1000, "m / s")
-      lambda { unit.in_seconds!  }.should
-        raise_error(TypeError, %{Unexpected Unit("1000/1 m.s^-1"), expected to be in s})
+      expect { unit.in_seconds! }.to(
+        raise_error(TypeError, %{Unexpected #{unit.inspect}, expected to be in s})
+      )
     end
   end
 

data/spec/system_spec.rb

@@ -1,31 +1,97 @@
 # -*- coding: utf-8 -*-
 require 'spec_helper'
 
-describe "Unit" do
-  describe "#default_system" do
-    describe "#load" do
-      it "should load an IO object" do
-        test_file = File.join(File.dirname(__FILE__), "yml", "io.yml")
-        File.open(test_file) do |file|
-          Unit.default_system.load(file)
+describe Unit::System do
+  let(:system) { Unit::System.new("test") }
+
+  describe "#load" do
+    it "should load an IO object" do
+      system.load(:si)
+      test_file = File.join(File.dirname(__FILE__), "yml", "io.yml")
+      File.open(test_file) { |file| system.load(file) }
+      Unit(1, "pim", system).should == Unit(3.14159, "m", system)
+    end
+
+    context "when passed a String" do
+      context "that is a filename" do
+        it "should load the file" do
+          filename = File.join(File.dirname(__FILE__), "yml", "filename.yml")
+          system.load(:si)
+          system.load(filename)
+          Unit(2, "dzm", system).should == Unit(24, "m", system)
+        end
+      end
+
+      context "that is not a filename" do
+        it "should load the built-in system of that name" do
+          system.load("si")
+          lambda { Unit(2, 'm', system) }.should_not raise_exception
+        end
+      end
+    end
+
+    context "when passed a Hash" do
+      context "of units" do
+        it "should load the units" do
+          system.load(:si)
+          system.load(
+            'units' => {
+              'dozen_meter' => {
+                'sym' => 'dzm',
+                'def' => '12 m'
+              }
+            }
+          )
+          Unit(2, "dzm", system).should == Unit(24, "m", system)
         end
-        Unit(1, "pim").should == Unit(3.14159, "m")
       end
 
-      it "should load a file" do
+      context "of factors" do
+        it "should load the factors" do
+          system.load(:si)
+          system.load(
+            'factors' => {
+              'dozen' => {
+                'sym' => 'dz',
+                'def' => 12
+              }
+            }
+          )
+          Unit(2, "dzm", system).should == Unit(24, "m", system)
+        end
+      end
+
+      context "when passed an invalid factor" do
+        it "should raise an exception" do
+          system.load(:si)
+          lambda {
+            system.load(
+              'factors' => {
+                'dozen' => {
+                  'sym' => 'dz'
+                }
+              }
+            )
+          }.should raise_exception("Invalid definition for factor dozen")
+        end
+      end
+    end
+
+    context "when called on the same filename a second time" do
+      it "should be a no-op" do
+        $stderr.should_not_receive(:puts)
         test_file = File.join(File.dirname(__FILE__), "yml", "filename.yml")
-        Unit.default_system.load(test_file)
-        Unit(2, "dzm").should == Unit(24, "m")
+        system.load(:si)
+        system.load(test_file)
+        lambda { system.load(test_file) }.should_not raise_exception
       end
+    end
 
-      it "should load a hash" do
-        Unit.default_system.load({
-          'dozen_meter' => {
-            'sym' => 'dzm',
-            'def' => '12 m'
-          }
-        })
-        Unit(2, "dzm").should == Unit(24, "m")
+    context "when called on the same symbol a second time" do
+      it "should be a no-op" do
+        $stderr.should_not_receive(:puts)
+        system.load(:si)
+        lambda { system.load(:si) }.should_not raise_exception
       end
     end
   end

data/spec/unit_spec.rb

@@ -158,7 +158,7 @@ describe 'Unit' do
 
   it 'should reduce units' do
     Unit(1, "joule/kilogram").normalize.unit.should == [[:one, :meter, 2], [:one, :second, -2]].sort
-    Unit(1, "megaton/kilometer").unit.should == [[:kilo, :ton, 1], [:one, :meter, -1]].reverse
+    Unit(1, "megaton/kilometer").unit.should == [[:one, :meter, -1], [:kilo, :ton, 1]]
   end
 
   it 'should work with floating point values' do
@@ -213,6 +213,14 @@ describe 'Unit' do
     Unit(Rational(1,3), "m").approx.should == Unit(1.0/3.0, "m")
   end
 
+  it "should be able to round and return a unit" do
+    Unit(Rational(1,3), "m").round.should == Unit(0, "m")
+    Unit(Rational(2,3), "m").round.should == Unit(1, "m")
+    Unit(0.1, "m").round.should == Unit(0, "m")
+    Unit(0.5, "m").round.should == Unit(1, "m")
+    Unit(1, "m").round.should == Unit(1, "m")
+  end
+
 end
 
 describe "Unit DSL", :dsl => true do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: unit
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.4.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-01-19 00:00:00.000000000 Z
+date: 2012-10-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &7079200 !ruby/object:Gem::Requirement
+  requirement: &11788980 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: 0.8.7
   type: :development
   prerelease: false
-  version_requirements: *7079200
+  version_requirements: *11788980
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &7078560 !ruby/object:Gem::Requirement
+  requirement: &11978500 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,7 +32,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *7078560
+  version_requirements: *11978500
 description: 
 email:
 - mail@daniel-mendler.de
@@ -88,7 +88,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: unit
-rubygems_version: 1.8.11
+rubygems_version: 1.8.15
 signing_key: 
 specification_version: 3
 summary: Scientific unit support for ruby for calculations