model_store.rb in volt-0.6.0

- old
+ new

@@ -1,46 +1,48 @@
 require 'volt/models/persistors/store'
 
+
 module Persistors
   class ModelStore < Store
     ID_CHARS = [('a'..'z'), ('A'..'Z'), ('0'..'9')].map {|v| v.to_a }.flatten
-  
-    @@identity_map = {}
     
     attr_reader :model
+    attr_accessor :in_identity_map
     
+    def initialize(model, tasks)
+      super
+      
+      @in_identity_map = false
+    end
+    
     def add_to_collection
       @in_collection = true
       ensure_setup
       changed
     end
     
     def remove_from_collection
       @in_collection = false
-      stop_listening_for_changes
     end
     
     # Called the first time a value is assigned into this model
     def ensure_setup
       if @model.attributes
         @model.attributes[:_id] ||= generate_id
 
-        if !model_in_identity_map?
-          @@identity_map[@model.attributes[:_id]] ||= self
-        end
-
-        # Check to see if we already have listeners setup
-        if @model.listeners[:changed]
-          listen_for_changes
-        end
+        add_to_identity_map
       end
     end
     
-    def model_in_identity_map?
-      @@identity_map[@model.attributes[:_id]]
+    def add_to_identity_map
+      unless @in_identity_map
+        @@identity_map.add(@model._id, @model)
+        
+        @in_identity_map = true
+      end      
     end
-    
+
     # Create a random unique id that can be used as the mongo id as well
     def generate_id
       id = []
       12.times { id << ID_CHARS.sample }
     
@@ -61,69 +63,27 @@
         puts "Save: #{collection} - #{self_attributes.inspect} - #{@model.path.inspect}"
         @tasks.call('StoreTasks', 'save', collection, self_attributes)
       end
     end
 
-    def listen_for_changes
-      unless @change_listening
-        if @in_collection
-          @change_listening = true
-          change_channel_connection("add")
-        end
-      end
-    end
-    
-    def stop_listening_for_changes
-      if @change_listening
-        @change_listening = false
-        change_channel_connection("remove")
-      end
-    end
-
     def event_added(event, scope_provider, first)
       if first && event == :changed
-        # Start listening
         ensure_setup
-        listen_for_changes
       end
     end
-  
-    def event_removed(event, no_more_events)
-      if no_more_events && event == :changed
-        # Stop listening
-        stop_listening_for_changes
-      end
-    end
-
-    def channel_name
-       @channel_name ||= "#{@model.path[-2]}##{@model.attributes[:_id]}"
-    end
     
-    # Finds the model in its parent collection and deletes it.
-    def delete!
-      if @model.path.size == 0
-        raise "Not in a collection"
-      end
-    
-      @model.parent.delete(@model)
-    end
-    
     # Update the models based on the id/identity map.  Usually these requests
     # will come from the backend.
-    def self.update(model_id, data)
-      persistor = @@identity_map[model_id]
+    def self.changed(model_id, data)
+      model = @@identity_map.lookup(model_id)
     
-      if persistor
+      if model
         data.each_pair do |key, value|
           if key != '_id'
-            persistor.model.send(:"#{key}=", value)
+            model.send(:"#{key}=", value)
           end
         end
       end
-    end
-    
-    def self.from_id(id)
-      @@identity_map[id]
     end
 
     private
       # Return the attributes that are only for this store, not any sub-associations.
       def self_attributes
\ No newline at end of file