unitwise 0.5.0 → 0.5.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d970e26b0f67f67405f4ee70e3c147cd9b1a816b
-  data.tar.gz: fd6e3942b5f6b1d1c9738dc6b6354023813a8f41
+  metadata.gz: d6ff99c65554976100b5a3cc719eb53aa95fc769
+  data.tar.gz: f3264f24f7f00d2380f2433ac4f5c6d0b7631b04
 SHA512:
-  metadata.gz: bec5e1b8cc43f3c72cee9c6291f8938580ef5e1d15d7ee85c0795398c6f2efa6e8b58818a97ec9d52b89f9bfd683050b46548de18c4ab1f9d1b1fc818d718d84
-  data.tar.gz: 64a1c445e9bde3bf1bd8cf501946bbb2cfb2b1d98c0f28a4fd22a90d46aae312d443a3b4099447897cc6ca104072edfb3c82f58abf103e9bda70adc555bec4a1
+  metadata.gz: 83c29762b50698411daacac88989649953282968257a932f86e224b8b9e84e5139cc912b25bf8ff4647df1dda3c6b1e5884e3285284a7b3fc463ff928ad1046c
+  data.tar.gz: a93702efcf3fcb0f849be1a6cd6a2219c5892df763ffa14f1284c2bb45a2d75c451a9c40db141591cde42ddde0dcbeecb6efcc1386ad795bd1f65d75542e2fdd

data/.travis.yml

@@ -6,7 +6,6 @@ rvm:
   - 2.0.0
   - 2.1.0
   - ruby-head
-  - rbx
   - rbx-2
 matrix:
   include:
@@ -14,8 +13,7 @@ matrix:
       env: JRUBY_OPTS="$JRUBY_OPTS --debug"
     - rvm: jruby-head
       env: JRUBY_OPTS="$JRUBY_OPTS --debug"
-  allow_failure:
-    - rvm: rbx
+  allow_failures:
     - rvm: ruby-head
     - rvm: jruby-head
   fast_finish: true

data/README.md

@@ -1,11 +1,10 @@
 # [Unitwise](//github.com/joshwlewis/unitwise)
 
-[![Gem Version](https://badge.fury.io/rb/unitwise.png)](http://badge.fury.io/rb/unitwise)
-[![Build Status](https://travis-ci.org/joshwlewis/unitwise.png)](https://travis-ci.org/joshwlewis/unitwise)
-[![Dependency Status](https://gemnasium.com/joshwlewis/unitwise.png)](https://gemnasium.com/joshwlewis/unitwise)
-[![Coverage Status](https://coveralls.io/repos/joshwlewis/unitwise/badge.png)](https://coveralls.io/r/joshwlewis/unitwise)
-[![Code Climate](https://codeclimate.com/github/joshwlewis/unitwise.png)](https://codeclimate.com/github/joshwlewis/unitwise)
-[![Inline docs](http://inch-pages.github.io/github/joshwlewis/unitwise.png)](http://inch-pages.github.io/github/joshwlewis/unitwise)
+[![Gem Version](http://img.shields.io/gem/v/unitwise.svg?style=flat)](https://rubygems.org/gems/unitwise)
+[![Build Status](http://img.shields.io/travis/joshwlewis/unitwise.svg?style=flat)](https://travis-ci.org/joshwlewis/unitwise)
+[![Dependency Status](http://img.shields.io/gemnasium/joshwlewis/unitwise.svg?style=flat)](https://gemnasium.com/joshwlewis/unitwise)
+[![Coverage Status](http://img.shields.io/coveralls/joshwlewis/unitwise.svg?style=flat)](https://coveralls.io/r/joshwlewis/unitwise)
+[![Code Climate](http://img.shields.io/codeclimate/github/joshwlewis/unitwise.svg?style=flat)](https://codeclimate.com/github/joshwlewis/unitwise)
 ![Analytics](https://ga-beacon.appspot.com/UA-49481499-1/joshwlewis/unitwise?pixel)
 
 Unitwise is a Ruby library for unit measurement conversion and math.

data/lib/unitwise.rb

@@ -1,6 +1,6 @@
 require 'liner'
 
-require "unitwise/version"
+require 'unitwise/version'
 require 'unitwise/base'
 require 'unitwise/expression'
 require 'unitwise/compatible'
@@ -36,7 +36,7 @@ module Unitwise
   # A helper to get the location of a yaml data file
   # @api private
   def self.data_file(key)
-    File.join path, "data", "#{key}.yaml"
+    File.join path, 'data', "#{key}.yaml"
   end
 end
 

data/lib/unitwise/atom.rb

@@ -1,6 +1,6 @@
 module Unitwise
   # Atoms are the most basic elements in Unitwise. They are named coded and
-  # scaled units without prefixes, multipliers, exponents, etc. Examples are 
+  # scaled units without prefixes, multipliers, exponents, etc. Examples are
   # 'meter', 'hour', 'pound force'.
   class Atom < Base
     liner :classification, :property, :metric, :special, :arbitrary, :dim
@@ -11,13 +11,13 @@ module Unitwise
       # Array of hashes representing atom properties.
       # @api private
       def data
-        @data ||= data_files.reduce([]){|m,f| m += YAML::load File.open(f)}
+        @data ||= data_files.map { |file| YAML.load(File.open file) }.flatten
       end
 
       # Data files containing atom data
       # @api private
       def data_files
-        %w(base_unit derived_unit).map{|type| Unitwise.data_file type}
+        %w(base_unit derived_unit).map { |type| Unitwise.data_file type }
       end
     end
 
@@ -26,10 +26,10 @@ module Unitwise
     # @return [true, false]
     # @api public
     def base?
-      scale.nil? && !@dim.nil?
+      !!(@dim && !scale)
     end
 
-    # Determine if an atom is derived. Derived atoms are defined with respect 
+    # Determine if an atom is derived. Derived atoms are defined with respect
     # to other atoms.
     # @return [true, false]
     # @api public
@@ -55,7 +55,7 @@ module Unitwise
     end
     alias_method :special?, :special
 
-    # Determine if a unit is arbitrary. Arbitrary atoms are not of any specific 
+    # Determine if a unit is arbitrary. Arbitrary atoms are not of any specific
     # dimension and have no general meaning, therefore cannot be compared with
     # any other unit.
     # @return [true, false]
@@ -98,7 +98,7 @@ module Unitwise
       end
     end
 
-    # Get a numeric value that can be used to with other atoms to compare with 
+    # Get a numeric value that can be used to with other atoms to compare with
     # or operate on. Base units have a scalar of 1.
     # @return [Numeric]
     # @api public
@@ -111,7 +111,7 @@ module Unitwise
     # @param x [Numeric] The number to convert to or convert from
     # @param forward [true, false] Convert to or convert from
     # @return [Numeric] The converted value
-    def functional(x=scalar, forward=true)
+    def functional(x = scalar, forward = true)
       scale.functional(x, forward)
     end
 
@@ -121,6 +121,5 @@ module Unitwise
     def root_terms
       base? ? [Term.new(atom_code: primary_code)] : scale.root_terms
     end
-
   end
-end
+end

data/lib/unitwise/base.rb

@@ -1,14 +1,16 @@
 require 'yaml'
 module Unitwise
+  # The base class that Atom and Prefix are extended from. This class includes
+  # shared functionality from those classes only.
   class Base
     liner :names, :primary_code, :secondary_code, :symbol, :scale
 
     def self.all
-      @all ||= data.map{|d| self.new d }
+      @all ||= data.map { |d| new d }
     end
 
-    def self.find(string, method=:primary_code)
-      self.all.find do |i|
+    def self.find(string, method = :primary_code)
+      all.find do |i|
         key = i.send(method)
         if key.respond_to?(:each)
           key.include?(string)
@@ -36,6 +38,5 @@ module Unitwise
     def to_s
       primary_code
     end
-
   end
-end
+end

data/lib/unitwise/compatible.rb

@@ -3,7 +3,6 @@ module Unitwise
   # measurements. This is done by determining the objects atomic composition
   # represented as a Signed Multiset.
   module Compatible
-
     # @api private
     def self.included(base)
       base.send :include, Comparable
@@ -14,7 +13,8 @@ module Unitwise
     # @api public
     def composition
       root_terms.reduce(SignedMultiset.new) do |s, t|
-        s.increment(t.atom.dim, t.exponent) if t.atom; s
+        s.increment(t.atom.dim, t.exponent) if t.atom
+        s
       end
     end
 
@@ -29,7 +29,7 @@ module Unitwise
     # @return [String]
     # @api public
     def composition_string
-      composition.sort.map do |k,v|
+      composition.sort.map do |k, v|
         v == 1 ? k.to_s : "#{k}#{v}"
       end.join('.')
     end
@@ -38,7 +38,7 @@ module Unitwise
     # @return [true false]
     # @api public
     def compatible_with?(other)
-      self.composition == other.composition
+      composition == other.composition
     end
 
     # Compare whether the instance is greater, less than or equal to other.
@@ -50,4 +50,4 @@ module Unitwise
       end
     end
   end
-end
+end

data/lib/unitwise/errors.rb

@@ -4,4 +4,4 @@ module Unitwise
 
   class ConversionError < Exception
   end
-end
+end

data/lib/unitwise/expression.rb

@@ -26,22 +26,30 @@ module Unitwise
       # @param expression [String] The string you wish to convert
       # @return [Array]
       # @example
-      #   Unitwise::Expression.decompose("m2/s2") 
+      #   Unitwise::Expression.decompose("m2/s2")
       #   # => [<Unitwise::Term m2>, <Unitwise::Term s-2>]
       # @api public
       def decompose(expression)
         expression = expression.to_s
-        @decompose ||= {}
-        if @decompose.has_key?(expression)
-          @decompose[expression]
+        if decomposed.key?(expression)
+          decomposed[expression]
         else
-          @decompose[expression] = begin
+          decomposed[expression] = begin
             Decomposer.new(expression).terms
           rescue ExpressionError
             nil
           end
         end
       end
+
+      private
+
+      # A cache of decomposed strings.
+      # @return [Hash]
+      # @api private
+      def decomposed
+        @decomposed ||= {}
+      end
     end
   end
-end
+end

data/lib/unitwise/ext.rb

@@ -1,2 +1,2 @@
 require 'unitwise'
-require 'unitwise/ext/numeric'
+require 'unitwise/ext/numeric'

data/lib/unitwise/functional.rb

@@ -1,36 +1,40 @@
 module Unitwise
+  # Functional is an alterative function-based scale for atoms with a
+  # non-linear (or non-zero y-intercept) scale. This is most commonly used for
+  # temperatures. Known functions for converting to and from special atoms
+  # are setup as class methods here.
   class Functional < Scale
     extend Math
 
-    def self._cel(x, forward=true)
+    def self._cel(x, forward = true)
       forward ? x - 273.15 : x + 273.15
     end
 
-    def self._degf(x, forward=true)
+    def self._degf(x, forward = true)
       forward ? 9.0 * x / 5.0 - 459.67 : 5.0 / 9 * (x + 459.67)
     end
 
-    def self._hpX(x, forward=true)
+    def self._hpX(x, forward = true)
       forward ? -log10(x) : 10 ** -x
     end
 
-    def self._hpC(x, forward=true)
-      forward ? -log(x) / log(100) : 100 ** -x 
+    def self._hpC(x, forward = true)
+      forward ? -log(x) / log(100) : 100 ** -x
     end
 
-    def self._tan100(x, forward=true)
+    def self._tan100(x, forward = true)
       forward ? 100 * tan(x) : atan(x / 100)
     end
 
-    def self._ph(x, forward=true)
+    def self._ph(x, forward = true)
       _hpX(x,forward)
     end
 
-    def self._ld(x, forward=true)
+    def self._ld(x, forward = true)
       forward ? log2(x) : 2 ** x
     end
 
-    def self._ln(x, forward=true)
+    def self._ln(x, forward = true)
       forward ? log(x) : Math::E ** x
     end
 
@@ -39,19 +43,29 @@ module Unitwise
     end
 
     def self._2lg(x, forward = true)
-      forward ? 2 * log10(x) : 10 ** ( x / 2 )
+      forward ? 2 * log10(x) : 10 ** (x / 2)
     end
 
     attr_reader :function_name
 
+    # Setup a new functional.
+    # @param value [Numeric] The magnitude of the scale
+    # @param unit [Unitwise::Unit, String] The unit of the scale
+    # @param function_name [String, Symbol] One of the class methods above to be
+    # used for conversion
     def initialize(value, unit, function_name)
       @function_name = function_name
       super(value, unit)
     end
 
-    def functional(x=scalar, forward = true)
+    # Get the equivalent scalar value of a unit based on the atom's function.
+    # @params x [Numeric]
+    # @params forward [true, false] The direction of the conversion. Use true
+    # when converting from the special, use false when converting to the special.
+    # @return [Numeric]
+    # @api public
+    def functional(x = scalar, forward = true)
       self.class.send(:"_#{function_name}", x, forward)
     end
-
   end
-end
+end

data/lib/unitwise/measurement.rb

@@ -4,19 +4,16 @@ module Unitwise
   # the value is the magnitued. This is the primary class that outside code
   # will interact with. Comes with conversion, comparison, and math methods.
   class Measurement < Scale
-
     # Create a new Measurement
     # @param value [Numeric] The scalar value for the measurement
     # @param unit  [String, Measurement::Unit] Either a string expression, or a
     # Measurement::Unit
     # @example
-    #   Unitwise::Measurement.new(20, 'm/s') # => #<Unitwise::Measurement 20 m/s>
+    #   Unitwise::Measurement.new(20, 'm/s')
     # @api public
     def initialize(*args)
       super(*args)
-      if terms.nil?
-        raise ExpressionError, "Could not evaluate `#{unit}`."
-      end
+      fail ExpressionError, "Could not evaluate `#{unit}`." if terms.nil?
     end
 
     # Convert this measurement to a compatible unit.
@@ -31,7 +28,7 @@ module Unitwise
       if compatible_with?(other_unit)
         new(converted_value(other_unit), other_unit)
       else
-        raise ConversionError, "Can't convert #{self} to #{other_unit}."
+        fail ConversionError, "Can't convert #{self} to #{other_unit}."
       end
     end
 
@@ -42,7 +39,8 @@ module Unitwise
     #   measurement * some_other_measurement
     # @api public
     def *(other)
-      operate(:*, other) || raise(TypeError, "Can't multiply #{self} by #{other}.")
+      operate(:*, other) ||
+        fail(TypeError, "Can't multiply #{self} by #{other}.")
     end
 
     # Divide this measurement by a number or another measurement
@@ -52,7 +50,7 @@ module Unitwise
     #   measurement / some_other_measurement
     # @api public
     def /(other)
-      operate(:/, other) || raise(TypeError, "Can't divide #{self} by #{other}")
+      operate(:/, other) || fail(TypeError, "Can't divide #{self} by #{other}")
     end
 
     # Add another measurement to this unit. Units must be compatible.
@@ -61,7 +59,7 @@ module Unitwise
     #   measurement + some_other_measurement
     # @api public
     def +(other)
-      combine(:+, other) || raise(TypeError, "Can't add #{other} to #{self}.")
+      combine(:+, other) || fail(TypeError, "Can't add #{other} to #{self}.")
     end
 
     # Subtract another measurement from this unit. Units must be compatible.
@@ -70,7 +68,8 @@ module Unitwise
     #   measurement - some_other_measurement
     # @api public
     def -(other)
-      combine(:-, other) || raise(TypeError, "Can't subtract #{other} from #{self}.")
+      combine(:-, other) ||
+        fail(TypeError, "Can't subtract #{other} from #{self}.")
     end
 
     # Raise a measurement to a numeric power.
@@ -78,11 +77,11 @@ module Unitwise
     # @example
     #   measurement ** 2
     # @api public
-    def **(number)
-      if number.is_a?(Numeric)
-        new( value ** number, unit ** number )
+    def **(other)
+      if other.is_a?(Numeric)
+        new(value ** other, unit ** other)
       else
-        raise TypeError, "Can't raise #{self} to #{number} power."
+        fail TypeError, "Can't raise #{self} to #{other} power."
       end
     end
 
@@ -97,7 +96,7 @@ module Unitwise
       when Numeric
         return self.class.new(other, '1'), self
       else
-        raise TypeError, "#{self.class} can't be coerced into #{other.class}"
+        fail TypeError, "#{self.class} can't be coerced into #{other.class}"
       end
     end
 
@@ -108,7 +107,7 @@ module Unitwise
     def to_i
       Integer(value)
     end
-    alias :to_int :to_i
+    alias_method :to_int, :to_i
 
     # Convert a measurement to a Float.
     # @example
@@ -184,12 +183,13 @@ module Unitwise
       elsif other.respond_to?(:composition)
         if compatible_with?(other)
           converted = other.convert_to(unit)
-          new(value.send(operator, converted.value), unit.send(operator, converted.unit))
+          new(value.send(operator, converted.value),
+              unit.send(operator, converted.unit))
         else
-          new(value.send(operator, other.value), unit.send(operator, other.unit))
+          new(value.send(operator, other.value),
+              unit.send(operator, other.unit))
         end
       end
     end
-
   end
-end
+end

data/lib/unitwise/prefix.rb

@@ -1,17 +1,24 @@
 module Unitwise
+  # A prefix can be used with metric atoms to modify their scale.
   class Prefix < Base
     liner :scalar
 
+    # The data loaded from the UCUM spec files
+    # @api semipublic
     def self.data
-      @data ||= YAML::load File.open(data_file)
+      @data ||= YAML.load File.open(data_file)
     end
 
+    # The location of the UCUM spec prefix data file
+    # @api semipublic
     def self.data_file
       Unitwise.data_file 'prefix'
     end
 
+    # Set the scalar value for the prefix, always as a Fixnum
+    # @api semipublic
     def scalar=(value)
       @scalar = value.to_f
     end
   end
-end
+end

data/lib/unitwise/scale.rb

@@ -1,5 +1,5 @@
 module Unitwise
-  # A Unitwise::Scale represents a value and a unit, sort of like a vector, it 
+  # A Unitwise::Scale represents a value and a unit, sort of like a vector, it
   # has two components. In this case, it's a value and unit rather than a
   # magnitude and direction. This class should be considered mostly privateish.
   class Scale
@@ -46,7 +46,7 @@ module Unitwise
     # @param forward [true, false] whether to convert to this unit or from it.
     # @return [Numeric]
     # @api public
-    def functional(x=value, forward=true)
+    def functional(x = value, forward = true)
       unit.functional(x, forward)
     end
 
@@ -58,7 +58,7 @@ module Unitwise
       value * unit.scalar
     end
 
-    # The base units this scale's unit is derived from
+    # The base terms this scale's unit is derived from
     # @return [Array] An array of Unitwise::Term
     # @api public
     def root_terms
@@ -82,4 +82,4 @@ module Unitwise
       "#<#{self.class} value=#{value} unit=#{unit}>"
     end
   end
-end
+end

data/lib/unitwise/standard.rb

@@ -24,7 +24,6 @@ module Unitwise
       def hash
         Nori.new.parse(body)["root"]
       end
-
     end
   end
-end
+end

data/lib/unitwise/term.rb

@@ -1,49 +1,92 @@
 require 'signed_multiset'
 module Unitwise
+  # A Term is the combination of an atom, prefix, factor and annotation.
+  # Not all properties have to be present. Examples: 'g', 'mm', 'mi2', '4[pi]',
+  # 'kJ{Electric Potential}'
   class Term < Liner.new(:atom, :prefix, :factor, :exponent, :annotation)
     include Unitwise::Compatible
 
+    # Setup a new term. Send a hash of properties, or ordered property values.
+    # @api public
     def initialize(*args)
       super(*args)
       freeze
     end
 
+    # Set the atom.
+    # @param value [String, Atom] Either a string representing an Atom, or an
+    # Atom
+    # @api public
     def atom=(value)
       value.is_a?(Atom) ? super(value) : super(Atom.find(value.to_s))
     end
 
+    # Set the prefix.
+    # @param value [String, Prefix] Either a string representing a Prefix, or
+    # a Prefix
     def prefix=(value)
       value.is_a?(Prefix) ? super(value) : super(Prefix.find(value.to_s))
     end
 
+    # Is this term special?
+    # @return [true, false]
     def special?
       atom.special rescue false
     end
 
+    # Determine how far away a unit is from a base unit.
+    # @return [Integer]
+    # @api public
     def depth
       atom ? atom.depth + 1 : 0
     end
 
+    # Determine if this is the last term in the scale chain
+    # @return [true, false]
+    # @api public
     def terminal?
       depth <= 3
     end
 
+    # The multiplication factor for this term. The default value is 1.
+    # @return [Numeric]
+    # @api public
     def factor
       super || 1
     end
 
+    # The exponent for this term. The default value is 1.
+    # @return [Numeric]
+    # @api public
     def exponent
       super || 1
     end
 
+    # The unitless value for this term. This is the equivalent value of it's
+    # base atom
+    # @return [Numeric]
+    # @api public
     def scalar
-      (factor * (prefix ? prefix.scalar : 1) * (atom ? atom.scalar : 1)) ** exponent
+      (factor * (prefix ? prefix.scalar : 1) *
+        (atom ? atom.scalar : 1)) ** exponent
     end
 
-    def functional(x=scalar, forward=true)
-      (factor * (prefix ? prefix.scalar : 1)) * (atom ? atom.functional(x, forward) : 1) ** exponent
+    # Get the equivalent scalar value of a unit based on the atom's function.
+    # @params x [Numeric]
+    # @params forward [true, false] The direction of the conversion. Use true
+    # when converting from the special, use false when converting to the
+    # special.
+    # @return [Numeric]
+    # @api public
+    # @param x [Numeric] The value
+    def functional(x = scalar, forward = true)
+      (factor * (prefix ? prefix.scalar : 1)) *
+        (atom ? atom.functional(x, forward) : 1) ** exponent
     end
 
+    # The base units this term is derived from
+    # @return [Array] An array of Unitwise::Term
+    # @api public
     def root_terms
       if terminal?
         [self]
@@ -54,6 +97,9 @@ module Unitwise
       end
     end
 
+    # Term multiplication. Multiply by a Unit, another Term, or a Numeric.
+    # params other [Unit, Term, Numeric]
+    # @return [Term]
     def *(other)
       if other.respond_to?(:terms)
         Unit.new(other.terms << self)
@@ -64,9 +110,12 @@ module Unitwise
       end
     end
 
+    # Term division. Divide by a Unit, another Term, or a Numeric.
+    # params other [Unit, Term, Numeric]
+    # @return [Term]
     def /(other)
       if other.respond_to?(:terms)
-        Unit.new(other.terms.map{|t| t ** -1} << self)
+        Unit.new(other.terms.map { |t| t ** -1 } << self)
       elsif other.respond_to?(:atom)
         Unit.new([self, other ** -1])
       elsif other.is_a?(Numeric)
@@ -74,14 +123,22 @@ module Unitwise
       end
     end
 
-    def **(integer)
-      self.class.new(to_hash.merge(exponent: exponent * integer))
+    # Term exponentiation. Raise a term to a numeric power.
+    # params other [Numeric]
+    # @return [Term]
+    def **(other)
+      if other.is_a?(Numeric)
+        self.class.new(to_hash.merge(exponent: exponent * other))
+      else
+        fail TypeError, "Can't raise #{self} to #{other}."
+      end
     end
 
+    # String representation for this term.
+    # @return [String]
     def to_s
       [(factor if factor != 1), prefix.to_s,
         atom.to_s, (exponent if exponent != 1)].compact.join('')
     end
-
   end
-end
+end

data/lib/unitwise/unit.rb

@@ -1,8 +1,14 @@
 module Unitwise
+  # A Unit is essentially a collection of Unitwise::Term. Terms can be combined
+  # through multiplication or division to create a unit. A unit does not have
+  # a magnitude, but it does have a scale.
   class Unit
     liner :expression, :terms
     include Unitwise::Compatible
 
+    # Create a new unit. You can send an expression or a collection of terms
+    # @param input [String, Unit, [Term]] A string expression, a unit, or a
+    # collection of tems.
     def initialize(input)
       if input.respond_to?(:expression)
         @expression = input.expression
@@ -29,7 +35,7 @@ module Unitwise
       terms.count == 1 && terms.all?(&:special?)
     end
 
-    def functional(x=scalar, forward=true)
+    def functional(x = scalar, forward = true)
       terms.first.functional(x, forward)
     end
 
@@ -42,7 +48,7 @@ module Unitwise
     end
 
     def scalar
-      terms.map(&:scalar).inject(&:*)
+      terms.map(&:scalar).reduce(&:*)
     end
 
     def *(other)
@@ -51,28 +57,32 @@ module Unitwise
       elsif other.respond_to?(:atom)
         self.class.new(terms << other)
       elsif other.is_a?(Numeric)
-        self.class.new(terms.map{ |t| t * other })
+        self.class.new(terms.map { |t| t * other })
       else
-        raise TypeError, "Can't multiply #{inspect} by #{other}."
+        fail TypeError, "Can't multiply #{self} by #{other}."
       end
     end
 
     def /(other)
       if other.respond_to?(:terms)
-        self.class.new(terms + other.terms.map{ |t| t ** -1})
+        self.class.new(terms + other.terms.map { |t| t ** -1 })
       elsif other.respond_to?(:atom)
         self.class.new(terms << other ** -1)
       else
-        raise TypeError, "Can't divide #{inspect} by #{other}."
+        fail TypeError, "Can't divide #{self} by #{other}."
       end
     end
 
-    def **(number)
-      self.class.new(terms.map{ |t| t ** number })
+    def **(other)
+      if other.is_a?(Numeric)
+        self.class.new(terms.map { |t| t ** other })
+      else
+        fail TypeError, "Can't raise #{self} to #{other}."
+      end
     end
 
     def to_s
       expression
     end
   end
-end
+end

data/lib/unitwise/version.rb

@@ -1,3 +1,3 @@
 module Unitwise
-  VERSION = "0.5.0"
+  VERSION = '0.5.1'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: unitwise
 version: !ruby/object:Gem::Version
-  version: 0.5.0
+  version: 0.5.1
 platform: ruby
 authors:
 - Josh Lewis