exalted_math 0.1.1 → 0.1.2

data/VERSION

@@ -1 +1 @@
-0.1.1
+0.1.2

data/exalted_math.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{exalted_math}
-  s.version = "0.1.1"
+  s.version = "0.1.2"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Jonathan Stott"]

data/lib/exalted_math/ast.rb

@@ -28,7 +28,7 @@ module Exalted
         true
       when 'stat', 'spec'
         false
-      when 'max'
+      when 'max', 'min'
         self[2].all? { |ast| ast.constant? }
       else
         raise UnknownNodeError, self[0]

data/spec/ast_spec.rb

@@ -22,6 +22,8 @@ describe "Exalted::Ast" do
     @mul_foo  = Exalted::Ast.new('mul', @three, @foo)
     @div_foo  = Exalted::Ast.new('div', @three, @foo)
     @nested   = Exalted::Ast.new('mul', @add, @sub_foo)
+    @min      = Exalted::Ast.new('min', 1, [@three, @seven] )
+    @max      = Exalted::Ast.new('max', 1, [@three, @seven] )
     @context  = { 'foo' => 3, 'bar' => 4 }
   end
 
@@ -53,6 +55,14 @@ describe "Exalted::Ast" do
     @div.should == Ast.div(@seven, @three)
   end
 
+  it ".min makes a min" do
+    @min.should == Ast.min(1, [@three, @seven])
+  end
+
+  it ".max makes a max" do
+    @max.should == Ast.max(1, [@three, @seven])
+  end
+
   it "a number is constant" do
     @three.should.be.constant
   end
@@ -73,6 +83,12 @@ describe "Exalted::Ast" do
   it "an div of two constants is constant" do
     @div.should.be.constant
   end
+  it "a min of constants is constant" do
+    @min.should.be.constant
+  end
+  it "a max of constants is constant" do
+    @max.should.be.constant
+  end
 
   it "an add of constant and not constant is not constant" do
     @add_foo.should.not.be.constant
@@ -154,6 +170,13 @@ describe "Exalted::Ast" do
     Exalted::Ast.value(@div, @context).should == 2
   end
 
+  it "the value of a min is the mininum value" do
+    Exalted::Ast.value(@min, @context).should == 3
+  end
+  it "the value of a max is the maxinum value" do
+    Exalted::Ast.value(@max, @context).should == 7
+  end
+
   it "it walks the whole tree to compute a value" do
      Exalted::Ast.value(@nested, @context).should == 0
   end

data/spec/parser_spec.rb

@@ -17,7 +17,9 @@ describe "Exalted::MathParser" do
     ['3 + 4', Ast.add(Ast.num(3), Ast.num(4) )],
     ['6 / 3', Ast.div(Ast.num(6), Ast.num(3) )],
     ['Essence * 4', Ast.mul(Ast.stat('essence'), Ast.num(4) )],
-    ['(Essence * 4) + Willpower', Ast.add(Ast.mul(Ast.stat('essence'), Ast.num(4) ), Ast.stat('willpower'))]
+    ['(Essence * 4) + Willpower', Ast.add(Ast.mul(Ast.stat('essence'), Ast.num(4) ), Ast.stat('willpower'))],
+    ['highest[2](compassion,conviction,temperance,valor)', Ast.max(2, [Ast.stat('compassion'),Ast.stat('conviction'),Ast.stat('temperance'),Ast.stat('valor') ])],
+    ['min(compassion,conviction,temperance,valor)', Ast.min(1, [Ast.stat('compassion'),Ast.stat('conviction'),Ast.stat('temperance'),Ast.stat('valor') ])]
   ].each do |string, ast|
     it "parses '#{string}'" do
       success, result = @parser.ast(string)

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: exalted_math
 version: !ruby/object:Gem::Version 
-  hash: 25
+  hash: 31
   prerelease: false
   segments: 
   - 0
   - 1
-  - 1
-  version: 0.1.1
+  - 2
+  version: 0.1.2
 platform: ruby
 authors: 
 - Jonathan Stott