Convert lib files to model concerns

diff --git a/lib/consistency_validations.rb b/app/models/concerns/consistency_validations.rb
similarity index 98%
rename from lib/consistency_validations.rb
rename to app/models/concerns/consistency_validations.rb
index 7e9b335861e6f913e5aff61da9147168f6c3ccd9..00c6ce9934b7b37c6a95f74e32a68d4678714668 100644 (file)
--- a/lib/consistency_validations.rb
+++ b/app/models/concerns/consistency_validations.rb
@@ -1,4 +1,6 @@
 module ConsistencyValidations
 module ConsistencyValidations

+  extend ActiveSupport::Concern
+

   # Generic checks that are run for the updates and deletes of
   # node, ways and relations. This code is here to avoid duplication,
   # and allow the extention of the checks without having to modify the
   # Generic checks that are run for the updates and deletes of
   # node, ways and relations. This code is here to avoid duplication,
   # and allow the extention of the checks without having to modify the

diff --git a/lib/redactable.rb b/app/models/concerns/redactable.rb
similarity index 57%
rename from lib/redactable.rb
rename to app/models/concerns/redactable.rb
index 6efdae0efd4b2dfeb8bf91c3969c88af54df8594..ccf04907f28ff363cbc0f1d2e409076c3fd254a6 100644 (file)
--- a/lib/redactable.rb
+++ b/app/models/concerns/redactable.rb
@@ -1,10 +1,8 @@
-require "osm"
-

 module Redactable
 module Redactable

-  def self.included(base)
-    # this is used to extend activerecord bases, as these aren't
-    # in scope for the module itself.
-    base.scope :unredacted, -> { where(:redaction_id => nil) }
+  extend ActiveSupport::Concern
+
+  included do
+    scope :unredacted, -> { where(:redaction_id => nil) }

   end
 
   def redacted?
   end
 
   def redacted?