lamep 0.1 → 0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: fc0ce5e8f408a519a1c060670e476287be1d9f67
-  data.tar.gz: c2930b9fbdcdc8c53df84b860f2d331adf53d911
+  metadata.gz: a557b4e3fe5b67811e338d680c486345ec1bb7ed
+  data.tar.gz: f9ad186e84d8465682dfc46ce32da2362663d1db
 SHA512:
-  metadata.gz: fbf0d01e871e567f1e9fb466512a581c17b10631845611b09e02e1374d338a5c6edfd53a7acd480186b8a7df5e14c23dfc025cd26929441eed5863a4087dd466
-  data.tar.gz: 1e0f8b49ed2b77cadc2cb0aa7b10fbebe9a7d21865647a34e25af1e6a47bcb8769a87cf6c5420e44bf86683cbee3f1f89157e68f582a2fa80e6f5d60e36b60f9
+  metadata.gz: 64b5b8d9bed78b78e68b481e86bdc641b4b34dc3b16c8365e2c9d45348c751129a53d9b5cfdfe8271bdabd23f08a5b742f94ef5cabb1e79f3099e710be5ab99f
+  data.tar.gz: 67133170d913738facf242cd13a124802306a11ef9d244c47e54049a6820016320691ff258403bfa9e563e909d3173f624d709f8b7ff6fef5213cd547bedf0c5

data/lamep.gemspec

@@ -4,7 +4,7 @@ $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 
 Gem::Specification.new do |spec|
   spec.name          = 'lamep'
-  spec.version       = 0.1
+  spec.version       = 0.2
   spec.authors       = ['Martin Svoboda', 'Miroslav Csonka']
   spec.email         = ['miroslav.csonka@gmail.com']
   spec.summary       = %q{Logical and mathematical expression parser}

data/lib/lamep/Expressions/and.rb

@@ -5,4 +5,8 @@ class And < Arity2Operators
     "(#{@left.to_sql} AND #{@right.to_sql})"
   end
 
+  def evaluate(attributes={})
+    !!@left.evaluate(attributes) && !!@right.evaluate(attributes)
+  end
+
 end

data/lib/lamep/Expressions/equal.rb

@@ -5,4 +5,8 @@ class Equal < Arity2Operators
     "(#{@left.to_sql} = #{@right.to_sql})"
   end
 
+  def evaluate(values = {})
+    @left.evaluate(values) == @right.evaluate(values)
+  end
+
 end

data/lib/lamep/Expressions/greater_than.rb

@@ -5,4 +5,9 @@ class GreaterThan < Arity2Operators
     "(#{@left.to_sql} > #{@right.to_sql})"
   end
 
+
+  def evaluate(attributes={})
+    @left.evaluate(attributes).to_i > @right.evaluate(attributes).to_i
+  end
+
 end

data/lib/lamep/Expressions/greater_than_equal.rb

@@ -5,4 +5,8 @@ class GreaterThanEqual < Arity2Operators
     "(#{@left.to_sql} >= #{@right.to_sql})"
   end
 
+  def evaluate(attributes={})
+    @left.evaluate(attributes).to_i >= @right.evaluate(attributes).to_i
+  end
+
 end

data/lib/lamep/Expressions/less_than.rb

@@ -5,4 +5,8 @@ class LessThan < Arity2Operators
     "(#{@left.to_sql} < #{@right.to_sql})"
   end
 
+  def evaluate(attributes={})
+    @left.evaluate(attributes).to_i < @right.evaluate(attributes).to_i
+  end
+
 end

data/lib/lamep/Expressions/less_than_equal.rb

@@ -5,4 +5,8 @@ class LessThanEqual < Arity2Operators
     "(#{@left.to_sql} <= #{@right.to_sql})"
   end
 
+  def evaluate(attributes={})
+    @left.evaluate(attributes).to_i <= @right.evaluate(attributes).to_i
+  end
+
 end

data/lib/lamep/Expressions/not_equal.rb

@@ -5,4 +5,8 @@ class NotEqual < Arity2Operators
     "(#{@left.to_sql} != #{@right.to_sql})"
   end
 
+  def evaluate(attributes={})
+    @left.evaluate(attributes) != @right.evaluate(attributes)
+  end
+
 end

data/lib/lamep/Expressions/operator.rb

@@ -27,4 +27,8 @@ class Operator
     raise NotImplementedError
   end
 
+  def evaluate(attributes = {})
+    raise NotImplementedError
+  end
+
 end

data/lib/lamep/Expressions/or.rb

@@ -4,4 +4,8 @@ class Or < Arity2Operators
   def to_sql
     "(#{@left.to_sql} OR #{@right.to_sql})"
   end
+
+  def evaluate(attributes={})
+    !!@left.evaluate(attributes) || !!@right.evaluate(attributes)
+  end
 end

data/lib/lamep/Expressions/unary_minus.rb

@@ -7,4 +7,8 @@ class UnaryMinus < Arity1Operators
     -operand.to_i
   end
 
+  def evaluate(attributes={})
+    -@operand.evaluate(attributes).to_i
+  end
+
 end

data/lib/lamep/Expressions/value_expression.rb

@@ -8,4 +8,12 @@ class ValueExpression < Arity1Operators
     operand
   end
 
+  def evaluate(attributes = {})
+    if attributes.key? @operand
+      attributes[@operand]
+    else
+      @operand
+    end
+  end
+
 end

data/lib/lamep/abstract_syntax_tree_builder.rb

@@ -7,10 +7,10 @@ class AbstractSyntaxTreeBuilder
   def build_tree
     until @postfix.length == 1
       operator_index = first_operator_index
-      fail 'Not enough operators' if operator_index.nil?
+      fail NotEnoughOperatorsException if operator_index.nil?
       exp = Operator.factory!(@postfix.slice!(operator_index))
       most_left_child = operator_index - exp::ARITY
-      fail "Not enough operands for operator #{exp}" if most_left_child < 0
+      fail NotEnoughOperandsException, expression: exp if most_left_child < 0
       children = @postfix.slice!(most_left_child, exp::ARITY)
       @postfix.insert(most_left_child, exp.new(*children))
     end

data/lib/lamep/exceptions/missing_left_parentheses_error.rb

@@ -0,0 +1,2 @@
+class MissingLeftParenthesesError < Exception
+end

data/lib/lamep/exceptions/missing_right_parentheses_error.rb

@@ -0,0 +1,2 @@
+class MissingRightParenthesesError < Exception
+end

data/lib/lamep/exceptions/not_enough_operands_exception.rb

@@ -0,0 +1,10 @@
+class NotEnoughOperandsException < Exception
+
+  attr_reader :expression
+
+  def initialize(*argv)
+    @expression = argv[0].fetch(:expression)
+    super
+  end
+
+end

data/lib/lamep/exceptions/not_enough_operators_exception.rb

@@ -0,0 +1,2 @@
+class NotEnoughOperatorsException < Exception
+end

data/lib/lamep/shunting_yard.rb

@@ -16,7 +16,7 @@ class ShuntingYard
           @stack << token
         when ')'
           bracket_sum -= 1
-          fail('Right parentheses mismatch') if bracket_sum < 0
+          fail MissingLeftParenthesesError if bracket_sum < 0
           burn_stack_to_parentheses
         else
           if Operator.exists?(token)
@@ -27,12 +27,12 @@ class ShuntingYard
           end
       end
     end
-    fail('Left parentheses mismatch') if bracket_sum > 0
+    fail MissingRightParenthesesError if bracket_sum > 0
     @output += @stack.reverse
     @output
   end
 
-  def burn_stack_to_higher_precedence(token)
+  private def burn_stack_to_higher_precedence(token)
     until @stack.empty? || @stack.last == '(' || Operator.precedence!(token) < Operator.precedence!(@stack.last)
       @output << @stack.pop
     end

data/lib/lamep.rb

