filter_lexer 0.1.1 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 47fbb2acdc5535e2e74b0355dbb042e289de54b1
-  data.tar.gz: 4be18e0e750a3b298e4572e175e2b2e43fbeea3e
+  metadata.gz: 7b1d2010a2fac9cc9e4a08944bc449531745baaa
+  data.tar.gz: 30772a55499dde15575d62e07855a320273a366f
 SHA512:
-  metadata.gz: 9e83318063753adab91aeddb75fbe34f3405a35f47b82dd01eed69a9276b5b97e9110a830da5f981a1a8d633159da158ce38a636562ce82d0da591a48c8e4503
-  data.tar.gz: a7ff4f435b9ab633daf95f8b31c1a98b5c001b8b86cd82dfcfaf69749b4e2b61bcbbfffb4f8ff020af0f2cee9d081297d12060c9b2a6008b2628a3599829c513
+  metadata.gz: 616e680238ad483a026a977d2dee20f418b60a677eec3b4559d4a85fd45a045dc0327497547043b2d54e9a7fc927c40484498a5423f99d09c5cff01f0ba395fd
+  data.tar.gz: f4ed9510505531fc897ab7d269de8e05c69b251e26e0e642d3abdf0c8a21ba62905711c3e8ce3c8ee5d944992f4d18cb9b3f4703c425dbb836935e2129803f9e

data/.rubocop.yml

@@ -27,6 +27,10 @@ Style/IndentationWidth:
 Style/MultilineOperationIndentation:
   EnforcedStyle: 'indented'
 
+Style/PercentLiteralDelimiters:
+  PreferredDelimiters:
+    '%': '[]'
+
 Style/RedundantReturn:
   Enabled: false
 

data/Rakefile

@@ -1,8 +1,11 @@
 require 'bundler/gem_tasks'
 require 'rubocop/rake_task'
 
-RuboCop::RakeTask.new(:rubocop, [:options]) do |task|
+RuboCop::RakeTask.new(:rubocop, [:options]) do |task, args|
 	task.options.push '--cache=false'
+
+	require 'shellwords'
+	task.options += Shellwords.shellsplit(args[:options]) unless args[:options].nil?
 end
 module RuboCop
 	# We use tabs for indentation, not spaces. As many of the RuboCop cops seem

data/lib/filter_lexer/formatters/sql.rb

@@ -29,7 +29,7 @@ module FilterLexer
 		end
 
 		def query_variables
-			return [data.sql]
+			return [data.data]
 		end
 	end
 
@@ -39,7 +39,7 @@ module FilterLexer
 		end
 	end
 
-	class LogicOperator
+	class LogicalOperator
 		def query_string
 			return sql
 		end
@@ -61,7 +61,7 @@ module FilterLexer
 		end
 	end
 
-	class Operator
+	class RelationalOperator
 		def query_string
 			return sql
 		end
@@ -73,15 +73,23 @@ module FilterLexer
 
 	class EQOperator
 		def sql
-			return 'IS' if parent.data.is_a?(ValueSpecial)
-			return '='
+			case parent.data
+				when BooleanLiteral, NullLiteral
+					return 'IS'
+				else
+					return '='
+			end
 		end
 	end
 
 	class NEQOperator
 		def sql
-			return 'IS NOT' if parent.data.is_a?(ValueSpecial)
-			return '<>'
+			case parent.data
+				when BooleanLiteral, NullLiteral
+					return 'IS NOT'
+				else
+					return '<>'
+			end
 		end
 	end
 
@@ -109,45 +117,15 @@ module FilterLexer
 		end
 	end
 
-	class NotLikeOperator
-		def sql
-			return 'NOT LIKE'
-		end
-	end
-
 	class LikeOperator
 		def sql
 			return 'LIKE'
 		end
 	end
 
