arel 0.1.0 → 0.1.2

data/lib/arel.rb

@@ -1,10 +1,14 @@
-$LOAD_PATH.unshift(File.dirname(__FILE__))
+require 'active_support/inflector'
+require 'active_support/core_ext/module/delegation'
+require 'active_support/core_ext/class/attribute_accessors'
 
-require 'rubygems'
-require 'activesupport'
-require 'activerecord'
+require 'active_record'
 require 'active_record/connection_adapters/abstract/quoting'
 
-require 'arel/algebra'
-require 'arel/engines'
-require 'arel/session'
+module Arel
+  require 'arel/algebra'
+  require 'arel/engines'
+  autoload :Session, 'arel/session'
+
+  VERSION = "0.1.2"
+end

data/lib/arel/algebra.rb

@@ -1,4 +1,9 @@
-require 'arel/algebra/extensions'
+require 'arel/algebra/core_extensions'
+
+require 'arel/algebra/attribute'
+require 'arel/algebra/expression'
+require 'arel/algebra/ordering'
 require 'arel/algebra/predicates'
 require 'arel/algebra/relations'
-require 'arel/algebra/primitives'
+require 'arel/algebra/value'
+

data/lib/arel/algebra/{primitives/attribute.rb → attribute.rb}

@@ -82,31 +82,31 @@ module Arel
 
     module Predications
       def eq(other)
-        Equality.new(self, other)
+        Predicates::Equality.new(self, other)
       end
 
       def lt(other)
-        LessThan.new(self, other)
+        Predicates::LessThan.new(self, other)
       end
 
       def lteq(other)
-        LessThanOrEqualTo.new(self, other)
+        Predicates::LessThanOrEqualTo.new(self, other)
       end
 
       def gt(other)
-        GreaterThan.new(self, other)
+        Predicates::GreaterThan.new(self, other)
       end
 
       def gteq(other)
-        GreaterThanOrEqualTo.new(self, other)
+        Predicates::GreaterThanOrEqualTo.new(self, other)
       end
 
       def matches(regexp)
-        Match.new(self, regexp)
+        Predicates::Match.new(self, regexp)
       end
 
       def in(array)
-        In.new(self, array)
+        Predicates::In.new(self, array)
       end
     end
     include Predications

data/lib/arel/algebra/core_extensions.rb

@@ -0,0 +1,4 @@
+require 'arel/algebra/core_extensions/object'
+require 'arel/algebra/core_extensions/class'
+require 'arel/algebra/core_extensions/symbol'
+require 'arel/algebra/core_extensions/hash'

data/lib/arel/algebra/{extensions → core_extensions}/class.rb

@@ -2,7 +2,7 @@ module Arel
   module ClassExtensions
     def attributes(*attrs)
       @attributes = attrs
-      attr_reader *attrs
+      attr_reader(*attrs)
     end
 
     def deriving(*methods)
@@ -25,7 +25,7 @@ module Arel
       }
       class_eval methods[method_name], __FILE__, __LINE__
     end
-    
+
     Class.send(:include, self)
   end
 end

data/lib/arel/algebra/{extensions → core_extensions}/hash.rb

@@ -5,7 +5,7 @@ module Arel
         bound.merge(key.bind(relation) => value.bind(relation))
       end
     end
-    
+
     Hash.send(:include, self)
   end
 end

data/lib/arel/algebra/{extensions → core_extensions}/object.rb

@@ -11,7 +11,7 @@ module Arel
     def let
       yield(self)
     end
-    
+
     Object.send(:include, self)
   end
 end

data/lib/arel/algebra/{extensions → core_extensions}/symbol.rb

@@ -3,7 +3,7 @@ module Arel
     def to_attribute(relation)
       Arel::Attribute.new(relation, self)
     end
-    
+
     Symbol.send(:include, self)
   end
 end

data/lib/arel/algebra/{primitives/ordering.rb → ordering.rb}

@@ -15,7 +15,7 @@ module Arel
     attributes :attribute
     deriving :initialize, :==
   end
-  
+
   class Descending < Ordering
     attributes :attribute
     deriving :initialize, :==

data/lib/arel/algebra/predicates.rb

@@ -1,41 +1,43 @@
 module Arel
-  class Predicate
-    def or(other_predicate)
-      Or.new(self, other_predicate)
-    end
+  module Predicates
+    class Predicate
+      def or(other_predicate)
+        Or.new(self, other_predicate)
+      end
 
