Update to iD v2.6.0

[rails.git] / lib / redactable.rb

diff --git a/lib/redactable.rb b/lib/redactable.rb
index d8367d7bdf766741aa9b57a244a16c92786e4885..d827cfd7462aa318a11c4754434ccd311dab4a7f 100644 (file)
--- a/lib/redactable.rb
+++ b/lib/redactable.rb
@@ -1,22 +1,22 @@
-require 'osm'
+require "osm"

 
 module Redactable
   def self.included(base)
     # this is used to extend activerecord bases, as these aren't
     # in scope for the module itself.
 
 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, base.where(:redaction_id => nil)
+    base.scope :unredacted, -> { base.where(:redaction_id => nil) }

   end
   end

-  
+

   def redacted?
   def redacted?

-    not self.redaction.nil?
+    !redaction.nil?

   end
 
   def redact!(redaction)
     # check that this version isn't the current version
   end
 
   def redact!(redaction)
     # check that this version isn't the current version

-    raise OSM::APICannotRedactError.new if self.is_latest_version?
+    raise OSM::APICannotRedactError if is_latest_version?

 
     # make the change
     self.redaction = redaction
 
     # make the change
     self.redaction = redaction

-    self.save!
+    save!

   end
 end
   end
 end