app/models/merit/badge.rb in merit-1.7.1 vs app/models/merit/badge.rb in merit-1.8.0

@@ -30,11 +30,11 @@
       def find_by_name_and_level(name, level)
         badges = Badge.by_name(name)
         badges = badges.by_level(level) unless level.nil?
         if (badge = badges.first).nil?
           str = "No badge '#{name}' found. Define it in initializers/merit.rb"
-          raise ::Merit::BadgeNotFound, str
+          fail ::Merit::BadgeNotFound, str
         end
         badge
       end
 
       # Last badges granted
@@ -46,10 +46,10 @@
 
       # Defines Badge#meritable_models method, to get related
       # entries with certain badge. For instance, Badge.find(3).users
       def _define_related_entries_method(meritable_class_name)
         define_method(:"#{meritable_class_name.underscore.pluralize}") do
-          sashes = BadgesSash.where(badge_id: self.id).pluck(:sash_id)
+          sashes = BadgesSash.where(badge_id: id).pluck(:sash_id)
           meritable_class_name.constantize.where(sash_id: sashes)
         end
       end
     end
   end