refactor already horrible code

adelevie · Apr 19, 2012 · 5d35649 · 5d35649
1 parent 1a273c1
commit 5d35649
Showing 1 changed file with 5 additions and 2 deletions.
diff --git a/lib/parse/push.rb b/lib/parse/push.rb
@@ -12,13 +12,16 @@ class Push
 
     def initialize(data, channel = "")
       @data = data
-      @channel = channel || ""
+      @channel = channel
     end
 
     def send
       uri   = Protocol.push_uri
       body = { :data => @data, :channel => @channel }
-      body.merge({ :channels => @channels }) if @channels && @channel.nil?
+      if @channel == "" && @channels
+        body.merge({ :channels => @channels }) 
+        body.delete :channel
+      end
       body.merge({ :expiration_time_interval => @expiration_time_interval }) if @expiration_time_interval
       body.merge({ :expiration_time => @expiration_time }) if @expiration_time && @expiration_time_interval.nil?
       body.merge({ :type => @type }) if @type