Simplify a number of object model methods

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

diff --git a/app/models/old_way.rb b/app/models/old_way.rb
index 408dd72c7e93dab73f0618c2b6849ad1721b5329..e5ba53852d76ee4fee03d83c08e6af50d2fa72d8 100644 (file)
--- a/app/models/old_way.rb
+++ b/app/models/old_way.rb
@@ -65,24 +65,11 @@ class OldWay < ActiveRecord::Base
   end
 
   def nds
-    unless @nds
-      @nds = Array.new
-      self.old_nodes.order(:sequence_id).each do |nd|
-        @nds += [nd.node_id]
-      end
-    end
-    @nds
+    @nds ||= self.old_nodes.order(:sequence_id).collect { |n| n.node_id }
   end
 
   def tags
-    unless @tags
-      @tags = Hash.new
-      self.old_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 nds=(s)