unit 0.2.1 → 0.3.0

data/lib/{systems → unit/systems}/si.yml

@@ -91,85 +91,65 @@ units:
     sym: kat
     def: mole / second
 
-prefixes:
+factors:
   # SI prefices
   yotta:
-    sym:  Y
-    base: 10
-    exp:  24
+    sym: Y
+    def: 10^24
   zetta:
-    sym:  Z
-    base: 10
-    exp:  21
+    sym: Z
+    def: 10^21
   exa:
-    sym:  E
-    base: 10
-    exp:  18
+    sym: E
+    def: 10^18
   peta:
-    sym:  P
-    base: 10
-    exp:  15
+    sym: P
+    def: 10^15
   tera:
-    sym:  T
-    base: 10
-    exp:  12
+    sym: T
+    def: 10^12
   giga:
-    sym:  G
-    base: 10
-    exp:  9
+    sym: G
+    def: 10^9
   mega:
-    sym:  M
-    base: 10
-    exp:  6
+    sym: M
+    def: 10^6
   kilo:
-    sym:  k
-    base: 10
-    exp:  3
+    sym: k
+    def: 10^3
   hecto:
-    sym:  h
-    base: 10
-    exp:  2
+    sym: h
+    def: 10^2
   deca:
-    sym:  da
-    base: 10
-    exp:  1
+    sym: da
+    def: 10^1
   deci:
-    sym:  d
-    base: 10
-    exp:  -1
+    sym: d
+    def: 10^-1
   centi:
-    sym:  c
-    base: 10
-    exp:  -2
+    sym: c
+    def: 10^-2
   milli:
-    sym:  m
-    base: 10
-    exp:  -3
+    sym: m
+    def: 10^-3
   micro:
-    sym:  µ
-    base: 10
-    exp:  -6
+    sym: µ
+    def: 10^-6
   nano:
-    sym:  n
-    base: 10
-    exp:  -9
+    sym: n
+    def: 10^-9
   pico:
-    sym:  p
-    base: 10
-    exp:  -12
+    sym: p
+    def: 10^-12
   femto:
-    sym:  f
-    base: 10
-    exp:  -15
+    sym: f
+    def: 10^-15
   atto:
-    sym:  a
-    base: 10
-    exp:  -18
+    sym: a
+    def: 10^-18
   zepto:
-    sym:  z
-    base: 10
-    exp:  -21
+    sym: z
+    def: 10^-21
   yokto:
-    sym:  y
-    base: 10
-    exp:  -24
+    sym: y
+    def: 10^-24

data/lib/unit/version.rb

@@ -0,0 +1,3 @@
+class Unit < Numeric
+  VERSION = '0.3.0'
+end

data/test/error_test.rb

@@ -0,0 +1,16 @@
+# -*- coding: utf-8 -*-
+require 'bacon'
+require 'unit'
+require 'unit/dsl'
+
+describe "Errors" do
+  describe "TypeError when adding incompatible units" do
+    it "should have a nice error message" do
+      unit_1 = Unit(1, "meter")
+      unit_2 = Unit(1, "second")
+      lambda {
+        unit_1 + unit_2
+      }.should.raise(TypeError).message.should.equal("Incompatible units: #{unit_1.inspect} and #{unit_2.inspect}")
+    end
+  end
+end

data/test/system_test.rb

@@ -0,0 +1,24 @@
+# -*- coding: utf-8 -*-
+require 'bacon'
+require 'unit'
+require 'unit/dsl'
+
+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)
+        end
+        Unit(1, "pim").should.equal Unit(3.14159, "m")
+      end
+
+      it "should load a file" do
+        test_file = File.join(File.dirname(__FILE__), "yml", "filename.yml")
+        Unit.default_system.load(test_file)
+        Unit(2, "dzm").should.equal Unit(24, "m")
+      end
+    end
+  end
+end

data/test/unit_test.rb

@@ -1,9 +1,11 @@
-# encoding: utf-8
+# -*- coding: utf-8 -*-
+require 'bacon'
 require 'unit'
+require 'unit/dsl'
 
-Unit::System::DEFAULT.load(:scientific)
-Unit::System::DEFAULT.load(:imperial)
-Unit::System::DEFAULT.load(:misc)
+Unit.default_system.load(:scientific)
+Unit.default_system.load(:imperial)
+Unit.default_system.load(:misc)
 
 describe 'Unit' do
   it 'should support multiplication' do
@@ -25,6 +27,11 @@ describe 'Unit' do
     (Unit(1, 'm') - Unit(1, 'cm')).should.equal Unit(99, 100, 'm')
   end
 
+  it "should support adding through zero" do
+    (Unit(0, "m") + Unit(1, "m")).should.equal Unit(1, "m")
+    (Unit(1, "m") + Unit(-1, "m") + Unit(1, "m")).should.equal Unit(1, "m")
+  end
+
   it 'should check unit compatiblity' do
     should.raise TypeError do
       (Unit(42, 'm') + Unit(1, 's'))
