CachedSupermodel 0.1.2.7 → 0.1.2.8

data/Rakefile

@@ -4,7 +4,7 @@ require 'rubygems'
 require 'hoe'
 require './lib/cached_supermodel.rb'
 
-Hoe.new('CachedSupermodel', '0.1.2.7') do |p|
+Hoe.new('CachedSupermodel', '0.1.2.8') 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

@@ -75,6 +75,7 @@ def self.#{finder}_get_ids(*args)
     key_type = columns_hash[self.primary_key].type
     
     rest = args[attributes.size..-1]
+    hash_args = rest.first || {}
     cache_value(['CachedSupermodel:' + self.name + ':#{finder}:' + normal_arguments.inspect, rest.inspect]) do
        params = []
        query = 'SELECT ' + self.primary_key.to_s  + ' from ' + self.table_name
@@ -86,23 +87,22 @@ def self.#{finder}_get_ids(*args)
 
        query << (' WHERE ' + where.join(' AND '))
 
-       if rest.include?(:order)
-         query << ' ORDER BY ?'
-         params << rest[:order]
+       if hash_args.include?(:order)
+         query << ' ORDER BY ' << hash_args[:order]
        end
 
        if find_all
-         if rest.include?(:limit)
+         if hash_args.include?(:limit)
            query << ' LIMIT ?'
-           params << rest[:limit]
+           params << hash_args[:limit]
          end
        else
          query << ' LIMIT 1'
        end
 
-       if rest.include?(:offset)
+       if hash_args.include?(:offset)
          query << ' OFFSET ?'
-         params << rest[:offset]
+         params << hash_args[:offset]
        end
        
        rval = self.connection.select_all(self.sanitizeSQL([query, *params])).collect{ |row| 

metadata

@@ -3,7 +3,7 @@ rubygems_version: 0.9.0
 specification_version: 1
 name: CachedSupermodel
 version: !ruby/object:Gem::Version 
-  version: 0.1.2.7
+  version: 0.1.2.8
 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: