ambition 0.1.1 → 0.1.2

data/README

@@ -158,6 +158,10 @@ still query through ActiveRecord just fine.
   User.select { |m| m.name == 'jon' }.sort_by { |m| -m.age }
   "SELECT * FROM users WHERE users.`name` = 'jon' ORDER BY users.age DESC"
 
+  User.select { |m| m.name == 'jon' }.sort_by { |m| -m.profiles.title }
+  "SELECT users.`id` AS t0_r0, ... FROM users LEFT OUTER JOIN profiles ON profiles.user_id = users.id 
+   WHERE (users.`name` = 'jon') ORDER BY profiles.title DESC"
+
   User.select { |m| m.name == 'jon' }.sort_by { rand }
   "SELECT * FROM users WHERE users.`name` = 'jon' ORDER BY RAND()"
 
@@ -175,4 +179,4 @@ Found a bug?  Sweet.  Add it at the Lighthouse: http://err.lighthouseapp.com/pro
 
 Feature requests are welcome. 
 
-* Chris Wanstrath [ chris@ozmm.org ]
+* Chris Wanstrath [ chris@ozmm.org ]

data/Rakefile

@@ -8,7 +8,7 @@ begin
   ENV['RUBY_FLAGS'] = ""
   require 'echoe'
 
-  Echoe.new('ambition', '0.1.1') do |p|
+  Echoe.new('ambition', '0.1.2') do |p|
     p.rubyforge_name = 'err'
     p.summary = "Ambition builds SQL from plain jane Ruby."
     p.description = "Ambition builds SQL from plain jane Ruby."

data/lib/ambition/order.rb

@@ -1,15 +1,16 @@
 module Ambition
   module Order
     def sort_by(&block)
-      query_context.add OrderProcessor.new(table_name, block)
+      query_context.add OrderProcessor.new(self, block)
     end
   end
 
   class OrderProcessor < Processor 
-    def initialize(table_name, block)
+    def initialize(owner, block)
       super()
       @receiver    = nil
-      @table_name  = table_name
+      @owner       = owner
+      @table_name  = owner.table_name
       @block       = block
       @key         = :order
     end
@@ -45,7 +46,7 @@ module Ambition
       when :__send__
         "#{@table_name}.#{eval('to_s', @block)}"
       else
-        "#{@table_name}.#{method}"
+        extract_includes(receiver, method) || "#{@table_name}.#{method}"
       end
     end
   end

data/lib/ambition/processor.rb

@@ -4,7 +4,8 @@ module Ambition
   class Processor < SexpProcessor 
     include ActiveRecord::ConnectionAdapters::Quoting
 
-    attr_reader :key, :join_string, :prefix
+    attr_reader :key, :join_string, :prefix, :includes
+
 
     def initialize
       super()
@@ -13,6 +14,7 @@ module Ambition
       @auto_shift_type = true
       @warn_on_default = false
       @default_method  = :process_error
+      @includes        = []
     end
 
     ##
@@ -50,5 +52,16 @@ module Ambition
       else ActiveRecord::Base.connection.quote(value) rescue quote(value)
       end
     end
+
+    def extract_includes(receiver, method)
+      return unless receiver.first == :call && receiver[1].last == @receiver
+
+      if reflection = @owner.reflections[receiver.last]
+        @includes << reflection.name unless @includes.include? reflection.name
+        "#{reflection.table_name}.#{method}"
+      else
+        raise "No reflection `#{receiver.last}' found on #{@owner}"
+      end
+    end
   end
 end

data/lib/ambition/where.rb

@@ -10,8 +10,6 @@ module Ambition
   end
 
   class WhereProcessor < Processor 
-    attr_reader :includes
-
     def initialize(owner, block)
       super()
       @receiver    = nil
@@ -19,7 +17,6 @@ module Ambition
       @table_name  = owner.table_name
       @block       = block
       @key         = :conditions
-      @includes    = []
     end
 
     ##
@@ -138,20 +135,7 @@ module Ambition
       when '!~'
         "#{process(receiver)} NOT LIKE #{process(other)}"
       else
-        build_condition(receiver, method, other)
-      end
-    end
-
-    def build_condition(receiver, method, other)
-      if receiver.first == :call && receiver[1].last == @receiver
-        if reflection = @owner.reflections[receiver.last]
-          @includes << reflection.name unless @includes.include? reflection.name
-          "#{reflection.table_name}.#{method}"
-        else
-          raise "No reflection `#{receiver.last}' found on #{@owner}"
-        end
-      else
-        "#{process(receiver)}.`#{method}` #{process(other)}"
+        extract_includes(receiver, method) || "#{process(receiver)}.`#{method}` #{process(other)}"
       end
     end
   end

data/test/join_test.rb

@@ -29,4 +29,20 @@ context "Joins" do
     sql = User.select { |m| m.liquor.brand == 'Jack' }
     should.raise { sql.to_hash } 
   end
+
+  specify "in order" do
+    sql = User.sort_by { |m| m.ideas.title }
+    sql.to_hash.should ==  { 
+      :order   => "ideas.title",
+      :include => [:ideas]
+    }
+  end
+
+  specify "in a more complex order" do
+    sql = User.sort_by { |m| [ m.ideas.title, -m.invites.email ] }
+    sql.to_hash.should ==  { 
+      :order   => "ideas.title, invites.email DESC",
+      :include => [:ideas, :invites]
+    }
+  end
 end

metadata

@@ -3,7 +3,7 @@ rubygems_version: 0.9.0
 specification_version: 1
 name: ambition
 version: !ruby/object:Gem::Version 
-  version: 0.1.1
+  version: 0.1.2
 date: 2007-08-30 00:00:00 -07:00
 summary: Ambition builds SQL from plain jane Ruby.
 require_paths: