rquerypad 0.1.11 → 0.1.20

data/CHANGELOG

@@ -1,6 +1,42 @@
+Changes in version 0.1.20 (2009-3-9)
+------------------------------------
+Support rails 2.3
+Changes in version 0.1.19 (2008-11-25)
+-------------------------------------
+fix a bug related to wrong table_name in some status 
+
+Changes in version 0.1.18 (2008-07-11)
+-------------------------------------
+fix a bug related to ` which occurred in rails 2.1
+
+Changes in version 0.1.17 (2008-06-16)
+-------------------------------------
+fix a bug when use model.exists(id)
+
+Changes in version 0.1.16 (2008-05-29)
+-------------------------------------
+fix a bug related to 'like' and 'in' escape in processing conditions
+
+Changes in version 0.1.15 (2008-05-21)
+-------------------------------------
+fix a bug when conditions is simgle String
+
+Changes in version 0.1.14 (2008-05-21)
+-------------------------------------
+fix a bug due to option key missing model identity
+
+Changes in version 0.1.13 (2008-05-21)
+-------------------------------------
+fix a bug when conditions include symbol as later hash's key
+
+Changes in version 0.1.12 (2008-05-13)
+-------------------------------------
+fix bugs about wrong Marshal call in the method related to construct_calculation_sql
+
 Changes in version 0.1.11 (2008-04-29)
 -------------------------------------
 fix bugs about invalid cache for options
+
 Changes in version 0.1.10 (2008-03-26)
 -------------------------------------
 make alias_method name with 4rqp(for rquerypad) suffix to avoid confliction with the 3rd plugins
@@ -45,4 +81,4 @@ support to rails 1.2.6
 
 Changes in version 0.1.0 (2008-03-18)
 -------------------------------------
-fix bug about table_name.field as parameter
+fix bug about table_name.field as parameter

data/README

@@ -1,4 +1,4 @@
-Rquerypad, release 0.1.11 (Apr. 2008)
+Rquerypad, release 0.1.20 (Mar. 2009)
 =========
 Simplify query options with association automation and improve inner join for activerecord of rails
 

data/Rakefile

@@ -1,32 +1,75 @@
+require 'rake'
 require 'rubygems'
 require 'rake/gempackagetask'
+require 'rake/testtask'
+require 'rake/rdoctask'
+
 PKG_NAME = "rquerypad"
-PKG_VERSION = "0.1.11"
+PKG_VERSION = "0.1.20"
 PKG_FILE_NAME = "#{PKG_NAME}-#{PKG_VERSION}"
 PKG_FILES = FileList[
-  '[A-Za-z]*',
+  '[A-Z]*',
   'lib/**/*',
-  'test/**/*',
   'tasks/**/*',
+  'test/**/*'
 ]
 spec = Gem::Specification.new do |s|
   s.platform = Gem::Platform::RUBY
-  s.summary = "Simplify query options with association automation and improve inner join for activerecord of rails"
+  s.summary = "Simplify query with OO way and improve inner join for ActiveRecord"
   s.name = PKG_NAME
   s.version = PKG_VERSION
-  s.requirements << 'none'
   s.require_path = 'lib'
-  s.rubyforge_project = 'rquerypad'
-  #s.executables = ['gem-sample']
-  #s.default_executable = 'gem-sample'
+  s.homepage = %q{http://rquerypad.rubyforge.org/}
+  s.rubyforge_project = 'Rquerypad'
+  s.has_rdoc = false
   s.authors = ["Leon Li"]
   s.email = "scorpio_leon@hotmail.com"
   s.files = PKG_FILES
   s.description = <<-EOF
-    Simplify query options with association automation and improve inner join for activerecord of rails
+    Simplify query options with association automation and improve inner join for ActiveRecord of rails by providing a compact and OO query language instead of writing some explicit join
   EOF
 end
 Rake::GemPackageTask.new(spec) do |pkg|
   pkg.need_zip = true
   pkg.need_tar = true
-end
+end
+
+desc 'Default: run unit tests.'
+task :default => :test
+
+desc 'Test the rquerypad plugin.'
+Rake::TestTask.new(:test) do |t|
+  t.libs << 'lib'
+  t.pattern = 'test/**/*_test.rb'
+  t.verbose = true
+end
+
+desc 'Generate documentation for the rquerypad plugin.'
+Rake::RDocTask.new(:rdoc) do |rdoc|
+  rdoc.rdoc_dir = 'rdoc'
+  rdoc.title    = 'Rquerypad'
+  rdoc.options << '--line-numbers' << '--inline-source'
+  rdoc.rdoc_files.include('README')
+  rdoc.rdoc_files.include('lib/**/*.rb')
+end
+
+desc 'Create the database defined in config/database.yml for the current RAILS_ENV'
+require 'activerecord'
+task :migrate  do
+  config = {'adapter' => "sqlite3", 'database' => "test/db.rquerypad", 'timeout' => 5000}
+  begin
+    FileUtils.rm_f(File.dirname(__FILE__) + "/" + config['database'])
+  rescue
+  end
+  begin
+    ActiveRecord::Base.establish_connection(config)
+    ActiveRecord::Base.connection
+  rescue
+    `sqlite3 "#{config['database']}"`
+  end
+  ActiveRecord::Base.logger = Logger.new(File.dirname(__FILE__) + "/migrate.log")
+  ActiveRecord::Migrator.migrate("test/migrate/")
+end
+
+
+

data/lib/rquerypad.rb

@@ -3,7 +3,6 @@ author: Leon Li(scorpio_leon@hotmail.com)
 =end
 require 'md5'
 class Rquerypad
-  #todo scope support
   class << self
     
     def prepare_with_debug
@@ -12,6 +11,21 @@ class Rquerypad
     def prepare(debug = $RQUERYPAD_DEBUG)
       return nil unless @prepared.nil?
       @prepared = true
+      ActiveRecord::Base.class_eval %{
+        class << self
+        def group_tables(options)
+          group = [options[:group], scope(:find, :group) ].join(", ")
+          return [] unless group && group.is_a?(String)
+          group.scan(/([\.a-zA-Z_]+).?\./).flatten
+        end
+        def include_eager_group?(options, tables = nil)
+          ((tables || group_tables(options)) - [table_name]).any?
+        end
+        def references_eager_loaded_tables?(options)
+          include_eager_order?(options) || include_eager_conditions?(options) || include_eager_select?(options) || include_eager_group?(options)
+        end
+        end
+      }
       ActiveRecord::Base.class_eval %{
         require "rquerypad"
         
@@ -25,7 +39,7 @@ class Rquerypad
             if !options.empty? && (options.include?(:conditions) || options.include?(:group) || options.include?(:order))
             #  if (!options.empty? && (!options[:conditions].nil? || !options[:group].nil? || !options[:order].nil?))
 	            #{"p 'original options:', options" if debug}
-	            cache_key = Rquerypad.options_key(options)
+	            cache_key = Rquerypad.options_key(self, options)
               #p "cache_key: #\{cache_key\}"
               #p "rquerypad_cache[cache_key]: #\{rquerypad_cache[cache_key]\}"
 	            if rquerypad_cache[cache_key].nil?
@@ -63,13 +77,13 @@ class Rquerypad
           def construct_calculation_sql(operation, column_name, options)
             if !options.empty? && (options.include?(:conditions) || options.include?(:group) || options.include?(:order))
               #{"p 'original options:', options" if debug}
-              cache_key = Rquerypad.options_key(options)
+              cache_key = Rquerypad.options_key(self, options)
               if rquerypad_cache[cache_key].nil?
                 #{"p 'process for:', options" if debug}
                 Rquerypad.new(self).improve_options!(options)
-                rquerypad_cache[cache_key] = Marshal.load(Marshal.dump(options))
+                rquerypad_cache[cache_key] = Marshal.dump(options)
               else
-                options = rquerypad_cache[cache_key]
+                options = Marshal.load(rquerypad_cache[cache_key])
               end
               #{"p 'new options:', options" if debug}
             end
@@ -110,8 +124,8 @@ class Rquerypad
       sql
     end
     
-    def options_key(options)
-      key = options.to_a.to_s
+    def options_key(obj, options)
+      key = obj.to_s + options.to_a.to_s
       key = MD5.hexdigest(key) if key.length > 100
       key
     end
@@ -119,7 +133,8 @@ class Rquerypad
   def initialize(obj)
     @owner = obj
     @class_name = obj.to_s.scan(/(\w*::)*([^\(]*)/)[0][1]
-    @table_name = @class_name.pluralize.underscore
+    #@table_name = @class_name.pluralize.underscore
+	 @table_name = obj.table_name 
     @tnwithdot = @table_name + "."
     @new_include = []
     @old_include = nil
@@ -130,11 +145,12 @@ class Rquerypad
     
     option_hash.each do |key, value|
       next if value.blank?
-      if key.to_s == "conditions"
+      key_str = key.to_s
+      if key_str == "conditions"
         option_hash[key] = improve_conditions(value)
-      elsif (key.to_s == "order" || key.to_s == "group" || key.to_s == "group_field")
+      elsif (key_str == "order" || key_str == "group" || key_str == "group_field")
         option_hash[key] = improve_ordergroup(value).join(", ")
-      elsif (key.to_s == "include")
+      elsif (key_str == "include")
         @old_include = value
       end
     end
@@ -189,17 +205,37 @@ class Rquerypad
   end
   
   def improve_conditions(options)
-    if options.is_a?(Array)
+
+    if options.is_a?(Hash)
+      #work around frozen issue
+      new_options = {}
+      until options.empty?
+        key, value = options.shift
+        key = key.to_s.dup
+        new_options[process_single!(key)] = value
+      end
+      options.merge!(new_options)
+    else
+      if options.is_a?(String)
+        options = [options]
+      end
       str = options[0]
-      temp = str.scan(/'.*?'/)
+      return nil if str.nil?
+      qp = /['"][^."]*['"]/
+      temp = str.scan(qp)
       #replace string in quote to avoid unecessary processing
-      str.gsub!(/'.*?'/, "'[??]'") unless temp.empty?
+      str.gsub!(qp, "'[??]'") unless temp.empty?
       str.gsub!(/(([\w\(\)]+\.)+\w+)[ !><=]/) do |n|
         #cut last char and abstract association for include
-        abstract_association(n[0..-2]) + n[-1, 1]
+        if n =~ /^\(/
+          '(' + abstract_association(n[1..-2]) + n[-1, 1]
+        else
+          abstract_association(n[0..-2]) + n[-1, 1]
+        end
+        
       end
       #add @table_name on single field
-      str.gsub!(/[\.]?\w+[\.]?/) {|x| x[-1, 1] == "." || ["and", "or", "is", "null", "not"].include?(x.downcase) ? x : @tnwithdot + x}
+      str.gsub!(/[\.:]?[`"']?\w+[`"']?[\.]?/) {|x| (x =~ /\D+/).nil? || x[-1, 1] == "." || x[0, 1] == ":" || ["and", "or", "is", "null", "not", "like", "in"].include?(x.downcase) ? x : @tnwithdot + x}
       str.gsub!(/\.#{@table_name}\./, ".")
       #recover string in quote
       unless temp.empty?
@@ -211,20 +247,11 @@ class Rquerypad
       end
       options[0] = str
     end
-    if options.is_a?(Hash)
-      #work around frozen issue
-      new_options = {}
-      until options.empty?
-        key, value = options.shift
-        key = key.to_s.dup
-        new_options[process_single!(key)] = value
-      end
-      options.merge!(new_options)
-    end
     options
   end
   
   def process_single!(key)
+    return key.sub!('=', '') if key[0, 1] == '='
     if key.include?(".")
       if /^(.+)[ ]/ =~ key
         key.sub!("#$1", abstract_association("#$1"))
@@ -252,12 +279,13 @@ class Rquerypad
     owners = []
     #get relevant owner for each table
     tables.each_index do |i|
+      #tables[i] = tables[i].pluralize
       if i == 0
         owners[i] = owner
       else
         tname = cut_end_underscore(tables[i-1])
         r = owners[i-1].reflections[tname.to_sym].options
-        owners[i] = r[:class_name].nil? ? eval(owners[i-1].to_s.gsub(/\w*$/, "")+tname.singularize.camelize) : Util::Common.str2class(r[:class_name])
+        owners[i] = r[:class_name].nil? ? eval(owners[i-1].to_s.gsub(/\w*$/, "")+tname.singularize.camelize) : eval("#{r[:class_name]}")
       end
     end
     owners.reverse!
@@ -300,6 +328,7 @@ class Rquerypad
   end
   
   def transfer_table_name(name, owner = @owner)
+    #p "=======================================", name,"=======================================", owner.inspect, "=======================================", owner.reflections.inspect, "=======================================" if  owner.reflections[name.to_sym].nil?
     owner.reflections[name.to_sym].class_name.gsub(/([\w]+::)*/, "").pluralize.underscore
   end
   

data/test/fixtures/{replies.yml → forum_replies.yml}

@@ -1,25 +1,25 @@
 reply_one:
   id: 1
   title: "rquerypad"
-  thread_id: 1
+  forum_thread_id: 1
   user_id: 1
   
 reply_two:
   id: 2
   title: "thank you"
-  thread_id: 2
+  forum_thread_id: 2
   user_id: 2
   
 reply_three:
   id: 3
   title: "thank you-1"
-  thread_id: 2
+  forum_thread_id: 2
   parent_id: 2
   user_id: 2
 
 reply_four:
   id: 4
   title: "thank you-2"
-  thread_id: 2
+  forum_thread_id: 2
   parent_id: 2
   user_id: 2

data/test/migrate/002_create_threads.rb

@@ -1,6 +1,6 @@
 class CreateThreads < ActiveRecord::Migration
   def self.up
-    create_table :threads do |t|
+    create_table :forum_threads do |t|
       t.string  "title"
       t.string  "content"
       t.integer "user_id"
@@ -10,6 +10,6 @@ class CreateThreads < ActiveRecord::Migration
   end
 
   def self.down
-    drop_table :threads
+    drop_table :forum_threads
   end
 end

data/test/migrate/003_create_replies.rb

@@ -1,10 +1,10 @@
 class CreateReplies < ActiveRecord::Migration
   def self.up
-    create_table :replies do |t|
+    create_table :forum_replies do |t|
       t.string  "title"
       t.string  "content"
       t.integer "user_id"
-      t.integer "thread_id"
+      t.integer "forum_thread_id"
       t.integer "parent_id"
       t.datetime  "created_at"
       t.datetime  "updated_at"
@@ -12,6 +12,6 @@ class CreateReplies < ActiveRecord::Migration
   end
 
   def self.down
-    drop_table :replies
+    drop_table :forum_replies
   end
 end

data/test/model.rb

@@ -1,16 +1,16 @@
 module Model
   class User < ActiveRecord::Base
-    has_many :threads
-    has_many :replies
+    has_many :threads, :class_name => "Model::ForumThread"
+    has_many :repliess, :class_name => "Model::ForumReply"
   end
-  class Thread < ActiveRecord::Base
-    has_many :replies
+  class ForumThread < ActiveRecord::Base
+    has_many :replies, :class_name => "Model::ForumReply"
     belongs_to :user
   end
-  class Reply < ActiveRecord::Base
-    belongs_to :thread
-    has_many :replies
-    belongs_to :reply, :foreign_key => "parent_id"
+  class ForumReply < ActiveRecord::Base
+    belongs_to :thread, :class_name => "Model::ForumThread"
+    has_many :replies, :class_name => "Model::ForumReply"
+    belongs_to :reply, :foreign_key => "parent_id", :class_name => "Model::ForumReply"
     belongs_to :user
     acts_as_tree
   end

data/test/rquerypad_test.rb

@@ -3,23 +3,33 @@ require File.dirname(__FILE__) + '/test_helper'
 
 require 'rquerypad'
 require 'test/model'
-class RquerypadTest < Test::Unit::TestCase
+class RquerypadTest < THE_TEST_CLASS
   # Replace this with your real tests.
   include Model
   def test_this_plugin
     @fixture_path = 'vendor/plugins/rquerypad/test/fixtures'
     
     @users = User.find(:all, :group => ["threads.created_at", "name"])
+    p @users
     assert_equal  @users.size, 2
-    
+
     c = User.count(:conditions => ["threads_.replies.title = ?", "rquerypad"])
     assert_equal  c, 1
-    
+
     @users = User.find(:all, :conditions => ["threads.replies.title = ? and threads.id = ?", "rquerypad", 1])
     assert_equal  @users.size, 1
-    
-    @replies = Reply.find(:all, :conditions => ["thread.id = ?", 2])
-    assert_equal  @replies.size, 3
+
+    @users = User.find(:all, :conditions => ["threads.replies.title = :title and threads.id = :id", {:title => "rquerypad", :id => 1}])
+   assert_equal  @users.size, 1
+
+    @replies = ForumReply.find(:all, :conditions => ["thread.id = ?", 2])
+   assert_equal  @replies.size, 3
+
+    @replies = ForumReply.find(:all, :conditions => ["id = ?", 2])
+    assert_equal  @replies.size, 1
+
+    @replies = User.find(:all, :conditions => ["id = ?", 2])
+   assert_equal  @replies.size, 1
 
   end
 end

data/test/test_helper.rb

@@ -1,43 +1,10 @@
-require 'rubygems'
-$LOAD_PATH.unshift File.dirname(__FILE__) + '/../lib'
-
-require 'rquerypad'
-
 ENV["RAILS_ENV"] = "rquerypad"
-#require File.expand_path(File.dirname(__FILE__) + "/../../../../config/environment")
+require File.expand_path(File.dirname(__FILE__) + "/../../../../config/environment")
 require 'test_help'
-Test::Unit::TestCase.fixture_path = File.expand_path(File.dirname(__FILE__) + "/fixtures/")
-class Test::Unit::TestCase
-  # Transactional fixtures accelerate your tests by wrapping each test method
-  # in a transaction that's rolled back on completion.  This ensures that the
-  # test database remains unchanged so your fixtures don't have to be reloaded
-  # between every test method.  Fewer database queries means faster tests.
-  #
-  # Read Mike Clark's excellent walkthrough at
-  #   http://clarkware.com/cgi/blosxom/2005/10/24#Rails10FastTesting
-  #
-  # Every Active Record database supports transactions except MyISAM tables
-  # in MySQL.  Turn off transactional fixtures in this case; however, if you
-  # don't care one way or the other, switching from MyISAM to InnoDB tables
-  # is recommended.
-  #
-  # The only drawback to using transactional fixtures is when you actually 
-  # need to test transactions.  Since your test is bracketed by a transaction,
-  # any transactions started in your code will be automatically rolled back.
+THE_TEST_CLASS = eval(RAILS_GEM_VERSION >= "2.3" ? "ActiveSupport::TestCase" : "Test::Unit::TestCase")
+THE_TEST_CLASS.fixture_path = File.expand_path(File.dirname(__FILE__) + "/fixtures/")
+class THE_TEST_CLASS
   self.use_transactional_fixtures = true
-
-  # Instantiated fixtures are slow, but give you @david where otherwise you
-  # would need people(:david).  If you don't want to migrate your existing
-  # test cases which use the @david style and don't mind the speed hit (each
-  # instantiated fixtures translates to a database query per test method),
-  # then set this back to true.
   self.use_instantiated_fixtures  = false
-
-  # Setup all fixtures in test/fixtures/*.(yml|csv) for all tests in alphabetical order.
-  #
-  # Note: You'll currently still have to declare fixtures explicitly in integration tests
-  # -- they do not yet inherit this setting
   fixtures :all
-
-  # Add more helper methods to be used by all tests here...
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: rquerypad
 version: !ruby/object:Gem::Version 
-  version: 0.1.11
+  version: 0.1.20
 platform: ruby
 authors: 
 - Leon Li
@@ -9,11 +9,11 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-05-04 00:00:00 +08:00
+date: 2009-03-09 00:00:00 +08:00
 default_executable: 
 dependencies: []
 
-description: Simplify query options with association automation and improve inner join for activerecord of rails
+description: Simplify query options with association automation and improve inner join for ActiveRecord of rails by providing a compact and OO query language instead of writing some explicit join
 email: scorpio_leon@hotmail.com
 executables: []
 
@@ -22,30 +22,25 @@ extensions: []
 extra_rdoc_files: []
 
 files: 
-- CHANGELOG
-- lib
 - MIT-LICENSE
-- pkg
 - Rakefile
+- CHANGELOG
 - README
-- tasks
-- test
 - lib/rquerypad.rb
-- test/db.rquerypad
+- tasks/rquerypad_tasks.rake
+- test/test_helper.rb
+- test/rquerypad_test.rb
+- test/model.rb
 - test/fixtures
-- test/fixtures/replies.yml
-- test/fixtures/threads.yml
+- test/fixtures/forum_replies.yml
 - test/fixtures/users.yml
+- test/fixtures/forum_threads.yml
 - test/migrate
+- test/migrate/003_create_replies.rb
 - test/migrate/001_create_users.rb
 - test/migrate/002_create_threads.rb
-- test/migrate/003_create_replies.rb
-- test/model.rb
-- test/rquerypad_test.rb
-- test/test_helper.rb
-- tasks/rquerypad_tasks.rake
 has_rdoc: false
-homepage: 
+homepage: http://rquerypad.rubyforge.org/
 post_install_message: 
 rdoc_options: []
 
@@ -63,12 +58,12 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version 
       version: "0"
   version: 
-requirements: 
-- none
-rubyforge_project: rquerypad
-rubygems_version: 1.0.1
+requirements: []
+
+rubyforge_project: Rquerypad
+rubygems_version: 1.3.1
 signing_key: 
 specification_version: 2
-summary: Simplify query options with association automation and improve inner join for activerecord of rails
+summary: Simplify query with OO way and improve inner join for ActiveRecord
 test_files: []