formula_dsl 0.3.0 → 0.4.0

data/VERSION

@@ -1 +1 @@
-0.3.0
+0.4.0

data/formula_dsl.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "formula_dsl"
-  s.version = "0.3.0"
+  s.version = "0.4.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Sergio Junior"]
-  s.date = "2012-04-03"
+  s.date = "2012-04-11"
   s.description = " External DSL to express math operations like you do in MSExcel formula bar. The parser generate a AST (Hash) for a given expression. "
   s.email = "sergior.jr@gmail.com"
   s.extra_rdoc_files = [

data/lib/formula_dsl/parser.rb

@@ -6,6 +6,7 @@ module FormulaDSL
     rule(:lparen) { str('(') >> space? }
     rule(:rparen) { str(')') >> space? }
     rule(:comma)  { str(',') >> space? }
+    rule(:dot)    { str('.') >> space? }
 
     # non significant character's
     rule(:space)  { match('\s').repeat(1) }
@@ -14,12 +15,12 @@ module FormulaDSL
     # Literal's
     rule(:number)     { match('\d').repeat(1) }
     rule(:quote)      { match('"') }
-    rule(:string)     { quote >> space? >> match('.') >> space? >> quote}
     rule(:identifier) { match['\w'].repeat(1) }
+    rule(:string)     { quote >> space? >> (str('"').absnt? >> any).repeat(1) >> space? >> quote}
 
     # Argument
-    rule (:argument) { identifier | number }
-    rule (:arglist)  { (argument >> comma.maybe).repeat }
+    rule (:argument) { function | identifier | number | string}
+    rule (:arglist)  { ( argument >> comma.maybe).repeat }
 
     # Operators
     rule(:add_operator ) { match(['+']) }

data/spec/formula_dsl/parser_spec.rb

@@ -8,6 +8,16 @@ module FormulaDSL
 
     context "Single Expression's" do
 
+      it "should recognize a number '2' " do
+        ast = parser.parse('2')
+        ast.to_s.should == '2'
+      end
+
+      it "should recognize a string '\"abc\"' " do
+        ast = parser.parse('"abc"')
+        ast.to_s.should == %Q("abc")
+      end
+
       it "should recognize expression '2 + 1' " do
         ast = parser.parse('2 + 1')
         ast.to_s.should == %Q({:+=>{:left=>"2"@0, :right=>"1"@4}})
@@ -62,12 +72,35 @@ module FormulaDSL
 
     end
 
-    context "Composed expression's " do
+    context "Functions" do
+      it "should recognize functions with string arguments 'FormatDate(\"MM/yyyy\")'" do
+        ast = parser.parse('FormatDate("MM/yyyy")')
+        ast.to_s.should == %Q({:function=>{:name=>"FormatDate"@0, :args=>"\\\"MM/yyyy\\\""@11}})
+      end
+
       it "should recognize a function like 'Month(data)' " do
         ast = parser.parse('Month(data)')
         ast.to_s.should == %Q({:function=>{:name=>"Month"@0, :args=>"data"@6}})
       end
 
+      it "should recognize expression with composed functions 'Max( Year(data) )'" do
+        ast = parser.parse('Max( Year(data) )')
+        ast.to_s.should == %Q({:function=>{:name=>"Max"@0, :args=>[{:function=>{:name=>"Year"@5, :args=>"data"@10}}]}})
+      end
+
+      it "should recognize expression with composed functions with 2 arguments 'Max( Year(data), Month(data) )'" do
+        ast = parser.parse('Max(Year(data), Month(data))')
+        ast.to_s.should == %Q({:function=>{:name=>"Max"@0, :args=>[{:function=>{:name=>"Year"@4, :args=>"data"@9}}, {:function=>{:name=>"Month"@16, :args=>"data"@22}}]}})
+      end
+
+      it "should recognize expression with composed functions with 2 arguments 'FormatDate( PriorMonth(data), \"MM/yyyy\" )'" do
+        ast = parser.parse('FormatDate( PriorMonth(data), "MM/yyyy")')
+        ast.to_s.should == %Q({:function=>{:name=>"FormatDate"@0, :args=>[{:function=>{:name=>"PriorMonth"@12, :args=>"data"@23}}]}})
+      end
+
+    end
+
+    context "Composed expression's " do
       it "should recognize the expression 'Month(data) - 1' " do
         ast = parser.parse('Month(data) - 1')
         ast.to_s.should == %Q({:-=>{:left=>{:function=>{:name=>"Month"@0, :args=>"data"@6}}, :right=>"1"@14}})
@@ -87,6 +120,7 @@ module FormulaDSL
         ast = parser.parse('Month(data) + Year(data)')
         ast.to_s.should == %Q({:+=>{:left=>{:function=>{:name=>"Month"@0, :args=>"data"@6}}, :right=>{:function=>{:name=>"Year"@14, :args=>"data"@19}}}})
       end
+
     end
 
     context "Expressions with string concatenation" do
@@ -112,17 +146,17 @@ module FormulaDSL
 
       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}}}}}}}})
+        ast.to_s.should == %Q({:-=>{:left=>{:function=>{:name=>"Month"@0, :args=>"data"@6}}, :right=>{:+=>{:left=>{:+=>{:left=>"1"@14, :right=>"\\\"/\\\""@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}}}}}}}})
+        ast.to_s.should == %Q({:*=>{:left=>{:function=>{:name=>"Month"@0, :args=>"data"@6}}, :right=>{:+=>{:left=>{:+=>{:left=>"1"@14, :right=>"\\\"/\\\""@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}}}}}}}})
+        ast.to_s.should == %Q({:/=>{:left=>{:function=>{:name=>"Month"@0, :args=>"data"@6}}, :right=>{:+=>{:left=>{:+=>{:left=>"1"@14, :right=>"\\\"/\\\""@18}}, :right=>{:function=>{:name=>"Year"@24, :args=>"data"@29}}}}}})
       end
 
     end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: formula_dsl
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.4.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-04-03 00:00:00.000000000 Z
+date: 2012-04-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: parslet
@@ -125,7 +125,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -3658736757412770386
+      hash: -6232718774881797
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: