nelson 0.6.0 → 0.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 33aefff26477090c67b8f6cbecfaffd8ac3a3173
-  data.tar.gz: 1623ada73d5b8dcaea957cd320715cebcfd85d95
+  metadata.gz: 45100c598e2cff175d15dfc787c63b014544d7d8
+  data.tar.gz: f6e35b6b8e318fbdbdc078f6a41b723961ab230f
 SHA512:
-  metadata.gz: ccb43e9f48aa59421075f7cd27462749a8665f335f5c836d28cbec331ddae08447363bb8f364dd1dc586bee1bc6e37ce5e73f2deff522f22fb5b69fae1acf044
-  data.tar.gz: aca694d340d8c234715a67b336f5d8f1c07238f7d4c1daabd60b96ddd116c104d6a58dd755ab5d47c48df12103a805e8196a21f7a34e2a99e75339cd754933ae
+  metadata.gz: f9ea8892b4313eae7949e084498b68574004d259698e814efcb4ccc6c3c84b5e3ac9dfd0a25c7bedc49c7def206ecc9cd54505a7c487bf7224d8cdda8c378759
+  data.tar.gz: fd41e23ea3f1b0d85b514be9a60c538311724dea8e8a619f358683010259dc4cc1b315b231b553e9d33bdec2974638a1d841777f54293c4ba8c6977664da1d8f

data/lib/nelson.rb

@@ -1,4 +1,5 @@
 require "nelson/version"
+require "nelson/term"
 require "nelson/expression"
 require "nelson/expression_builder"
 require "nelson/dsl"

data/lib/nelson/expression.rb

@@ -5,7 +5,7 @@ module Nelson
 
     def initialize(*terms)
       raise ArgumentError, "At least 1 term must be specified" unless terms.length > 0
-      @terms = terms
+      @terms = terms.map { |t| Term(t) }
     end
 
     def *(term)
@@ -32,10 +32,14 @@ module Nelson
       DivisionExpression.new(rhs_value, lhs_value).call
     end
 
+    def has_term?(term)
+      terms.include?(term)
+    end
+
     private
 
     def try_to_eval(term)
-      term.respond_to?(:call) ? term.call : term
+      term.respond_to?(:call) ? term.call : Term(term)
     end
   end
 

data/lib/nelson/term.rb

@@ -0,0 +1,112 @@
+
+module Nelson
+  class Term
+    include Comparable
+    attr_reader :raw_value, :value
+
+    def initialize(value)
+      @raw_value = value
+      @value = value.is_a?(Numeric) ? value.to_r : value
+    end
+
+    def <=>(other)
+      other <=> @value
+    end
+
+    def value=(new_value)
+      @raw_value = new_value
+      @value = @raw_value.to_r
+    end
+
+    def +(other)
+      if other.is_a? Term
+        Term.new(value + other.value)
+      elsif other.is_a? Numeric
+        Term.new(value + other)
+      elsif other.is_a? Expression
+        Term.new(value + other.call)
+      else
+        if other.respond_to? :coerce
+          a, b = other.coerce(self)
+          a + b
+        else
+          raise TypeError, "#{other.class} can't be coerced into Term"
+        end
+      end
+    end
+
+    def -(other)
+      if other.is_a? Term
+        Term.new(value - other.value)
+      elsif other.is_a? Numeric
+        Term.new(value - other)
+      else
+        if other.respond_to? :coerce
+          a, b = other.coerce(self)
+          a - b
+        else
+          raise TypeError, "#{other.class} can't be coerced into Term"
+        end
+      end
+    end
+
+    def *(other)
+      if other.is_a? Term
+        Term.new(value * other.value)
+      elsif other.is_a? Numeric
+        Term.new(value * other)
+      else
+        if other.respond_to? :coerce
+          a, b = other.coerce(self)
+          a * b
+        else
+          raise TypeError, "#{other.class} can't be coerced into Term"
+        end
+      end
+    end
+
+    def /(other)
+      if other.is_a? Term
+        Term.new(value / other.value)
+      elsif other.is_a? Numeric
+        Term.new(value / other)
+      else
+        if other.respond_to? :coerce
+          a, b = other.coerce(self)
+          a / b
+        else
+          raise TypeError, "#{other.class} can't be coerced into Term"
+        end
+      end
+    end
+
+    def coerce(other)
+      [Term.new(other), self]
+    end
+
+    def to_s
+      raw_value.to_s
+    end
+
+    def to_r
+      value
+    end
+
+    def to_f
+      value.to_f
+    end
+
+    def to_i
+      value.to_i
+    end
+  end
+end
+
+def Term(value)
+  case value
+  when Nelson::Term, Nelson::Expression
+    value
+  when Numeric
+    Nelson::Term.new(value)
+  end
+end

data/lib/nelson/version.rb

@@ -1,3 +1,3 @@
 module Nelson
-  VERSION = "0.6.0"
+  VERSION = "0.7.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: nelson
 version: !ruby/object:Gem::Version
-  version: 0.6.0
+  version: 0.7.0
 platform: ruby
 authors:
 - Patrick Metcalfe
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2015-10-05 00:00:00.000000000 Z
+date: 2015-10-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -124,6 +124,7 @@ files:
 - lib/nelson/expressions/division_expression.rb
 - lib/nelson/expressions/multipication_expression.rb
 - lib/nelson/expressions/subtraction_expression.rb
+- lib/nelson/term.rb
 - lib/nelson/version.rb
 - nelson.gemspec
 homepage: