lib/dao/conducer/active_model.rb in dao-4.4.4 vs lib/dao/conducer/active_model.rb in dao-4.6.4
- old
+ new
@@ -33,10 +33,17 @@
ActiveModel::Name.new(Map[:name, model_name])
end
def default_model_name
return model_name_for('Conducer') if self == Dao::Conducer
- model_name_for(name.to_s.sub(/Conducer$/, '').sub(/(:|_)+$/, ''))
+
+ suffixes = /(Conducer|Resource|Importer|Presenter|Conductor|Cell)\Z/o
+
+ name = self.name.to_s
+ name.sub!(suffixes, '') unless name.sub(suffixes, '').blank?
+ name.sub!(/(:|_)+$/, '')
+
+ model_name_for(name)
end
def collection_name
@collection_name ||= model_name.plural.to_s
end