move Federated::Generator to Diaspora::Federated::Generator

app/models/comment.rb

@@ -54,7 +54,7 @@ class Comment < ActiveRecord::Base
      self[:text] = text.to_s.strip #to_s if for nil, for whatever reason
   end
 
-  class Generator < Federated::Generator
+  class Generator < Diaspora::Federated::Generator
     def self.federated_class
       Comment
     end

app/models/like.rb

@@ -12,7 +12,7 @@ class Like < ActiveRecord::Base
 
   alias_attribute :parent, :target
 
-  class Generator < Federated::Generator
+  class Generator < Diaspora::Federated::Generator
     def self.federated_class
       Like
     end

app/models/participation.rb

@@ -4,7 +4,7 @@ class Participation < ActiveRecord::Base
   include Diaspora::Fields::Author
   include Diaspora::Fields::Target
 
-  class Generator < Federated::Generator
+  class Generator < Diaspora::Federated::Generator
     def self.federated_class
       Participation
     end

app/models/poll_participation.rb

@@ -25,7 +25,7 @@ class PollParticipation < ActiveRecord::Base
     end
   end
 
-  class Generator < Federated::Generator
+  class Generator < Diaspora::Federated::Generator
     def self.federated_class
       PollParticipation
     end

lib/diaspora/federated/generator.rb

@@ -0,0 +1,31 @@
+module Diaspora
+  module Federated
+    class Generator
+      include Diaspora::Logging
+
+      def initialize(user, target)
+        @user = user
+        @target = target
+      end
+
+      def create!(options={})
+        relayable = build(options)
+        if relayable.save!
+          logger.info "user:#{@user.id} dispatching #{relayable.class}:#{relayable.guid}"
+          Diaspora::Federation::Dispatcher.defer_dispatch(@user, relayable)
+          relayable
+        end
+      end
+
+      def build(options={})
+        self.class.federated_class.new(options.merge(relayable_options).merge(author_id: @user.person.id))
+      end
+
+      protected
+
+      def relayable_options
+        raise NotImplementedError, "You must override relayable_options"
+      end
+    end
+  end
+end

lib/federated/generator.rb

@@ -1,29 +0,0 @@
-module Federated
-  class Generator
-    include Diaspora::Logging
-
-    def initialize(user, target)
-      @user = user
-      @target = target
-    end
-
-    def create!(options={})
-      relayable = build(options)
-      if relayable.save!
-        logger.info "user:#{@user.id} dispatching #{relayable.class}:#{relayable.guid}"
-        Diaspora::Federation::Dispatcher.defer_dispatch(@user, relayable)
-        relayable
-      end
-    end
-
-    def build(options={})
-      self.class.federated_class.new(options.merge(relayable_options).merge(author_id: @user.person.id))
-    end
-
-    protected
-
-    def relayable_options
-      {}
-    end
-  end
-end