formula_dsl 0.2.0 → 0.3.0

data/VERSION

@@ -1 +1 @@
-0.2.0
+0.3.0

data/formula_dsl.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = "formula_dsl"
-  s.version = "0.2.0"
+  s.version = "0.3.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Sergio Junior"]

data/lib/formula_dsl/parser.rb

@@ -33,19 +33,19 @@ module FormulaDSL
 
     #binary operations + - / *
     rule :addition do
-      ( number.as(:left) >> space? >> add_operator >> space? >> ( number ).as(:right) ).as(:+)
+      ( argument.as(:left) >> space? >> add_operator >> space? >> ( argument ).as(:right) ).as(:+)
     end
 
     rule :subtraction do
-      ( number.as(:left) >> space? >> sub_operator >> space? >> ( number ).as(:right) ).as(:-)
+      ( argument.as(:left) >> space? >> sub_operator >> space? >> ( argument ).as(:right) ).as(:-)
     end
 
     rule :multiplication do
-      ( number.as(:left) >> space? >> mult_operator >> space? >> ( number ).as(:right) ).as(:*)
+      ( argument.as(:left) >> space? >> mult_operator >> space? >> ( argument ).as(:right) ).as(:*)
     end
 
     rule :division do
-      ( number.as(:left) >> space? >> div_operator >> space? >> ( number ).as(:right) ).as(:/)
+      ( argument.as(:left) >> space? >> div_operator >> space? >> ( argument ).as(:right) ).as(:/)
     end
 
     rule :function do
@@ -63,19 +63,19 @@ module FormulaDSL
     # expression with other expression (compose expression)
     # Ex: expression >> some_op >> number === [ Mont(data) - 1 ]
     rule :subtraction_expression do
-      (single_expression.as(:left) >> space? >> sub_operator >> space? >> (single_expression | number).as(:right) ).as(:-)
+      (single_expression.as(:left) >> space? >> sub_operator >> space? >> ( expression_list | argument).as(:right) ).as(:-)
     end
 
     rule :addition_expression do
-      (single_expression.as(:left) >> space? >> add_operator >> space? >> ( expression_list | number ).as(:right) ).as(:+)
+      (single_expression.as(:left) >> space? >> add_operator >> space? >> ( expression_list | argument ).as(:right) ).as(:+)
     end
 
     rule :multiplication_expression do
-      (single_expression.as(:left) >> space? >> mult_operator >> space? >> (single_expression | number).as(:right) ).as(:*)
+      (single_expression.as(:left) >> space? >> mult_operator >> space? >> (expression_list | argument).as(:right) ).as(:*)
     end
 
     rule :division_expression do
-      (single_expression.as(:left) >> space? >> div_operator >> space? >> (single_expression | number).as(:right) ).as(:/)
+      (single_expression.as(:left) >> space? >> div_operator >> space? >> (expression_list | argument).as(:right) ).as(:/)
     end
 
     rule :string_concat_expression do

data/spec/formula_dsl/parser_spec.rb

@@ -34,6 +34,34 @@ module FormulaDSL
       end
     end
 
+    context "Expressions based on identifier names (aka variables)" do
+      it "should recognize expression 'budget + fee' " do
+        ast = parser.parse('budget + fee')
+        ast.to_s.should == %Q({:+=>{:left=>"budget"@0, :right=>"fee"@9}})
+      end
+
+      it "should recognize expression 'budget - fee' " do
+        ast = parser.parse('budget - fee')
+        ast.to_s.should == %Q({:-=>{:left=>"budget"@0, :right=>"fee"@9}})
+      end
+
+      it "should recognize expression 'budget * fee' " do
+        ast = parser.parse('budget * fee')
+        ast.to_s.should == %Q({:*=>{:left=>"budget"@0, :right=>"fee"@9}})
+      end
+
+      it "should recognize expression 'budget + 1 + fee' " do
+        ast = parser.parse('budget + 1 + fee')
+        ast.to_s.should == %Q({:+=>{:left=>{:+=>{:left=>"budget"@0, :right=>"1"@9}}, :right=>"fee"@13}})
+      end
+
+      it "should recognize expression 'budget * 1 + fee' " do
+        ast = parser.parse('budget * 1 + fee')
+        ast.to_s.should == %Q({:+=>{:left=>{:*=>{:left=>"budget"@0, :right=>"1"@9}}, :right=>"fee"@13}})
+      end
+
+    end
+
     context "Composed expression's " do
       it "should recognize a function like 'Month(data)' " do
         ast = parser.parse('Month(data)')
@@ -81,6 +109,22 @@ module FormulaDSL
         ast = parser.parse('Month(data) + "/" + Year(data)')
         ast.to_s.should == %Q({:+=>{:left=>{:function=>{:name=>"Month"@0, :args=>"data"@6}}, :right=>{:+=>{:left=>"\\\"/\\\""@14, :right=>{:function=>{:name=>"Year"@20, :args=>"data"@25}}}}}})
       end
+
+      it " should recognize expression with string concat 'Month(data) - 1 + \"/\" + Year(data)'" do
+        ast = parser.parse('Month(data) - 1 + "/" + Year(data)')
+        ast.to_s.should == %Q({:-=>{:left=>{:function=>{:name=>\"Month\"@0, :args=>\"data\"@6}}, :right=>{:+=>{:left=>\"1\"@14, :right=>{:+=>{:left=>\"\\\"/\\\"\"@18, :right=>{:function=>{:name=>\"Year\"@24, :args=>\"data\"@29}}}}}}}})
+      end
+
+      it " should recognize expression with string concat 'Month(data) - 1 + \"/\" + Year(data)'" do
+        ast = parser.parse('Month(data) * 1 + "/" + Year(data)')
+        ast.to_s.should == %Q({:*=>{:left=>{:function=>{:name=>\"Month\"@0, :args=>\"data\"@6}}, :right=>{:+=>{:left=>\"1\"@14, :right=>{:+=>{:left=>\"\\\"/\\\"\"@18, :right=>{:function=>{:name=>\"Year\"@24, :args=>\"data\"@29}}}}}}}})
+      end
+
+      it " should recognize expression with string concat 'Month(data) - 1 + \"/\" + Year(data)'" do
+        ast = parser.parse('Month(data) / 1 + "/" + Year(data)')
+        ast.to_s.should == %Q({:/=>{:left=>{:function=>{:name=>\"Month\"@0, :args=>\"data\"@6}}, :right=>{:+=>{:left=>\"1\"@14, :right=>{:+=>{:left=>\"\\\"/\\\"\"@18, :right=>{:function=>{:name=>\"Year\"@24, :args=>\"data\"@29}}}}}}}})
+      end
+
     end
 
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: formula_dsl
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.3.0
   prerelease: 
 platform: ruby
 authors:
@@ -125,7 +125,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 2530953314598159526
+      hash: -3658736757412770386
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: