ambition 0.2.2 → 0.3.1

data/Manifest

@@ -4,6 +4,7 @@
 ./lib/ambition/proc_to_ruby.rb
 ./lib/ambition/processor.rb
 ./lib/ambition/query.rb
+./lib/ambition/ruby_processor.rb
 ./lib/ambition/select_processor.rb
 ./lib/ambition/simple_processor.rb
 ./lib/ambition/sort_processor.rb
@@ -42,5 +43,6 @@
 ./test/order_test.rb
 ./test/profiler.rb
 ./test/source_test.rb
+./test/ruby_test.rb
 ./test/types_test.rb
 ./test/where_test.rb

data/README

@@ -59,21 +59,13 @@ See, +to_hash+:
   >> User.select { |m| m.name == 'jon' }.to_hash
   => {:conditions=>"users.name = 'jon'"} 
 
-== Limitations
-
-You can use variables, but any more complex Ruby (right now) won't work
-inside your blocks.  Just do it outside the block and assign it to a variable.
-
-Instead of:
-  User.select { |m| m.date == 2.days.ago }
-
-Just do:
-  date = 2.days.ago
-  User.select { |m| m.date == date }
+== Equality -- select { |u| u.field == 'bob' }
 
-Instance variables and globals work, too.  Same with method calls.
+  User.select { |m| m.name == 'jon' }
+  "SELECT * FROM users WHERE users.name = 'jon'"
 
-== Equality -- select { |u| u.field == 'bob' }
+  User.select { |m| m.created_at > 2.days.ago }
+  "SELECT * FROM users WHERE users.created_at > '2007-09-26 20:37:47'"
 
   User.select { |m| m.name == 'jon' }
   "SELECT * FROM users WHERE users.name = 'jon'"
@@ -208,4 +200,8 @@ Found a bug?  Sweet.  Add it at the Lighthouse:
 
 Feature requests are welcome. 
 
+And hey, join our mailing list!
+
+  http://groups.google.com/group/ambition-rb
+
 * Chris Wanstrath [ chris@ozmm.org ]

data/Rakefile

@@ -2,19 +2,18 @@ require 'rake'
 require 'rake/testtask'
 require 'rake/rdoctask'
 
-Version = '0.2.2'
+Version = '0.3.1'
 
 module Rake::TaskManager
-  def redefine_task(task_class, args, &block)
+  def delete_task(task_class, args, &block)
     task_name, deps = resolve_args(args)
     @tasks.delete(task_class.scope_name(@scope, task_name).to_s)
-    define_task(task_class, args, &block)
   end
 end
 class Rake::Task
-  def self.redefine_task(args, &block) Rake.application.redefine_task(self, args, &block) end
+  def self.delete_task(args, &block) Rake.application.delete_task(self, args, &block) end
 end
-def redefine_task(args, &block) Rake::Task.redefine_task(args, &block) end
+def delete_task(args, &block) Rake::Task.delete_task(args, &block) end
 
 begin
   require 'rubygems'
@@ -30,6 +29,7 @@ begin
     p.author = 'Chris Wanstrath'
     p.email = "chris@ozmm.org"
     p.extra_deps << ['ParseTree',    '=2.0.1']
+    p.extra_deps << ['ruby2ruby',    '=1.1.7']
     p.extra_deps << ['activerecord', '>=1.15.0']
     p.test_globs = 'test/*_test.rb'
   end
@@ -37,7 +37,7 @@ begin
 rescue LoadError 
 end
 
-redefine_task(:test) { }
+delete_task :test
 
 Rake::TestTask.new('test') do |t|
   t.pattern = 'test/*_test.rb'

data/lib/ambition.rb

@@ -5,6 +5,7 @@ end
 require 'ambition/api'
 require 'ambition/source'
 require 'ambition/processor'
+require 'ambition/ruby_processor'
 require 'ambition/select_processor'
 require 'ambition/sort_processor'
 require 'ambition/simple_processor'

data/lib/ambition/proc_to_ruby.rb

@@ -1,6 +1,7 @@
 ##
 # Taken from ruby2ruby, Copyright (c) 2006 Ryan Davis under the MIT License
 require 'parse_tree'
+require 'ruby2ruby'
 
 class ProcHolder
 end

data/lib/ambition/processor.rb

@@ -14,23 +14,31 @@ module Ambition
 
     ##
     # Processing methods
-    def process_error(exp)
-      raise "Missing process method for sexp: #{exp.inspect}"
-    end
-
     def process_proc(exp)
       receiver, body = process(exp.shift), exp.shift
-      return process(body)
+      process(body)
     end
 
     def process_dasgn_curr(exp)
-      @receiver = exp.shift
-      return @receiver.to_s
+      @receiver = exp.first
+      @receiver.to_s
     end
+    alias_method :process_dasgn, :process_dasgn_curr
 
     def process_array(exp)
-      arrayed = exp.map { |m| process(m) }
-      return arrayed.join(', ')
+      # Branch on whether this is straight Ruby or a real array
+      if ruby = rubify(exp)
+        value ruby
+      else
+        arrayed = exp.map { |m| process(m) }
+        arrayed.join(', ')
+      end
+    end
+
+    def rubify(exp)
+      if exp.first.first == :call && exp.first[1].last != @receiver && Array(exp.first[1][1]).last != @receiver
+        RubyProcessor.process(exp.first)
+      end
     end
 
     ##
@@ -39,6 +47,10 @@ module Ambition
       process(@block.to_sexp).squeeze(' ')
     end
 
+    def value(variable)
+      sanitize eval(variable, @block)
+    end
+
     def sanitize(value)
       if value.is_a? Array
         return value.map { |v| sanitize(v) }.join(', ')
@@ -98,7 +110,14 @@ module Ambition
 
     def process(node)
       node ||= []
-      respond_to?(method = "process_#{node.shift}") ? send(method, node) : ''
+
+      if respond_to?(method = "process_#{node.first}") 
+        send(method, node[1..-1]) 
+      elsif node.blank?
+        ''
+      else
+        raise "Missing process method for sexp: #{node.inspect}"
+      end
     end
   end
 end

data/lib/ambition/query.rb

@@ -58,12 +58,13 @@ module Ambition
     def to_s
       hash = keyed_clauses
 
+      raise "Sorry, I can't construct SQL with complex joins (yet)" unless hash[:includes].blank?
+
       sql = []
-      sql << "JOIN #{hash[:includes].join(', ')}"       unless hash[:includes].blank?
       sql << "WHERE #{hash[:conditions].join(' AND ')}" unless hash[:conditions].blank?
       sql << "ORDER BY #{hash[:order].join(', ')}"      unless hash[:order].blank?
       sql << "LIMIT #{hash[:limit]}"                    unless hash[:limit].blank?
-      sql << "OFFSET #{hash[:limit]}"                   unless hash[:offset].blank?
+      sql << "OFFSET #{hash[:offset]}"                  unless hash[:offset].blank?
 
       @@select % [ @table_name, sql.join(' ') ]
     end

data/lib/ambition/ruby_processor.rb

@@ -0,0 +1,22 @@
+module Ambition
+  class RubyProcessor < RubyToRuby
+    def self.process(node)
+      @processor ||= new
+      @processor.process node
+    end
+
+    ##
+    # This is not DRY, and I don't care.
+    def process(node)
+      node ||= []
+
+      if respond_to?(method = "process_#{node.first}") 
+        send(method, node[1..-1]) 
+      elsif node.blank?
+        ''
+      else
+        raise "Missing process method for sexp: #{node.inspect}"
+      end
+    end
+  end
+end

data/lib/ambition/select_processor.rb

@@ -103,10 +103,6 @@ module Ambition
       "(" + clauses.map { |c| process(c) }.join(" #{with} ") + ")"
     end
 
-    def value(variable)
-      sanitize eval(variable, @block)
-    end
-
     def negate(method, target = nil)
       if Array(target).last == [:nil]
         return 'IS NOT'

data/test/benchmark.rb

@@ -30,6 +30,12 @@ Benchmark.bm(30) do |x|
     end
   end
 
+  x.report 'simple select w/ eval' do
+    Times.times do
+      User.select { |u| u.created_at == Time.now }.to_hash
+    end
+  end
+
   x.report 'dual select' do
     Times.times do
       User.select { |u| u.id == 20 && u.age > 20 }.to_hash

data/test/join_test.rb

@@ -25,6 +25,19 @@ context "Joins" do
     }
   end
 
+  specify "belongs_to" do
+    sql = User.select { |m| m.account.id > 20 }
+    sql.to_hash.should ==  { 
+      :conditions => "accounts.id > 20",
+      :include    => [:account]
+    }
+  end
+
+  specify "complex joins have no to_s" do
+    sql = User.select { |m| m.account.id > 20 }
+    should.raise { sql.to_s }
+  end
+
   specify "non-existant associations" do
     sql = User.select { |m| m.liquor.brand == 'Jack' }
     should.raise { sql.to_hash } 

data/test/ruby_test.rb

@@ -0,0 +1,9 @@
+require File.dirname(__FILE__) + '/helper'
+
+context "Inline Ruby" do
+  xspecify "should know what to return" do
+    name = 'David'
+    sql = User.select { |u| name.nil? || u.name == name }.to_s
+    sql.should == "SELECT * FROM users WHERE (users.name = 'David')"
+  end
+end

data/test/types_test.rb

@@ -52,9 +52,8 @@ context "Different types" do
     sql.should == "SELECT * FROM users WHERE users.name IS NOT NULL"
   end
 
-  xspecify "Time" do
-    # TODO: nothing but variables inside blocks for now
+  specify "Time" do
     sql = User.select { |m| m.name == Time.now }.to_sql
-    sql.should == "SELECT * FROM users WHERE users.name = NULL"
+    sql.should == "SELECT * FROM users WHERE users.name = '#{Time.now.to_s(:db)}'"
   end
 end

data/test/where_test.rb

@@ -74,7 +74,7 @@ context "Where (using select)" do
     sql.should == "SELECT * FROM users WHERE users.name = '#{@me}'"
   end
 
-  xspecify "simple == with instance variable method call" do
+  specify "simple == with instance variable method call" do
     require 'ostruct'
     @person = OpenStruct.new(:name => 'chris')
 
@@ -136,11 +136,15 @@ context "Where (using select)" do
   specify "undefined equality symbol" do
     should.raise { User.select { |m| m.name =* /chris/ }.to_sql }
   end
+
+  specify "block variable / assigning variable conflict" do
+    m = User.select { |m| m.name == 'chris' }.to_sql
+    m.should == "SELECT * FROM users WHERE users.name = 'chris'"
+  end
   
-  xspecify "simple == with inline ruby" do
-    # TODO: implement this
+  specify "simple == with inline ruby" do
     sql = User.select { |m| m.created_at == 2.days.ago.to_s(:db) }.to_sql
-    sql.should == "SELECT * FROM users WHERE users.created_at = #{2.days.ago.to_s(:db)}"
+    sql.should == "SELECT * FROM users WHERE users.created_at = '#{2.days.ago.to_s(:db)}'"
   end
 
   specify "inspect" do

metadata

@@ -3,8 +3,8 @@ rubygems_version: 0.9.0
 specification_version: 1
 name: ambition
 version: !ruby/object:Gem::Version 
-  version: 0.2.2
-date: 2007-09-11 00:00:00 -07:00
+  version: 0.3.1
+date: 2007-11-06 00:00:00 -08:00
 summary: Ambition builds SQL from plain jane Ruby.
 require_paths: 
 - lib
@@ -35,6 +35,7 @@ files:
 - ./lib/ambition/proc_to_ruby.rb
 - ./lib/ambition/processor.rb
 - ./lib/ambition/query.rb
+- ./lib/ambition/ruby_processor.rb
 - ./lib/ambition/select_processor.rb
 - ./lib/ambition/simple_processor.rb
 - ./lib/ambition/sort_processor.rb
@@ -73,6 +74,7 @@ files:
 - ./test/order_test.rb
 - ./test/profiler.rb
 - ./test/source_test.rb
+- ./test/ruby_test.rb
 - ./test/types_test.rb
 - ./test/where_test.rb
 test_files: 
@@ -82,6 +84,7 @@ test_files:
 - test/join_test.rb
 - test/limit_test.rb
 - test/order_test.rb
+- test/ruby_test.rb
 - test/source_test.rb
 - test/types_test.rb
 - test/where_test.rb
@@ -105,6 +108,15 @@ dependencies:
       - !ruby/object:Gem::Version 
         version: 2.0.1
     version: 
+- !ruby/object:Gem::Dependency 
+  name: ruby2ruby
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Version::Requirement 
+    requirements: 
+    - - "="
+      - !ruby/object:Gem::Version 
+        version: 1.1.7
+    version: 
 - !ruby/object:Gem::Dependency 
   name: activerecord
   version_requirement: