ambition 0.1.5 → 0.1.6

data/Manifest

@@ -1,18 +1,41 @@
 ./init.rb
 ./lib/ambition/count.rb
+./lib/ambition/database_statements.rb
 ./lib/ambition/enumerable.rb
 ./lib/ambition/limit.rb
 ./lib/ambition/order.rb
+./lib/ambition/proc_to_ruby.rb
 ./lib/ambition/processor.rb
 ./lib/ambition/query.rb
 ./lib/ambition/where.rb
 ./lib/ambition.rb
-./lib/proc_to_ruby.rb
 ./LICENSE
+./Manifest
 ./Rakefile
 ./README
 ./test/chaining_test.rb
+./test/console
+./test/constructive_test.rb
 ./test/count_test.rb
+./test/databases/boot.rb
+./test/databases/database.yml
+./test/databases/fixtures/admin.rb
+./test/databases/fixtures/companies.yml
+./test/databases/fixtures/company.rb
+./test/databases/fixtures/developer.rb
+./test/databases/fixtures/developers_projects.yml
+./test/databases/fixtures/project.rb
+./test/databases/fixtures/projects.yml
+./test/databases/fixtures/replies.yml
+./test/databases/fixtures/reply.rb
+./test/databases/fixtures/topic.rb
+./test/databases/fixtures/topics.yml
+./test/databases/fixtures/user.rb
+./test/databases/fixtures/users.yml
+./test/databases/lib/activerecord_test_connector.rb
+./test/databases/lib/load_fixtures.rb
+./test/databases/lib/schema.rb
+./test/destructive_test.rb
 ./test/enumerable_test.rb
 ./test/helper.rb
 ./test/join_test.rb
@@ -20,4 +43,3 @@
 ./test/order_test.rb
 ./test/types_test.rb
 ./test/where_test.rb
-./Manifest

data/Rakefile

@@ -2,7 +2,7 @@ require 'rake'
 require 'rake/testtask'
 require 'rake/rdoctask'
 
-Version = '0.1.5'
+Version = '0.1.6'
 
 module Rake::TaskManager
   def redefine_task(task_class, args, &block)

data/lib/ambition/database_statements.rb

@@ -0,0 +1,31 @@
+module Ambition
+  module DatabaseStatements
+    def self.const_missing(*args)
+      Abstract
+    end
+
+    class Abstract
+      def regexp(options)
+        'REGEXP'
+      end
+    end
+
+    class PostgreSQL < Abstract
+      def regexp(regexp)
+        if regexp.options == 1
+          '~*'
+        else
+          '~'
+        end
+      end
+
+      def negated_regexp(regexp)
+        if regexp.options == 1
+          '!~*'
+        else
+          '!~'
+        end
+      end
+    end
+  end
+end

data/lib/ambition/enumerable.rb

@@ -3,7 +3,7 @@ module Ambition
     include ::Enumerable
 
     def each(&block)
-      find(:all, query_context.to_hash).each(&block)
+      entries.each(&block)
     end
 
     def any?(&block)

data/lib/ambition/limit.rb

@@ -1,27 +1,35 @@
 module Ambition
   module Limit
-    def first(limit = 1, offset = nil)
-      query_context.add LimitProcessor.new(limit, offset)
-      find(limit == 1 ? :first : :all, query_context.to_hash)
+    def first(limit = 1)
+      query_context.add LimitProcessor.new(limit)
+
+      if limit == 1
+        find(:first, query_context.to_hash)
+      else
+        query_context
+      end
     end
 
-    def [](offset, limit = nil)
-      return first(offset, limit) if limit
+    def slice(offset, limit = nil)
 
       if offset.is_a? Range
         limit  = offset.end
         limit -= 1 if offset.exclude_end?
-        first(offset.first, limit - offset.first)
-      else
-        first(offset, 1)
+        offset = offset.first
+        limit -= offset
+      elsif limit.nil?
+        return find(offset)
       end
+
+      query_context.add OffsetProcessor.new(offset)
+      query_context.add LimitProcessor.new(limit)
     end
-    alias_method :slice, :[]
+    alias_method :[], :slice
   end
 
   class LimitProcessor 
-    def initialize(*args)
-      @args = args
+    def initialize(limit)
+      @limit = limit
     end
 
     def key
@@ -29,7 +37,21 @@ module Ambition
     end
 
     def to_s
-      @args.compact * ', '
+      @limit
+    end
+  end
+
+  class OffsetProcessor
+    def initialize(offset)
+      @offset = offset
+    end
+
+    def key
+      :offset
+    end
+
+    def to_s
+      @offset
     end
   end
 end

data/lib/ambition/proc_to_ruby.rb

@@ -0,0 +1,25 @@
+##
+# Taken from ruby2ruby, Copyright (c) 2006 Ryan Davis under the MIT License
+require 'parse_tree'
+require 'sexp_processor'
+
+class ProcHolder
+end
+
+class Method
+  def to_sexp
+    ParseTree.translate(ProcHolder, :proc_to_method)
+  end
+end
+
+class Proc
+  def to_method
+    ProcHolder.send(:define_method, :proc_to_method, self)
+    ProcHolder.new.method(:proc_to_method)
+  end
+
+  def to_sexp
+    body = to_method.to_sexp[2][1..-1]
+    [:proc, *body]
+  end
+end

data/lib/ambition/processor.rb

@@ -45,15 +45,41 @@ module Ambition
     end
 
     def sanitize(value)
-      case value.to_s
-      when 'true'  then '1'
-      when 'false' then '0'
-      else ActiveRecord::Base.connection.quote(value) rescue quote(value)
+      if value.is_a? Array
+        return value.map { |v| sanitize(v) }.join(', ')
       end
+
+      case value
+      when true,  'true'  
+        '1'
+      when false, 'false' 
+        '0'
+      when Regexp
+        "'#{value.source}'"
+      else 
+        ActiveRecord::Base.connection.quote(value) 
+      end
+    rescue ActiveRecord::ConnectionNotEstablished
+      quote(value)
+    rescue
+      "'#{value}'"
     end
     
     def quote_column_name(value)
-      ActiveRecord::Base.connection.quote_column_name(value) rescue value.to_s
+      ActiveRecord::Base.connection.quote_column_name(value) 
+    rescue ActiveRecord::ConnectionNotEstablished
+      value.to_s
+    end
+
+    def statement(*args)
+      @statement_instnace ||= DatabaseStatements.const_get(adapter_name).new
+      @statement_instnace.send(*args)
+    end
+
+    def adapter_name
+      ActiveRecord::Base.connection.adapter_name
+    rescue ActiveRecord::ConnectionNotEstablished
+      'Abstract'
     end
 
     def extract_includes(receiver, method)

data/lib/ambition/query.rb

@@ -45,7 +45,11 @@ module Ambition
       end
 
       if limit = keyed[:limit]
-        hash[:limit] = limit.join(', ')
+        hash[:limit] = limit.last
+      end
+
+      if offset = keyed[:offset]
+        hash[:offset] = offset.last
       end
 
       hash
@@ -58,7 +62,8 @@ module Ambition
       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].join(', ')}"         unless hash[:limit].blank?
+      sql << "LIMIT #{hash[:limit]}"                    unless hash[:limit].blank?
+      sql << "OFFSET #{hash[:limit]}"                   unless hash[:offset].blank?
 
       @@select % [ @table_name, sql.join(' ') ]
     end

data/lib/ambition/where.rb

@@ -30,9 +30,16 @@ module Ambition
     end
 
     def process_not(exp)
-      _, receiver, method, other = *exp.first
+      type, receiver, method, other = *exp.first
       exp.clear
-      return translation(receiver, negate(method), other)
+
+      case type
+      when :call
+        translation(receiver, negate(method, other), other)
+      when :match3
+        regexp = receiver.last
+        "#{process(method)} #{statement(:negated_regexp, regexp)} #{sanitize(regexp)}"
+      end
     end
 
     def process_call(exp)
@@ -63,8 +70,8 @@ module Ambition
     end
 
     def process_match3(exp)
-      regexp, target = exp.shift.last.inspect.gsub(/\/([^\/]+)\/\S*/, '\1'), process(exp.shift)
-      "#{target} REGEXP '#{regexp}'"
+      regexp, target = exp.shift.last, process(exp.shift)
+      "#{target} #{statement(:regexp, regexp)} #{sanitize(regexp)}"
     end
 
     def process_dvar(exp)
@@ -111,23 +118,29 @@ module Ambition
       sanitize eval(variable, @block)
     end
 
-    def negate(method)
+    def negate(method, target = nil)
+      if Array(target).last == [:nil]
+        return 'IS NOT'
+      end
+
       case method
       when :== 
         '<>'
       when :=~
         '!~'
       else 
-        raise "Not implemented: #{method}"
+        raise "Not implemented: #{method.inspect}"
       end
     end
     
-    def translation(receiver, method, other)
+    def translation(receiver, method, other = nil)
       case method.to_s
+      when 'IS NOT'
+        "#{process(receiver)} IS NOT #{process(other)}"
       when '=='
         case other_value = process(other)
         when "NULL"
-          "#{process(receiver)} is #{other_value}"
+          "#{process(receiver)} IS #{other_value}"
         else
           "#{process(receiver)} = #{other_value}"
         end

data/lib/ambition.rb

@@ -1,6 +1,8 @@
-require 'rubygems'
-require 'active_record' unless defined? ActiveRecord
-require 'proc_to_ruby'
+unless defined? ActiveRecord
+  require 'rubygems'
+  require 'active_record' 
+end
+require 'ambition/proc_to_ruby'
 require 'ambition/processor'
 require 'ambition/query'
 require 'ambition/where'
@@ -8,6 +10,7 @@ require 'ambition/order'
 require 'ambition/limit'
 require 'ambition/count'
 require 'ambition/enumerable'
+require 'ambition/database_statements'
 
 module Ambition 
   include Where, Order, Limit, Enumerable, Count

data/test/console

@@ -0,0 +1,9 @@
+#!/usr/bin/env ruby
+irb = RUBY_PLATFORM =~ /(:?mswin|mingw)/ ? 'irb.bat' : 'irb'
+libs = []
+dirname = File.dirname(__FILE__)
+
+libs << 'irb/completion'
+libs << File.join(dirname, 'databases', 'boot')
+
+exec "#{irb} #{libs.map{|l| " -r #{l}" }.join} --simple-prompt"

data/test/databases/boot.rb

@@ -0,0 +1,3 @@
+require File.dirname(__FILE__) + '/lib/load_fixtures'
+$:.unshift File.dirname(__FILE__) + '/../../lib'
+require 'ambition'

data/test/databases/database.yml

@@ -0,0 +1,17 @@
+sqlite3:
+  adapter: sqlite3
+  database: db/development.sqlite3
+
+mysql:
+  adapter: mysql
+  database: ambition_development
+  username: root
+  password: 
+  host: localhost
+
+postgres:
+  adapter: postgresql
+  database: ambition_development
+  username: root
+  password: 
+  host: localhost

data/test/databases/fixtures/admin.rb

@@ -0,0 +1,3 @@
+class Admin < User
+  has_many :companies, :finder_sql => 'SELECT * FROM companies'
+end

data/test/databases/fixtures/companies.yml

@@ -0,0 +1,24 @@
+thirty_seven_signals:
+  id: 1
+  name: 37Signals
+  rating: 4
+
+TextDrive:
+  id: 2
+  name: TextDrive
+  rating: 3
+
+PlanetArgon:
+  id: 3
+  name: Planet Argon
+  rating: 3
+
+Google:
+  id: 4
+  name: Google
+  rating: 5
+  
+Ionist:
+  id: 5
+  name: Ioni.st
+  rating: 4

data/test/databases/fixtures/company.rb

@@ -0,0 +1,23 @@
+class Company < ActiveRecord::Base
+  attr_protected :rating
+  set_sequence_name :companies_nonstd_seq
+
+  validates_presence_of :name
+  def validate
+    errors.add('rating', 'rating should not be 2') if rating == 2
+  end  
+
+  def self.with_best
+    with_scope :find => { :conditions => ['companies.rating > ?', 3] } do
+      yield
+    end
+  end
+
+  def self.find_best(*args)
+    with_best { find(*args) }
+  end
+
+  def self.calculate_best(*args)
+    with_best { calculate(*args) }
+  end
+end

data/test/databases/fixtures/developer.rb

@@ -0,0 +1,11 @@
+class Developer < User
+  has_and_belongs_to_many :projects, :include => :topics, :order => 'projects.name'
+
+  def self.with_poor_ones(&block)
+    with_scope :find => { :conditions => ['salary <= ?', 80000], :order => 'salary' } do
+      yield
+    end
+  end
+
+  def self.per_page() 10 end
+end

data/test/databases/fixtures/developers_projects.yml

@@ -0,0 +1,13 @@
+david_action_controller:
+  developer_id: 1
+  project_id: 2
+  joined_on: 2004-10-10
+
+david_active_record:
+  developer_id: 1
+  project_id: 1
+  joined_on: 2004-10-10
+
+jamis_active_record:
+  developer_id: 2
+  project_id: 1

data/test/databases/fixtures/project.rb

@@ -0,0 +1,4 @@
+class Project < ActiveRecord::Base
+  has_and_belongs_to_many :developers, :uniq => true
+  has_many :topics
+end

data/test/databases/fixtures/projects.yml

@@ -0,0 +1,7 @@
+action_controller:
+  id: 2
+  name: Active Controller
+
+active_record:
+  id: 1
+  name: Active Record

data/test/databases/fixtures/replies.yml

@@ -0,0 +1,20 @@
+witty_retort:
+  id: 1
+  topic_id: 1
+  content: Birdman is better!
+  created_at: <%= 6.hours.ago.to_s(:db) %>
+  updated_at: nil
+  
+another:
+  id: 2
+  topic_id: 2
+  content: Nuh uh!
+  created_at: <%= 1.hour.ago.to_s(:db) %>
+  updated_at: nil
+  
+spam:
+  id: 3
+  topic_id: 1
+  content: Nice site!
+  created_at: <%= 1.hour.ago.to_s(:db) %>
+  updated_at: nil

data/test/databases/fixtures/reply.rb

@@ -0,0 +1,5 @@
+class Reply < ActiveRecord::Base
+  belongs_to :topic, :include => [:replies]
+  
+  validates_presence_of :content
+end

data/test/databases/fixtures/topic.rb

@@ -0,0 +1,19 @@
+class Topic < ActiveRecord::Base
+  has_many :replies, :dependent => :destroy, :order => 'replies.created_at DESC'
+  belongs_to :project
+
+  # pretend find and count were extended and accept an extra option
+  # if there is a :foo option, prepend its value to collection
+  def self.find(*args)
+    more = []
+    more << args.last.delete(:foo) if args.last.is_a?(Hash) and args.last[:foo]
+    res = super
+    more.empty?? res : more + res
+  end
+
+  # if there is a :foo option, always return 100
+  def self.count(*args)
+    return 100 if args.last.is_a?(Hash) and args.last[:foo]
+    super
+  end
+end

data/test/databases/fixtures/topics.yml

@@ -0,0 +1,32 @@
+futurama:
+  id: 1
+  title: Isnt futurama awesome?
+  subtitle: It really is, isnt it.
+  content: I like futurama
+  created_at: <%= 1.day.ago.to_s(:db) %>
+  updated_at: <%= 1.day.ago.to_s(:db) %>
+  
+harvey_birdman:
+  id: 2
+  title: Harvey Birdman is the king of all men
+  subtitle: yup
+  content: He really is
+  created_at: <%= 2.hours.ago.to_s(:db) %>
+  updated_at: <%= 2.hours.ago.to_s(:db) %>
+
+rails:
+  id: 3
+  project_id: 1
+  title: Rails is nice
+  subtitle: It makes me happy
+  content: except when I have to hack internals to fix pagination. even then really.
+  created_at: <%= 20.minutes.ago.to_s(:db) %>
+  updated_at: <%= 20.minutes.ago.to_s(:db) %>
+
+ar:
+  id: 4
+  project_id: 1
+  title: ActiveRecord sometimes freaks me out
+  content: "I mean, what's the deal with eager loading?"
+  created_at: <%= 15.minutes.ago.to_s(:db) %>
+  updated_at: <%= 15.minutes.ago.to_s(:db) %>

data/test/databases/fixtures/user.rb

@@ -0,0 +1,2 @@
+class User < ActiveRecord::Base
+end

data/test/databases/fixtures/users.yml

@@ -0,0 +1,35 @@
+david:
+  id: 1
+  name: David
+  salary: 80000
+  type: Developer
+
+jamis:
+  id: 2
+  name: Jamis
+  salary: 150000
+  type: Developer
+
+<% for digit in 3..10 %>
+dev_<%= digit %>:
+  id: <%= digit %>
+  name: fixture_<%= digit %>
+  salary: 100000
+  type: Developer
+<% end %>
+
+poor_jamis:
+  id: 11
+  name: Jamis
+  salary: 9000
+  type: Developer
+
+admin:
+  id: 12
+  name: admin
+  type: Admin
+
+goofy:
+  id: 13
+  name: Goofy
+  type: Admin

