boolean-expression 0.0.1.1 → 0.0.1.2

data/lib/boolean/expression.rb

@@ -23,39 +23,62 @@ end
 
 class Boolean::Expression
 	def self.parse (text)
-		base  = Group.new
-		name  = nil
-		stack = [base]
-		logic = nil
+		base   = Group.new
+		name   = nil
+		stack  = [base]
+		logic  = nil
+		string = false
+		quoted = false
 
 		text.to_s.chars.each_with_index {|char, index|
 			begin
-				if char == ')' && stack.length == 1
+				if !string && char == ')' && stack.length == 1
 					raise SyntaxError, 'closing an unopened parenthesis'
 				end
 
-				if char.match(/\s|\(|\)/) || (!logic && ['|', '&', '!'].member?(char))
-					if logic || (name && name.match(/(and|or|not)/i))
+				if !string && (char.match(/\s|\(|\)/) || (!logic && ['|', '&', '!'].member?(char)))
+					if logic || (name && name.match(/^(and|or|not)$/i) && !quoted)
 						stack.last << Logic.new(logic || name)
 						logic       = nil
 						name        = nil
 					elsif name
+						if !stack.last.last.nil? && !stack.last.last.is_a?(Logic)
+							raise SyntaxError, 'you cannot put two names in a row'
+						end
+
 						stack.last << Name.new(name)
 						name        = nil
+						quoted      = false
 					end
 				end
 
-				if name || logic
-					name  << char if name
-					logic << char if logic
+				if name
+					if char == '"'
+						string = false
+					else
+						name << char
+					end
+				elsif logic
+					logic << char
 				else
-					case char
-						when '(' then stack.push Group.new
-						when ')' then stack[-2] << stack.pop
-						when '|' then logic = '|'
-						when '&' then logic = '&'
-						when '!' then stack.last << Logic.new('!')
-						else name = char if !char.match(/\s/)
+					if char == '"'
+						string = true
+						quoted = true
+
+						next
+					end
+
+					if string
+						name = char unless name
+					else
+						case char
+							when '(' then stack.push Group.new
+							when ')' then stack[-2] << stack.pop
+							when '|' then logic = '|'
+							when '&' then logic = '&'
+							when '!' then stack.last << Logic.new('!')
+							else          name = char if !char.match(/\s/)
+						end
 					end
 				end
 			rescue SyntaxError => e
@@ -67,7 +90,13 @@ class Boolean::Expression
 		
 		raise SyntaxError, 'the expression cannot end with a logic operator' if logic
 
-		base << Name.new(name) if name
+		if name
+			if !stack.last.last.nil? && !stack.last.last.is_a?(Logic)
+				raise SyntaxError, 'you cannot put two names in a row'
+			end
+
+			base << Name.new(name)
+		end
 
 		base = base.first if base.length == 1 && base.first.is_a?(Group)
 

data/lib/boolean/expression/group.rb

@@ -18,7 +18,9 @@
 #++
 
 class Boolean::Expression::Group < Array
-	def inspect
+	def to_s
 		'(' + map { |e| e.inspect }.join(' ') + ')'
 	end
+
+	alias inspect to_s
 end

data/lib/boolean/expression/logic.rb

@@ -37,7 +37,9 @@ class Boolean::Expression::Logic
 		end
 	end
 
-	def inspect
+	def to_s
 		type.to_s.upcase
 	end
+
+	alias inspect to_s
 end

data/lib/boolean/expression/name.rb

@@ -19,6 +19,8 @@
 
 class Boolean::Expression::Name < String
 	def inspect
-		to_s.downcase
+		(match(/[\s!&|]/) || %w(and or not).include?(downcase)) ? super : self
 	end
+
+	alias to_s inspect
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: boolean-expression
 version: !ruby/object:Gem::Version
-  version: 0.0.1.1
+  version: 0.0.1.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-01-28 00:00:00.000000000 Z
+date: 2012-02-09 00:00:00.000000000 Z
 dependencies: []
 description: 
 email: meh@paranoici.org
@@ -41,7 +41,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.10
+rubygems_version: 1.8.15
 signing_key: 
 specification_version: 3
 summary: A simple library to evaluate boolean expressions.