-	class BooleanLiteralFalse
-		def sql
-			return 'FALSE'
-		end
-	end
-
-	class BooleanLiteralTrue
-		def sql
-			return 'TRUE'
-		end
-	end
-
-	class NullLiteral
-		def sql
-			return 'NULL'
-		end
-	end
-
-	class StringLiteral
-		def sql
-			return text_value
-		end
-	end
-
-	class NumberLiteral
+	class NotLikeOperator
 		def sql
-			return text_value
+			return 'NOT LIKE'
 		end
 	end
 end

data/lib/filter_lexer/nodes/collections.rb

@@ -0,0 +1,9 @@
+module FilterLexer
+	# The root element, expression is a collection of other expressions and and/or operators
+	class Expression < Treetop::Runtime::SyntaxNode
+	end
+
+	# A group is simply an expression in parenthesis
+	class Group < Treetop::Runtime::SyntaxNode
+	end
+end

data/lib/filter_lexer/nodes/filter.rb

@@ -0,0 +1,25 @@
+module FilterLexer
+	# A filter is the core object of the lexer: an indentifier, an relational operator and data
+	class Filter < Treetop::Runtime::SyntaxNode
+		# The identifier element
+		#
+		# Of type FilterLexer::Identifier
+		def identifier
+			return elements[0]
+		end
+
+		# The operator element
+		#
+		# Subclass of FilterLexer::RelationalOperator
+		def operator
+			return elements[1]
+		end
+
+		# The data element
+		#
+		# Subclass of FilterLexer::Literal
+		def data
+			return elements[2]
+		end
+	end
+end

data/lib/filter_lexer/nodes/identifier.rb

@@ -0,0 +1,5 @@
+module FilterLexer
+	# An identifier is the target (variable) of the filter
+	class Identifier < Treetop::Runtime::SyntaxNode
+	end
+end

data/lib/filter_lexer/nodes/literals.rb

@@ -0,0 +1,47 @@
+module FilterLexer
+	# A literal is the value (data) of the filter
+	class Literal < Treetop::Runtime::SyntaxNode
+		def data
+			return text_value
+		end
+	end
+
+	# A boolean is a dual-state true/false literal
+	class BooleanLiteral < Literal
+		# The data for the boolean will be set during lexing
+	end
+
+	# A null is an unset or undefined literal
+	class NullLiteral < Literal
+		def data
+			return nil
+		end
+	end
+
+	# A string is a series of characters
+	class StringLiteral < Literal
+		def data
+			# Try to parse the string
+			string = text_value
+			quote_char = string[0]
+			string = string.slice(1, string.size - 2)
+			string = string.gsub(%[\\\\], %[\\])
+			string = string.gsub(%[\\] + quote_char, quote_char)
+			return string
+		end
+	end
+
+	# A number is an integer or a float, with an optional sign and an optional exponent
+	class NumberLiteral < Literal
+		def data
+			return text_value.to_f
+		end
+	end
+
+	# A datetime is a moment in time
+	class DatetimeLiteral < Literal
+		def data
+			return DateTime.parse(elements.first.data)
+		end
+	end
+end

data/lib/filter_lexer/nodes/logical_operators.rb

@@ -0,0 +1,13 @@
+module FilterLexer
+	# An logical operator is the glue between filters
+	class LogicalOperator < Treetop::Runtime::SyntaxNode
+	end
+
+	# An logical OR operator
+	class OrOperator < LogicalOperator
+	end
+
+	# An logical AND operator
+	class AndOperator < LogicalOperator
+	end
+end

data/lib/filter_lexer/nodes/relational_operators.rb

@@ -0,0 +1,37 @@
+module FilterLexer
+	# An relational operator is the type (function) of the filter
+	class RelationalOperator < Treetop::Runtime::SyntaxNode
+	end
+
+	# An relational equality operator
+	class EQOperator < RelationalOperator
+	end
+
+	# An relational negative equality operator
+	class NEQOperator < RelationalOperator
+	end
+
+	# An relational less-than operator
+	class LTOperator < RelationalOperator
+	end
+
+	# An relational less-than-or-equal operator
+	class LEOperator < RelationalOperator
+	end
+
+	# An relational greater-than operator
+	class GTOperator < RelationalOperator
+	end
+
+	# An relational greater-than-or-equal operator
+	class GEOperator < RelationalOperator
+	end
+
+	# An relational string matching operator
+	class LikeOperator < RelationalOperator
+	end
+
+	# An relational negative string matching operator
+	class NotLikeOperator < RelationalOperator
+	end
+end

data/lib/filter_lexer/nodes.rb

@@ -1,100 +1,6 @@
-module FilterLexer
-	# The root element, expression is a collection of other expressions and and/or operators
-	class Expression < Treetop::Runtime::SyntaxNode
-	end
-
-	# A group is simply an expression in parenthesis
-	class Group < Treetop::Runtime::SyntaxNode
-	end
-
-	# A filter is the core object of the lexer: an indentifier, an operator and a data
-	class Filter < Treetop::Runtime::SyntaxNode
-		# The identifier element
-		#
-		# Of type FilterLexer::Identifier
-		def identifier
-			return elements[0]
-		end
-
-		# The operator element
-		#
-		# Subclass of FilterLexer::Operator
-		def operator
-			return elements[1]
-		end
-
-		# The value element
-		#
-		# Subclass of FilterLexer::Value
-		def data
-			return elements[2]
-		end
-	end
-
-	# An logic operator is the glue between filters
-	class LogicOperator < Treetop::Runtime::SyntaxNode
-	end
-
-	class OrOperator < LogicOperator
-	end
-
-	class AndOperator < LogicOperator
-	end
-
-	# An identifier is the target (variable) of the filter
-	class Identifier < Treetop::Runtime::SyntaxNode
-	end
-
-	# An operator is the type (function) of the filter
-	class Operator < Treetop::Runtime::SyntaxNode
-	end
-
-	class EQOperator < Operator
-	end
-
-	class NEQOperator < Operator
-	end
-
-	class LTOperator < Operator
-	end
-
-	class LEOperator < Operator
-	end
-
-	class GTOperator < Operator
-	end
-
-	class GEOperator < Operator
-	end
-
-	class NotLikeOperator < Operator
-	end
-
-	class LikeOperator < Operator
-	end
-
-	# A value is the data of the filter
-	class Value < Treetop::Runtime::SyntaxNode
-	end
-
-	class ValueSpecial < Value
-	end
-
-	class ValueScalar < Value
-	end
-
-	class BooleanLiteralFalse < ValueSpecial
-	end
-
-	class BooleanLiteralTrue < ValueSpecial
-	end
-
-	class NullLiteral < ValueSpecial
-	end
-
-	class StringLiteral < ValueScalar
-	end
-
-	class NumberLiteral < ValueScalar
-	end
-end
+require 'filter_lexer/nodes/collections'
+require 'filter_lexer/nodes/filter'
+require 'filter_lexer/nodes/identifier'
+require 'filter_lexer/nodes/literals'
+require 'filter_lexer/nodes/logical_operators'
+require 'filter_lexer/nodes/relational_operators'

data/lib/filter_lexer/syntax.treetop

@@ -28,11 +28,11 @@ grammar FilterLexer
 	end
 
 	rule filter_comparison
-		identifier space? comparison_operator space? number <Filter>
+		identifier space? comparison_operator space? (number / datetime) <Filter>
 	end
 
 	rule filter_like
-		identifier space like_operator space string <Filter>
+		identifier space? like_operator space? string <Filter>
 	end
 
 	# Logic
@@ -64,45 +64,41 @@ grammar FilterLexer
 	end
 
 	rule eq_operator
-		'==' <EQOperator>
+		'' ('==' / 'eq' / 'EQ' / 'is' / 'IS') <EQOperator>
 	end
 
 	rule neq_operator
-		'' ('!=' / '<>') <NEQOperator>
+		'' ('!=' / '<>' / 'neq' / 'NEQ' / 'not is' / 'NOT IS' / 'is not' / 'IS NOT') <NEQOperator>
 	end
 
 	rule lt_operator
-		'<' <LTOperator>
+		'' ('<' / 'lt' / 'LT') <LTOperator>
 	end
 
 	rule le_operator
-		'<=' <LEOperator>
+		'' ('<=' / 'le' / 'LE') <LEOperator>
 	end
 
 	rule gt_operator
-		'>' <GTOperator>
+		'' ('>' / 'gt' / 'GT') <GTOperator>
 	end
 
 	rule ge_operator
-		'>=' <GEOperator>
+		'' ('>=' / 'ge' / 'GE') <GEOperator>
 	end
 
 	rule yes_like_operator
-		'' ('like' / 'LIKE' / '~=') <LikeOperator>
+		'' ('=~' / 'like' / 'LIKE') <LikeOperator>
 	end
 
 	rule not_like_operator
-		'' ('!~=' / 'NOT LIKE' / 'not like') <NotLikeOperator>
+		'' ('!=~' / 'not like' / 'NOT LIKE') <NotLikeOperator>
 	end
 
 	# Literals
 
 	rule value
-		value_special / number / string
-	end
-
-	rule value_special
-		null / boolean 
+		null / boolean / number / datetime / string
 	end
 
 	rule number
@@ -134,27 +130,46 @@ grammar FilterLexer
 	end
 
 	rule boolean_true
-		'' ('true' / 'TRUE' / 'on' / 'ON' / 'yes' / 'YES') <BooleanLiteralTrue>
+		'' ('true' / 'TRUE' / 'on' / 'ON' / 'yes' / 'YES') <BooleanLiteral> {
+			def data
+				return true
+			end
+		}
 	end
 
 	rule boolean_false
-		'' ('false' / 'FALSE' / 'off' / 'OFF' / 'no' / 'NO') <BooleanLiteralFalse>
+		'' ('false' / 'FALSE' / 'off' / 'OFF' / 'no' / 'NO') <BooleanLiteral> {
+			def data
+				return false
+			end
+		}
 	end
 
 	rule null
 		'' ('null' / 'NULL' / 'nil' / 'NIL' / 'nul' / 'NUL') <NullLiteral>
 	end
 
+	rule datetime
+		string &{ |s|
+			begin
+				DateTime.parse(s.first.data)
+				return true
+			rescue
+				return false
+			end
+		} <DatetimeLiteral>
+	end
+
 	rule string
-		string_single / string_double
+		'' (string_single / string_double) <StringLiteral>
 	end
 
 	rule string_single
-		"'" ([^'\\] / "\\" . )* "'" <StringLiteral>
+		"'" ([^'\\] / "\\" . )* "'"
 	end
 
 	rule string_double
-		'"' ([^"\\] / "\\" . )* '"' <StringLiteral>
+		'"' ([^"\\] / "\\" . )* '"'
 	end
 
 	rule identifier

data/lib/filter_lexer/version.rb

@@ -1,3 +1,3 @@
 module FilterLexer
-	VERSION = '0.1.1'
+	VERSION = '0.2.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: filter_lexer
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.2.0
 platform: ruby
 authors:
 - Michon van Dooren
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2015-11-26 00:00:00.000000000 Z
+date: 2015-11-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -118,6 +118,12 @@ files:
 - lib/filter_lexer/exceptions.rb
 - lib/filter_lexer/formatters/sql.rb
 - lib/filter_lexer/nodes.rb
+- lib/filter_lexer/nodes/collections.rb
+- lib/filter_lexer/nodes/filter.rb
+- lib/filter_lexer/nodes/identifier.rb
+- lib/filter_lexer/nodes/literals.rb
+- lib/filter_lexer/nodes/logical_operators.rb
+- lib/filter_lexer/nodes/relational_operators.rb
 - lib/filter_lexer/syntax.treetop
 - lib/filter_lexer/version.rb
 homepage: http://github.com/MaienM/FilterLexer