lib/flirt.rb in flirt-0.0.1 vs lib/flirt.rb in flirt-0.0.2

@@ -6,29 +6,35 @@
 
 module Flirt
 
     class << self
 
-        def broadcast(event_name, event_data)
+        def publish(event_name, event_data)
             return if disabled
             raise ArgumentError.new("Event name must be a symbol") unless event_name.is_a? Symbol
             (callbacks[event_name] || []).each do |callback|
                 callback.call(event_data)
             end
         end
-        alias_method :publish, :broadcast
+        alias_method :broadcast, :publish
 
         def subscribe(object, event_name, options = {})
-            raise ArgumentError.new("You must pass a callback")    unless options[:with].is_a? Symbol
-            raise ArgumentError.new("You must pass an object")     if     object.nil?
-            raise ArgumentError.new("You must pass an event name") unless event_name.is_a? Symbol
+            check_subscription_arguments(event_name, object, options)
             callback = Flirt::Callback.new object: object,
                                            callback_name: options[:with]
             add_callback(event_name, callback)
         end
         alias_method :listen, :subscribe
 
+        def unsubscribe(object, event_name, options = {})
+            check_subscription_arguments(event_name, object, options)
+            callback = Flirt::Callback.new object: object,
+                                           callback_name: options[:with]
+            remove_callback(event_name, callback)
+        end
+        alias_method :unlisten, :unsubscribe
+
         def enable
             self.disabled = false
         end
 
         def disable
@@ -49,9 +55,23 @@
         end
 
         def add_callback(event_name, callback)
             callbacks[event_name] ||= []
             callbacks[event_name] << callback
+        end
+
+        def remove_callback(event_name, callback_to_delete)
+            return unless callbacks[event_name]
+
+            callbacks[event_name].each do |callback|
+                callbacks[event_name].delete(callback) if callback == callback_to_delete
+            end
+        end
+
+        def check_subscription_arguments(event_name, object, options)
+            raise ArgumentError.new("You must pass a callback") unless    options[:with].is_a? Symbol
+            raise ArgumentError.new("You must pass an object")  if        object.nil?
+            raise ArgumentError.new("You must pass an event name") unless event_name.is_a? Symbol
         end
 
     end
 
 end