Split up files

lib/guillotine/expressions.rb

@@ -45,14 +45,14 @@ def classes
     autoload :Base,                 "#{dir}/base"
     autoload :TopLevelExpression,   "#{dir}/top_level_expression"
     autoload :Column,               "#{dir}/column"
-    autoload :Equal,                "#{dir}/expressions"
-    autoload :LessThan,             "#{dir}/expressions"
-    autoload :GreaterThan,          "#{dir}/expressions"
-    autoload :GreaterThanOrEqualTo, "#{dir}/expressions"
-    autoload :LessThanOrEqualTo,    "#{dir}/expressions"
-    autoload :NotEqual,             "#{dir}/expressions"
-    autoload :IsNull,               "#{dir}/expressions"
-    autoload :IsNotNull,            "#{dir}/expressions"
+    autoload :Equal,                "#{dir}/equal"
+    autoload :LessThan,             "#{dir}/less_than"
+    autoload :GreaterThan,          "#{dir}/greater_than"
+    autoload :GreaterThanOrEqualTo, "#{dir}/greater_than_or_equal_to"
+    autoload :LessThanOrEqualTo,    "#{dir}/less_than_or_equal_to"
+    autoload :NotEqual,             "#{dir}/not_equal"
+    autoload :IsNull,               "#{dir}/is_null"
+    autoload :IsNotNull,            "#{dir}/is_not_null"
     autoload :Select,               "#{dir}/select"
     autoload :From,                 "#{dir}/from"
     autoload :OrderBy,              "#{dir}/order_by"

lib/guillotine/expressions/equal.rb

@@ -0,0 +1,17 @@
+module Guillotine
+  module Expressions
+    class Equal < Base
+      RUBY_OPERATOR = :==
+      SQL_OPERATOR = "="
+
+      def to_lambda
+        new_lambda_with_comparison(RUBY_OPERATOR)
+      end
+
+      def to_sql
+        "#{key} #{SQL_OPERATOR} #{value}"
+      end
+    end
+  end
+end
+

lib/guillotine/expressions/greater_than.rb

@@ -0,0 +1,16 @@
+module Guillotine
+  module Expressions    
+    class GreaterThan < Base
+      RUBY_OPERATOR = :>
+      SQL_OPERATOR  = RUBY_OPERATOR.to_s
+
+      def to_lambda
+        new_lambda_with_comparison(RUBY_OPERATOR)
+      end
+
+      def to_sql
+        "#{key} #{SQL_OPERATOR} #{value}"
+      end
+    end
+  end
+end

lib/guillotine/expressions/greater_than_or_equal_to.rb

@@ -0,0 +1,16 @@
+module Guillotine
+  module Expressions    
+    class GreaterThanOrEqualTo < Base
+      RUBY_OPERATOR = :>=
+      SQL_OPERATOR  = RUBY_OPERATOR.to_s
+
+      def to_lambda
+        new_lambda_with_comparison(RUBY_OPERATOR)
+      end
+
+      def to_sql
+        "#{key} #{SQL_OPERATOR} #{value}"
+      end
+    end
+  end
+end

lib/guillotine/expressions/is_not_null.rb

@@ -0,0 +1,15 @@
+module Guillotine
+  module Expressions    
+    class IsNotNull < IsNull
+      SQL_OPERATOR = "IS NOT NULL"
+
+      def to_lambda
+        lambda { |obj| ! super.call(obj) }
+      end
+
+      def to_sql
+        "#{key} #{SQL_OPERATOR}"
+      end
+    end
+  end
+end

lib/guillotine/expressions/is_null.rb

@@ -0,0 +1,20 @@
+module Guillotine
+  module Expressions    
+    class IsNull < Base
+      RUBY_OPERATOR = :nil?
+      SQL_OPERATOR  = "IS NULL"
+
+      def initialize(key)
+        super(key, nil)
+      end
+
+      def to_lambda
+        new_lambda_with_comparison(:==)
+      end
+
+      def to_sql
+        "#{key} #{SQL_OPERATOR}"
+      end
+    end
+  end
+end

lib/guillotine/expressions/less_than.rb

@@ -0,0 +1,16 @@
+module Guillotine
+  module Expressions
+    class LessThan < Base
+      RUBY_OPERATOR = :<
+      SQL_OPERATOR  = RUBY_OPERATOR.to_s
+
+      def to_lambda
+        new_lambda_with_comparison(RUBY_OPERATOR)
+      end
+
+      def to_sql
+        "#{key} #{SQL_OPERATOR} #{value}"
+      end
+    end
+  end
+end

lib/guillotine/expressions/less_than_or_equal_to.rb

@@ -0,0 +1,16 @@
+module Guillotine
+  module Expressions    
+    class LessThanOrEqualTo < Base
+      RUBY_OPERATOR = :<=
+      SQL_OPERATOR  = RUBY_OPERATOR.to_s
+
+      def to_lambda
+        new_lambda_with_comparison(RUBY_OPERATOR)
+      end
+
+      def to_sql
+        "#{key} #{SQL_OPERATOR} #{value}"
+      end
+    end
+  end
+end

lib/guillotine/expressions/not_equal.rb

@@ -0,0 +1,15 @@
+module Guillotine
+  module Expressions    
+    class NotEqual < Equal
+      SQL_OPERATOR = "!="
+
+      def to_lambda
+        lambda { |obj| ! super.call(obj) }
+      end
+
+      def to_sql
+        "#{key} #{SQL_OPERATOR} #{value}"
+      end
+    end
+  end
+end