move Guid module to fields

app/models/comment.rb

@@ -5,8 +5,7 @@
 class Comment < ActiveRecord::Base
 
   include Diaspora::Federated::Base
-
-  include Diaspora::Guid
+  include Diaspora::Fields::Guid
   include Diaspora::Fields::Author
   include Diaspora::Relayable
 

app/models/conversation.rb

@@ -1,6 +1,6 @@
 class Conversation < ActiveRecord::Base
   include Diaspora::Federated::Base
-  include Diaspora::Guid
+  include Diaspora::Fields::Guid
   include Diaspora::Fields::Author
 
   has_many :conversation_visibilities, dependent: :destroy

app/models/message.rb

@@ -1,6 +1,6 @@
 class Message < ActiveRecord::Base
   include Diaspora::Federated::Base
-  include Diaspora::Guid
+  include Diaspora::Fields::Guid
   include Diaspora::Fields::Author
 
   belongs_to :conversation, touch: true

app/models/person.rb

@@ -3,7 +3,7 @@
 #   the COPYRIGHT file.
 
 class Person < ActiveRecord::Base
-  include Diaspora::Guid
+  include Diaspora::Fields::Guid
 
   # NOTE API V1 to be extracted
   acts_as_api

app/models/poll.rb

@@ -1,6 +1,6 @@
 class Poll < ActiveRecord::Base
   include Diaspora::Federated::Base
-  include Diaspora::Guid
+  include Diaspora::Fields::Guid
 
   belongs_to :status_message
   has_many :poll_answers, -> { order 'id ASC' }

app/models/poll_answer.rb

@@ -1,6 +1,6 @@
 class PollAnswer < ActiveRecord::Base
   include Diaspora::Federated::Base
-  include Diaspora::Guid
+  include Diaspora::Fields::Guid
 
   belongs_to :poll
   has_many :poll_participations

app/models/poll_participation.rb

@@ -1,6 +1,6 @@
 class PollParticipation < ActiveRecord::Base
   include Diaspora::Federated::Base
-  include Diaspora::Guid
+  include Diaspora::Fields::Guid
   include Diaspora::Fields::Author
   include Diaspora::Relayable
 

lib/diaspora/fields/guid.rb

@@ -0,0 +1,18 @@
+module Diaspora
+  module Fields
+    module Guid
+      # Creates a after_initialize callback which calls #set_guid
+      def self.included(model)
+        model.class_eval do
+          after_initialize :set_guid
+          validates :guid, uniqueness: true
+        end
+      end
+
+      # @return [String] The model's guid.
+      def set_guid
+        self.guid = UUID.generate(:compact) if guid.blank?
+      end
+    end
+  end
+end

lib/diaspora/guid.rb

@@ -1,14 +0,0 @@
-module Diaspora::Guid
-  # Creates a before_create callback which calls #set_guid
-  def self.included(model)
-    model.class_eval do
-      after_initialize :set_guid
-      validates :guid, :uniqueness => true
-    end
-  end
-
-  # @return [String] The model's guid.
-  def set_guid
-    self.guid = UUID.generate :compact if self.guid.blank?
-  end
-end

lib/diaspora/shareable.rb

@@ -8,7 +8,7 @@ module Diaspora
   module Shareable
     def self.included(model)
       model.instance_eval do
-        include Diaspora::Guid
+        include Diaspora::Fields::Guid
         include Diaspora::Fields::Author
 
         has_many :aspect_visibilities, as: :shareable, validate: false, dependent: :delete_all

lib/federated/relayable.rb

@@ -3,7 +3,7 @@ module Federated
     self.abstract_class = true
 
     include Diaspora::Federated::Base
-    include Diaspora::Guid
+    include Diaspora::Fields::Guid
     include Diaspora::Fields::Author
 
     include Diaspora::Relayable