lib/toy/identity_map.rb in toystore-0.8.3 vs lib/toy/identity_map.rb in toystore-0.9.0

@@ -1,106 +1,83 @@
 module Toy
-  def self.identity_map
-    Thread.current[:toystore_identity_map] ||= {}
-  end
 
   module IdentityMap
     extend ActiveSupport::Concern
 
-    included do
-      identity_map_on
+    def self.enabled=(flag)
+      Thread.current[:toystore_identity_map_enabled] = flag
     end
 
-    module ClassMethods
-      def identity_map
-        Toy.identity_map
-      end
+    def self.enabled
+      Thread.current[:toystore_identity_map_enabled]
+    end
 
-      def identity_map_on?
-        @identity_map_on == true
-      end
+    def self.enabled?
+      enabled == true
+    end
 
-      def identity_map_off?
-        !identity_map_on?
-      end
+    def self.repository
+      Thread.current[:toystore_identity_map] ||= {}
+    end
 
-      def identity_map_on
-        @identity_map_on = true
-      end
+    def self.clear
+      repository.clear
+    end
 
-      def identity_map_off
-        @identity_map_on = false
-      end
+    def self.include?(object)
+      repository.keys.include?(object.id)
+    end
 
-      def without_identity_map(&block)
-        begin
-          original_identity_map_on = @identity_map_on
-          identity_map_off
-          yield
-        ensure
-          @identity_map_on = original_identity_map_on
-        end
-      end
+    def self.use
+      old, self.enabled = enabled, true
 
+      yield if block_given?
+    ensure
+      self.enabled = old
+      clear
+    end
+
+    def self.without
+      old, self.enabled = enabled, false
+
+      yield if block_given?
+    ensure
+      self.enabled = old
+    end
+
+    module ClassMethods
       def get(id)
         get_from_identity_map(id) || super
       end
 
       def get_from_identity_map(id)
-        return nil unless identity_map_on?
-        if record = identity_map[id]
-          log_operation(:img, self.name, store, id)
-          record
-        end
+        IdentityMap.repository[id] if IdentityMap.enabled?
       end
 
       def load(id, attrs)
         return nil if attrs.nil?
 
-        if instance = identity_map[id]
+        if IdentityMap.enabled? && instance = IdentityMap.repository[id]
           instance
         else
           super.tap { |doc| doc.add_to_identity_map }
         end
       end
     end
 
-    def identity_map
-      Toy.identity_map
-    end
-
     def save(*)
-      super.tap do |result|
-        add_to_identity_map if result
-      end
+      super.tap { |result| add_to_identity_map if result }
     end
 
     def delete(*)
       super.tap { remove_from_identity_map }
     end
 
     def add_to_identity_map
-      return unless self.class.identity_map_on?
-      identity_map[id] = self
-      log_operation(:ims, self.class.name, store, id)
+      IdentityMap.repository[id] = self if IdentityMap.enabled?
     end
 
     def remove_from_identity_map
-      return unless self.class.identity_map_on?
-      identity_map.delete(id)
-      log_operation(:imd, self.class.name, store, id)
+      IdentityMap.repository.delete(id) if IdentityMap.enabled?
     end
-
-    private
-      def has_embedded_objects?
-        self.class.embedded_lists.any?
-      end
-
-      def each_embedded_object(&block)
-        if has_embedded_objects?
-          self.class.embedded_lists.keys.inject([]) do |objects, name|
-            objects.concat(send(name).to_a.compact)
-          end.each { |object| block.call(object) }
-        end
-      end
   end
 end
\ No newline at end of file