ambitious-activerecord 0.1.0 → 0.1.1

data/ambitious-activerecord.gemspec

@@ -1,11 +1,11 @@
 
-# Gem::Specification for Ambitious-activerecord-0.1.0
+# Gem::Specification for Ambitious-activerecord-0.1.1
 # Originally generated by Echoe
 
 Gem::Specification.new do |s|
   s.name = %q{ambitious-activerecord}
-  s.version = "0.1.0"
-  s.date = %q{2008-01-29}
+  s.version = "0.1.1"
+  s.date = %q{2008-02-16}
   s.summary = %q{An ambitious adapter for ActiveRecord}
   s.email = %q{chris@ozmm.org}
   s.homepage = %q{http://ambition.rubyforge.org/}
@@ -16,7 +16,7 @@ Gem::Specification.new do |s|
   s.files = ["lib/ambition/adapters/active_record/base.rb", "lib/ambition/adapters/active_record/query.rb", "lib/ambition/adapters/active_record/select.rb", "lib/ambition/adapters/active_record/slice.rb", "lib/ambition/adapters/active_record/sort.rb", "lib/ambition/adapters/active_record/statements.rb", "lib/ambition/adapters/active_record.rb", "test/benchmark.rb", "test/chaining_test.rb", "test/count_test.rb", "test/enumerable_test.rb", "test/helper.rb", "test/join_test.rb", "test/profiler.rb", "test/ruby_test.rb", "test/select_test.rb", "test/slice_test.rb", "test/sort_test.rb", "test/source_test.rb", "test/types_test.rb", "Manifest", "ambitious-activerecord.gemspec"]
   s.test_files = ["test/chaining_test.rb", "test/count_test.rb", "test/enumerable_test.rb", "test/join_test.rb", "test/ruby_test.rb", "test/select_test.rb", "test/slice_test.rb", "test/sort_test.rb", "test/source_test.rb", "test/types_test.rb"]
   s.add_dependency(%q<activerecord>, [">= 1.15.0"])
-  s.add_dependency(%q<ambition>, [">= 0.5.0"])
+  s.add_dependency(%q<ambition>, [">= 0.5.1"])
 end
 
 
@@ -24,7 +24,7 @@ end
 # 
 # require 'rake'
 # 
-# Version = '0.1.0'
+# Version = '0.1.1'
 # 
 # begin
 #   require 'rubygems'
@@ -42,7 +42,7 @@ end
 #     p.url            = "http://ambition.rubyforge.org/"
 #     p.test_pattern   = 'test/*_test.rb'
 #     p.version        = Version
-#     p.dependencies  << 'ambition >=0.5.0'
+#     p.dependencies  << 'ambition >=0.5.1'
 #   end
 # 
 # rescue LoadError 

data/lib/ambition/adapters/active_record/query.rb

@@ -24,11 +24,11 @@ module Ambition
             hash[:order] = order.join(', ')
           end
 
-          if clauses[:slice].last =~ /LIMIT (\d+)/
+          if Array(clauses[:slice]).last =~ /LIMIT (\d+)/
             hash[:limit] = $1.to_i
           end
 
-          if clauses[:slice].last =~ /OFFSET (\d+)/
+          if Array(clauses[:slice]).last =~ /OFFSET (\d+)/
             hash[:offset] = $1.to_i
           end
 

data/lib/ambition/adapters/active_record/select.rb

@@ -81,6 +81,11 @@ module Ambition
           "#{right} IN (#{left})"
         end
 
+        def nil?(column)
+          left = "#{owner.table_name}.#{quote_column_name column}"
+          negated? ? not_equal(left, nil) : self.==(left, nil)
+        end
+
         def downcase(column)
           "LOWER(#{owner.table_name}.#{quote_column_name column})"
         end

data/test/benchmark.rb

@@ -1,67 +1,69 @@
-$:.unshift File.dirname(__FILE__) + '/../../../lib'
-%w( rubygems ambition ambition/adapters/active_record benchmark ).each { |f| require f }
+unless defined? Test
+  $:.unshift File.dirname(__FILE__) + '/../../../lib'
+  %w( rubygems ambition/adapters/active_record benchmark ).each { |f| require f }
 
-class User < ActiveRecord::Base
-  def self.reflections
-    return @reflections if @reflections
-    @reflections = {}
-    @reflections[:ideas]    = Reflection.new(:has_many,   'user_id',     :ideas,   'ideas')
-    @reflections[:invites]  = Reflection.new(:has_many,   'referrer_id', :invites, 'invites')
-    @reflections[:profile]  = Reflection.new(:has_one,    'user_id',     :profile, 'profiles')
-    @reflections[:account]  = Reflection.new(:belongs_to, 'account_id',  :account, 'accounts')
-    @reflections
-  end
+  class User < ActiveRecord::Base
+    def self.reflections
+      return @reflections if @reflections
+      @reflections = {}
+      @reflections[:ideas]    = Reflection.new(:has_many,   'user_id',     :ideas,   'ideas')
+      @reflections[:invites]  = Reflection.new(:has_many,   'referrer_id', :invites, 'invites')
+      @reflections[:profile]  = Reflection.new(:has_one,    'user_id',     :profile, 'profiles')
+      @reflections[:account]  = Reflection.new(:belongs_to, 'account_id',  :account, 'accounts')
+      @reflections
+    end
 
-  def self.table_name
-    'users'
+    def self.table_name
+      'users'
+    end
   end
-end
 
-class Reflection < Struct.new(:macro, :primary_key_name, :name, :table_name)
-end
+  class Reflection < Struct.new(:macro, :primary_key_name, :name, :table_name)
+  end
 
-Times = 10000
+  Times = 10000
 
-Benchmark.bm(30) do |x|
-  x.report 'simple select' do
-    Times.times do
-      User.select { |u| u.id == 20 }.to_hash
+  Benchmark.bm(30) do |x|
+    x.report 'simple select' do
+      Times.times do
+        User.select { |u| u.id == 20 }.to_hash
+      end
     end
-  end
 
-  x.report 'simple select w/ eval' do
-    Times.times do
-      User.select { |u| u.created_at == Time.now }.to_hash
+    x.report 'simple select w/ eval' do
+      Times.times do
+        User.select { |u| u.created_at == Time.now }.to_hash
+      end
     end
-  end
 
-  x.report 'dual select' do
-    Times.times do
-      User.select { |u| u.id == 20 && u.age > 20 }.to_hash
+    x.report 'dual select' do
+      Times.times do
+        User.select { |u| u.id == 20 && u.age > 20 }.to_hash
+      end
     end
-  end
 
-  x.report 'join select' do
-    Times.times do
-      User.select { |u| u.id == 20 && u.ideas.name =~ /stuff/ }.to_hash
+    x.report 'join select' do
+      Times.times do
+        User.select { |u| u.id == 20 && u.ideas.name =~ /stuff/ }.to_hash
+      end
     end
-  end
 
-  x.report 'dual select w/ sort' do
-    Times.times do
-      User.select { |u| u.id == 20 && u.age > 20 }.sort_by { |u| u.id }.to_hash
+    x.report 'dual select w/ sort' do
+      Times.times do
+        User.select { |u| u.id == 20 && u.age > 20 }.sort_by { |u| u.id }.to_hash
+      end
     end
-  end
 
-  x.report 'dual select w/ sort & first' do
-    Times.times do
-      User.select { |u| u.id == 20 && u.age > 20 }.sort_by { |u| u.id }.first(20).to_hash
+    x.report 'dual select w/ sort & first' do
+      Times.times do
+        User.select { |u| u.id == 20 && u.age > 20 }.sort_by { |u| u.id }.first(20).to_hash
+      end
     end
-  end
 
-  x.report "it's complicated" do
-    Times.times do
-      User.select { |u| (u.id == 20 && u.age > 20) || u.profile.name == 'Jon' }.sort_by { |u| [u.id, -u.name] }.first(20).to_hash
+    x.report "it's complicated" do
+      Times.times do
+        User.select { |u| (u.id == 20 && u.age > 20) || u.profile.name == 'Jon' }.sort_by { |u| [u.id, -u.name] }.first(20).to_hash
+      end
     end
   end
 end

data/test/helper.rb

@@ -25,6 +25,10 @@ end
 module ActiveRecord
   module ConnectionAdapters
     class MysqlAdapter  
+      def initialize(*args)
+        super
+      end
+
       def connect(*args)
         true
       end

data/test/types_test.rb

@@ -52,6 +52,16 @@ context "Different types" do
     sql.should == "SELECT * FROM users WHERE users.name IS NOT NULL"
   end
 
+  specify "nil?" do
+    sql = User.select { |m| m.name.nil? }.to_s
+    sql.should == "SELECT * FROM users WHERE users.name IS NULL"
+  end
+
+  specify "!nil?" do
+    sql = User.select { |m| !m.name.nil? }.to_s
+    sql.should == "SELECT * FROM users WHERE users.name IS NOT NULL"
+  end
+
   specify "Time" do
     sql = User.select { |m| m.name == Time.now }.to_s
     sql.should == "SELECT * FROM users WHERE users.name = '#{Time.now.to_s(:db)}'"

metadata

@@ -3,8 +3,8 @@ rubygems_version: 0.9.4
 specification_version: 1
 name: ambitious-activerecord
 version: !ruby/object:Gem::Version 
-  version: 0.1.0
-date: 2008-01-29 00:00:00 -08:00
+  version: 0.1.1
+date: 2008-02-16 00:00:00 -08:00
 summary: An ambitious adapter for ActiveRecord
 require_paths: 
 - lib
@@ -89,5 +89,5 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 0.5.0
+        version: 0.5.1
     version: