ambition 0.1.3 → 0.1.4

data/README

@@ -178,13 +178,21 @@ still query through ActiveRecord just fine.
 
 == Other Enumerables
 
-  These methods perform COUNT() operations rather than loading your array into memory.  They're all 
-  kickers.
+These methods perform COUNT() operations rather than loading your array into memory.  They're all 
+kickers.
   
   User.any? { |m| m.name == 'jon' }
   User.all? { |m| m.name == 'jon' }
   User.select { |m| m.name == 'jon' }.empty?
 
+== More Sugar
+
+The +downcase+ and +upcase+ methods will map to LOWER() and UPPER(), respectively.
+
+  >> User.select { |m| m.name.downcase =~ 'jon%' }.to_sql
+  => "SELECT * FROM users WHERE LOWER(users.`name`) LIKE 'jon%'"
+  
+
 == SELECT * FROM bugs 
 
 Found a bug?  Sweet.  Add it at the Lighthouse: http://err.lighthouseapp.com/projects/466-plugins/tickets/new

data/Rakefile

@@ -2,13 +2,27 @@ require 'rake'
 require 'rake/testtask'
 require 'rake/rdoctask'
 
+Version = '0.1.4'
+
+module Rake::TaskManager
+  def redefine_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
+end
+def redefine_task(args, &block) Rake::Task.redefine_task(args, &block) end
+
 begin
   require 'rubygems'
   gem 'echoe', '=1.3'
   ENV['RUBY_FLAGS'] = ""
   require 'echoe'
 
-  Echoe.new('ambition', '0.1.3') do |p|
+  Echoe.new('ambition', Version) do |p|
     p.rubyforge_name = 'err'
     p.summary = "Ambition builds SQL from plain jane Ruby."
     p.description = "Ambition builds SQL from plain jane Ruby."
@@ -23,6 +37,12 @@ begin
 rescue LoadError 
 end
 
+redefine_task(:test) { }
+
+Rake::TestTask.new('test') do |t|
+  t.pattern = 'test/*_test.rb'
+end
+
 desc 'Default: run unit tests.'
 task :default => :test
 

data/lib/ambition/where.rb

@@ -63,7 +63,7 @@ module Ambition
     end
 
     def process_match3(exp)
-      regexp, target = exp.shift.last.inspect.gsub('/',''), process(exp.shift)
+      regexp, target = exp.shift.last.inspect.gsub(/\/([^\/]+)\/\S*/, '\1'), process(exp.shift)
       "#{target} REGEXP '#{regexp}'"
     end
 
@@ -121,11 +121,16 @@ module Ambition
         raise "Not implemented: #{method}"
       end
     end
-
+    
     def translation(receiver, method, other)
       case method.to_s
       when '=='
-        "#{process(receiver)} = #{process(other)}"
+        case other_value = process(other)
+        when "NULL"
+          "#{process(receiver)} is #{other_value}"
+        else
+          "#{process(receiver)} = #{other_value}"
+        end
       when '<>', '>', '<'
         "#{process(receiver)} #{method} #{process(other)}"
       when 'include?'
@@ -134,8 +139,12 @@ module Ambition
         "#{process(receiver)} LIKE #{process(other)}"
       when '!~'
         "#{process(receiver)} NOT LIKE #{process(other)}"
+      when 'upcase'
+        "UPPER(#{process(receiver)})"
+      when 'downcase'
+        "LOWER(#{process(receiver)})"
       else
-        extract_includes(receiver, method) || "#{process(receiver)}.`#{method}` #{process(other)}"
+        extract_includes(receiver, method) || "#{process(receiver)}.`#{method}`"
       end
     end
   end

data/test/types_test.rb

@@ -8,7 +8,6 @@ context "Different types" do
     :symbol  => "'--- :symbol\n'",
     1        => '1',
     1.2      => '1.2',
-    nil      => 'NULL',
     true     => '1',
     false    => '0',
     Time.now     => "'#{Time.now.to_s(:db)}'",
@@ -27,17 +26,17 @@ context "Different types" do
     sql = User.select { |m| m.name == 1.2 }.to_sql
     sql.should == "SELECT * FROM users WHERE users.`name` = 1.2"
   end
-
+  
   specify "integer" do
     sql = User.select { |m| m.name == 1 }.to_sql
     sql.should == "SELECT * FROM users WHERE users.`name` = 1"
   end
-
+  
   specify "true" do
     sql = User.select { |m| m.name == true }.to_sql
     sql.should == "SELECT * FROM users WHERE users.`name` = 1"
   end
-
+  
   specify "false" do
     sql = User.select { |m| m.name == false }.to_sql
     sql.should == "SELECT * FROM users WHERE users.`name` = 0"
@@ -45,7 +44,7 @@ context "Different types" do
 
   specify "nil" do
     sql = User.select { |m| m.name == nil }.to_sql
-    sql.should == "SELECT * FROM users WHERE users.`name` = NULL"
+    sql.should == "SELECT * FROM users WHERE users.`name` is NULL"
   end
 
   xspecify "Time" do

data/test/where_test.rb

@@ -109,14 +109,25 @@ context "Where (using select)" do
     sql.should == "SELECT * FROM users WHERE users.`name` REGEXP 'chris'"
   end
 
+  specify "simple =~ with regexp flags" do
+    sql = User.select { |m| m.name =~ /chris/i }.to_sql
+    sql.should == "SELECT * FROM users WHERE users.`name` REGEXP 'chris'"
+  end
+
+  specify "simple LOWER()" do
+    sql = User.select { |m| m.name.downcase =~ 'chris%' }.to_sql
+    sql.should == "SELECT * FROM users WHERE LOWER(users.`name`) LIKE 'chris%'"
+  end
+
+  specify "simple UPPER()" do
+    sql = User.select { |m| m.name.upcase =~ 'chris%' }.to_sql
+    sql.should == "SELECT * FROM users WHERE UPPER(users.`name`) LIKE 'chris%'"
+  end
+
   specify "undefined equality symbol" do
     should.raise { User.select { |m| m.name =* /chris/ }.to_sql }
   end
   
-  specify "undefined inequality symbol" do
-    should.raise { User.select { |m| m.name !+ 'chris' }.to_sql }
-  end
-
   xspecify "simple == with inline ruby" do
     # TODO: implement this
     sql = User.select { |m| m.created_at == 2.days.ago.to_s(:db) }.to_sql

metadata

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