squeel 0.5.0 → 0.5.5

data/spec/squeel/dsl_spec.rb

@@ -4,25 +4,25 @@ module Squeel
   describe DSL do
 
     it 'evaluates code' do
-      result = DSL.evaluate { {id => 1} }
+      result = DSL.eval { {id => 1} }
       result.should be_a Hash
       result.keys.first.should be_a Nodes::Stub
     end
 
     it 'creates function nodes when a method has arguments' do
-      result = DSL.evaluate { max(id) }
+      result = DSL.eval { max(id) }
       result.should be_a Nodes::Function
       result.args.should eq [Nodes::Stub.new(:id)]
     end
 
     it 'creates polymorphic join nodes when a method has a single class argument' do
-      result = DSL.evaluate { association(Person) }
+      result = DSL.eval { association(Person) }
       result.should be_a Nodes::Join
       result.klass.should eq Person
     end
 
     it 'handles OR between predicates' do
-      result = DSL.evaluate {(name =~ 'Joe%') | (articles.title =~ 'Hello%')}
+      result = DSL.eval {(name =~ 'Joe%') | (articles.title =~ 'Hello%')}
       result.should be_a Nodes::Or
       result.left.should be_a Nodes::Predicate
       result.right.should be_a Nodes::KeyPath
@@ -36,7 +36,7 @@ module Squeel
         end
 
         def dsl_test
-          DSL.evaluate {name =~ a_method}
+          DSL.eval {name =~ a_method}
         end
       end
 
@@ -56,7 +56,7 @@ module Squeel
         end
 
         def dsl_test
-          DSL.evaluate {|q| q.name =~ a_method}
+          DSL.eval {|q| q.name =~ a_method}
         end
       end
 

data/spec/squeel/nodes/join_spec.rb

@@ -4,24 +4,37 @@ module Squeel
   module Nodes
     describe Join do
 
-      it 'defaults to Arel::InnerJoin' do
+      before do
         @j = Join.new :name
+      end
+
+      it 'defaults to Arel::InnerJoin' do
         @j.type.should eq Arel::InnerJoin
       end
 
       it 'allows setting join type' do
-        @j = Join.new :name
         @j.outer
         @j.type.should eq Arel::OuterJoin
       end
 
       it 'allows setting polymorphic class' do
-        @j = Join.new :name
         @j.klass = Person
         @j.should be_polymorphic
         @j.klass.should eq Person
       end
 
+      it 'creates a KeyPath when sent an unknown method' do
+        keypath = @j.another
+        keypath.should be_a KeyPath
+        keypath.path_with_endpoint.should eq [@j, Stub.new(:another)]
+      end
+
+      it 'creates a KeyPath with a join endpoint when sent a method with a Class param' do
+        keypath = @j.another(Person)
+        keypath.should be_a KeyPath
+        keypath.path_with_endpoint.should eq [@j, Join.new(:another, Arel::InnerJoin, Person)]
+      end
+
     end
   end
 end

data/spec/squeel/nodes/stub_spec.rb

@@ -27,6 +27,18 @@ module Squeel
         merged[Stub.new(:attribute)].should eq 2
       end
 
+      it 'creates a KeyPath when sent an unknown method' do
+        keypath = @s.another
+        keypath.should be_a KeyPath
+        keypath.path_with_endpoint.should eq [@s, Stub.new(:another)]
+      end
+
+      it 'creates a KeyPath with a join endpoint when sent a method with a Class param' do
+        keypath = @s.another(Person)
+        keypath.should be_a KeyPath
+        keypath.path_with_endpoint.should eq [@s, Join.new(:another, Arel::InnerJoin, Person)]
+      end
+
       Squeel::Constants::PREDICATES.each do |method_name|
         it "creates #{method_name} predicates with no value" do
           predicate = @s.send(method_name)

data/spec/squeel/visitors/{order_visitor_spec.rb → attribute_visitor_spec.rb}

@@ -1,18 +1,17 @@
 module Squeel
   module Visitors
-    describe OrderVisitor do
+    describe AttributeVisitor do
 
       before do
-        @jd = ActiveRecord::Associations::JoinDependency.
-             new(Person, {
+        @jd = new_join_dependency(Person, {
                :children => {
                  :children => {
                    :parent => :parent
                  }
                }
              }, [])
-        @c = Squeel::Contexts::JoinDependencyContext.new(@jd)
-        @v = OrderVisitor.new(@c)
+        @c = Squeel::Adapters::ActiveRecord::Context.new(@jd)
+        @v = AttributeVisitor.new(@c)
       end
 
       it 'creates a bare ARel attribute given a symbol with no asc/desc' do

data/spec/squeel/visitors/predicate_visitor_spec.rb

@@ -5,15 +5,14 @@ module Squeel
     describe PredicateVisitor do
 
       before do
-        @jd = ActiveRecord::Associations::JoinDependency.
-             new(Person, {
+        @jd = new_join_dependency(Person, {
                :children => {
                  :children => {
                    :parent => :parent
                  }
                }
              }, [])
-        @c = Squeel::Contexts::JoinDependencyContext.new(@jd)
+        @c = Squeel::Adapters::ActiveRecord::Context.new(@jd)
         @v = PredicateVisitor.new(@c)
       end
 
@@ -136,6 +135,20 @@ module Squeel
         predicate.to_sql.should match /"people"."name" = "children_people"."name"/
       end
 
+      it 'visits ActiveRecord::Relation values in predicates' do
+        predicate = @v.accept(dsl{id >> Person.select{id}.limit(3).order{id.desc}})
+        predicate.should be_a Arel::Nodes::In
+        predicate.right.should be_a Arel::Nodes::SelectStatement
+        predicate.to_sql.should be_like '"people"."id" IN (SELECT  "people"."id" FROM "people"  ORDER BY "people"."id" DESC LIMIT 3)'
+      end
+
+      it "doesn't try to sanitize_sql an array of strings in the value of a Predicate" do
+        predicate = @v.accept(dsl{name >> ['Aric Smith', 'Gladyce Kulas']})
+        predicate.should be_a Arel::Nodes::In
+        predicate.right.should be_an Array
+        predicate.to_sql.should match /"people"."name" IN \('Aric Smith', 'Gladyce Kulas'\)/
+      end
+
       it 'creates a node of the proper type when a hash has a Predicate as a key' do
         predicate = @v.accept(:name.matches => 'Joe%')
         predicate.should be_a Arel::Nodes::Matches
@@ -248,9 +261,8 @@ module Squeel
 
       context 'with polymorphic joins in the JoinDependency' do
         before do
-          @jd = ActiveRecord::Associations::JoinDependency.
-                new(Note, dsl{[notable(Article), notable(Person)]}, [])
-          @c = Squeel::Contexts::JoinDependencyContext.new(@jd)
+          @jd = new_join_dependency(Note, dsl{[notable(Article), notable(Person)]}, [])
+          @c = Squeel::Adapters::ActiveRecord::Context.new(@jd)
           @v = PredicateVisitor.new(@c)
         end
 

data/spec/squeel/visitors/symbol_visitor_spec.rb

@@ -0,0 +1,42 @@
+require 'spec_helper'
+
+module Squeel
+  module Visitors
+    describe SymbolVisitor do
+      before do
+        @v = SymbolVisitor.new
+      end
+
+      it 'returns symbols unmodified' do
+        @v.accept(:blah).should eq :blah
+      end
+
+      it 'converts stubs to symbols' do
+        @v.accept(dsl{blah}).should eq :blah
+      end
+
+      it 'converts joins to their names' do
+        @v.accept(dsl{blah(Article)}).should eq :blah
+      end
+
+      it 'converts keypaths to their hash equivalents' do
+        @v.accept(dsl{one.two.three.four}).should eq({
+          :one => {:two => {:three => :four}}
+        })
+      end
+
+      it 'visits hashes' do
+        @v.accept(dsl{{
+          blah1 => {blah2(Article) => blah3}
+        }}).should eq({:blah1 => {:blah2 => :blah3}})
+      end
+
+      it 'visits arrays' do
+        @v.accept(dsl{[{
+          blah1 => {blah2(Article) => blah3}
+        }]}).should eq([{:blah1 => {:blah2 => :blah3}}])
+      end
+
+    end
+  end
+end

data/squeel.gemspec

@@ -30,8 +30,8 @@ you're feeling especially appreciative. It'd help me justify this
 
   s.rubyforge_project = "squeel"
 
-  s.add_dependency 'activerecord', '~> 3.1.0.alpha'
-  s.add_dependency 'activesupport', '~> 3.1.0.alpha'
+  s.add_dependency 'activerecord', '~> 3.0'
+  s.add_dependency 'activesupport', '~> 3.0'
   s.add_development_dependency 'rspec', '~> 2.5.0'
   s.add_development_dependency 'machinist', '~> 1.0.6'
   s.add_development_dependency 'faker', '~> 0.9.5'

metadata

@@ -2,7 +2,7 @@
 name: squeel
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.5.0
+  version: 0.5.5
 platform: ruby
 authors: 
 - Ernie Miller
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-04-09 00:00:00 Z
+date: 2011-04-20 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: activerecord
@@ -20,7 +20,7 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        version: 3.1.0.alpha
+        version: "3.0"
   type: :runtime
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
@@ -31,7 +31,7 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        version: 3.1.0.alpha
+        version: "3.0"
   type: :runtime
   version_requirements: *id002
 - !ruby/object:Gem::Dependency 
@@ -97,12 +97,20 @@ files:
 - lib/core_ext/symbol.rb
 - lib/squeel.rb
 - lib/squeel/adapters/active_record.rb
+- lib/squeel/adapters/active_record/3.0/association_preload.rb
+- lib/squeel/adapters/active_record/3.0/compat.rb
+- lib/squeel/adapters/active_record/3.0/context.rb
+- lib/squeel/adapters/active_record/3.0/join_association.rb
+- lib/squeel/adapters/active_record/3.0/join_dependency.rb
+- lib/squeel/adapters/active_record/3.0/relation.rb
+- lib/squeel/adapters/active_record/context.rb
 - lib/squeel/adapters/active_record/join_association.rb
 - lib/squeel/adapters/active_record/join_dependency.rb
+- lib/squeel/adapters/active_record/preloader.rb
 - lib/squeel/adapters/active_record/relation.rb
 - lib/squeel/configuration.rb
 - lib/squeel/constants.rb
-- lib/squeel/contexts/join_dependency_context.rb
+- lib/squeel/context.rb
 - lib/squeel/dsl.rb
 - lib/squeel/nodes.rb
 - lib/squeel/nodes/and.rb
@@ -127,10 +135,10 @@ files:
 - lib/squeel/predicate_methods/symbol.rb
 - lib/squeel/version.rb
 - lib/squeel/visitors.rb
+- lib/squeel/visitors/attribute_visitor.rb
 - lib/squeel/visitors/base.rb
-- lib/squeel/visitors/order_visitor.rb
 - lib/squeel/visitors/predicate_visitor.rb
-- lib/squeel/visitors/select_visitor.rb
+- lib/squeel/visitors/symbol_visitor.rb
 - spec/blueprints/articles.rb
 - spec/blueprints/comments.rb
 - spec/blueprints/notes.rb
@@ -140,10 +148,10 @@ files:
 - spec/core_ext/symbol_spec.rb
 - spec/helpers/squeel_helper.rb
 - spec/spec_helper.rb
+- spec/squeel/adapters/active_record/context_spec.rb
 - spec/squeel/adapters/active_record/join_association_spec.rb
 - spec/squeel/adapters/active_record/join_depdendency_spec.rb
 - spec/squeel/adapters/active_record/relation_spec.rb
-- spec/squeel/contexts/join_dependency_context_spec.rb
 - spec/squeel/dsl_spec.rb
 - spec/squeel/nodes/function_spec.rb
 - spec/squeel/nodes/join_spec.rb
@@ -154,9 +162,9 @@ files:
 - spec/squeel/nodes/predicate_operators_spec.rb
 - spec/squeel/nodes/predicate_spec.rb
 - spec/squeel/nodes/stub_spec.rb
-- spec/squeel/visitors/order_visitor_spec.rb
+- spec/squeel/visitors/attribute_visitor_spec.rb
 - spec/squeel/visitors/predicate_visitor_spec.rb
-- spec/squeel/visitors/select_visitor_spec.rb
+- spec/squeel/visitors/symbol_visitor_spec.rb
 - spec/support/schema.rb
 - squeel.gemspec
 homepage: http://metautonomo.us/projects/squeel
@@ -201,10 +209,10 @@ test_files:
 - spec/core_ext/symbol_spec.rb
 - spec/helpers/squeel_helper.rb
 - spec/spec_helper.rb
+- spec/squeel/adapters/active_record/context_spec.rb
 - spec/squeel/adapters/active_record/join_association_spec.rb
 - spec/squeel/adapters/active_record/join_depdendency_spec.rb
 - spec/squeel/adapters/active_record/relation_spec.rb
-- spec/squeel/contexts/join_dependency_context_spec.rb
 - spec/squeel/dsl_spec.rb
 - spec/squeel/nodes/function_spec.rb
 - spec/squeel/nodes/join_spec.rb
@@ -215,7 +223,7 @@ test_files:
 - spec/squeel/nodes/predicate_operators_spec.rb
 - spec/squeel/nodes/predicate_spec.rb
 - spec/squeel/nodes/stub_spec.rb
-- spec/squeel/visitors/order_visitor_spec.rb
+- spec/squeel/visitors/attribute_visitor_spec.rb
 - spec/squeel/visitors/predicate_visitor_spec.rb
-- spec/squeel/visitors/select_visitor_spec.rb
+- spec/squeel/visitors/symbol_visitor_spec.rb
 - spec/support/schema.rb

data/lib/squeel/contexts/join_dependency_context.rb

@@ -1,74 +0,0 @@
-require 'active_record'
-
-module Squeel
-  # Because the AR::Associations namespace is insane
-  JoinPart = ActiveRecord::Associations::JoinDependency::JoinPart
-
-  module Contexts
-    class JoinDependencyContext
-      attr_reader :base, :engine, :arel_visitor
-
-      def initialize(join_dependency)
-        @join_dependency = join_dependency
-        @base = join_dependency.join_base
-        @engine = @base.arel_engine
-        @arel_visitor = Arel::Visitors.visitor_for @engine
-        @default_table = Arel::Table.new(@base.table_name, :as => @base.aliased_table_name, :engine => @engine)
-        @tables = Hash.new {|hash, key| hash[key] = get_table(key)}
-      end
-
-      def find(object, parent = @base)
-        if JoinPart === parent
-          object = object.to_sym if String === object
-          case object
-          when Symbol, Nodes::Stub
-            @join_dependency.join_associations.detect { |j|
-              j.reflection.name == object.to_sym && j.parent == parent
-            }
-          when Nodes::Join
-            @join_dependency.join_associations.detect { |j|
-              j.reflection.name == object.name && j.parent == parent &&
-              (object.polymorphic? ? j.reflection.klass == object.klass : true)
-            }
-          else
-            @join_dependency.join_associations.detect { |j|
-              j.reflection == object && j.parent == parent
-            }
-          end
-        else
-          nil
-        end
-      end
-
-      def traverse(keypath, parent = @base, include_endpoint = false)
-        parent = @base if keypath.absolute?
-        keypath.path.each do |key|
-          parent = find(key, parent)
-        end
-        parent = find(keypath.endpoint, parent) if include_endpoint
-
-        parent
-      end
-
-      def contextualize(object)
-        @tables[object]
-      end
-
-      def sanitize_sql(conditions, parent)
-        parent.active_record.send(:sanitize_sql, conditions, parent.aliased_table_name)
-      end
-
-      private
-
-      def get_table(object)
-        if [Symbol, Nodes::Stub].include?(object.class)
-          Arel::Table.new(object.to_sym, :engine => @engine)
-        elsif object.respond_to?(:aliased_table_name)
-          Arel::Table.new(object.table_name, :as => object.aliased_table_name, :engine => @engine)
-        else
-          @default_table
-        end
-      end
-    end
-  end
-end

data/lib/squeel/visitors/select_visitor.rb

@@ -1,103 +0,0 @@
-require 'squeel/visitors/base'
-require 'squeel/contexts/join_dependency_context'
-
-module Squeel
-  module Visitors
-    class SelectVisitor < Base
-
-      def visit_Hash(o, parent)
-        o.map do |k, v|
-          if implies_context_change?(v)
-            visit_with_context_change(k, v, parent)
-          else
-            visit_without_context_change(k, v, parent)
-          end
-        end.flatten
-      end
-
-      def implies_context_change?(v)
-        Hash === v || can_accept?(v) ||
-        (Array === v && !v.empty? && v.all? {|val| can_accept?(val)})
-      end
-
-      def visit_with_context_change(k, v, parent)
-        parent = case k
-          when Nodes::KeyPath
-            traverse(k, parent, true)
-          else
-            find(k, parent)
-          end
-
-        if Array === v
-          v.map {|val| accept(val, parent || k)}
-        else
-          can_accept?(v) ? accept(v, parent || k) : v
-        end
-      end
-
-      def visit_without_context_change(k, v, parent)
-        v
-      end
-
-      def visit_Array(o, parent)
-        o.map { |v| can_accept?(v) ? accept(v, parent) : v }.flatten
-      end
-
-      def visit_Symbol(o, parent)
-        contextualize(parent)[o]
-      end
-
-      def visit_Squeel_Nodes_Stub(o, parent)
-        contextualize(parent)[o.symbol]
-      end
-
-      def visit_Squeel_Nodes_KeyPath(o, parent)
-        parent = traverse(o, parent)
-
-        accept(o.endpoint, parent)
-      end
-
-      def visit_Squeel_Nodes_Function(o, parent)
-        args = o.args.map do |arg|
-          case arg
-          when Nodes::Function, Nodes::KeyPath
-            accept(arg, parent)
-          when Symbol, Nodes::Stub
-            Arel.sql(arel_visitor.accept contextualize(parent)[arg.to_sym])
-          else
-            quoted?(arg) ? Arel.sql(arel_visitor.accept arg) : arg
-          end
-        end
-        Arel::Nodes::NamedFunction.new(o.name, args, o.alias)
-      end
-
-      def visit_Squeel_Nodes_Operation(o, parent)
-        args = o.args.map do |arg|
-          case arg
-          when Nodes::Function
-            accept(arg, parent)
-          when Symbol, Nodes::Stub
-            Arel.sql(arel_visitor.accept contextualize(parent)[arg.to_sym])
-          else
-            quoted?(arg) ? Arel.sql(arel_visitor.accept arg) : arg
-          end
-        end
-
-        op = case o.operator
-        when :+
-          Arel::Nodes::Addition.new(args[0], args[1])
-        when :-
-          Arel::Nodes::Subtraction.new(args[0], args[1])
-        when :*
-          Arel::Nodes::Multiplication.new(args[0], args[1])
-        when :/
-          Arel::Nodes::Division.new(args[0], args[1])
-        else
-          Arel.sql("#{arel_visitor.accept(args[0])} #{o.operator} #{arel_visitor.accept(args[1])}")
-        end
-        o.alias ? op.as(o.alias) : op
-      end
-
-    end
-  end
-end