CachedSupermodel 0.1.2.5 → 0.1.2.7

data/Rakefile

@@ -4,7 +4,7 @@ require 'rubygems'
 require 'hoe'
 require './lib/cached_supermodel.rb'
 
-Hoe.new('CachedSupermodel', '0.1.2.5') do |p|
+Hoe.new('CachedSupermodel', '0.1.2.7') do |p|
   p.summary = 'A library that automatically caches all ActiveRecord::Base instances in memcache using the AdoccaMemcache gem.'
   p.description = p.paragraphs_of('README.txt', 2..5).join("\n\n")
   p.author = 'adocca Entertainment AB'

data/lib/cs_active_record.rb

@@ -68,15 +68,60 @@ class ActiveRecord::Base
       class_eval "
 def self.#{finder}_get_ids(*args)
     match = '#{finder}'.match(/^find_(all_)?by_(.*)$/)
+    # flag for find / find_all
+    find_all =  '#{finder}'.match(/^find_all_by/) ? true : false
     attributes = match[2].to_s.split(/_and_/)
     normal_arguments = args[0...attributes.size]
+    key_type = columns_hash[self.primary_key].type
+    
     rest = args[attributes.size..-1]
     cache_value(['CachedSupermodel:' + self.name + ':#{finder}:' + normal_arguments.inspect, rest.inspect]) do
-       rval = method_missing(:#{finder}, *args)
-       if Array === rval
-          rval.collect(&:id)
+       params = []
+       query = 'SELECT ' + self.primary_key.to_s  + ' from ' + self.table_name
+       where = []
+       attributes.each_with_index do |a, i|
+         where << a + ' = ?'
+         params << args[i]
+       end
+
+       query << (' WHERE ' + where.join(' AND '))
+
+       if rest.include?(:order)
+         query << ' ORDER BY ?'
+         params << rest[:order]
+       end
+
+       if find_all
+         if rest.include?(:limit)
+           query << ' LIMIT ?'
+           params << rest[:limit]
+         end
+       else
+         query << ' LIMIT 1'
+       end
+
+       if rest.include?(:offset)
+         query << ' OFFSET ?'
+         params << rest[:offset]
+       end
+       
+       rval = self.connection.select_all(self.sanitizeSQL([query, *params])).collect{ |row| 
+                                                                                      if key_type == :integer
+                                                                                        row[self.primary_key.to_s].to_i
+                                                                                      else
+                                                                                        row[self.primary_key.to_s]
+                                                                                      end
+                                                                                    }.compact
+
+
+       if find_all
+         rval
        else
-          rval.nil? ? nil : rval.id
+         if rval.blank?
+           nil
+         else
+           rval.first
+         end
        end
     end
 end

metadata

@@ -3,8 +3,8 @@ rubygems_version: 0.9.0
 specification_version: 1
 name: CachedSupermodel
 version: !ruby/object:Gem::Version 
-  version: 0.1.2.5
-date: 2007-07-30 00:00:00 +02:00
+  version: 0.1.2.7
+date: 2007-08-23 00:00:00 +02:00
 summary: A library that automatically caches all ActiveRecord::Base instances in memcache using the AdoccaMemcache gem.
 require_paths: 
 - lib
@@ -40,10 +40,13 @@ files:
 - test/test_cached_supermodel.rb
 test_files: 
 - test/test_cached_supermodel.rb
-rdoc_options: []
-
-extra_rdoc_files: []
-
+rdoc_options: 
+- --main
+- README.txt
+extra_rdoc_files: 
+- History.txt
+- Manifest.txt
+- README.txt
 executables: 
 - cached_supermodel
 extensions: []
@@ -67,5 +70,5 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 1.2.0
+        version: 1.2.2
     version: