Fix most auto-correctable rubocop issues

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

diff --git a/app/models/user_preference.rb b/app/models/user_preference.rb
index 3985a527ec5f62e83b53b948b72164a48789a08d..969a368e371f60b93a6fd4c65c0b366a51ef0723 100644 (file)
--- a/app/models/user_preference.rb
+++ b/app/models/user_preference.rb
@@ -1,14 +1,17 @@
 class UserPreference < ActiveRecord::Base
-  set_primary_keys :user_id, :k
+  self.primary_keys = "user_id", "k"
+
   belongs_to :user
 
+  validates_length_of :k, :within => 1..255
+  validates_length_of :v, :within => 1..255
+
   # Turn this Node in to an XML Node without the <osm> wrapper.
   def to_xml_node
     el1 = XML::Node.new 'preference'
-    el1['k'] = self.k
-    el1['v'] = self.v
-    
-    return el1
-  end
+    el1['k'] = k
+    el1['v'] = v
 
+    el1
+  end
 end