Differentiated the names of the VersionMethods modules so that each c…

…alls included only once (Rails 4.1-compatibility)
laserlemon · Jun 6, 2014 · a3bec7c · a3bec7c
1 parent beccc57
commit a3bec7c
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/lib/vestal_versions/users.rb b/lib/vestal_versions/users.rb
@@ -6,7 +6,7 @@ module Users
 
     included do
       attr_accessor :updated_by
-      Version.class_eval{ include VersionMethods }
+      Version.class_eval{ include UserVersionMethods }
     end
 
     # Methods added to versioned ActiveRecord::Base instances to enable versioning with additional
@@ -22,7 +22,7 @@ def version_attributes
   end
 
   # Instance methods added to VestalVersions::Version to accomodate incoming user information.
-  module VersionMethods
+  module UserVersionMethods
     extend ActiveSupport::Concern
 
     included do

diff --git a/lib/vestal_versions/version_tagging.rb b/lib/vestal_versions/version_tagging.rb
@@ -23,7 +23,7 @@ def tag_version(tag)
   end
 
   # Instance methods included into VestalVersions::Version to enable version tagging.
-  module VersionMethods
+  module TaggingVersionMethods
     extend ActiveSupport::Concern
 
     included do
@@ -46,6 +46,6 @@ def validate_tags?
       tagged? && tag != 'deleted'
     end
 
-    Version.class_eval{ include VersionMethods }
+    Version.class_eval{ include TaggingVersionMethods }
   end
 end