Use CanCanCan for export controller

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

diff --git a/app/models/way_tag.rb b/app/models/way_tag.rb
index fa9b4336177061287d00d4b153a9da6cef28c6a9..c4df0abb53904bf9b733ef5110f698b01dd123df 100644 (file)
--- a/app/models/way_tag.rb
+++ b/app/models/way_tag.rb
@@ -1,14 +1,23 @@
+# == Schema Information
+#
+# Table name: current_way_tags
+#
+#  way_id :integer          not null, primary key
+#  k      :string           default(""), not null, primary key
+#  v      :string           default(""), not null
+#
+# Foreign Keys
+#
+#  current_way_tags_id_fkey  (way_id => current_ways.id)
+#
+
 class WayTag < ActiveRecord::Base
-  set_table_name 'current_way_tags'
+  self.table_name = "current_way_tags"
+  self.primary_keys = "way_id", "k"
 
-  # False multipart keys. The following would be a hack:
-  # set_primary_keys :id, :k, :v
-  # FIXME add a real multipart key to waytags so that we can do eager loadin
+  belongs_to :way
 
-  belongs_to :way, :foreign_key => 'id'
-  
-  validates_presence_of :id
-  validates_length_of :k, :v, :maximum => 255, :allow_blank => true
-  validates_uniqueness_of :id, :scope => :k
-  validates_numericality_of :id, :only_integer => true
+  validates :way, :presence => true, :associated => true
+  validates :k, :v, :allow_blank => true, :length => { :maximum => 255 }, :characters => true
+  validates :k, :uniqueness => { :scope => :way_id }
 end