lib/blather/stanza/presence.rb in blather-0.2 vs lib/blather/stanza/presence.rb in blather-0.2.1

@@ -7,16 +7,10 @@
     VALID_TYPES = [:unavailable, :subscribe, :subscribed, :unsubscribe, :unsubscribed, :probe, :error]
 
     register :presence
 
     ##
-    # Ensure element_name is "presence" for all subclasses
-    def self.new
-      super :presence
-    end
-
-    ##
     # Creates a class based on the presence type
     # either a Status or Subscription object is created based
     # on the type attribute.
     # If neither is found it instantiates a Presence object
     def self.import(node)
@@ -24,9 +18,15 @@
       when nil, 'unavailable' then Status
       when /subscribe/        then Subscription
       else self
       end
       klass.new.inherit(node)
+    end
+
+    ##
+    # Ensure element_name is "presence" for all subclasses
+    def initialize
+      super :presence
     end
 
     VALID_TYPES.each do |valid_type|
       define_method("#{valid_type}?") { self.type == valid_type }
     end
\ No newline at end of file