@@ -0,0 +1,28 @@
+require './lib/lamep/exceptions/not_enough_operands_exception'
+require './lib/lamep/exceptions/not_enough_operators_exception'
+require './lib/lamep/exceptions/missing_left_parentheses_error'
+require './lib/lamep/exceptions/missing_right_parentheses_error'
+require './lib/lamep/Expressions/operator'
+require './lib/lamep/Expressions/arity1_operators'
+require './lib/lamep/Expressions/arity2_operators'
+require './lib/lamep/Expressions/value_expression'
+require './lib/lamep/token_parser'
+require './lib/lamep/shunting_yard'
+require './lib/lamep/Expressions/equal'
+require './lib/lamep/Expressions/greater_than'
+require './lib/lamep/Expressions/less_than'
+require './lib/lamep/Expressions/greater_than_equal'
+require './lib/lamep/Expressions/less_than_equal'
+require './lib/lamep/Expressions/and'
+require './lib/lamep/Expressions/or'
+require './lib/lamep/Expressions/unary_minus'
+require './lib/lamep/Expressions/not_equal'
+require './lib/lamep/abstract_syntax_tree_builder'
+
+class Lamep
+  def evaluate(expression, attributes={})
+    tokens = TokenParser.new.parse(expression)
+    postfix = ShuntingYard.new(tokens).postfix
+    AbstractSyntaxTreeBuilder.new(postfix).build_tree.evaluate(attributes)
+  end
+end

data/spec/lib/abstract_syntax_tree_builder_spec.rb

@@ -57,11 +57,11 @@ describe AbstractSyntaxTreeBuilder do
 	end
 
 	it 'only operands' do
-		expect {AbstractSyntaxTreeBuilder.new(%w(materiál cena)).build_tree }.to raise_error(RuntimeError)
+		expect {AbstractSyntaxTreeBuilder.new(%w(materiál cena)).build_tree }.to raise_error(NotEnoughOperatorsException)
 	end
 
 	it 'only operators' do
-		expect {AbstractSyntaxTreeBuilder.new(%w(&& -)).build_tree }.to raise_error(RuntimeError)
+		expect {AbstractSyntaxTreeBuilder.new(%w(&& -)).build_tree }.to raise_error(NotEnoughOperandsException)
 	end
 
 end

data/spec/lib/evaluation_spec.rb

@@ -0,0 +1,66 @@
+require './spec/spec_helper'
+
+describe 'Evaluating of expressions' do
+
+  def matches?(filter, values={})
+    tokens = TokenParser.new.parse(filter)
+    postfix = ShuntingYard.new(tokens).postfix
+    AbstractSyntaxTreeBuilder.new(postfix).build_tree.evaluate(values)
+  end
+
+  describe Equal do
+
+    it 'is false' do
+      expect(matches?('true = false')).to eq false
+      expect(matches?('true = true')).to eq true
+    end
+
+    it 'replacing value holders with actual values' do
+      expect(matches?('name = mirek', { 'name' => 'mirek' })).to eq true
+      expect(matches?('name = mirek', { 'name' => 'Tomáš' })).to eq false
+    end
+
+  end
+
+
+  it GreaterThan do
+    expect(matches?('price > 200', { 'price' => '300' })).to eq true
+    expect(matches?('price > 200', { 'price' => 150 })).to eq false
+  end
+
+  it LessThan do
+    expect(matches?('(price < 200)', { 'price' => 150 })).to eq true
+    expect(matches?('(price < 200)', { 'price' => 500 })).to eq false
+  end
+
+  it GreaterThanEqual do
+    expect(matches?('price >= 200', { 'price' => '200' })).to eq true
+    expect(matches?('price >= 200', { 'price' => 201 })).to eq true
+    expect(matches?('price >= 200', { 'price' => 199 })).to eq false
+  end
+
+  it LessThanEqual do
+    expect(matches?('(price <= 200)', { 'price' => 201 })).to eq false
+    expect(matches?('(price <= 200)', { 'price' => 200 })).to eq true
+    expect(matches?('(price <= 200)', { 'price' => 199 })).to eq true
+  end
+
+  it And do
+    expect(matches?('(price > 200) && price < 500', { 'price' => 400 })).to eq true
+  end
+
+  it NotEqual do
+    expect(matches?('name != mirek')).to eq true
+    expect(matches?('name != name')).to eq false
+  end
+
+  it Or do
+    expect(matches?('(price > 200) || (category = 1)', { 'price' => 0, 'category' => '1' })).to eq true
+    expect(matches?('price > 200 || category = 1', { 'price' => '0', 'category' => '0' })).to eq false
+  end
+
+  it UnaryMinus do
+    expect(matches?('-1 = -(1)', {})).to eq true
+  end
+
+end

