unitwise 0.2.1 → 0.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7cf611ec88dbc4e07823a8237da220ddc2747dd0
-  data.tar.gz: 8efa28b4bbf55900b05cac6f25655b9fe6476f11
+  metadata.gz: 59c17c683ada5799884a58c772a51eb20b59a5b8
+  data.tar.gz: f8fb3b7099821b43a090d3253edb6e93a728dad3
 SHA512:
-  metadata.gz: 9e2dc02863b592f53e73912d43c536388a54dad320dff00c28855645aa9e59071e9328ea7c12a8c151db567e476160179efc404e6898df7955d5e940ca8f7b10
-  data.tar.gz: 5775f6a107d7b953bb40a38edcde038b88ba20c020049c67eb747cba29fdf9803f6b7a23c320d4db7f404eadb90a7cf7327a1d3e299f00d93bbca9b37c2e2298
+  metadata.gz: 7ebe5b4426d7adf2a107fa4ab122ebffffcc79468b342e9592b06e0dc434fe90582db96a5e563c1c755bdd8b66fa26c5146c59879c8e66c9e2d697a9d1e4762f
+  data.tar.gz: 685a1a81769b575066d608572038ebaf43eab8c04bf9e635971ec7ff8080fee248ea1f549ba1d9e94d95af8032959f5080fcbec091846e346cb4e8d28fa7b8dc

data/lib/unitwise/atom.rb

@@ -1,7 +1,7 @@
 module Unitwise
   class Atom < Base
-    attr_accessor :classification, :property, :metric, :special
-    attr_accessor :arbitrary, :dim
+    attr_accessor :classification, :property, :metric, :special, :arbitrary
+    attr_writer :dim
 
     include Unitwise::Composable
 
@@ -16,7 +16,7 @@ module Unitwise
     end
 
     def base?
-      scale.nil? && !dim.nil?
+      scale.nil? && !@dim.nil?
     end
 
     def derived?
@@ -47,8 +47,8 @@ module Unitwise
       depth <= 3
     end
 
-    def key
-      base? ? dim : property
+    def dim
+      terminal? ? @dim || property : composition_string
     end
 
     def scale=(attrs)
@@ -67,7 +67,6 @@ module Unitwise
       scale.functional(x, direction)
     end
 
-
     def root_terms
       base? ? [Term.new(atom: self)] : scale.root_terms
     end

data/lib/unitwise/composable.rb

@@ -7,10 +7,20 @@ module Unitwise
 
     def composition
       root_terms.reduce(SignedMultiset.new) do |s, t|
-        s.increment(t.atom.key, t.exponent) if t.atom; s
+        s.increment(t.atom.dim, t.exponent) if t.atom; s
       end
     end
 
+    def dim
+      composition_string
+    end
+
+    def composition_string
+      composition.sort.map do |k,v|
+        v == 1 ? k.to_s : "#{k}#{v}"
+      end.join('.')
+    end
+
     def similar_to?(other)
       self.composition == other.composition
     end

data/lib/unitwise/expression/parser.rb

@@ -45,7 +45,7 @@ module Unitwise
       end
 
       rule (:expression) do
-        (group | term).as(:left) >> (operator >> expression.as(:right)).maybe
+        ((group | term).as(:left)).maybe >> (operator >> expression.as(:right)).maybe
       end
 
     end

data/lib/unitwise/expression/transformer.rb

@@ -8,6 +8,10 @@ module Unitwise
       rule(atom_code: simple(:c)) { Atom.find(c) }
       rule(term: subtree(:h)) { Term.new(h) }
 
+      rule(operator: simple(:o), right: simple(:r)) do
+        o == '/' ? r ** -1 : r
+      end
+
       rule(left: simple(:l), operator: simple(:o), right: simple(:r)) do
         o == '/' ? l / r : l * r
       end

data/lib/unitwise/version.rb

@@ -1,3 +1,3 @@
 module Unitwise
-  VERSION = "0.2.1"
+  VERSION = "0.2.2"
 end

data/test/unitwise/atom_test.rb

@@ -23,11 +23,12 @@ describe Unitwise::Atom do
     end
   end
 
-  let(:second) { Unitwise::Atom.find("s") }
-  let(:yard) { Unitwise::Atom.find("[yd_i]")}
-  let(:pi) { Unitwise::Atom.find("[pi]")}
+  let(:second)  { Unitwise::Atom.find("s") }
+  let(:yard)    { Unitwise::Atom.find("[yd_i]")}
+  let(:pi)      { Unitwise::Atom.find("[pi]")}
   let(:celsius) { Unitwise::Atom.find("Cel")}
-  let(:pfu) { Unitwise::Atom.find("[PFU]")}
+  let(:pfu)     { Unitwise::Atom.find("[PFU]")}
+  let(:joule)   { Unitwise::Atom.find("J")}
   describe "#scale" do
     it "must be nil for base atoms" do
       second.scale.must_equal nil
@@ -106,11 +107,11 @@ describe Unitwise::Atom do
     end
   end
 
-  describe "#key" do
-    it "must return the dim or the property" do
-      second.key.must_equal "T"
-      pi.key.must_equal "number"
-      celsius.key.must_equal "temperature"
+  describe "#dim" do
+    it "must return the dim" do
+      second.dim.must_equal 'T'
+      yard.dim.must_equal 'L'
+      joule.dim.must_equal 'L2.M.T-2'
     end
   end
 

data/test/unitwise/expression/parser_test.rb

@@ -87,5 +87,23 @@ describe Unitwise::Expression::Parser do
     end
   end
 
+  describe "#expression" do
+    it "must match left only" do
+      match = subject.expression.parse('m')
+      match[:left][:term][:atom][:atom_code].must_equal("m")
+    end
+    it "must match left + right + operator" do
+      match = subject.expression.parse('m.s')
+      match[:left][:term][:atom][:atom_code].must_equal("m")
+      match[:operator].must_equal('.')
+      match[:right][:left][:term][:atom][:atom_code].must_equal('s')
+    end
+    it "must match operator + right" do
+      match = subject.expression.parse("/s")
+      match[:operator].must_equal('/')
+      match[:right][:left][:term][:atom][:atom_code].must_equal('s')
+    end
+  end
+
 
 end

data/test/unitwise/unit_test.rb

@@ -3,7 +3,7 @@ require 'test_helper'
 describe Unitwise::Unit do
 
   let(:ms2) { Unitwise::Unit.new("m/s2") }
-  let(:kg) { Unitwise::Unit.new("kg") }
+  let(:kg)  { Unitwise::Unit.new("kg") }
   let(:psi) { Unitwise::Unit.new("[psi]")}
   let(:deg) { Unitwise::Unit.new("deg")}
 
@@ -40,6 +40,13 @@ describe Unitwise::Unit do
     end
   end
 
+  describe "#dim" do
+    it "must be a string representing it's dimensional makeup" do
+      ms2.dim.must_equal 'L.T-2'
+      psi.dim.must_equal 'L-1.M.T-2'
+    end
+  end
+
   describe "#*" do
     it "should multiply units" do
       mult = kg * ms2

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: unitwise
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.2.2
 platform: ruby
 authors:
 - Josh Lewis
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-12-14 00:00:00.000000000 Z
+date: 2013-12-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: signed_multiset