@@ -32,6 +39,9 @@ describe 'Unit' do
     should.raise TypeError do
       (Unit(42, 'g') + Unit(1, 'm'))
     end
+    should.raise TypeError do
+      (Unit(0, 'g') + Unit(1, 'm'))
+    end
   end
 
   it 'should support exponentiation' do
@@ -95,15 +105,40 @@ describe 'Unit' do
   end
 
   it 'should have dimensionless? method' do
+    100.meter_per_km.should.be.dimensionless
     100.meter.per_km.should.be.dimensionless
     100.meter.per_km.should.be.unitless
     42.meter.per_second.should.not.be.unitless
-    100.meter.per_km.should.equal Rational(1, 10).to_unit
+    100.meter.per_km.should.equal Unit(Rational(1, 10))
   end
 
   it 'should be equal to rational if dimensionless' do
     100.meter.per_km.should.equal Rational(1, 10)
     100.meter.per_km.approx.should.equal 0.1
   end
+
+  it 'should be comparable' do
+    Unit(1,'m').should < Unit(2,'m')
+    Unit(1,'m').should <= Unit(2,'m')
+
+    Unit(1,'m').should <= Unit(1,'m')
+    Unit(1,'m').should >= Unit(1,'m')
+
+    Unit(1,'m').should > Unit(0,'m')
+    Unit(1,'m').should >= Unit(0,'m')
+
+    Unit(100, "m").should < Unit(1, "km")
+    Unit(100, "m").should > Unit(0.0001, "km")
+  end
+
+  it "should fail comparison on differing units" do
+    lambda do
+      Unit(1, "second") > Unit(1, "meter")
+    end.should.raise(ArgumentError)
+  end
+
+  it "should keep units when the value is zero" do
+    Unit(0, "m").unit.should.equal [[:one, :meter, 1]]
+  end
 end
 

data/test/yml/filename.yml

@@ -0,0 +1,4 @@
+units:
+  dozen_meter:
+    sym: dzm
+    def: 12 m

data/test/yml/io.yml

@@ -0,0 +1,4 @@
+units:
+  pi_meter:
+    sym: pim
+    def: 3.14159 m

data/unit.gemspec

@@ -1,5 +1,5 @@
 # -*- encoding: utf-8 -*-
-require File.dirname(__FILE__) + '/lib/unit'
+require File.dirname(__FILE__) + '/lib/unit/version'
 
 Gem::Specification.new do |s|
   s.name = %q{unit}

metadata

@@ -2,7 +2,7 @@
 name: unit
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.2.1
+  version: 0.3.0
 platform: ruby
 authors: 
 - Daniel Mendler
@@ -47,18 +47,28 @@ extra_rdoc_files: []
 files: 
 - .travis.yml
 - Gemfile
+- LICENSE
 - README.markdown
 - Rakefile
-- lib/systems/binary.yml
-- lib/systems/degree.yml
-- lib/systems/imperial.yml
-- lib/systems/misc.yml
-- lib/systems/scientific.yml
-- lib/systems/si.yml
-- lib/systems/time.yml
 - lib/unit.rb
-- lib/units.rb
+- lib/unit/class.rb
+- lib/unit/compatibility.rb
+- lib/unit/constructor.rb
+- lib/unit/dsl.rb
+- lib/unit/system.rb
+- lib/unit/systems/binary.yml
+- lib/unit/systems/degree.yml
+- lib/unit/systems/imperial.yml
+- lib/unit/systems/misc.yml
+- lib/unit/systems/scientific.yml
+- lib/unit/systems/si.yml
+- lib/unit/systems/time.yml
+- lib/unit/version.rb
+- test/error_test.rb
+- test/system_test.rb
 - test/unit_test.rb
+- test/yml/filename.yml
+- test/yml/io.yml
 - unit.gemspec
 has_rdoc: true
 homepage: http://github.com/minad/unit

data/lib/systems/binary.yml

@@ -1,41 +0,0 @@
-units:
-  bit:
-    sym: bit
-    def: bit
-  byte:
-    sym: B
-    def: 8 * bit
-
-prefixes:
-  kibi:
-    sym:  Ki
-    base: 2
-    exp:  10
-  mebi:
-    sym:  Mi
-    base: 2
-    exp:  20
-  gibi:
-    sym:  Gi
-    base: 2
-    exp:  30
-  tebi:
-    sym:  Ti
-    base: 2
-    exp:  40
-  pebi:
-    sym:  Pi
-    base: 2
-    exp:  50
-  exbi:
-    sym:  Ei
-    base: 2
-    exp:  60
-  zebi:
-    sym:  Zi
-    base: 2
-    exp:  70
-  yobi:
-    sym:  Yi
-    base: 2
-    exp:  80

data/lib/units.rb

@@ -1 +0,0 @@
-require 'unit'