data/spec/lib/shunting_yard_spec.rb

@@ -35,8 +35,8 @@ describe ShuntingYard do
 	it 'brackets' do
 		returns %w(( cena > 180 )), %w(cena 180 >)
 		returns %w(( ( cena ) > ( 180 ) )), %w(cena 180 >)
-		expect { ShuntingYard.new(%w{( cena ) > 180 )}).postfix }.to raise_error(RuntimeError)
-		expect { ShuntingYard.new(%w{((( cena ) > 180 )}).postfix }.to raise_error(RuntimeError)
+		expect { ShuntingYard.new(%w{( cena ) > 180 )}).postfix }.to raise_error(MissingLeftParenthesesError )
+		expect { ShuntingYard.new(%w{( ( ( cena ) > 180 )}).postfix }.to raise_error(MissingRightParenthesesError)
 	end
 
 	it 'difficult cases' do

data/spec/spec_helper.rb

@@ -1,19 +1,4 @@
-require './lib/lamep/Expressions/operator'
-require './lib/lamep/Expressions/arity1_operators'
-require './lib/lamep/Expressions/arity2_operators'
-require './lib/lamep/Expressions/value_expression'
-require './lib/lamep/token_parser'
-require './lib/lamep/shunting_yard'
-require './lib/lamep/Expressions/equal'
-require './lib/lamep/Expressions/greater_than'
-require './lib/lamep/Expressions/less_than'
-require './lib/lamep/Expressions/greater_than_equal'
-require './lib/lamep/Expressions/less_than_equal'
-require './lib/lamep/Expressions/and'
-require './lib/lamep/Expressions/or'
-require './lib/lamep/Expressions/unary_minus'
-require './lib/lamep/Expressions/not_equal'
-require './lib/lamep/abstract_syntax_tree_builder'
+require './lib/lamep'
 
 RSpec.configure do |config|
 	# rspec-expectations config goes here. You can use an alternate

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: lamep
 version: !ruby/object:Gem::Version
-  version: '0.1'
+  version: '0.2'
 platform: ruby
 authors:
 - Martin Svoboda
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-01-14 00:00:00.000000000 Z
+date: 2015-01-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -67,6 +67,7 @@ files:
 - README.md
 - Rakefile
 - lamep.gemspec
+- lib/lamep.rb
 - lib/lamep/Expressions/and.rb
 - lib/lamep/Expressions/arity1_operators.rb
 - lib/lamep/Expressions/arity2_operators.rb
@@ -81,10 +82,15 @@ files:
 - lib/lamep/Expressions/unary_minus.rb
 - lib/lamep/Expressions/value_expression.rb
 - lib/lamep/abstract_syntax_tree_builder.rb
+- lib/lamep/exceptions/missing_left_parentheses_error.rb
+- lib/lamep/exceptions/missing_right_parentheses_error.rb
+- lib/lamep/exceptions/not_enough_operands_exception.rb
+- lib/lamep/exceptions/not_enough_operators_exception.rb
 - lib/lamep/shunting_yard.rb
 - lib/lamep/token_parser.rb
 - spec/lib/Expressions/operators_spec.rb
 - spec/lib/abstract_syntax_tree_builder_spec.rb
+- spec/lib/evaluation_spec.rb
 - spec/lib/shunting_yard_spec.rb
 - spec/lib/token_parser_spec.rb
 - spec/spec_helper.rb
@@ -115,6 +121,7 @@ summary: Logical and mathematical expression parser
 test_files:
 - spec/lib/Expressions/operators_spec.rb
 - spec/lib/abstract_syntax_tree_builder_spec.rb
+- spec/lib/evaluation_spec.rb
 - spec/lib/shunting_yard_spec.rb
 - spec/lib/token_parser_spec.rb
 - spec/spec_helper.rb