ar-simple-idmap 0.1.2 → 0.1.3

data/VERSION

@@ -1 +1 @@
-0.1.2
+0.1.3

data/lib/identity_map/active_record/base.rb

@@ -26,23 +26,51 @@ module ActiveRecord
 		end
 		
 		private
+          def fetch_from_map(map, ids)
+            result, not_cached = [], []
+            ids.each do |id|
+              if ( obj = map[id] )
+                result << obj
+              else
+                not_cached << id
+              end
+            end
+            unless not_cached.empty?
+              add = yield not_cached
+              result.concat( add ) if add
+            end
+            result
+          end
 	  
 		  def find_with_identity_map( *args )
 			if_id_map do |map|
-			  unless args.size > 1 && args[1].values.any?
-				args0 = args[0]
-				if args0.is_a?(Array)
-				  result, to_find = [], []
-				  args0.each do |id| 
-				  	if (obj = map[id])
-				  	  result << obj
-				  	else
-				  	  to_find << id
-				  	end
-				  end
-				  result + find_without_identity_map( to_find )
+              from_arg0 = args.size == 1 ||
+                    args[1].is_a?(Hash) && !args[1].values.any?
+              from_condition_ids = !from_arg0 &&
+                    (args[0] == :all || args[0] == :first)
+                    args.size == 2 && args[1].is_a?(Hash) &&
+                    args[1].all?{|key, value| key == :conditions || value.blank?} &&
+                    args[1][:conditions].keys == [:id]
+			  if from_arg0 || from_condition_ids
+				ids = from_arg0 ? args[0] : args[1][:conditions][:id]
+				if ids.is_a?(Array)
+                  if from_arg0
+				    fetch_from_map( map, ids, &method(:find_without_identity_map) )
+                  elsif args[0] == :all
+                    fetch_from_map( map, ids ){|not_cached| 
+                        find_without_identity_map(:all, {:conditions=>{:id=>not_cached}})
+                    }
+                  elsif args[0] == :first
+                    to_find = nil
+                    result = fetch_from_map( map, ids ){|not_cached| to_find = not_cached; nil}
+                    unless result.empty?
+                      result.first
+                    else
+                      find_without_identity_map(:first, {:conditions=>{:id=>to_find}})
+                    end
+                  end
 				else
-				  map[args0] || find_without_identity_map(args0)
+				  map[ids]
 				end
 			  end
 			end || find_without_identity_map(*args)

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: ar-simple-idmap
 version: !ruby/object:Gem::Version 
-  hash: 31
+  hash: 29
   prerelease: false
   segments: 
   - 0
   - 1
-  - 2
-  version: 0.1.2
+  - 3
+  version: 0.1.3
 platform: ruby
 authors: 
 - Sokolov Yura aka funny_falcon