nelson 0.4.1 → 0.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 505266cdf76433347a2a7142af7bd5b4478c13d8
-  data.tar.gz: 0d0390a1c7b3c08773a36ed1094c3f145abb46b1
+  metadata.gz: 3fc4c34810d4cde8b5d8fc7228708acd891b3442
+  data.tar.gz: 4fecf9537288391a76e32187c6de46d7e6c9daff
 SHA512:
-  metadata.gz: 7efe402a4c0b0c131c04716cfeec79b7674c6841add263709c097cf040c5af7cf153cb2af328cd916ccaa138dfd933b8302ca30c31a45cbfba190df873e8e2b6
-  data.tar.gz: e085f27abeb6224d77fbde17df79f1f373be8b8ca13254d2b3688d21d7e7d49987fdb69d888792b2eb7a96e4ad40f895fea1d9087f99de3a2a2c80ba0c9c71c4
+  metadata.gz: d0510cb77e8a7876983137d7dc3609a3e50a767dc00820b22466dc468429e30d32d298929294af5f3dd72cb51fafd0b6bd8617e4b9d5a7b9a2bf6206092f86fc
+  data.tar.gz: 9c76ba2a597640269f2add63dd51f45a712f59e4b37177e265c97487f874bd03b77e975afae2064f0cee288188df95d583a32ee8a6e89b13ef44072ea083557e

data/lib/nelson/dsl.rb

@@ -10,5 +10,14 @@ module Nelson
     def sum_of(*terms)
       AdditionExpressionBuilder.new(*terms)
     end
+
+    def quotient_of(*terms)
+      DivisionExpressionBuilder.new(*terms)
+    end
+
+    def difference_of(*terms)
+      SubtractionExpressionBuilder.new(*terms)
+    end
+    alias :difference_between :difference_of
   end
 end

data/lib/nelson/expression.rb

@@ -26,6 +26,12 @@ module Nelson
       SubtractionExpression.new(rhs_value, lhs_value).call
     end
 
+    def /(term)
+      rhs_value = self.call
+      lhs_value = try_to_eval term
+      DivisionExpression.new(rhs_value, lhs_value).call
+    end
+
     private
 
     def try_to_eval(term)
@@ -36,4 +42,5 @@ module Nelson
   autoload :MultipicationExpression, "nelson/expressions/multipication_expression"
   autoload :AdditionExpression, "nelson/expressions/addition_expression"
   autoload :SubtractionExpression, "nelson/expressions/subtraction_expression"
+  autoload :DivisionExpression, "nelson/expressions/division_expression"
 end

data/lib/nelson/expression_builder.rb

@@ -24,9 +24,14 @@ module Nelson
     def minus(term)
       SubtractionExpressionBuilder.new(self, term)
     end
+
+    def divided_by(term)
+      DivisionExpressionBuilder.new(self, term)
+    end
   end
 
   autoload :MultipicationExpressionBuilder, "nelson/expression_builders/multipication_expression_builder"
   autoload :AdditionExpressionBuilder, "nelson/expression_builders/addition_expression_builder"
   autoload :SubtractionExpressionBuilder, "nelson/expression_builders/subtraction_expression_builder"
+  autoload :DivisionExpressionBuilder, "nelson/expression_builders/division_expression_builder"
 end

data/lib/nelson/expression_builders/division_expression_builder.rb

@@ -0,0 +1,13 @@
+
+module Nelson
+  class DivisionExpressionBuilder < ExpressionBuilder
+    def initialize(term1, term2)
+      super(term1, term2)
+    end
+    
+    def build
+      terms.map! { |e| e.is_a?(ExpressionBuilder) ? e.build : e }
+      DivisionExpression.new(*terms)
+    end
+  end
+end

data/lib/nelson/expression_builders/multipication_expression_builder.rb

@@ -1,19 +1,9 @@
 
 module Nelson
-  class MultipicationExpression < Expression
-    def call
-      terms.reduce(:*)
-    end
-
-    def to_s
-      terms.sort_by { |t| t.is_a?(Expression) ? 1 : 0 }.reduce("") do |c, t|
-        case t
-        when Expression
-          c << "(#{t})"
-        else
-          c = [c, t].map(&:to_s).reject(&:empty?).join("*")
-        end
-      end
+  class MultipicationExpressionBuilder < ExpressionBuilder
+    def build
+      terms.map! { |e| e.is_a?(ExpressionBuilder) ? e.build : e }
+      MultipicationExpression.new(*terms)
     end
   end
 end

data/lib/nelson/expressions/division_expression.rb

@@ -0,0 +1,23 @@
+
+module Nelson
+  class DivisionExpression < Expression
+    def initialize(term1, term2)
+      super(term1.to_f, term2.to_f)
+    end
+
+    def call
+      terms.reduce(:/)
+    end
+
+    def to_s
+      terms.sort_by { |t| t.is_a?(Expression) ? 1 : 0 }.reduce("") do |c, t|
+        case t
+        when Expression
+          c << "(#{t})"
+        else
+          c = [c, t].map(&:to_s).reject(&:empty?).join("/")
+        end
+      end
+    end
+  end
+end

data/lib/nelson/expressions/multipication_expression.rb

@@ -1,9 +1,19 @@
 
 module Nelson
-  class MultipicationExpressionBuilder < ExpressionBuilder
-    def build
-      terms.map! { |e| e.is_a?(ExpressionBuilder) ? e.build : e }
-      MultipicationExpression.new(*terms)
+  class MultipicationExpression < Expression
+    def call
+      terms.reduce(:*)
+    end
+
+    def to_s
+      terms.sort_by { |t| t.is_a?(Expression) ? 1 : 0 }.reduce("") do |c, t|
+        case t
+        when Expression
+          c << "(#{t})"
+        else
+          c = [c, t].map(&:to_s).reject(&:empty?).join("*")
+        end
+      end
     end
   end
 end

data/lib/nelson/version.rb

@@ -1,3 +1,3 @@
 module Nelson
-  VERSION = "0.4.1"
+  VERSION = "0.5.0"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: nelson
 version: !ruby/object:Gem::Version
-  version: 0.4.1
+  version: 0.5.0
 platform: ruby
 authors:
 - Patrick Metcalfe
@@ -117,9 +117,11 @@ files:
 - lib/nelson/expression.rb
 - lib/nelson/expression_builder.rb
 - lib/nelson/expression_builders/addition_expression_builder.rb
+- lib/nelson/expression_builders/division_expression_builder.rb
 - lib/nelson/expression_builders/multipication_expression_builder.rb
 - lib/nelson/expression_builders/subtraction_expression_builder.rb
 - lib/nelson/expressions/addition_expression.rb
+- lib/nelson/expressions/division_expression.rb
 - lib/nelson/expressions/multipication_expression.rb
 - lib/nelson/expressions/subtraction_expression.rb
 - lib/nelson/version.rb