netshade-cache-money 0.2.5.2 → 0.2.5.3

data/lib/cash/query/abstract.rb

@@ -154,7 +154,7 @@ module Cash
       end
 
       def find_from_keys(*missing_keys)
-        missing_ids = Array(missing_keys).flatten.collect { |key| key.split('/')[2].to_i }
+        missing_ids = Array(missing_keys).flatten.collect { |key| key.split('/')[2] }
         find_from_ids_without_cache(missing_ids, {})
       end
     end

data/lib/cash/query/primary_key.rb

@@ -3,18 +3,37 @@ module Cash
     class PrimaryKey < Abstract
       def initialize(active_record, ids, options1, options2)
         super(active_record, options1, options2)
-        @expects_array = ids.first.kind_of?(Array)
         @original_ids = ids
+        @keytype = active_record.columns_hash[active_record.primary_key]
         @ids = ids.flatten.compact.uniq.collect do |object|
-          object.respond_to?(:quoted_id) ? object.quoted_id : object.to_i
+          object.respond_to?(:quoted_id) ? object.quoted_id : ((@keytype == :integer) ? object.to_i : object.to_s)
+        end
+        @expects_array = @ids.size > 1 || ids.first.kind_of?(Array)
+
+        if @options1[:limit] || @options1[:offset]
+          max = (@options1[:limit] || @ids.size)
+          max -= (@options1[:offset] || 0)
+          @expected_size =   max
+        else
+          @expected_size = @ids.size          
         end
       end
 
       def perform
         return [] if @expects_array && @ids.empty?
         raise ActiveRecord::RecordNotFound if @ids.empty?
-
-        super(:conditions => { :id => @ids.first })
+        results = super(:conditions => { :id => @ids.first })
+        if @expects_array
+          if results.size != @expected_size
+            raise ActiveRecord::RecordNotFound.new("Couldn't find all #{@active_record.name.pluralize} with IDs (#{@ids.join(",")}) (found #{results.size} results, but was looking for #{@expected_size})")
+          end
+        else
+          if results.kind_of?(Array)
+            Rails.logger.info("Found multiple(#{results.size}) results for primary key(#{@active_record.name}-#{@ids.join(",")}), choosing first")
+            results = results.first
+          end
+        end
+        results
       end
 
       protected

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: netshade-cache-money
 version: !ruby/object:Gem::Version 
-  version: 0.2.5.2
+  version: 0.2.5.3
 platform: ruby
 authors: 
 - Nick Kallen