Cleanup trailing whitespace

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

diff --git a/app/models/old_relation.rb b/app/models/old_relation.rb
index 284efd09cf6288d27ef0b7af5d329ad119a244ae..86c4784c4b9c144a094b12f521b43c9ff1baf4d7 100644 (file)
--- a/app/models/old_relation.rb
+++ b/app/models/old_relation.rb
@@ -1,7 +1,7 @@
 class OldRelation < ActiveRecord::Base
   include ConsistencyValidations
   include ObjectMetadata
-  
+
   self.table_name = "relations"
   self.primary_keys = "relation_id", "version"
 
@@ -15,7 +15,7 @@ class OldRelation < ActiveRecord::Base
 
   has_many :old_members, -> { order(:sequence_id) }, :class_name => 'OldRelationMember', :foreign_key => [:relation_id, :version]
   has_many :old_tags, :class_name => 'OldRelationTag', :foreign_key => [:relation_id, :version]
-  
+
   validates_associated :changeset
 
   def self.from_relation(relation)
@@ -31,14 +31,7 @@ class OldRelation < ActiveRecord::Base
   end
 
   def save_with_dependencies!
-
-    # see comment in old_way.rb ;-)
     save!
-    clear_aggregation_cache
-    clear_association_cache
-    @attributes.update(OldRelation.where(:relation_id => self.relation_id, :timestamp => self.timestamp).order("version DESC").first.instance_variable_get('@attributes'))
-
-    # ok, you can touch from here on
 
     self.tags.each do |k,v|
       tag = OldRelationTag.new
@@ -60,24 +53,13 @@ class OldRelation < ActiveRecord::Base
   end
 
   def members
-    unless @members
-      @members = Array.new
-      self.old_members.order(:sequence_id).each do |m|
-        @members += [[m.type,m.id,m.role]]
-      end
+    @members ||= self.old_members.collect do |member|
+      [member.member_type, member.member_id, member.member_role]
     end
-    @members
   end
 
   def tags
-    unless @tags
-      @tags = Hash.new
-      self.tags.each do |tag|
-        @tags[tag.k] = tag.v
-      end
-    end
-    @tags = Hash.new unless @tags
-    @tags
+    @tags ||= Hash[self.old_tags.collect { |t| [t.k, t.v] }]
   end
 
   def members=(s)
@@ -107,7 +89,7 @@ class OldRelation < ActiveRecord::Base
       member_el['role'] = member.member_role.to_s
       el << member_el
     end
-    
+
     add_tags_to_xml_node(el, self.old_tags)
 
     return el