lib/markable.rb in markable-0.0.5 vs lib/markable.rb in markable-0.0.6

@@ -28,11 +28,11 @@
   end
 
   def self.create_methods markers, markables
     markables.try :each do |markable|
       markers.try :each do |marker|
-        markable.markable_marks.each { |mark, options|
+        markable.__markable_marks.each { |mark, options|
           if options[:allowed_markers] == :all || options[:allowed_markers].include?(marker.marker_name)
             markable_name = markable.name.downcase
             method_name = "#{mark}_#{markable_name}".pluralize
             marker.class_eval %(
               def #{method_name}
@@ -78,13 +78,13 @@
   def self.can_mark_object? marker_object, markable_object, mark
     marker_name = marker_object.class.name.to_sym
     markable_name = markable_object.class.name.to_sym
     raise Markable::WrongMarkerType.new(marker_name) unless @@markers.include?(marker_name)
     raise Markable::WrongMarkableType.new(markable_name) unless @@markables.include?(markable_name)
-    raise Markable::WrongMark.new(marker_object, markable_object, mark) unless markable_object.markable_marks.include?(mark)
+    raise Markable::WrongMark.new(marker_object, markable_object, mark) unless markable_object.class.__markable_marks.include?(mark)
 
-    raise Markable::NotAllowedMarker.new(marker_object, markable_object, mark) unless (markable_object.markable_marks[mark][:allowed_markers] == :all ||
-                                                                  markable_object.markable_marks[mark][:allowed_markers].include?(marker_name.to_s.downcase.to_sym))
+    raise Markable::NotAllowedMarker.new(marker_object, markable_object, mark) unless (markable_object.class.__markable_marks[mark][:allowed_markers] == :all ||
+                                                                  markable_object.class.__markable_marks[mark][:allowed_markers].include?(marker_name.to_s.downcase.to_sym))
 
     true
   end
 end