quantified 1.0.0 → 1.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b82fde76b902f73feeafc005768ef407964241c1
-  data.tar.gz: b36878a61fde1cf01bb5b982295d15a66fa1317c
+  metadata.gz: 84ba6ca1ebcb53b0a7bae563f6c7f9d899bcad86
+  data.tar.gz: 93d065832067c0c4c5d6a80867d6b90fcfd11958
 SHA512:
-  metadata.gz: eb74b18116d50c2cff3a550c47cd93569d901e96f6f265e73d6a27774401e9591dad3893de93e2beac5f3e45128b00fe73a57365b02973600f8a41d152fa5685
-  data.tar.gz: 6b0391b2b1a160eefccacbdb7cfea0c210fb56fa2a4ca6cd549882c8c08f0052f0b1adb3aa806a156bc7c7a8a69159bc2844c9f876e57c1c813df4356d8fc93d
+  metadata.gz: 0d1ad95fbed7c90460f6d3cfec4f5f11c2003abfa593a24571f7007c056112db723f5f969032a57628361ace8a096789936defaa79710c8d5709e3fe11056d5c
+  data.tar.gz: f502a30054914e6ed2f9b805cf7260db8932ec4ab78cee9d993f552e243362fd25d450b9302c900565455e59bf438cde2a2b7368c11a8b82b8c4f0c702e758b9

data/lib/quantified/length.rb

@@ -2,18 +2,34 @@ module Quantified
   class Length < Attribute
     system :metric do
       primitive :metre
+      one :meter, :is => Length.new(1, :metres)
+      one :m, :plural => :m, :is => Length.new(1, :metres)
 
       one :centimetre, :is => Length.new(0.01, :metres)
+      one :centimeter, :is => Length.new(0.01, :metres)
+      one :cm, :plural => :cm, :is => Length.new(0.01, :metres)
+
       one :millimetre, :is => Length.new(0.1, :centimetres)
+      one :millimeter, :is => Length.new(0.1, :centimetres)
+      one :mm, :plural => :mm, :is => Length.new(0.1, :centimetres)
+
       one :kilometre, :is => Length.new(1000, :metres)
+      one :kilometer, :is => Length.new(1000, :metres)
+      one :km, :plural => :km, :is => Length.new(1000, :metres)
     end
 
     system :imperial do
       primitive :inch
+
       one :inch, :is => Length.new(0.0254, :metres)
+      one :in, :plural => :in, :is => Length.new(0.0254, :metres)
 
       one :foot, :plural => :feet, :is => Length.new(12, :inches)
+      one :ft, :plural => :ft, :is => Length.new(12, :inches)
+
       one :yard, :is => Length.new(3, :feet)
+      one :yd, :plural => :yd, :is => Length.new(3, :feet)
+
       one :mile, :is => Length.new(5280, :feet)
     end
   end

data/lib/quantified/mass.rb

@@ -2,17 +2,29 @@ module Quantified
   class Mass < Attribute
     system :metric do
       primitive :gram
+      one :g, :plural => :g, :is => Mass.new(1, :grams)
 
       one :milligram, :is => Mass.new(0.001, :grams)
+      one :mg, :plural => :mg, :is => Mass.new(0.001, :grams)
+
+      one :carat, :is => Mass.new(0.2, :grams)
+      one :ct, :plural => :ct, :is => Mass.new(0.2, :grams)
+
       one :kilogram, :is => Mass.new(1000, :grams)
+      one :kg, :plural => :kg, :is => Mass.new(1000, :grams)
     end
 
     system :imperial do
       primitive :ounce
       one :ounce, :is => Mass.new(28.349523125, :grams)
+      one :oz, :plural => :oz, :is => Mass.new(28.349523125, :grams)
 
       one :pound, :is => Mass.new(16, :ounces)
+      one :lb, :plural => :lb, :is => Mass.new(16, :ounces)
+
       one :stone, :is => Mass.new(14, :pounds)
+      one :st, :plural => :st, :is => Mass.new(14, :pounds)
+
       one :short_ton, :is => Mass.new(2000, :pounds)
     end
   end

data/lib/quantified/version.rb

@@ -1,3 +1,3 @@
 module Quantified
-  VERSION = "1.0.0"
+  VERSION = "1.0.1"
 end

data/test/length_test.rb

@@ -85,8 +85,8 @@ class LengthTest < Test::Unit::TestCase
 
   def test_systems
     assert_equal [:metric, :imperial], Length.systems
-    assert_equal [:metres, :centimetres, :millimetres, :kilometres], Length.units(:metric)
-    assert_equal [:inches, :feet, :yards, :miles], Length.units(:imperial)
+    assert_equal [:metres, :meters, :m, :centimetres, :centimeters, :cm, :millimetres, :millimeters, :mm, :kilometres, :kilometers, :km], Length.units(:metric)
+    assert_equal [:inches, :in, :feet, :ft, :yards, :yd, :miles], Length.units(:imperial)
 
     assert_equal :metric, 2.centimetres.system
     assert_equal :imperial, 2.feet.system

data/test/mass_test.rb

@@ -82,8 +82,8 @@ class MassTest < Test::Unit::TestCase
 
   def test_systems
     assert_equal [:metric, :imperial], Mass.systems
-    assert_equal [:grams, :milligrams, :kilograms], Mass.units(:metric)
-    assert_equal [:ounces, :pounds, :stones, :short_tons], Mass.units(:imperial)
+    assert_equal [:grams, :g, :milligrams, :mg, :carats, :ct, :kilograms, :kg], Mass.units(:metric)
+    assert_equal [:ounces, :oz, :pounds, :lb, :stones, :st, :short_tons], Mass.units(:imperial)
   end
 
   def test_right_side_comparison_with_fixnum

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: quantified
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.0.1
 platform: ruby
 authors:
 - James MacAulay
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-01-26 00:00:00.000000000 Z
+date: 2015-05-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake