rquerypad 0.1.21 → 0.1.22

data/CHANGELOG

@@ -1,3 +1,6 @@
+Changes in version 0.1.22 (2009-4-30)
+refactoring remove_dup_includes and fix related bugs
+
 Changes in version 0.1.21 (2009-4-14)
 rquerypad will not change original options to avoid side effect
 

data/README

@@ -1,4 +1,4 @@
-Rquerypad, release 0.1.20 (Mar. 2009)
+Rquerypad
 =========
 Simplify query options with association automation and improve inner join for activerecord of rails
 
@@ -41,7 +41,7 @@ $RQUERYPAD_DEBUG = true
 
 Test
 =======
-Note: current migrate script works only in rails 2.0
+Note: current migrate script works only in rails 2.0 or later
 
 1.Prepare
 

data/Rakefile

@@ -5,7 +5,7 @@ require 'rake/testtask'
 require 'rake/rdoctask'
 
 PKG_NAME = "rquerypad"
-PKG_VERSION = "0.1.21"
+PKG_VERSION = "0.1.22"
 PKG_FILE_NAME = "#{PKG_NAME}-#{PKG_VERSION}"
 PKG_FILES = FileList[
   '[A-Z]*',

data/lib/rquerypad.rb

@@ -98,25 +98,7 @@ class Rquerypad
           end
         end
             }
-      
-            Hash.class_eval do
-                def single_lt?(other)
-                    return false if self == other
-                    return true if self.size == 0
-                    return false unless other.is_a?(Hash)
-                    return false if other.nil? || other.size < self.size
-                    return false if self.size != other.size || self.size > 1
-                    a = self.to_a[0]
-                    o = other.to_a[0]
-                    return false if a[0] != o[0]
-                    return true unless a[1].is_a?(Hash)
-                    a[1].single_lt?(o[1])
-                end
-                def single_gt?(other)
-                    return false if self == other
-                    return !(single_lt?(other))
-                end
-            end
+
         end
     
         def process_inner_join(sql, inner_joins)
@@ -163,48 +145,32 @@ class Rquerypad
         return new_options if @new_include.empty?
         # #generate new include
     
-        remove_dup_includes
+        
         unless @new_include.nil?
             new_options[:include] ||= []
+            new_options[:include] = [new_options[:include] ] unless new_options[:include] .is_a?(Array)
             new_options[:include]  += @new_include
-            new_options[:include].uniq!
         end
+        new_options[:include] = remove_dup_includes(new_options[:include])
+
         new_options[:inner_joins] = @inner_joins unless @inner_joins.empty?
         new_options
     end
-  
-    def remove_dup_includes
-        final_includes = []
-        @new_include.each do |ni|
-            next if final_includes.include?(ni)
-            if final_includes.size > 0
-                final_includes.each_index do |i|
-                    if ni.is_a?(Hash)
-                        if final_includes[i].is_a?(Hash)
-                            if final_includes[i].single_lt?(ni)
-                                final_includes[i] = ni
-                            elsif final_includes[i].single_gt?(ni)
-                            else
-                                final_includes << ni
-                            end
-                        elsif ni.entries[0][0].to_s == final_includes[i].to_s
-                            final_includes[i] = ni
-                        else
-                            final_includes << ni
-                        end
-                    else
-                        if final_includes[i].is_a?(Hash)
-                            final_includes << ni if final_includes[i].entries[0][0].to_s != ni.to_s
-                        else
-                            final_includes << ni if final_includes[i].to_s != ni.to_s
-                        end
-                    end
-                end
-            else
-                final_includes << ni
-            end
+
+    #suppose {:a => :b} {:a => {:b => :c} }, will remove {:a => :b}
+    def remove_dup_includes(options)
+        result = {}
+        options.each {|o| result[o.inspect.gsub(/[\{\}\":]/, '') + "=>"] = o}
+        result = result.sort.reverse
+        keep_keys = []
+        options = []
+        result.each do |o|
+            skip = false
+            keep_keys.each {|k| skip = true if (k.index(o[0]) == 0)}
+            options << o[1] unless skip
+            keep_keys << o[0]
         end
-        @new_include = final_includes
+        options
     end
   
     def improve_conditions(options)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: rquerypad
 version: !ruby/object:Gem::Version 
-  version: 0.1.21
+  version: 0.1.22
 platform: ruby
 authors: 
 - Leon Li
@@ -9,11 +9,11 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-04-15 00:00:00 +08:00
+date: 2009-04-30 00:00:00 +08:00
 default_executable: 
 dependencies: []
 
-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
+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\n"
 email: scorpio_leon@hotmail.com
 executables: []
 
@@ -31,16 +31,16 @@ files:
 - test/test_helper.rb
 - test/rquerypad_test.rb
 - test/model.rb
-- test/fixtures
 - 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
 has_rdoc: false
 homepage: http://rquerypad.rubyforge.org/
+licenses: []
+
 post_install_message: 
 rdoc_options: []
 
@@ -61,9 +61,9 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: Rquerypad
-rubygems_version: 1.3.1
+rubygems_version: 1.3.2
 signing_key: 
-specification_version: 2
+specification_version: 3
 summary: Simplify query with OO way and improve inner join for ActiveRecord
 test_files: []