data/test/databases/lib/activerecord_test_connector.rb

@@ -0,0 +1,65 @@
+class ActiveRecordTestConnector
+  cattr_accessor :able_to_connect
+  cattr_accessor :connected
+
+  # Set our defaults
+  self.connected = false
+  self.able_to_connect = true
+
+  def self.setup
+    unless connected || !able_to_connect
+      setup_connection
+      load_schema
+      require_fixture_models
+      self.connected = true
+    end
+  rescue Exception => e  # errors from ActiveRecord setup
+    if e.to_s =~ /unknown database/i
+      puts "\nPlease create an `ambition_development' database to play!"
+    else
+      $stderr.puts "\nSkipping ActiveRecord assertion tests: #{e}"
+    end
+    self.able_to_connect = false
+  end
+
+  private
+
+  def self.setup_connection
+    if Object.const_defined?(:ActiveRecord)
+      config_file = File.dirname(__FILE__) + '/../database.yml'
+      ActiveRecord::Base.logger = Logger.new STDOUT
+      
+      case adapter = ENV['ADAPTER'] || 'mysql'
+      when 'sqlite3'
+        options = { :database => ':memory:', :adapter => 'sqlite3', :timeout => 500 }
+        ActiveRecord::Base.configurations = { 'sqlite3_ar_integration' => options }
+      else
+        options = YAML.load_file(config_file)[adapter]
+      end
+
+      puts "Using #{adapter}"
+
+      ActiveRecord::Base.establish_connection(options)
+      ActiveRecord::Base.connection
+
+      unless Object.const_defined?(:QUOTED_TYPE)
+        Object.send :const_set, :QUOTED_TYPE, ActiveRecord::Base.connection.quote_column_name('type')
+      end
+    else
+      raise "Can't setup connection since ActiveRecord isn't loaded."
+    end
+  end
+
+    # Load actionpack sqlite tables
+  def self.load_schema
+    ActiveRecord::Base.silence do
+      load File.dirname(__FILE__) + "/schema.rb"
+    end
+  end
+
+  def self.require_fixture_models
+    models = Dir.glob(File.dirname(__FILE__) + "/../fixtures/*.rb")
+    models = (models.grep(/user.rb/) + models).uniq
+    models.each {|f| require f}
+  end
+end

data/test/databases/lib/load_fixtures.rb

@@ -0,0 +1,13 @@
+dirname = File.dirname(__FILE__)
+%w(rubygems active_record active_record/version active_record/fixtures).each {|f| require f}
+puts "  (ActiveRecord v#{ActiveRecord::VERSION::STRING})"
+require File.join(dirname, 'activerecord_test_connector')
+
+# setup the connection
+ActiveRecordTestConnector.setup
+
+# load all fixtures
+fixture_path = File.join(dirname, '..', 'fixtures')
+Fixtures.create_fixtures(fixture_path, tables = ActiveRecord::Base.connection.tables - %w(schema_info))
+
+puts "Available models: #{Dir[fixture_path+'/*.rb'].map{|f|File.basename(f,'.rb')}.map(&:classify).to_sentence}"

data/test/databases/lib/schema.rb

@@ -0,0 +1,41 @@
+ActiveRecord::Schema.define(:version => 0) do
+  create_table :users, :force => true do |t|
+    t.column :name,       :string
+    t.column :type,       :string
+    t.column :salary,     :integer,  :default => 70_000
+    t.column :created_at, :datetime, :null => false
+    t.column :updated_at, :datetime, :null => false
+  end
+
+  create_table :replies, :force => true do |t|
+    t.column :content,    :string
+    t.column :topic_id,   :integer
+    t.column :created_at, :datetime, :null => false
+    t.column :updated_at, :datetime, :null => false
+  end
+
+  create_table :topics, :force => true do |t|
+    t.column :project_id, :integer
+    t.column :title,      :string
+    t.column :subtitle,   :string
+    t.column :content,    :text
+    t.column :created_at, :datetime, :null => false
+    t.column :updated_at, :datetime, :null => false
+  end
+
+  create_table :projects, :force => true do |t|
+    t.column :name, :string
+  end
+
+  create_table :developers_projects, :force => true do |t|
+    t.column :developer_id, :integer
+    t.column :project_id,   :integer
+    t.column :joined_on,    :datetime
+    t.column :access_level, :integer, :default => 1
+  end
+
+  create_table :companies, :force => true do |t|
+    t.column :name,    :string
+    t.column :rating,  :integer
+  end
+end

data/test/enumerable_test.rb

@@ -10,7 +10,7 @@ context "Each" do
   end
 
   specify "limit and conditions" do
-    hash = { :limit => '5', :conditions => "users.age = 21" }
+    hash = { :limit => 5, :conditions => "users.age = 21" }
     User.expects(:find).with(:all, hash).returns([])
     User.select { |m| m.age == 21 }.first(5).each do |user|
       puts user.name
@@ -18,7 +18,7 @@ context "Each" do
   end
 
   specify "limit and conditions and order" do
-    hash = { :limit => '5', :conditions => "users.age = 21", :order => 'users.name' }
+    hash = { :limit => 5, :conditions => "users.age = 21", :order => 'users.name' }
     User.expects(:find).with(:all, hash).returns([])
     User.select { |m| m.age == 21 }.sort_by { |m| m.name }.first(5).each do |user|
       puts user.name
@@ -26,7 +26,7 @@ context "Each" do
   end
 
   specify "limit and order" do
-    hash = { :limit => '5', :order => 'users.name' }
+    hash = { :limit => 5, :order => 'users.name' }
     User.expects(:find).with(:all, hash).returns([])
     User.sort_by { |m| m.name }.first(5).each do |user|
       puts user.name

data/test/helper.rb

@@ -1,22 +1,20 @@
 require 'rubygems'
 begin
-  require 'test/spec'
+  require 'test/spec' unless $NO_TEST
   require 'mocha'
-  require 'active_support'
 rescue LoadError
-  puts "=> You need the test-spec, mocha, and activesupport gems to run these tests."
+  puts "=> You need the test-spec and mocha gems to run these tests."
   exit
 end
+require 'active_support'
 require 'active_record'
 
-begin require 'redgreen'; rescue LoadError; end
+begin require 'redgreen'; rescue LoadError; end unless $NO_TEST
 
 $:.unshift File.dirname(__FILE__) + '/../lib'
 require 'ambition'
 
-class User
-  extend Ambition
-
+class User < ActiveRecord::Base 
   def self.reflections
     return @reflections if @reflections
     @reflections = {}
@@ -34,3 +32,23 @@ end
 
 class Reflection < Struct.new(:macro, :primary_key_name, :name, :table_name)
 end
+
+module ActiveRecord
+  module ConnectionAdapters
+    class MysqlAdapter  
+      def connect(*args)
+        true
+      end
+    end
+
+    class PostgreSQLAdapter  
+      def connect(*args)
+        true
+      end
+      class PGError; end
+    end
+
+    class FakeAdapter < AbstractAdapter
+    end
+  end
+end

data/test/limit_test.rb

@@ -6,38 +6,36 @@ context "Limit" do
   end
 
   specify "first" do
-    conditions = { :conditions => "users.name = 'jon'", :limit => '1' }
+    conditions = { :conditions => "users.name = 'jon'", :limit => 1 }
     User.expects(:find).with(:first, conditions)
     @sql.first
   end
 
   specify "first with argument" do
-    conditions = { :conditions => "users.name = 'jon'", :limit => '5' }
+    conditions = { :conditions => "users.name = 'jon'", :limit => 5 }
     User.expects(:find).with(:all, conditions)
-    @sql.first(5)
-  end
-
-  specify "[] with one element" do
-    conditions = { :conditions => "users.name = 'jon'", :limit => '10, 1' }
-    User.expects(:find).with(:all, conditions)
-    @sql[10]
+    @sql.first(5).entries
   end
   
   specify "[] with two elements" do
-    conditions = { :conditions => "users.name = 'jon'", :limit => '10, 20' }
+    conditions = { :conditions => "users.name = 'jon'", :limit => 20, :offset => 10 }
+    User.expects(:find).with(:all, conditions)
+    @sql[10, 20].entries
+
+    conditions = { :conditions => "users.name = 'jon'", :limit => 20, :offset => 20 }
     User.expects(:find).with(:all, conditions)
-    @sql[10, 20]
+    @sql[20, 20].entries
   end
   
   specify "slice is an alias of []" do
-    conditions = { :conditions => "users.name = 'jon'", :limit => '10, 20' }
+    conditions = { :conditions => "users.name = 'jon'", :limit => 20, :offset => 10 }
     User.expects(:find).with(:all, conditions)
-    @sql.slice(10, 20)
+    @sql.slice(10, 20).entries
   end
   
   specify "[] with range" do
-    conditions = { :conditions => "users.name = 'jon'", :limit => '10, 10' }
+    conditions = { :conditions => "users.name = 'jon'", :limit => 10, :offset => 10 }
     User.expects(:find).with(:all, conditions)
-    @sql[10..20]
+    @sql[10..20].entries
   end
 end

data/test/types_test.rb

@@ -44,7 +44,12 @@ context "Different types" do
 
   specify "nil" do
     sql = User.select { |m| m.name == nil }.to_sql
-    sql.should == "SELECT * FROM users WHERE users.name is NULL"
+    sql.should == "SELECT * FROM users WHERE users.name IS NULL"
+  end
+
+  specify "not nil" do
+    sql = User.select { |m| m.name != nil }.to_sql
+    sql.should == "SELECT * FROM users WHERE users.name IS NOT NULL"
   end
 
   xspecify "Time" do

data/test/where_test.rb

@@ -47,6 +47,12 @@ context "Where (using select)" do
     sql.should == "SELECT * FROM users WHERE users.id IN (1, 2, 3, 4)"
   end
 
+  specify "variable'd array.include? item" do
+    array = [1, 2, 3, 4]
+    sql = User.select { |m| array.include? m.id }.to_sql
+    sql.should == "SELECT * FROM users WHERE users.id IN (1, 2, 3, 4)"
+  end
+
   specify "simple == with variables" do
     me = 'chris'
     sql = User.select { |m| m.name == me }.to_sql
@@ -144,14 +150,92 @@ end
 
 context "Where (using detect)" do
   specify "simple ==" do
-    conditions = { :conditions => "users.name = 'chris'", :limit => '1' }
-    User.expects(:find).with(:first, conditions)
+    User.expects(:select).returns(mock(:first => true))
     User.detect { |m| m.name == 'chris' }
   end
 
   specify "nothing found" do
-    conditions = { :conditions => "users.name = 'chris'", :limit => '1' }
-    User.expects(:find).with(:first, conditions).returns(nil)
+    User.expects(:select).returns(mock(:first => nil))
     User.detect { |m| m.name == 'chris' }.should.be.nil
   end
 end
+
+context "Where (using [])" do
+  specify "finds a single row" do
+    User.expects(:find).with(1)
+    User[1]
+  end
+end
+
+context "PostgreSQL specific"  do
+  setup do
+    ActiveRecord::Base.connection = ActiveRecord::ConnectionAdapters::PostgreSQLAdapter.new 'fake_connection', 'fake_logger'
+  end
+
+  teardown do
+    ActiveRecord::Base.remove_connection
+  end
+
+  specify "quoting of column name" do
+    me = 'chris'
+    sql = User.select { |m| m.name == me }.to_sql
+    sql.should == %(SELECT * FROM users WHERE users."name" = '#{me}')
+  end
+
+  specify "simple =~ with regexp" do
+    sql = User.select { |m| m.name =~ /chris/ }.to_sql
+    sql.should == %(SELECT * FROM users WHERE users."name" ~ 'chris')
+  end
+
+  specify "insensitive =~" do
+    sql = User.select { |m| m.name =~ /chris/i }.to_sql
+    sql.should == %(SELECT * FROM users WHERE users."name" ~* 'chris')
+  end
+
+  specify "negated =~" do
+    sql = User.select { |m| m.name !~ /chris/ }.to_sql
+    sql.should == %(SELECT * FROM users WHERE users."name" !~ 'chris')
+  end
+
+  specify "negated insensitive =~" do
+    sql = User.select { |m| m.name !~ /chris/i }.to_sql
+    sql.should == %(SELECT * FROM users WHERE users."name" !~* 'chris')
+  end
+end
+
+context "MySQL specific" do
+  setup do
+    ActiveRecord::Base.connection = ActiveRecord::ConnectionAdapters::MysqlAdapter.new('connection', 'logger', 'options', 'config')
+  end
+
+  teardown do
+    ActiveRecord::Base.remove_connection
+  end
+
+  specify "quoting of column name" do
+    me = 'chris'
+    sql = User.select { |m| m.name == me }.to_sql
+    sql.should == "SELECT * FROM users WHERE users.`name` = '#{me}'"
+  end
+
+  specify "simple =~ with regexp" do
+    sql = User.select { |m| m.name =~ /chris/ }.to_sql
+    sql.should == "SELECT * FROM users WHERE users.`name` REGEXP 'chris'"
+  end
+end
+
+context "Adapter without overrides" do
+  setup do
+    ActiveRecord::Base.connection = ActiveRecord::ConnectionAdapters::FakeAdapter.new('connection', 'logger')
+  end
+
+  teardown do
+    ActiveRecord::Base.remove_connection
+  end
+
+  specify "quoting of column name" do
+    me = 'chris'
+    sql = User.select { |m| m.name == me }.to_sql
+    sql.should == "SELECT * FROM users WHERE users.name = '#{me}'"
+  end
+end

metadata

@@ -3,8 +3,8 @@ rubygems_version: 0.9.0
 specification_version: 1
 name: ambition
 version: !ruby/object:Gem::Version 
-  version: 0.1.5
-date: 2007-08-30 00:00:00 -07:00
+  version: 0.1.6
+date: 2007-09-02 00:00:00 -07:00
 summary: Ambition builds SQL from plain jane Ruby.
 require_paths: 
 - lib
@@ -31,19 +31,42 @@ authors:
 files: 
 - ./init.rb
 - ./lib/ambition/count.rb
+- ./lib/ambition/database_statements.rb
 - ./lib/ambition/enumerable.rb
 - ./lib/ambition/limit.rb
 - ./lib/ambition/order.rb
+- ./lib/ambition/proc_to_ruby.rb
 - ./lib/ambition/processor.rb
 - ./lib/ambition/query.rb
 - ./lib/ambition/where.rb
 - ./lib/ambition.rb
-- ./lib/proc_to_ruby.rb
 - ./LICENSE
+- ./Manifest
 - ./Rakefile
 - ./README
 - ./test/chaining_test.rb
+- ./test/console
+- ./test/constructive_test.rb
 - ./test/count_test.rb
+- ./test/databases/boot.rb
+- ./test/databases/database.yml
+- ./test/databases/fixtures/admin.rb
+- ./test/databases/fixtures/companies.yml
+- ./test/databases/fixtures/company.rb
+- ./test/databases/fixtures/developer.rb
+- ./test/databases/fixtures/developers_projects.yml
+- ./test/databases/fixtures/project.rb
+- ./test/databases/fixtures/projects.yml
+- ./test/databases/fixtures/replies.yml
+- ./test/databases/fixtures/reply.rb
+- ./test/databases/fixtures/topic.rb
+- ./test/databases/fixtures/topics.yml
+- ./test/databases/fixtures/user.rb
+- ./test/databases/fixtures/users.yml
+- ./test/databases/lib/activerecord_test_connector.rb
+- ./test/databases/lib/load_fixtures.rb
+- ./test/databases/lib/schema.rb
+- ./test/destructive_test.rb
 - ./test/enumerable_test.rb
 - ./test/helper.rb
 - ./test/join_test.rb
@@ -51,7 +74,6 @@ files:
 - ./test/order_test.rb
 - ./test/types_test.rb
 - ./test/where_test.rb
-- ./Manifest
 test_files: 
 - test/chaining_test.rb
 - test/constructive_test.rb

data/lib/proc_to_ruby.rb

@@ -1,36 +0,0 @@
-##
-# Taken from ruby2ruby, Copyright (c) 2006 Ryan Davis under the MIT License
-require 'parse_tree'
-require 'unique'
-require 'sexp_processor'
-
-class Method
-  def with_class_and_method_name
-    if self.inspect =~ /<Method: (.*)\#(.*)>/ then
-      klass = eval $1
-      method  = $2.intern
-      raise "Couldn't determine class from #{self.inspect}" if klass.nil?
-      return yield(klass, method)
-    else
-      raise "Can't parse signature: #{self.inspect}"
-    end
-  end
-
-  def to_sexp
-    with_class_and_method_name do |klass, method|
-      ParseTree.new(false).parse_tree_for_method(klass, method)
-    end
-  end
-end
-
-class Proc
-  def to_method
-    Unique.send(:define_method, :proc_to_method, self)
-    Unique.new.method(:proc_to_method)
-  end
-
-  def to_sexp
-    body = self.to_method.to_sexp[2][1..-1]
-    [:proc, *body]
-  end
-end