-    def and(other_predicate)
-      And.new(self, other_predicate)
+      def and(other_predicate)
+        And.new(self, other_predicate)
+      end
     end
-  end
 
-  class Binary < Predicate
-    attributes :operand1, :operand2
-    deriving :initialize
+    class Binary < Predicate
+      attributes :operand1, :operand2
+      deriving :initialize
 
-    def ==(other)
-      self.class === other          and
-      @operand1  ==  other.operand1 and
-      @operand2  ==  other.operand2
-    end
+      def ==(other)
+        self.class === other          and
+        @operand1  ==  other.operand1 and
+        @operand2  ==  other.operand2
+      end
 
-    def bind(relation)
-      self.class.new(operand1.find_correlate_in(relation), operand2.find_correlate_in(relation))
+      def bind(relation)
+        self.class.new(operand1.find_correlate_in(relation), operand2.find_correlate_in(relation))
+      end
     end
-  end
 
-  class Equality < Binary
-    def ==(other)
-      Equality === other and
-        ((operand1 == other.operand1 and operand2 == other.operand2) or
-         (operand1 == other.operand2 and operand2 == other.operand1))
+    class Equality < Binary
+      def ==(other)
+        Equality === other and
+          ((operand1 == other.operand1 and operand2 == other.operand2) or
+           (operand1 == other.operand2 and operand2 == other.operand1))
+      end
     end
-  end
 
-  class GreaterThanOrEqualTo  < Binary; end
-  class GreaterThan           < Binary; end
-  class LessThanOrEqualTo     < Binary; end
-  class LessThan              < Binary; end
-  class Match                 < Binary; end
-  class In                    < Binary; end
+    class GreaterThanOrEqualTo  < Binary; end
+    class GreaterThan           < Binary; end
+    class LessThanOrEqualTo     < Binary; end
+    class LessThan              < Binary; end
+    class Match                 < Binary; end
+    class In                    < Binary; end
+  end
 end

data/lib/arel/algebra/relations/relation.rb

@@ -110,7 +110,7 @@ module Arel
       private
       def matching_attributes(attribute)
         (@matching_attributes ||= attributes.inject({}) do |hash, a|
-          (hash[a.root] ||= []) << a
+          (hash[a.is_a?(Value) ? a.value : a.root] ||= []) << a
           hash
         end)[attribute.root] || []
       end

data/lib/arel/engines/memory/predicates.rb

@@ -1,35 +1,37 @@
 module Arel
-  class Binary < Predicate
-    def eval(row)
-      operand1.eval(row).send(operator, operand2.eval(row))
+  module Predicates
+    class Binary < Predicate
+      def eval(row)
+        operand1.eval(row).send(operator, operand2.eval(row))
+      end
     end
-  end
 
-  class Equality < Binary
-    def operator; :== end
-  end
+    class Equality < Binary
+      def operator; :== end
+    end
 
-  class GreaterThanOrEqualTo < Binary
-    def operator; :>= end
-  end
+    class GreaterThanOrEqualTo < Binary
+      def operator; :>= end
+    end
 
-  class GreaterThan < Binary
-    def operator; :> end
-  end
+    class GreaterThan < Binary
+      def operator; :> end
+    end
 
-  class LessThanOrEqualTo < Binary
-    def operator; :<= end
-  end
+    class LessThanOrEqualTo < Binary
+      def operator; :<= end
+    end
 
-  class LessThan < Binary
-    def operator; :< end
-  end
+    class LessThan < Binary
+      def operator; :< end
+    end
 
-  class Match < Binary
-    def operator; :=~ end
-  end
+    class Match < Binary
+      def operator; :=~ end
+    end
 
-  class In < Binary
-    def operator; :include? end
+    class In < Binary
+      def operator; :include? end
+    end
   end
 end

data/lib/arel/engines/sql.rb

@@ -3,5 +3,5 @@ require 'arel/engines/sql/relations'
 require 'arel/engines/sql/primitives'
 require 'arel/engines/sql/predicates'
 require 'arel/engines/sql/formatters'
-require 'arel/engines/sql/extensions'
+require 'arel/engines/sql/core_extensions'
 require 'arel/engines/sql/christener'

data/lib/arel/engines/sql/core_extensions.rb

@@ -0,0 +1,4 @@
+require 'arel/engines/sql/core_extensions/object'
+require 'arel/engines/sql/core_extensions/array'
+require 'arel/engines/sql/core_extensions/range'
+require 'arel/engines/sql/core_extensions/nil_class'

data/lib/arel/engines/sql/{extensions → core_extensions}/array.rb

@@ -8,7 +8,7 @@ module Arel
       def inclusion_predicate_sql
         "IN"
       end
-      
+
       Array.send(:include, self)
     end
   end

data/lib/arel/engines/sql/{extensions → core_extensions}/nil_class.rb

@@ -4,7 +4,7 @@ module Arel
       def equality_predicate_sql
         'IS'
       end
-      
+
       NilClass.send(:include, self)
     end
   end

data/lib/arel/engines/sql/{extensions → core_extensions}/object.rb

@@ -8,7 +8,7 @@ module Arel
       def equality_predicate_sql
         '='
       end
-      
+
       Object.send(:include, self)
     end
   end

data/lib/arel/engines/sql/{extensions → core_extensions}/range.rb

@@ -8,7 +8,7 @@ module Arel
       def inclusion_predicate_sql
         "BETWEEN"
       end
-      
+
       Range.send(:include, self)
     end
   end

data/lib/arel/engines/sql/formatters.rb

@@ -13,7 +13,6 @@ module Arel
 
     class SelectClause < Formatter
       def attribute(attribute)
-        # FIXME this should check that the column exists
         "#{quote_table_name(name_for(attribute.original_relation))}.#{quote_column_name(attribute.name)}" +
         (attribute.alias ? " AS #{quote(attribute.alias.to_s)}" : "")
       end
@@ -92,8 +91,12 @@ module Arel
       end
 
       def table(table)
-        quote_table_name(table.name) +
-        (table.name != name_for(table) ? " AS " + quote_table_name(name_for(table)) : '')
+        if table.name =~ /\s/
+          table.name
+        else
+          quote_table_name(table.name) +
+            (table.name != name_for(table) ? " AS " + quote_table_name(name_for(table)) : '')
+        end
       end
     end
 

data/lib/arel/engines/sql/predicates.rb

@@ -1,51 +1,53 @@
 module Arel
-  class Binary < Predicate
-    def to_sql(formatter = nil)
-      "#{operand1.to_sql} #{predicate_sql} #{operand1.format(operand2)}"
+  module Predicates
+    class Binary < Predicate
+      def to_sql(formatter = nil)
+        "#{operand1.to_sql} #{predicate_sql} #{operand1.format(operand2)}"
+      end
     end
-  end
 
-  class CompoundPredicate < Binary
-    def to_sql(formatter = nil)
-      "(#{operand1.to_sql(formatter)} #{predicate_sql} #{operand2.to_sql(formatter)})"
+    class CompoundPredicate < Binary
+      def to_sql(formatter = nil)
+        "(#{operand1.to_sql(formatter)} #{predicate_sql} #{operand2.to_sql(formatter)})"
+      end
     end
-  end
 
-  class Or < CompoundPredicate
-    def predicate_sql; "OR" end
-  end
+    class Or < CompoundPredicate
+      def predicate_sql; "OR" end
+    end
 
-  class And < CompoundPredicate
-    def predicate_sql; "AND" end
-  end
+    class And < CompoundPredicate
+      def predicate_sql; "AND" end
+    end
 
-  class Equality < Binary
-    def predicate_sql
-      operand2.equality_predicate_sql
+    class Equality < Binary
+      def predicate_sql
+        operand2.equality_predicate_sql
+      end
     end
-  end
 
-  class GreaterThanOrEqualTo < Binary
-    def predicate_sql; '>=' end
-  end
+    class GreaterThanOrEqualTo < Binary
+      def predicate_sql; '>=' end
+    end
 
-  class GreaterThan < Binary
-    def predicate_sql; '>' end
-  end
+    class GreaterThan < Binary
+      def predicate_sql; '>' end
+    end
 
-  class LessThanOrEqualTo < Binary
-    def predicate_sql; '<=' end
-  end
+    class LessThanOrEqualTo < Binary
+      def predicate_sql; '<=' end
+    end
 
-  class LessThan < Binary
-    def predicate_sql; '<' end
-  end
+    class LessThan < Binary
+      def predicate_sql; '<' end
+    end
 
-  class Match < Binary
-    def predicate_sql; 'LIKE' end
-  end
+    class Match < Binary
+      def predicate_sql; 'LIKE' end
+    end
 
-  class In < Binary
-    def predicate_sql; operand2.inclusion_predicate_sql end
+    class In < Binary
+      def predicate_sql; operand2.inclusion_predicate_sql end
+    end
   end
 end