nelson 0.5.0 → 0.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3fc4c34810d4cde8b5d8fc7228708acd891b3442
-  data.tar.gz: 4fecf9537288391a76e32187c6de46d7e6c9daff
+  metadata.gz: 33aefff26477090c67b8f6cbecfaffd8ac3a3173
+  data.tar.gz: 1623ada73d5b8dcaea957cd320715cebcfd85d95
 SHA512:
-  metadata.gz: d0510cb77e8a7876983137d7dc3609a3e50a767dc00820b22466dc468429e30d32d298929294af5f3dd72cb51fafd0b6bd8617e4b9d5a7b9a2bf6206092f86fc
-  data.tar.gz: 9c76ba2a597640269f2add63dd51f45a712f59e4b37177e265c97487f874bd03b77e975afae2064f0cee288188df95d583a32ee8a6e89b13ef44072ea083557e
+  metadata.gz: ccb43e9f48aa59421075f7cd27462749a8665f335f5c836d28cbec331ddae08447363bb8f364dd1dc586bee1bc6e37ce5e73f2deff522f22fb5b69fae1acf044
+  data.tar.gz: aca694d340d8c234715a67b336f5d8f1c07238f7d4c1daabd60b96ddd116c104d6a58dd755ab5d47c48df12103a805e8196a21f7a34e2a99e75339cd754933ae

data/lib/nelson/dsl.rb

@@ -1,8 +1,7 @@
 
 module Nelson
   module DSL
-    module_function
-
+    extend self
     def product_of(*terms)
       MultipicationExpressionBuilder.new(*terms)
     end

data/lib/nelson/expression_builder.rb

@@ -28,6 +28,10 @@ module Nelson
     def divided_by(term)
       DivisionExpressionBuilder.new(self, term)
     end
+
+    def built_terms
+      terms.map { |e| e.is_a?(ExpressionBuilder) ? e.build : e }
+    end
   end
 
   autoload :MultipicationExpressionBuilder, "nelson/expression_builders/multipication_expression_builder"

data/lib/nelson/expression_builders/addition_expression_builder.rb

@@ -2,8 +2,7 @@
 module Nelson
   class AdditionExpressionBuilder < ExpressionBuilder
     def build
-      terms.map! { |e| e.is_a?(ExpressionBuilder) ? e.build : e }
-      AdditionExpression.new(*terms)
+      AdditionExpression.new(*built_terms)
     end
   end
 end

data/lib/nelson/expression_builders/division_expression_builder.rb

@@ -4,10 +4,9 @@ module Nelson
     def initialize(term1, term2)
       super(term1, term2)
     end
-    
+
     def build
-      terms.map! { |e| e.is_a?(ExpressionBuilder) ? e.build : e }
-      DivisionExpression.new(*terms)
+      DivisionExpression.new(*built_terms)
     end
   end
 end

data/lib/nelson/expression_builders/multipication_expression_builder.rb

@@ -2,8 +2,7 @@
 module Nelson
   class MultipicationExpressionBuilder < ExpressionBuilder
     def build
-      terms.map! { |e| e.is_a?(ExpressionBuilder) ? e.build : e }
-      MultipicationExpression.new(*terms)
+      MultipicationExpression.new(*built_terms)
     end
   end
 end

data/lib/nelson/expression_builders/subtraction_expression_builder.rb

@@ -2,8 +2,7 @@
 module Nelson
   class SubtractionExpressionBuilder < ExpressionBuilder
     def build
-      terms.map! { |e| e.is_a?(ExpressionBuilder) ? e.build : e }
-      SubtractionExpression.new(*terms)
+      SubtractionExpression.new(*built_terms)
     end
   end
 end

data/lib/nelson/expressions/division_expression.rb

@@ -2,11 +2,11 @@
 module Nelson
   class DivisionExpression < Expression
     def initialize(term1, term2)
-      super(term1.to_f, term2.to_f)
+      super(term1, term2)
     end
 
     def call
-      terms.reduce(:/)
+      terms.map { |n| n.is_a?(Numeric) ? n.to_f : n }.reduce(:/)
     end
 
     def to_s

data/lib/nelson/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: nelson
 version: !ruby/object:Gem::Version
-  version: 0.5.0
+  version: 0.6.0
 platform: ruby
 authors:
 - Patrick Metcalfe
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2015-09-29 00:00:00.000000000 Z
+date: 2015-10-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler