Fix some rubocop rails style issues

[rails.git] / app / models / old_way_tag.rb

diff --git a/app/models/old_way_tag.rb b/app/models/old_way_tag.rb
index 9926db1446310fdf46d41aa6592df8f203a59331..69bd2b1861d12d845d2c3716f8fd651311d781c1 100644 (file)
--- a/app/models/old_way_tag.rb
+++ b/app/models/old_way_tag.rb
@@ -4,8 +4,7 @@ class OldWayTag < ActiveRecord::Base
 
   belongs_to :old_way, :foreign_key => [:way_id, :version]
 
-  validates_presence_of :old_way
-  validates_length_of :k, :maximum => 255, :allow_blank => true
-  validates_uniqueness_of :k, :scope => [:way_id, :version]
-  validates_length_of :v, :maximum => 255, :allow_blank => true
+  validates :old_way, :presence => true, :associated => true
+  validates :k, :v, :allow_blank => true, :length => { :maximum => 255 }
+  validates :k, :uniqueness => { :scope => [:way_id, :version] }
 end