ambition 0.2.0 → 0.2.1

data/Manifest

@@ -1,21 +1,20 @@
 ./init.rb
-./lib/ambition/count.rb
+./lib/ambition/api.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/select_processor.rb
+./lib/ambition/simple_processor.rb
+./lib/ambition/sort_processor.rb
 ./lib/ambition.rb
 ./LICENSE
 ./Manifest
 ./Rakefile
 ./README
+./test/benchmark.rb
 ./test/chaining_test.rb
 ./test/console
-./test/constructive_test.rb
 ./test/count_test.rb
 ./test/databases/boot.rb
 ./test/databases/database.yml
@@ -35,11 +34,12 @@
 ./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
 ./test/limit_test.rb
+./test/mocks_test.rb
 ./test/order_test.rb
+./test/profiler.rb
 ./test/types_test.rb
 ./test/where_test.rb

data/Rakefile

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

data/lib/ambition.rb

@@ -2,24 +2,12 @@ unless defined? ActiveRecord
   require 'rubygems'
   require 'active_record' 
 end
-require 'ambition/proc_to_ruby'
+require 'ambition/api'
 require 'ambition/processor'
+require 'ambition/select_processor'
+require 'ambition/sort_processor'
+require 'ambition/simple_processor'
 require 'ambition/query'
-require 'ambition/where'
-require 'ambition/order'
-require 'ambition/limit'
-require 'ambition/count'
-require 'ambition/enumerable'
 require 'ambition/database_statements'
 
-module Ambition 
-  include Where, Order, Limit, Enumerable, Count
-
-  attr_accessor :query_context
-
-  def query_context
-    @query_context || Query.new(self)
-  end
-end
-
-ActiveRecord::Base.extend Ambition
+ActiveRecord::Base.extend Ambition::API

data/lib/ambition/api.rb

@@ -0,0 +1,73 @@
+module Ambition
+  module API
+    include Enumerable
+
+    attr_accessor :query_context 
+    def query_context
+      @query_context || Query.new(self)
+    end
+
+    def entries
+      find(:all, query_context.to_hash)
+    end
+    alias_method :to_a, :entries
+
+    def select(*args, &block)
+      query_context.add SelectProcessor.new(self, block)
+    end
+
+    def first(limit = 1)
+      query_context.add SimpleProcessor.new(:limit => limit)
+
+      if limit == 1
+        find(:first, query_context.to_hash)
+      else
+        query_context
+      end
+    end
+
+    def slice(offset, limit = nil)
+      if offset.is_a? Range
+        limit  = offset.end
+        limit -= 1 if offset.exclude_end?
+        offset = offset.first
+        limit -= offset
+      elsif limit.nil?
+        return find(offset)
+      end
+
+      query_context.add SimpleProcessor.new(:offset => offset)
+      query_context.add SimpleProcessor.new(:limit  => limit)
+    end
+    alias_method :[], :slice
+
+    def sort_by(&block)
+      query_context.add SortProcessor.new(self, block)
+    end
+
+    def detect(&block)
+      select(&block).first
+    end
+
+    def size
+      count(query_context.to_hash)
+    end
+    alias_method :length, :size
+
+    def each(&block)
+      entries.each(&block)
+    end
+
+    def any?(&block)
+      select(&block).size > 0
+    end
+
+    def all?(&block)
+      size == select(&block).size
+    end
+
+    def empty?
+      size.zero?
+    end
+  end
+end

data/lib/ambition/proc_to_ruby.rb

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

data/lib/ambition/processor.rb

@@ -1,4 +1,5 @@
 require 'active_record/connection_adapters/abstract/quoting'
+require 'ambition/proc_to_ruby'
 
 module Ambition
   class Processor 
@@ -29,7 +30,6 @@ module Ambition
 
     def process_array(exp)
       arrayed = exp.map { |m| process(m) }
-      exp.clear
       return arrayed.join(', ')
     end
 
@@ -52,18 +52,26 @@ module Ambition
       when Regexp
         "'#{value.source}'"
       else 
-        ActiveRecord::Base.connection.quote(value) 
+        if active_connection?
+          ActiveRecord::Base.connection.quote(value) 
+        else
+          quote(value)
+        end
       end
-    rescue ActiveRecord::ConnectionNotEstablished
-      quote(value)
     rescue
       "'#{value}'"
     end
     
     def quote_column_name(value)
-      ActiveRecord::Base.connection.quote_column_name(value) 
-    rescue ActiveRecord::ConnectionNotEstablished
-      value.to_s
+      if active_connection?
+        ActiveRecord::Base.connection.quote_column_name(value) 
+      else
+        value.to_s
+      end
+    end
+
+    def active_connection?
+      ActiveRecord::Base.active_connection_name
     end
 
     def statement(*args)

data/lib/ambition/{where.rb → select_processor.rb}

@@ -1,15 +1,5 @@
 module Ambition
-  module Where
-    def select(*args, &block)
-      query_context.add WhereProcessor.new(self, block)
-    end
-
-    def detect(&block)
-      select(&block).first
-    end
-  end
-
-  class WhereProcessor < Processor 
+  class SelectProcessor < Processor 
     def initialize(owner, block)
       super()
       @receiver    = nil
@@ -31,7 +21,6 @@ module Ambition
 
     def process_not(exp)
       type, receiver, method, other = *exp.first
-      exp.clear
 
       case type
       when :call
@@ -39,14 +28,15 @@ module Ambition
       when :match3
         regexp = receiver.last
         "#{process(method)} #{statement(:negated_regexp, regexp)} #{sanitize(regexp)}"
+      else
+        process_error(exp)
       end
     end
 
     def process_call(exp)
       receiver, method, other = *exp
-      exp.clear
 
-      return translation(receiver, method, other)
+      translation(receiver, method, other)
     end
 
     def process_lit(exp)
@@ -77,9 +67,9 @@ module Ambition
     def process_dvar(exp)
       target = exp.shift
       if target == @receiver
-        return @table_name
+        @table_name
       else
-        return value(target.to_s[0..-1])
+        value(target.to_s[0..-1])
       end
     end
 
@@ -100,7 +90,6 @@ module Ambition
     end
 
     def process_attrasgn(exp)
-      exp.clear
       raise "Assignment not supported.  Maybe you meant ==?"
     end
 
@@ -111,7 +100,7 @@ module Ambition
       while clause = exp.shift
         clauses << clause
       end
-      return "(" + clauses.map { |c| process(c) }.join(" #{with} ") + ")"
+      "(" + clauses.map { |c| process(c) }.join(" #{with} ") + ")"
     end
 
     def value(variable)

data/lib/ambition/simple_processor.rb

@@ -0,0 +1,10 @@
+module Ambition
+  class SimpleProcessor 
+    attr_reader  :key, :value
+    alias_method :to_s, :value
+
+    def initialize(info = {})
+      @key, @value = info.to_a.first
+    end
+  end
+end

data/lib/ambition/{order.rb → sort_processor.rb}

@@ -1,11 +1,5 @@
 module Ambition
-  module Order
-    def sort_by(&block)
-      query_context.add OrderProcessor.new(self, block)
-    end
-  end
-
-  class OrderProcessor < Processor 
+  class SortProcessor < Processor 
     def initialize(owner, block)
       super()
       @receiver    = nil

data/test/benchmark.rb

@@ -0,0 +1,62 @@
+$:.unshift File.dirname(__FILE__) + '/../lib'
+$NO_TEST = true
+%w( ambition rubygems 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
+
+  def self.table_name
+    'users'
+  end
+end
+
+class Reflection < Struct.new(:macro, :primary_key_name, :name, :table_name)
+end
+
+Times = 1000
+
+Benchmark.bm(30) do |x|
+  x.report 'simple select' do
+    Times.times do
+      User.select { |u| u.id == 20 }.to_hash
+    end
+  end
+
+  x.report 'dual select' do
+    Times.times do
+      User.select { |u| u.id == 20 && u.age > 20 }.to_hash
+    end
+  end
+
+  x.report 'join select' do
+    Times.times do
+      User.select { |u| u.id == 20 && u.ideas.name =~ /stuff/ }.to_hash
+    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
+    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
+    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
+    end
+  end
+end

data/test/mocks_test.rb

@@ -0,0 +1,29 @@
+#require File.dirname(__FILE__) + '/helper'
+#
+#context "Setting the ambition_source" do
+#  setup do
+#    @users = [
+#      OpenStruct.new(:name => 'Chris', :age => 22),
+#      OpenStruct.new(:name => 'PJ',    :age => 24),
+#      OpenStruct.new(:name => 'Kevin', :age => 23),
+#      OpenStruct.new(:name => '_why',  :age => 65)
+#    ]
+#    User.ambition_source = @users
+#  end
+#
+#  teardown do
+#    User.ambition_source = nil
+#  end
+#
+#  xspecify "should run all selects /  detects against that collection" do
+#    User.detect { |u| u.name == 'Chris' }.should == @users.first
+#  end
+#
+#  specify "should run all sorts against that collection" do
+#    User.sort_by { |u| -u.age }.entries.should == @users.sort_by { |u| -u.age }
+#  end
+#
+#  xspecify "should chain successfully" do
+#    User.select { |u| u.age > 22 }.sort_by { |u| -u.age }.entries.should == [ @users[3], @users[1], @users[2] ]
+#  end
+#end

data/test/profiler.rb

@@ -0,0 +1,34 @@
+$:.unshift File.dirname(__FILE__) + '/../lib'
+require 'ambition'
+require 'ruby-prof'
+
+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'
+  end
+end
+
+class Reflection < Struct.new(:macro, :primary_key_name, :name, :table_name)
+end
+
+result = RubyProf.profile do
+  1000.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
+
+printer = RubyProf::FlatPrinter.new(result)
+#printer = RubyProf::GraphPrinter.new(result)
+printer.print(STDOUT, 0) 
+
+puts User.select { |u| (u.id == 20 && u.age > 20) || u.profile.name == 'Jon' }.sort_by { |u| [u.id, -u.name] }.first(20).to_hash.inspect

metadata

@@ -3,8 +3,8 @@ rubygems_version: 0.9.0
 specification_version: 1
 name: ambition
 version: !ruby/object:Gem::Version 
-  version: 0.2.0
-date: 2007-09-04 00:00:00 -07:00
+  version: 0.2.1
+date: 2007-09-10 00:00:00 -07:00
 summary: Ambition builds SQL from plain jane Ruby.
 require_paths: 
 - lib
@@ -30,23 +30,22 @@ authors:
 - Chris Wanstrath
 files: 
 - ./init.rb
-- ./lib/ambition/count.rb
+- ./lib/ambition/api.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/select_processor.rb
+- ./lib/ambition/simple_processor.rb
+- ./lib/ambition/sort_processor.rb
 - ./lib/ambition.rb
 - ./LICENSE
 - ./Manifest
 - ./Rakefile
 - ./README
+- ./test/benchmark.rb
 - ./test/chaining_test.rb
 - ./test/console
-- ./test/constructive_test.rb
 - ./test/count_test.rb
 - ./test/databases/boot.rb
 - ./test/databases/database.yml
@@ -66,22 +65,22 @@ files:
 - ./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
 - ./test/limit_test.rb
+- ./test/mocks_test.rb
 - ./test/order_test.rb
+- ./test/profiler.rb
 - ./test/types_test.rb
 - ./test/where_test.rb
 test_files: 
 - test/chaining_test.rb
-- test/constructive_test.rb
 - test/count_test.rb
-- test/destructive_test.rb
 - test/enumerable_test.rb
 - test/join_test.rb
 - test/limit_test.rb
+- test/mocks_test.rb
 - test/order_test.rb
 - test/types_test.rb
 - test/where_test.rb

data/lib/ambition/count.rb

@@ -1,8 +0,0 @@
-module Ambition
-  module Count
-    def size
-      count(query_context.to_hash)
-    end
-    alias_method :length, :size
-  end
-end

data/lib/ambition/enumerable.rb

@@ -1,26 +0,0 @@
-module Ambition
-  module Enumerable
-    include ::Enumerable
-
-    def each(&block)
-      entries.each(&block)
-    end
-
-    def any?(&block)
-      select(&block).size > 0
-    end
-
-    def all?(&block)
-      size == select(&block).size
-    end
-
-    def empty?
-      size.zero?
-    end
-
-    def entries
-      find(:all, query_context.to_hash)
-    end
-    alias_method :to_a, :entries
-  end
-end

data/lib/ambition/limit.rb

@@ -1,57 +0,0 @@
-module Ambition
-  module Limit
-    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 slice(offset, limit = nil)
-
-      if offset.is_a? Range
-        limit  = offset.end
-        limit -= 1 if offset.exclude_end?
-        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
-  end
-
-  class LimitProcessor 
-    def initialize(limit)
-      @limit = limit
-    end
-
-    def key
-      :limit
-    end
-
-    def to_s
-      @limit
-    end
-  end
-
-  class OffsetProcessor
-    def initialize(offset)
-      @offset = offset
-    end
-
-    def key
-      :offset
-    end
-
-    def to_s
-      @offset
-    end
-  end
-end

data/test/constructive_test.rb

@@ -1,16 +0,0 @@
-require File.dirname(__FILE__) + '/helper'
-
-
-context "Constructive" do
-  xspecify "concat" do
-  end
-
-  xspecify "<<" do
-  end
-
-  xspecify "+=" do
-  end
-
-  xspecify "push" do
-  end
-end

data/test/destructive_test.rb

@@ -1,21 +0,0 @@
-require File.dirname(__FILE__) + '/helper'
-
-context "Destructive" do
-  xspecify "clear" do
-  end
-  
-  xspecify "delete" do
-  end
-
-  xspecify "delete_if" do
-  end
-
-  xspecify "<<" do
-  end
-
-  xspecify "concat" do
-  end
-
-  xspecify "delete_at" do
-  end
-end