unitwise 0.2.0 → 0.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7b43a98361a2647155beb5a86d6bc1281e8f160c
-  data.tar.gz: 25dbd408ecc497a0003592c17c41b3636537d2bb
+  metadata.gz: 7cf611ec88dbc4e07823a8237da220ddc2747dd0
+  data.tar.gz: 8efa28b4bbf55900b05cac6f25655b9fe6476f11
 SHA512:
-  metadata.gz: 1e1b4d53bc2c1cbe081df9a5df31d82872ae390773831558137fba10139d27fb9e4fab531149f5f876a5c4a7bf57d97340ef70e671d0fbabaa5c930a953f96a1
-  data.tar.gz: f17f89d11af392f7c9b520ad4defe197ddf9657ccb7bce721923f59a229caf5336ab892653c01fc9f6d5d546864bca1b7c298cd5e56ccb54e480e80fcc90bc8e
+  metadata.gz: 9e2dc02863b592f53e73912d43c536388a54dad320dff00c28855645aa9e59071e9328ea7c12a8c151db567e476160179efc404e6898df7955d5e940ca8f7b10
+  data.tar.gz: 5775f6a107d7b953bb40a38edcde038b88ba20c020049c67eb747cba29fdf9803f6b7a23c320d4db7f404eadb90a7cf7327a1d3e299f00d93bbca9b37c2e2298

data/Gemfile

@@ -1,4 +1,5 @@
 source 'https://rubygems.org'
 
 # Specify your gem's dependencies in unitwise.gemspec
+gem 'pry'
 gemspec

data/lib/unitwise/expression.rb

@@ -14,10 +14,16 @@ module Unitwise
       end
 
       def decompose(expression)
-        begin
-          Decomposer.new(expression).terms
-        rescue ExpressionError
-          nil
+        expression = expression.to_s
+        @decompose ||= {}
+        if @decompose.has_key?(expression)
+          @decompose[expression]
+        else
+          @decompose[expression] = begin
+            Decomposer.new(expression).terms
+          rescue ExpressionError
+            nil
+          end
         end
       end
     end

data/lib/unitwise/ext/numeric.rb

@@ -4,10 +4,8 @@ class Numeric
   end
 
   def method_missing(meth, *args, &block)
-    if Unitwise::Expression.decompose(meth)
-      self.convert(meth)
-    else
-      super(meth, *args, &block)
-    end
+    convert(meth)
+  rescue Unitwise::ExpressionError
+    super(meth, *args)
   end
 end

data/lib/unitwise/measurement.rb

@@ -1,6 +1,13 @@
 module Unitwise
   class Measurement < Scale
 
+    def initialize(value, unit)
+      super(value, unit)
+      if terms.nil?
+        raise ExpressionError, "Could not evaluate `#{unit}`."
+      end
+    end
+
     def convert(other_unit)
       other_unit = Unit.new(other_unit)
       if similar_to?(other_unit)

data/lib/unitwise/scale.rb

@@ -21,6 +21,10 @@ module Unitwise
       unit.atoms
     end
 
+    def terms
+      unit.terms
+    end
+
     def special?
       unit.special?
     end

data/lib/unitwise/unit.rb

@@ -1,7 +1,6 @@
 module Unitwise
   class Unit
     include Unitwise::Composable
-    attr_writer :terms, :expression
 
     def initialize(input)
       if input.respond_to?(:expression)

data/lib/unitwise/version.rb

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

data/test/unitwise/measurement_test.rb

@@ -7,6 +7,9 @@ describe Unitwise::Measurement do
       subject.value.must_equal(1)
       subject.unit.to_s.must_equal('m/s')
     end
+    it "should raise an error for unknown units" do
+      ->{ Unitwise::Measurement.new(1,"funkitron") }.must_raise(Unitwise::ExpressionError)
+    end
   end
 
   describe "#unit" do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: unitwise
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.1
 platform: ruby
 authors:
 - Josh Lewis
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-11-14 00:00:00.000000000 Z
+date: 2013-12-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: signed_multiset
@@ -210,3 +210,4 @@ test_files:
 - test/unitwise/term_test.rb
 - test/unitwise/unit_test.rb
 - test/unitwise_test.rb
+has_rdoc: